Tag: cws_src680_oj17 User: oj Date: 06/03/08 22:24:18 Modified: /dba/dbaccess/source/core/dataaccess/ databasedocument.cxx, databasedocument.hxx
Log: #i60290# remove globalevent broadcaster File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: databasedocument.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasedocument.cxx?r1=1.25&r2=1.25.22.1 Delta lines: +3 -29 -------------------- --- databasedocument.cxx 7 Feb 2006 10:18:42 -0000 1.25 +++ databasedocument.cxx 9 Mar 2006 06:24:15 -0000 1.25.22.1 @@ -4,9 +4,9 @@ * * $RCSfile: databasedocument.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.25.22.1 $ * - * last change: $Author: rt $ $Date: 2006/02/07 10:18:42 $ + * last change: $Author: oj $ $Date: 2006/03/09 06:24:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -172,17 +172,6 @@ { DBG_CTOR(ODatabaseDocument,NULL); - // adjust our readonly flag - try - { - m_xDocEventBroadcaster.set(m_pImpl->m_xServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.GlobalEventBroadcaster"))), - UNO_QUERY); - } - catch(Exception) - { - OSL_ENSURE(0,"Could not create GlobalEventBroadcaster!"); - } - osl_incrementInterlockedCount( &m_refCount ); { impl_reparent_nothrow( m_xForms ); @@ -1034,21 +1023,7 @@ try { css::document::EventObject aEvt(*this, _sEventName); - Reference< XEventListener > xDocEventBroadcaster; - /// TODO: this code has to be deleted after AS' cws will be integrated - try - { - xDocEventBroadcaster = xDocEventBroadcaster.query( m_pImpl->m_xServiceFactory->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.GlobalEventBroadcaster" ) ) ) ); - } - catch(Exception) - { - OSL_ENSURE(0,"Could not create GlobalEventBroadcaster!"); - } - _rGuard.clear(); - if ( xDocEventBroadcaster.is() ) - xDocEventBroadcaster->notifyEvent(aEvt); m_aDocEventListeners.notifyEach( &css::document::XEventListener::notifyEvent, aEvt ); } catch(Exception&) @@ -1082,7 +1057,6 @@ m_aCloseListener.disposeAndClear( aDisposeEvent ); m_aDocEventListeners.disposeAndClear( aDisposeEvent ); - m_xDocEventBroadcaster = NULL; m_xUIConfigurationManager = NULL; impl_clearObjectContainer( m_xForms, true ); File [changed]: databasedocument.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasedocument.hxx?r1=1.8&r2=1.8.22.1 Delta lines: +7 -5 ------------------- --- databasedocument.hxx 7 Feb 2006 10:18:54 -0000 1.8 +++ databasedocument.hxx 9 Mar 2006 06:24:16 -0000 1.8.22.1 @@ -4,9 +4,9 @@ * * $RCSfile: databasedocument.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.8.22.1 $ * - * last change: $Author: rt $ $Date: 2006/02/07 10:18:54 $ + * last change: $Author: oj $ $Date: 2006/03/09 06:24:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -77,12 +77,15 @@ #ifndef _COM_SUN_STAR_SDB_XOFFICEDATABASEDOCUMENT_HPP_ #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp> #endif +#ifndef _COM_SUN_STAR_EMBED_XTRANSACTIONLISTENER_HPP_ #include <com/sun/star/embed/XTransactionListener.hpp> +#endif + #include <boost/shared_ptr.hpp> #ifndef _DBA_COREDATAACCESS_MODELIMPL_HXX_ #include "ModelImpl.hxx" #endif -#include <cppuhelper/compbase11.hxx> + //........................................................................ namespace dbaccess { @@ -112,7 +115,6 @@ ,public ODatabaseDocument_OfficeDocument { ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager> m_xUIConfigurationManager; - ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener > m_xDocEventBroadcaster; ::cppu::OInterfaceContainerHelper m_aModifyListeners; ::cppu::OInterfaceContainerHelper m_aCloseListener; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
