Tag: cws_dev300_odbmacros3 User: fs Date: 2008-07-22 06:31:39+0000 Modified: dba/dbaccess/source/core/dataaccess/databasedocument.cxx dba/dbaccess/source/core/dataaccess/databasedocument.hxx
Log: #i76128# add an instance which executes the scripts bound to our document's events 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.40.6.7&r2=1.40.6.8 Delta lines: +5 -6 ------------------- --- databasedocument.cxx 2008-07-16 14:23:40+0000 1.40.6.7 +++ databasedocument.cxx 2008-07-22 06:31:37+0000 1.40.6.8 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: databasedocument.cxx,v $ - * $Revision: 1.40.6.7 $ + * $Revision: 1.40.6.8 $ * * This file is part of OpenOffice.org. * @@ -36,6 +36,7 @@ #include "dbastrings.hrc" #include "module_dba.hxx" #include "documentevents.hxx" +#include "documenteventexecutor.hxx" #include "databasecontext.hxx" #include "documentcontainer.hxx" @@ -121,6 +122,7 @@ ,m_aDocEventListeners( getMutex() ) ,m_aStorageListeners( getMutex() ) ,m_pEventContainer( new DocumentEvents( *this, getMutex() ) ) + ,m_pEventExecutor( NULL ) // initialized below, ref-count-protected { DBG_CTOR(ODatabaseDocument,NULL); @@ -130,6 +132,8 @@ impl_reparent_nothrow( m_xReports ); impl_reparent_nothrow( m_pImpl->m_xTableDefinitions ); impl_reparent_nothrow( m_pImpl->m_xCommandDefinitions ); + + m_pEventExecutor = new DocumentEventExecutor( m_pImpl->m_aContext, this ); } osl_decrementInterlockedCount( &m_refCount ); } @@ -1099,11 +1103,6 @@ Reference< XModel > xHoldAlive( this ); { - { - document::EventObject aEvent( *this, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnLoad" ) ) ); - impl_notifyEvent_nolck_nothrow( aEvent ); - } - lang::EventObject aDisposeEvent(static_cast<XWeak*>(this)); m_aModifyListeners.disposeAndClear( aDisposeEvent ); m_aCloseListener.disposeAndClear( aDisposeEvent ); File [changed]: databasedocument.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasedocument.hxx?r1=1.20.2.3&r2=1.20.2.4 Delta lines: +4 -1 ------------------- --- databasedocument.hxx 2008-07-16 14:23:40+0000 1.20.2.3 +++ databasedocument.hxx 2008-07-22 06:31:37+0000 1.20.2.4 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: databasedocument.hxx,v $ - * $Revision: 1.20.2.3 $ + * $Revision: 1.20.2.4 $ * * This file is part of OpenOffice.org. * @@ -67,6 +67,7 @@ #include <cppuhelper/compbase10.hxx> #include <cppuhelper/implbase3.hxx> +#include <rtl/ref.hxx> #include <boost/shared_ptr.hpp> @@ -80,6 +81,7 @@ //........................................................................ class DocumentEvents; +class DocumentEventExecutor; typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > > Controllers; @@ -123,6 +125,7 @@ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > m_xCurrentController; Controllers m_aControllers; DocumentEvents* m_pEventContainer; + ::rtl::Reference< DocumentEventExecutor > m_pEventExecutor; ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xForms; ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xReports; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
