diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-22 14:50:10 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-22 15:38:44 +0200 |
commit | 252b0c4364690e00b45175693d35eb64a07324b4 (patch) | |
tree | 08d49a42a2d7aba24d5f68584cffe521c084d021 | |
parent | fd42a226246470d5083441b976bbe0017d78fcf2 (diff) |
Update to XDocumentEventBroadcaster et al
Change-Id: Idf481726e322067af8730ef1eb1e663a174a6e3e
-rw-r--r-- | dbaccess/source/core/dataaccess/intercept.cxx | 12 | ||||
-rw-r--r-- | dbaccess/source/core/dataaccess/intercept.hxx | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index 19d9273309a2..96751d7e88fc 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -22,7 +22,7 @@ #include "dbastrings.hrc" #include <com/sun/star/embed/EmbedStates.hpp> -#include <com/sun/star/document/XEventBroadcaster.hpp> +#include <com/sun/star/document/XDocumentEventBroadcaster.hpp> #include <com/sun/star/util/XModifiable.hpp> #include <cppuhelper/weak.hxx> @@ -191,9 +191,9 @@ IMPL_LINK( OInterceptor, OnDispatch, void*, _pDispatcher ) Reference< XDispatch > xDispatch = m_xSlaveDispatchProvider->queryDispatch(pHelper->aURL, "_self", 0 ); if ( xDispatch.is() ) { - Reference< ::com::sun::star::document::XEventBroadcaster> xEvtB(m_pContentHolder->getComponent(),UNO_QUERY); + Reference< ::com::sun::star::document::XDocumentEventBroadcaster> xEvtB(m_pContentHolder->getComponent(),UNO_QUERY); if ( xEvtB.is() ) - xEvtB->removeEventListener(this); + xEvtB->removeDocumentEventListener(this); Reference< XInterface > xKeepContentHolderAlive( *m_pContentHolder ); xDispatch->dispatch( pHelper->aURL,pHelper->aArguments); @@ -257,9 +257,9 @@ void SAL_CALL OInterceptor::addStatusListener( } m_pStatCL->addInterface(_URL.Complete,Control); - Reference< ::com::sun::star::document::XEventBroadcaster> xEvtB(m_pContentHolder->getComponent(),UNO_QUERY); + Reference< ::com::sun::star::document::XDocumentEventBroadcaster> xEvtB(m_pContentHolder->getComponent(),UNO_QUERY); if ( xEvtB.is() ) - xEvtB->addEventListener(this); + xEvtB->addDocumentEventListener(this); } else { @@ -401,7 +401,7 @@ void SAL_CALL OInterceptor::setMasterDispatchProvider( m_xMasterDispatchProvider = NewSupplier; } -void SAL_CALL OInterceptor::notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OInterceptor::documentEventOccured( const ::com::sun::star::document::DocumentEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) { osl::ResettableMutexGuard _rGuard(m_aMutex); if ( m_pStatCL && Event.EventName == "OnModifyChanged" ) diff --git a/dbaccess/source/core/dataaccess/intercept.hxx b/dbaccess/source/core/dataaccess/intercept.hxx index 43490e238dee..85b6482008a7 100644 --- a/dbaccess/source/core/dataaccess/intercept.hxx +++ b/dbaccess/source/core/dataaccess/intercept.hxx @@ -25,7 +25,7 @@ #include <cppuhelper/interfacecontainer.hxx> #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> #include <com/sun/star/frame/XInterceptorInfo.hpp> -#include <com/sun/star/document/XEventListener.hpp> +#include <com/sun/star/document/XDocumentEventListener.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include "documentdefinition.hxx" #include <vcl/svapp.hxx> @@ -37,7 +37,7 @@ namespace dbaccess class OInterceptor : public ::cppu::WeakImplHelper4< ::com::sun::star::frame::XDispatchProviderInterceptor, ::com::sun::star::frame::XInterceptorInfo, ::com::sun::star::frame::XDispatch, - ::com::sun::star::document::XEventListener> + ::com::sun::star::document::XDocumentEventListener> { DECL_LINK( OnDispatch, void* _aURL ); protected: @@ -133,8 +133,8 @@ public: ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XEventListener - virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // XDocumentEventListener + virtual void SAL_CALL documentEventOccured( const ::com::sun::star::document::DocumentEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: |