User: kz Date: 05/03/04 01:43:22 Modified: /dba/dbaccess/source/core/dataaccess/ datasource.cxx
Log: INTEGRATION: CWS fwkpostbeta03 (1.54.12); FILE MERGED 2005/02/15 09:10:03 as 1.54.12.1: #i40349# add db models to global model collection; provide document events for all db models File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: datasource.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/datasource.cxx?r1=1.56&r2=1.57 Delta lines: +5 -9 ------------------- --- datasource.cxx 17 Feb 2005 11:03:46 -0000 1.56 +++ datasource.cxx 4 Mar 2005 09:43:20 -0000 1.57 @@ -164,6 +164,7 @@ using namespace ::vos; using namespace ::dbtools; using namespace ::comphelper; +namespace css = ::com::sun::star; //........................................................................ namespace dbaccess @@ -531,6 +532,7 @@ ,m_aModifyListeners(m_aMutex) ,m_aCloseListener(m_aMutex) ,m_aFlushListeners(m_aMutex) + ,m_aDocEventListeners(m_aMutex) ,m_pDBContext(_pDBContext) ,m_nControllerLockCount(0) { @@ -565,6 +567,7 @@ ,m_aModifyListeners(m_aMutex) ,m_aCloseListener(m_aMutex) ,m_aFlushListeners(m_aMutex) + ,m_aDocEventListeners(m_aMutex) ,m_pDBContext(_pDBContext) ,m_nControllerLockCount(0) { @@ -590,15 +593,6 @@ m_bReadOnly = sal_False; m_aContainer.resize(4); m_pChildCommitListen = NULL; - try - { - m_xDocEventBroadcaster.set(m_xServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.GlobalEventBroadcaster"))), - UNO_QUERY); - } - catch(Exception) - { - OSL_ENSURE(0,"Could not create GlobalEventBroadcaster!"); - } } // ----------------------------------------------------------------------------- void ODatabaseSource::setMeAsParent(const Reference< XNameAccess >& _xName) @@ -805,6 +799,7 @@ m_aModifyListeners.disposeAndClear( aDisposeEvent ); m_aCloseListener.disposeAndClear( aDisposeEvent ); m_aFlushListeners.disposeAndClear( aDisposeEvent ); + m_aDocEventListeners.disposeAndClear( aDisposeEvent ); ::std::vector<TContentPtr>::iterator aIter = m_aContainer.begin(); ::std::vector<TContentPtr>::iterator aEnd = m_aContainer.end(); @@ -1395,4 +1390,5 @@ //........................................................................ } // namespace dbaccess //........................................................................ + --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
