diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-08-30 21:00:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-31 08:11:05 +0200 |
| commit | 48cff413e21830e3da4df8cb55540e68a4f009a6 (patch) | |
| tree | 47c4f41c68d6b2b5b12531c432ad1b1e33616f4e /include/sfx2 | |
| parent | 1ff8e0a958685fbaf63fbc2d4c766a76869d4879 (diff) | |
flatten SfxStbCtrlFactArr_Impl
Change-Id: I1d92a41f0f1a2610930e48b5eeaa689ac47ab7fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121329
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/app.hxx | 3 | ||||
| -rw-r--r-- | include/sfx2/module.hxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index 573eef573246..541e9cf94159 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -45,7 +45,6 @@ class SfxObjectShellArr_Impl; class SfxObjectShellLock; class SfxProgress; class SfxSlotPool; -class SfxStbCtrlFactArr_Impl; class SfxTbxCtrlFactArr_Impl; class SfxViewFrame; class SfxViewFrameArr_Impl; @@ -174,7 +173,7 @@ public: SAL_DLLPRIVATE void RegisterStatusBarControl_Impl(SfxModule*, const SfxStbCtrlFactory&); SAL_DLLPRIVATE void RegisterToolBoxControl_Impl( SfxModule*, const SfxTbxCtrlFactory&); SAL_DLLPRIVATE SfxTbxCtrlFactArr_Impl& GetTbxCtrlFactories_Impl() const; - SAL_DLLPRIVATE SfxStbCtrlFactArr_Impl& GetStbCtrlFactories_Impl() const; + SAL_DLLPRIVATE SfxStbCtrlFactory* GetStbCtrlFactory(const std::type_info& rSlotType, sal_uInt16 nSlotID) const; SAL_DLLPRIVATE SfxChildWinFactory* GetChildWinFactoryById(sal_uInt16 nId) const; SAL_DLLPRIVATE SfxViewFrameArr_Impl& GetViewFrames_Impl() const; SAL_DLLPRIVATE SfxViewShellArr_Impl& GetViewShells_Impl() const; diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index 707d03cc4a25..c24d1acac4e9 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.hxx @@ -37,7 +37,6 @@ struct SfxStbCtrlFactory; struct SfxTbxCtrlFactory; class SfxTabPage; class SfxTbxCtrlFactArr_Impl; -class SfxStbCtrlFactArr_Impl; namespace com::sun::star::frame { class XFrame; @@ -96,7 +95,7 @@ public: FieldUnit GetFieldUnit() const; SAL_DLLPRIVATE SfxTbxCtrlFactArr_Impl* GetTbxCtrlFactories_Impl() const; - SAL_DLLPRIVATE SfxStbCtrlFactArr_Impl* GetStbCtrlFactories_Impl() const; + SAL_DLLPRIVATE SfxStbCtrlFactory* GetStbCtrlFactory(const std::type_info& rSlotType, sal_uInt16 nSlotID) const; SAL_DLLPRIVATE SfxChildWinFactory* GetChildWinFactoryById(sal_uInt16 nId) const; }; |