diff options
| author | Noel Grandin <noel@peralex.com> | 2016-06-06 13:25:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-06-06 15:31:41 +0200 |
| commit | dfa8ecef62f4f55aa614013a80ad9aeb61a4fdac (patch) | |
| tree | b6910678c51b6aba2796cf6af324aa9e44e574ce /include/sfx2/module.hxx | |
| parent | 55a07417c8df1f451cac33d5dfc6a2ef450fa544 (diff) | |
Revert "Revert "Simplify sfx2 removing SfxModuleArr_Impl and dummy SfxModule flag""
This reverts commit abde31a2bc68302e1afafe1fcc3f5d85369010f8.
Since my analysis was completely incorrect, and the bug was elsewhere.
Diffstat (limited to 'include/sfx2/module.hxx')
| -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; |