User: kz Date: 05/03/04 01:42:14 Modified: /dba/dbaccess/source/core/dataaccess/ datasource.hxx
Log: INTEGRATION: CWS fwkpostbeta03 (1.25.14); FILE MERGED 2005/02/15 09:10:04 as 1.25.14.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.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/datasource.hxx?r1=1.27&r2=1.28 Delta lines: +16 -7 -------------------- --- datasource.hxx 1 Mar 2005 19:14:07 -0000 1.27 +++ datasource.hxx 4 Mar 2005 09:42:11 -0000 1.28 @@ -110,8 +110,8 @@ #ifndef _CPPUHELPER_IMPLBASE9_HXX_ #include <cppuhelper/implbase9.hxx> #endif -#ifndef _CPPUHELPER_IMPLBASE10_HXX_ -#include <cppuhelper/implbase10.hxx> +#ifndef _CPPUHELPER_IMPLBASE12_HXX_ +#include <cppuhelper/implbase12.hxx> #endif #ifndef _COM_SUN_STAR_EMBED_XTRANSACTIONLISTENER_HPP_ #include <com/sun/star/embed/XTransactionListener.hpp> @@ -217,7 +217,7 @@ > ODatabaseSource_Base; -typedef ::cppu::ImplHelper10 < ::com::sun::star::frame::XModel +typedef ::cppu::ImplHelper12< ::com::sun::star::frame::XModel , ::com::sun::star::util::XModifiable , ::com::sun::star::frame::XStorable , ::com::sun::star::view::XPrintable @@ -227,6 +227,8 @@ , ::com::sun::star::ui::XUIConfigurationManagerSupplier , ::com::sun::star::document::XDocumentSubStorageSupplier , ::com::sun::star::embed::XTransactionListener + , ::com::sun::star::document::XEventBroadcaster + , ::com::sun::star::document::XEventListener > ODatabaseSource_OfficeDocument; @@ -295,13 +297,12 @@ ::cppu::OInterfaceContainerHelper m_aModifyListeners; ::cppu::OInterfaceContainerHelper m_aCloseListener; ::cppu::OInterfaceContainerHelper m_aFlushListeners; + ::cppu::OInterfaceContainerHelper m_aDocEventListeners; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener> m_xSharedConnectionManager; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController> m_xCurrentController; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xStorage; ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager> m_xUIConfigurationManager; - ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener > m_xDocEventBroadcaster; - ODatabaseContext* m_pDBContext; OSharedConnectionManager* m_pSharedConnectionManager; @@ -484,6 +485,13 @@ virtual sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException) ; virtual void SAL_CALL setModified( sal_Bool bModified ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException) ; +// ::com::sun::star::document::XEventBroadcaster + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + +// ::com::sun::star::document::XEventListener + virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); + // ::com::sun::star::view::XPrintable virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPrinter( ) throw (::com::sun::star::uno::RuntimeException) ; virtual void SAL_CALL setPrinter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aPrinter ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) ; @@ -562,4 +570,5 @@ //........................................................................ #endif // _DBA_COREDATAACCESS_DATALINK_HXX_ + --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
