Revert "Simplify sfx2 removing SfxModuleArr_Impl and dummy SfxModule flag"

This reverts commit e319ef1171dab61fff2201f5c1470ca09894c395.

Apparently, at some point, someone added a 'bool bDummy' param to
SfxModule, but only updated 2 of the 5 callsites. Since we're
passing in pointers here, at the other call sites, the bDummy
param evaluated to 'true'.

1 files changed, 5 insertions, 2 deletions

diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index 787167503fd3..6e10d7cd029b 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -35,6 +35,7 @@ class SfxObjectFactory;
 class ModalDialog;
 class SfxObjectFactory;
 class SfxModule;
+class SfxModuleArr_Impl;
 class SfxModule_Impl;
 class SfxSlotPool;
 struct SfxChildWinContextFactory;
@@ -53,6 +54,7 @@ class SFX2_DLLPUBLIC SfxModule : public SfxShell
 {
 private:
     ResMgr*                     pResMgr;
+    bool                        bDummy : 1;
     SfxModule_Impl*             pImpl;
 
     SAL_DLLPRIVATE void Construct_Impl();
@@ -66,7 +68,8 @@ private:
 
 public:
 
-                                SfxModule( ResMgr* pMgrP, SfxObjectFactory* pFactoryP, ... );
+                                SfxModule( ResMgr* pMgrP, bool bDummy,
+                                    SfxObjectFactory* pFactoryP, ... );
                                 virtual ~SfxModule();
 
     ResMgr*                     GetResMgr();
@@ -93,7 +96,7 @@ public:
     static FieldUnit            GetModuleFieldUnit( css::uno::Reference< css::frame::XFrame > const & i_frame );
     FieldUnit                   GetFieldUnit() const;
 
-    SAL_DLLPRIVATE static std::vector<SfxModule*>& GetModules_Impl();
+    SAL_DLLPRIVATE static SfxModuleArr_Impl& GetModules_Impl();
     SAL_DLLPRIVATE static void DestroyModules_Impl();
     SAL_DLLPRIVATE SfxTbxCtrlFactArr_Impl* GetTbxCtrlFactories_Impl() const;
     SAL_DLLPRIVATE SfxStbCtrlFactArr_Impl* GetStbCtrlFactories_Impl() const;