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 /sfx2/source/inc | |
| 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 'sfx2/source/inc')
| -rw-r--r-- | sfx2/source/inc/appdata.hxx | 4 | ||||
| -rw-r--r-- | sfx2/source/inc/ctrlfactoryimpl.hxx | 14 |
2 files changed, 2 insertions, 16 deletions
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx index f74d364dfd1a..2f15933944f2 100644 --- a/sfx2/source/inc/appdata.hxx +++ b/sfx2/source/inc/appdata.hxx @@ -96,8 +96,8 @@ public: std::unique_ptr<SfxTbxCtrlFactArr_Impl> pTbxCtrlFac; - std::unique_ptr<SfxStbCtrlFactArr_Impl> - pStbCtrlFac; + std::vector<SfxStbCtrlFactory> + maStbCtrlFactories; std::unique_ptr<SfxViewFrameArr_Impl> pViewFrames; std::unique_ptr<SfxViewShellArr_Impl> diff --git a/sfx2/source/inc/ctrlfactoryimpl.hxx b/sfx2/source/inc/ctrlfactoryimpl.hxx index 4d32f1d3d298..465ddae60b2a 100644 --- a/sfx2/source/inc/ctrlfactoryimpl.hxx +++ b/sfx2/source/inc/ctrlfactoryimpl.hxx @@ -25,20 +25,6 @@ #include <vector> -class SfxStbCtrlFactArr_Impl -{ - typedef std::vector<SfxStbCtrlFactory> DataType; - DataType maData; - -public: - const SfxStbCtrlFactory& operator[](size_t i) const; - SfxStbCtrlFactory& operator[](size_t i); - - void push_back(const SfxStbCtrlFactory&); - - size_t size() const; -}; - class SfxTbxCtrlFactArr_Impl { typedef std::vector<SfxTbxCtrlFactory> DataType; |