diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2014-08-12 23:58:14 +0900 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-08-13 08:53:48 -0500 |
| commit | a247b8257a904372fcc2330bd8820176d4a71ebd (patch) | |
| tree | a5b0c4e19be964abdd7cf680d9d10bb52d2ede42 /include | |
| parent | a8c503a69c467526ef80ec36b7916e7b931f9101 (diff) | |
fdo#75757: remove inheritance to std::vector
... by replacing the following 3 classes with typedefs of std::vector:
SfxObjectShellArr_Impl / SfxViewFrameArr_Impl / SfxViewShellArr_Impl
and the following 4 with typedefs of boost::ptr_vector:
SfxChildWinFactArr_Impl / SfxMenuCtrlFactArr_Impl /
SfxStbCtrlFactArr_Impl / SfxTbxCtrlFactArr_Impl
Change-Id: I1754bd19ec418a3e7ba5c47fb6d8568e8fca9b29
Reviewed-on: https://gerrit.libreoffice.org/10891
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/app.hxx | 20 | ||||
| -rw-r--r-- | include/sfx2/module.hxx | 5 |
2 files changed, 13 insertions, 12 deletions
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index 0a11a0616b5a..ca2200067552 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -35,7 +35,12 @@ // header file because in former times SfxApplication was derived from it #include <vcl/svapp.hxx> +#include <sfx2/childwin.hxx> +#include <sfx2/mnuitem.hxx> #include <sfx2/shell.hxx> +#include <sfx2/stbitem.hxx> +#include <sfx2/tbxctrl.hxx> +#include <boost/ptr_container/ptr_vector.hpp> #include <vector> class Timer; @@ -51,32 +56,31 @@ class AppSettings; struct SfxChildWinContextFactory; class SfxAppData_Impl; class SfxBindings; -class SfxChildWinFactArr_Impl; +typedef boost::ptr_vector<SfxChildWinFactory> SfxChildWinFactArr_Impl; class SfxChildWindow; class SfxDispatcher; class SfxEventConfiguration; class SfxEventHint; class SfxItemSet; class SfxMedium; -class SfxMenuCtrlFactArr_Impl; +typedef boost::ptr_vector<SfxMenuCtrlFactory> SfxMenuCtrlFactArr_Impl; class SfxNewFileDialog; class SfxObjectShell; -class SfxObjectShellArr_Impl; +typedef ::std::vector<SfxObjectShell*> SfxObjectShellArr_Impl; class SfxProgress; class SfxSlotPool; -class SfxStbCtrlFactArr_Impl; -class SfxTbxCtrlFactArr_Impl; +typedef boost::ptr_vector<SfxStbCtrlFactory> SfxStbCtrlFactArr_Impl; +typedef boost::ptr_vector<SfxTbxCtrlFactory> SfxTbxCtrlFactArr_Impl; class SfxTemplateDialog; class SfxViewFrame; -class SfxViewFrameArr_Impl; +typedef ::std::vector<SfxViewFrame*> SfxViewFrameArr_Impl; class SfxViewShell; -class SfxViewShellArr_Impl; +typedef ::std::vector<SfxViewShell*> SfxViewShellArr_Impl; class StarBASIC; class SfxWorkWindow; class SfxFilterMatcher; class SfxModule; class SfxModule; -typedef ::std::vector<SfxModule*> SfxModuleArr_Impl; class Window; struct SfxChildWinFactory; struct SfxMenuCtrlFactory; diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index 9dbfbad287bd..cf9130f97b8a 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.hxx @@ -21,6 +21,7 @@ #define _SFXMOD_HXX // external #include <sal/config.h> +#include <sfx2/app.hxx> #include <sfx2/dllapi.h> #include <sfx2/shell.hxx> #include <svtools/imgdef.hxx> @@ -44,10 +45,6 @@ struct SfxChildWinFactory; struct SfxMenuCtrlFactory; struct SfxStbCtrlFactory; struct SfxTbxCtrlFactory; -class SfxTbxCtrlFactArr_Impl; -class SfxChildWinFactArr_Impl; -class SfxMenuCtrlFactArr_Impl; -class SfxStbCtrlFactArr_Impl; class SfxTabPage; class Window; |