diff options
author | Daniel Sikeler <d.sikeler94@gmail.com> | 2014-09-02 09:12:44 +0000 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-09-10 11:48:43 +0000 |
commit | db9cfa672c5944f22ca82a28ed150a5fbae6f5b5 (patch) | |
tree | cd5ad9a28206694e39390a16b92ad88ceaf98eaf /ucb | |
parent | 50df87ceddc5f4dbebe9552c07e6c899dc17717c (diff) |
fdo#55380 replaced use of obsolete interfaces
Change-Id: I94fed6a9361f21457b3e631efffc0db833068aef
Reviewed-on: https://gerrit.libreoffice.org/11256
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'ucb')
-rw-r--r-- | ucb/source/ucp/tdoc/tdoc_docmgr.cxx | 24 | ||||
-rw-r--r-- | ucb/source/ucp/tdoc/tdoc_docmgr.hxx | 12 |
2 files changed, 18 insertions, 18 deletions
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx index 52f49b2cfd89..f6da87a35421 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx @@ -33,7 +33,7 @@ #include "com/sun/star/awt/XTopWindow.hpp" #include "com/sun/star/beans/XPropertySet.hpp" -#include "com/sun/star/document/XEventBroadcaster.hpp" +#include "com/sun/star/document/XDocumentEventBroadcaster.hpp" #include "com/sun/star/document/XStorageBasedDocument.hpp" #include "com/sun/star/frame/theGlobalEventBroadcaster.hpp" #include "com/sun/star/frame/XStorable.hpp" @@ -74,15 +74,15 @@ void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::notifyClosin const lang::EventObject& Source ) throw ( uno::RuntimeException, std::exception ) { - document::EventObject aDocEvent; + document::DocumentEvent aDocEvent; aDocEvent.Source = Source.Source; aDocEvent.EventName = "OfficeDocumentsListener::notifyClosing"; - m_pManager->notifyEvent( aDocEvent ); + m_pManager->documentEventOccured( aDocEvent ); } -// lang::XEventListener (base of util::XCloseListener) +// lang::XDocumentEventListener (base of util::XCloseListener) @@ -110,8 +110,8 @@ OfficeDocumentsManager::OfficeDocumentsManager( m_xDocCloseListener( new OfficeDocumentsCloseListener( this ) ) { // Order is important (multithreaded environment) - uno::Reference< document::XEventBroadcaster >( - m_xDocEvtNotifier, uno::UNO_QUERY_THROW )->addEventListener( this ); + uno::Reference< document::XDocumentEventBroadcaster >( + m_xDocEvtNotifier, uno::UNO_QUERY_THROW )->addDocumentEventListener( this ); buildDocumentsList(); } @@ -129,8 +129,8 @@ OfficeDocumentsManager::~OfficeDocumentsManager() void OfficeDocumentsManager::destroy() { - uno::Reference< document::XEventBroadcaster >( - m_xDocEvtNotifier, uno::UNO_QUERY_THROW )->removeEventListener( this ); + uno::Reference< document::XDocumentEventBroadcaster >( + m_xDocEvtNotifier, uno::UNO_QUERY_THROW )->removeDocumentEventListener( this ); } @@ -176,13 +176,13 @@ getDocumentId( const uno::Reference< uno::XInterface > & xDoc ) -// document::XEventListener +// document::XDocumentEventListener // virtual -void SAL_CALL OfficeDocumentsManager::notifyEvent( - const document::EventObject & Event ) +void SAL_CALL OfficeDocumentsManager::documentEventOccured( + const document::DocumentEvent & Event ) throw ( uno::RuntimeException, std::exception ) { /* @@ -427,7 +427,7 @@ void SAL_CALL OfficeDocumentsManager::notifyEvent( -// lang::XEventListener (base of document::XEventListener) +// lang::XDocumentEventListener (base of document::XDocumentEventListener) diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx index 36c5756a5016..003e78476995 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx @@ -26,7 +26,7 @@ #include "cppuhelper/implbase1.hxx" -#include "com/sun/star/document/XEventListener.hpp" +#include "com/sun/star/document/XDocumentEventListener.hpp" #include "com/sun/star/embed/XStorage.hpp" #include "com/sun/star/frame/XModel.hpp" #include "com/sun/star/frame/XModuleManager2.hpp" @@ -82,7 +82,7 @@ namespace tdoc_ucp { class OfficeDocumentsManager : - public cppu::WeakImplHelper1< com::sun::star::document::XEventListener > + public cppu::WeakImplHelper1< com::sun::star::document::XDocumentEventListener > { class OfficeDocumentsCloseListener : public cppu::WeakImplHelper1< com::sun::star::util::XCloseListener > @@ -120,12 +120,12 @@ namespace tdoc_ucp { void destroy(); - // document::XEventListener - virtual void SAL_CALL notifyEvent( - const com::sun::star::document::EventObject & Event ) + // document::XDocumentEventListener + virtual void SAL_CALL documentEventOccured( + const com::sun::star::document::DocumentEvent & Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // lang::XEventListener (base of document::XEventListener) + // lang::XEventListener (base of document::XDocumentEventListener) virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject & Source ) throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; |