User: hr Date: 2006/08/15 03:45:06 Modified: dba/dbaccess/source/core/dataaccess/datasource.hxx
Log: INTEGRATION: CWS dba30 (1.29.12); FILE MERGED 2006/07/19 12:18:20 fs 1.29.12.9: RESYNC: (1.35-1.36); FILE MERGED 2006/05/11 12:28:44 fs 1.29.12.8: #i10000# merge error 2006/05/09 07:16:32 fs 1.29.12.7: #i10000# 2006/04/20 06:46:00 oj 1.29.12.6: RESYNC: (1.34-1.35); FILE MERGED 2006/03/21 18:24:29 fs 1.29.12.5: RESYNC: (1.33-1.34); FILE MERGED 2005/11/23 10:15:28 fs 1.29.12.4: RESYNC: (1.32-1.33); FILE MERGED 2005/10/13 14:52:30 fs 1.29.12.3: RESYNC: (1.31-1.32); FILE MERGED 2005/09/30 06:16:01 fs 1.29.12.2: RESYNC: (1.29-1.31); FILE MERGED 2005/04/06 07:20:17 fs 1.29.12.1: #i46768# implement a Settings property, wrapping (as PropertyBag) the Info property File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: datasource.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/datasource.hxx?r1=1.36&r2=1.37 Delta lines: +4 -3 ------------------- --- datasource.hxx 20 Jun 2006 02:44:55 -0000 1.36 +++ datasource.hxx 15 Aug 2006 10:45:03 -0000 1.37 @@ -186,6 +186,7 @@ ODatabaseSource_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); private: + OBookmarkContainer m_aBookmarks; ::cppu::OInterfaceContainerHelper m_aFlushListeners; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
