diff options
| author | Mark Page <aptitude@btconnect.com> | 2016-06-03 11:16:49 +0100 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-06 07:40:25 +0000 |
| commit | e319ef1171dab61fff2201f5c1470ca09894c395 (patch) | |
| tree | 357f5ac9c42287c66e057c13781a030fa03233f9 /include | |
| parent | 9d4bc00abbada676e17ff44c5bc1cc7a77765575 (diff) | |
Simplify sfx2 removing SfxModuleArr_Impl and dummy SfxModule flag
The SfxModuleArr_Impl is a static container of SfxModule, since
this is private to the SfxModule class it does not require
wrapping.
The bDummy flag is unused, and complicates the class
Change-Id: Ib03b215543a0c37d4edf20b2d0fc141a783e115e
Reviewed-on: https://gerrit.libreoffice.org/25859
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/module.hxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index 6e10d7cd029b..787167503fd3 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.hxx @@ -35,7 +35,6 @@ class SfxObjectFactory; class ModalDialog; class SfxObjectFactory; class SfxModule; -class SfxModuleArr_Impl; class SfxModule_Impl; class SfxSlotPool; struct SfxChildWinContextFactory; @@ -54,7 +53,6 @@ class SFX2_DLLPUBLIC SfxModule : public SfxShell { private: ResMgr* pResMgr; - bool bDummy : 1; SfxModule_Impl* pImpl; SAL_DLLPRIVATE void Construct_Impl(); @@ -68,8 +66,7 @@ private: public: - SfxModule( ResMgr* pMgrP, bool bDummy, - SfxObjectFactory* pFactoryP, ... ); + SfxModule( ResMgr* pMgrP, SfxObjectFactory* pFactoryP, ... ); virtual ~SfxModule(); ResMgr* GetResMgr(); @@ -96,7 +93,7 @@ public: static FieldUnit GetModuleFieldUnit( css::uno::Reference< css::frame::XFrame > const & i_frame ); FieldUnit GetFieldUnit() const; - SAL_DLLPRIVATE static SfxModuleArr_Impl& GetModules_Impl(); + SAL_DLLPRIVATE static std::vector<SfxModule*>& GetModules_Impl(); SAL_DLLPRIVATE static void DestroyModules_Impl(); SAL_DLLPRIVATE SfxTbxCtrlFactArr_Impl* GetTbxCtrlFactories_Impl() const; SAL_DLLPRIVATE SfxStbCtrlFactArr_Impl* GetStbCtrlFactories_Impl() const; |