merge tdoc_ucp::OfficeDocumentsEventListener with

tdoc_ucp::ContentProvider

Change-Id: I4c743ce3d61d048ae9cf762462d9042337cd9d47
Reviewed-on: https://gerrit.libreoffice.org/26903
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

3 files changed, 8 insertions, 17 deletions

diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
index 1af03327bafd..f2390d020a4c 100644
--- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
@@ -44,6 +44,7 @@
 #include "com/sun/star/util/XCloseBroadcaster.hpp"
 
 #include "tdoc_docmgr.hxx"
+#include "tdoc_provider.hxx"
 
 using namespace com::sun::star;
 using namespace tdoc_ucp;
@@ -92,7 +93,7 @@ void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::disposing(
 
 OfficeDocumentsManager::OfficeDocumentsManager(
             const uno::Reference< uno::XComponentContext > & rxContext,
-            OfficeDocumentsEventListener * pDocEventListener )
+            ContentProvider * pDocEventListener )
 : m_xContext( rxContext ),
   m_xDocEvtNotifier( frame::theGlobalEventBroadcaster::get( rxContext ) ),
   m_pDocEventListener( pDocEventListener ),
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
index 72717e22817b..a98411cf25ab 100644
--- a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
@@ -36,16 +36,7 @@
 
 namespace tdoc_ucp {
 
-    class OfficeDocumentsEventListener
-    {
-    public:
-        virtual void notifyDocumentOpened( const OUString & rDocId ) = 0;
-        virtual void notifyDocumentClosed( const OUString & rDocId ) = 0;
-
-    protected:
-        ~OfficeDocumentsEventListener() {}
-    };
-
+    class ContentProvider;
 
     struct StorageInfo
     {
@@ -111,7 +102,7 @@ namespace tdoc_ucp {
     public:
         OfficeDocumentsManager(
             const css::uno::Reference< css::uno::XComponentContext > & rxContext,
-            OfficeDocumentsEventListener * pDocEventListener );
+            ContentProvider * pDocEventListener );
         virtual ~OfficeDocumentsManager();
 
         void destroy();
@@ -166,7 +157,7 @@ namespace tdoc_ucp {
         css::uno::Reference< css::frame::XGlobalEventBroadcaster > m_xDocEvtNotifier;
         css::uno::Reference< css::frame::XModuleManager2 >         m_xModuleMgr;
         DocumentList                                        m_aDocs;
-        OfficeDocumentsEventListener *                      m_pDocEventListener;
+        ContentProvider *                              m_pDocEventListener;
         ::rtl::Reference<OfficeDocumentsCloseListener> m_xDocCloseListener;
     };
 
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx
index d119c8dee550..e82db66e1823 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx
@@ -53,8 +53,7 @@ class StorageElementFactory;
 
 class ContentProvider :
     public ::ucbhelper::ContentProviderImplHelper,
-    public css::frame::XTransientDocumentsDocumentContentFactory,
-    public OfficeDocumentsEventListener
+    public css::frame::XTransientDocumentsDocumentContentFactory
 {
 public:
     explicit ContentProvider( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
@@ -140,8 +139,8 @@ public:
     queryDocumentModel( const OUString & rUri ) const;
 
     // interface OfficeDocumentsEventListener
-    virtual void notifyDocumentOpened( const OUString & rDocId ) override;
-    virtual void notifyDocumentClosed( const OUString & rDocId ) override;
+    void notifyDocumentOpened( const OUString & rDocId );
+    void notifyDocumentClosed( const OUString & rDocId );
 
 private:
     rtl::Reference< OfficeDocumentsManager > m_xDocsMgr;