mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge tdoc_ucp::OfficeDocumentsEventListener with

Browse Source 
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>
This commit is contained in:
Noel Grandin
2016-07-04 13:04:55 +02:00
committed by Noel Grandin
parent add9a35ba6
commit b9854c60c6
4 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
compilerplugins/clang/mergeclasses.results
View File

@@ -382,7 +382,6 @@ merge sw::mark::IBookmark with sw::mark::Bookmark
merge sw::mark::ICheckboxFieldmark with sw::mark::CheckboxFieldmark merge sw::mark::ICheckboxFieldmark with sw::mark::CheckboxFieldmark
merge sw::sidebarwindows::SwSidebarWin with sw::annotation::SwAnnotationWin merge sw::sidebarwindows::SwSidebarWin with sw::annotation::SwAnnotationWin
merge sw::util::WrtRedlineAuthor with WW8_WrtRedlineAuthor merge sw::util::WrtRedlineAuthor with WW8_WrtRedlineAuthor
merge tdoc_ucp::OfficeDocumentsEventListener with tdoc_ucp::ContentProvider
merge toolkit::ScrollableInterface with toolkit::ScrollableWrapper merge toolkit::ScrollableInterface with toolkit::ScrollableWrapper
merge unographic::GraphicTransformer with unographic::Graphic merge unographic::GraphicTransformer with unographic::Graphic
merge vcl::DeletionNotifier with SalFrame merge vcl::DeletionNotifier with SalFrame

3
ucb/source/ucp/tdoc/tdoc_docmgr.cxx
View File

@@ -44,6 +44,7 @@
#include "com/sun/star/util/XCloseBroadcaster.hpp" #include "com/sun/star/util/XCloseBroadcaster.hpp"
#include "tdoc_docmgr.hxx" #include "tdoc_docmgr.hxx"
#include "tdoc_provider.hxx"
using namespace com::sun::star; using namespace com::sun::star;
using namespace tdoc_ucp; using namespace tdoc_ucp;
@@ -92,7 +93,7 @@ void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::disposing(
OfficeDocumentsManager::OfficeDocumentsManager( OfficeDocumentsManager::OfficeDocumentsManager(
const uno::Reference< uno::XComponentContext > & rxContext, const uno::Reference< uno::XComponentContext > & rxContext,
OfficeDocumentsEventListener * pDocEventListener ) ContentProvider * pDocEventListener )
: m_xContext( rxContext ), : m_xContext( rxContext ),
m_xDocEvtNotifier( frame::theGlobalEventBroadcaster::get( rxContext ) ), m_xDocEvtNotifier( frame::theGlobalEventBroadcaster::get( rxContext ) ),
m_pDocEventListener( pDocEventListener ), m_pDocEventListener( pDocEventListener ),

15
ucb/source/ucp/tdoc/tdoc_docmgr.hxx
View File

@@ -36,16 +36,7 @@
namespace tdoc_ucp { namespace tdoc_ucp {
class OfficeDocumentsEventListener class ContentProvider;
{
public:
virtual void notifyDocumentOpened( const OUString & rDocId ) = 0;
virtual void notifyDocumentClosed( const OUString & rDocId ) = 0;
protected:
~OfficeDocumentsEventListener() {}
};
struct StorageInfo struct StorageInfo
{ {
@@ -111,7 +102,7 @@ namespace tdoc_ucp {
public: public:
OfficeDocumentsManager( OfficeDocumentsManager(
const css::uno::Reference< css::uno::XComponentContext > & rxContext, const css::uno::Reference< css::uno::XComponentContext > & rxContext,
OfficeDocumentsEventListener * pDocEventListener ); ContentProvider * pDocEventListener );
virtual ~OfficeDocumentsManager(); virtual ~OfficeDocumentsManager();
void destroy(); void destroy();
@@ -166,7 +157,7 @@ namespace tdoc_ucp {
css::uno::Reference< css::frame::XGlobalEventBroadcaster > m_xDocEvtNotifier; css::uno::Reference< css::frame::XGlobalEventBroadcaster > m_xDocEvtNotifier;
css::uno::Reference< css::frame::XModuleManager2 > m_xModuleMgr; css::uno::Reference< css::frame::XModuleManager2 > m_xModuleMgr;
DocumentList m_aDocs; DocumentList m_aDocs;
OfficeDocumentsEventListener * m_pDocEventListener; ContentProvider * m_pDocEventListener;
::rtl::Reference<OfficeDocumentsCloseListener> m_xDocCloseListener; ::rtl::Reference<OfficeDocumentsCloseListener> m_xDocCloseListener;
}; };

7
ucb/source/ucp/tdoc/tdoc_provider.hxx
View File

@@ -53,8 +53,7 @@ class StorageElementFactory;
class ContentProvider : class ContentProvider :
public ::ucbhelper::ContentProviderImplHelper, public ::ucbhelper::ContentProviderImplHelper,
public css::frame::XTransientDocumentsDocumentContentFactory, public css::frame::XTransientDocumentsDocumentContentFactory
public OfficeDocumentsEventListener
{ {
public: public:
explicit ContentProvider( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); explicit ContentProvider( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
@@ -140,8 +139,8 @@ public:
queryDocumentModel( const OUString & rUri ) const; queryDocumentModel( const OUString & rUri ) const;
// interface OfficeDocumentsEventListener // interface OfficeDocumentsEventListener
virtual void notifyDocumentOpened( const OUString & rDocId ) override; void notifyDocumentOpened( const OUString & rDocId );
virtual void notifyDocumentClosed( const OUString & rDocId ) override; void notifyDocumentClosed( const OUString & rDocId );
private: private:
rtl::Reference< OfficeDocumentsManager > m_xDocsMgr; rtl::Reference< OfficeDocumentsManager > m_xDocsMgr;