diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-11-21 00:01:17 -0500 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-11-21 08:52:27 -0500 |
commit | 721edde36b98a878a6d0031119fdae74fc6fb010 (patch) | |
tree | 9d3de34ce7e1c631fe1474cc02373f5dc97d111b | |
parent | 4ecbc7e63cd0b84ad9310b5206c41ce750f46a57 (diff) |
Forward declare SfxChildWinFactArr_Impl in sfx2/app.hxx.
Change-Id: I52128b405e861551a933d9c1625d7741b43ad2b6
-rw-r--r-- | include/sfx2/app.hxx | 3 | ||||
-rw-r--r-- | sfx2/source/appl/appquit.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/appl/childwinimpl.cxx | 35 | ||||
-rw-r--r-- | sfx2/source/appl/childwinimpl.hxx | 19 | ||||
-rw-r--r-- | sfx2/source/appl/module.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/appl/workwin.cxx | 1 |
6 files changed, 58 insertions, 2 deletions
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index b2e5878254d2..d0a045996e9f 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -35,7 +35,6 @@ // 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> @@ -56,7 +55,7 @@ class AppSettings; struct SfxChildWinContextFactory; class SfxAppData_Impl; class SfxBindings; -typedef boost::ptr_vector<SfxChildWinFactory> SfxChildWinFactArr_Impl; +class SfxChildWinFactArr_Impl; class SfxChildWindow; class SfxDispatcher; class SfxEventConfiguration; diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx index 1fba87125583..b601bfa8f0d4 100644 --- a/sfx2/source/appl/appquit.cxx +++ b/sfx2/source/appl/appquit.cxx @@ -53,6 +53,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/docfac.hxx> #include "appbaslib.hxx" +#include "childwinimpl.hxx" #include <basic/basicmanagerrepository.hxx> #include <svtools/svtresid.hxx> diff --git a/sfx2/source/appl/childwinimpl.cxx b/sfx2/source/appl/childwinimpl.cxx index 5022fa58f91e..acdc15f3fa0f 100644 --- a/sfx2/source/appl/childwinimpl.cxx +++ b/sfx2/source/appl/childwinimpl.cxx @@ -39,4 +39,39 @@ void SfxChildWinContextArr_Impl::push_back( SfxChildWinContextFactory* p ) maData.push_back(p); } +size_t SfxChildWinFactArr_Impl::size() const +{ + return maData.size(); +} + +const SfxChildWinFactory& SfxChildWinFactArr_Impl::operator []( size_t i ) const +{ + return maData[i]; +} + +SfxChildWinFactory& SfxChildWinFactArr_Impl::operator []( size_t i ) +{ + return maData[i]; +} + +void SfxChildWinFactArr_Impl::push_back( SfxChildWinFactory* p ) +{ + maData.push_back(p); +} + +void SfxChildWinFactArr_Impl::erase( iterator it ) +{ + maData.erase(it); +} + +SfxChildWinFactArr_Impl::iterator SfxChildWinFactArr_Impl::begin() +{ + return maData.begin(); +} + +SfxChildWinFactArr_Impl::const_iterator SfxChildWinFactArr_Impl::begin() const +{ + return maData.begin(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/appl/childwinimpl.hxx b/sfx2/source/appl/childwinimpl.hxx index 5095de408686..8b414e743baf 100644 --- a/sfx2/source/appl/childwinimpl.hxx +++ b/sfx2/source/appl/childwinimpl.hxx @@ -36,6 +36,25 @@ public: void push_back( SfxChildWinContextFactory* p ); }; +class SfxChildWinFactArr_Impl +{ + typedef boost::ptr_vector<SfxChildWinFactory> DataType; + DataType maData; + +public: + typedef DataType::iterator iterator; + typedef DataType::const_iterator const_iterator; + + size_t size() const; + const SfxChildWinFactory& operator []( size_t i ) const; + SfxChildWinFactory& operator []( size_t i ); + void push_back( SfxChildWinFactory* p ); + void erase( iterator it ); + + iterator begin(); + const_iterator begin() const; +}; + #endif diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index 5d4fdbcc9e68..974276ba4f1e 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -41,6 +41,7 @@ #define SfxModule #include "sfxslots.hxx" +#include "childwinimpl.hxx" static SfxModuleArr_Impl* pModules=0; diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 32c33e2e79e6..e1c08677124d 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -32,6 +32,7 @@ #include <sfx2/dockwin.hxx> #include <sfx2/viewsh.hxx> #include "splitwin.hxx" +#include "childwinimpl.hxx" #include <sfx2/msgpool.hxx> #include <sfx2/sfxresid.hxx> #include <sfx2/request.hxx> |