diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-11-21 22:17:04 -0500 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-11-21 22:26:46 -0500 |
commit | 483cff5e661aa40c8fd16d62eeb68cc29872eb4b (patch) | |
tree | 5e9dafb4e3acc12d680dd6c1c5cb7cee68b13a62 /sfx2 | |
parent | c2d11710716f3ec5696f3402951be0d7539fe376 (diff) |
Forward declare SfxTbxCtrlFactArr_Impl and SfxStbCtrlFactArr_Impl in app.hxx.
Now we can finally remove ptr_vector include from this header.
Change-Id: I7aeaa520e10b4eacb1a24ad666086739821e56b0
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/appl/shutdowniconunx.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/control/ctrlfactoryimpl.cxx | 40 | ||||
-rw-r--r-- | sfx2/source/control/unoctitm.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/inc/ctrlfactoryimpl.hxx | 30 | ||||
-rw-r--r-- | sfx2/source/statbar/stbitem.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/view/frame2.cxx | 1 |
7 files changed, 75 insertions, 0 deletions
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx index b716f56d8724..746819d6fd20 100644 --- a/sfx2/source/appl/shutdowniconunx.cxx +++ b/sfx2/source/appl/shutdowniconunx.cxx @@ -26,6 +26,7 @@ #include <gtk/gtk.h> #include <glib.h> #include <osl/mutex.hxx> +#include <osl/module.hxx> #include <vcl/bitmapex.hxx> #include <vcl/bmpacc.hxx> #include "tools/rc.hxx" diff --git a/sfx2/source/control/ctrlfactoryimpl.cxx b/sfx2/source/control/ctrlfactoryimpl.cxx index 3e5fbf515c51..9a877e143ece 100644 --- a/sfx2/source/control/ctrlfactoryimpl.cxx +++ b/sfx2/source/control/ctrlfactoryimpl.cxx @@ -39,4 +39,44 @@ size_t SfxMenuCtrlFactArr_Impl::size() const return maData.size(); } +const SfxStbCtrlFactory& SfxStbCtrlFactArr_Impl::operator []( size_t i ) const +{ + return maData[i]; +} + +SfxStbCtrlFactory& SfxStbCtrlFactArr_Impl::operator []( size_t i ) +{ + return maData[i]; +} + +void SfxStbCtrlFactArr_Impl::push_back( SfxStbCtrlFactory* p ) +{ + maData.push_back(p); +} + +size_t SfxStbCtrlFactArr_Impl::size() const +{ + return maData.size(); +} + +const SfxTbxCtrlFactory& SfxTbxCtrlFactArr_Impl::operator []( size_t i ) const +{ + return maData[i]; +} + +SfxTbxCtrlFactory& SfxTbxCtrlFactArr_Impl::operator []( size_t i ) +{ + return maData[i]; +} + +void SfxTbxCtrlFactArr_Impl::push_back( SfxTbxCtrlFactory* p ) +{ + maData.push_back(p); +} + +size_t SfxTbxCtrlFactArr_Impl::size() const +{ + return maData.size(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index b371e7a88d44..ba0ea7c94e7d 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -66,6 +66,7 @@ #include <boost/scoped_ptr.hpp> #include <iostream> +#include <map> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sfx2/source/inc/ctrlfactoryimpl.hxx b/sfx2/source/inc/ctrlfactoryimpl.hxx index a40f275a6bbd..81feb31a8ef6 100644 --- a/sfx2/source/inc/ctrlfactoryimpl.hxx +++ b/sfx2/source/inc/ctrlfactoryimpl.hxx @@ -21,6 +21,8 @@ #define INCLUDED_SFX2_CTRLFACTORYIMPL_HXX #include <sfx2/mnuitem.hxx> +#include <sfx2/stbitem.hxx> +#include <sfx2/tbxctrl.hxx> #include <boost/ptr_container/ptr_vector.hpp> @@ -38,6 +40,34 @@ public: size_t size() const; }; +class SfxStbCtrlFactArr_Impl +{ + typedef boost::ptr_vector<SfxStbCtrlFactory> DataType; + DataType maData; + +public: + const SfxStbCtrlFactory& operator []( size_t i ) const; + SfxStbCtrlFactory& operator []( size_t i ); + + void push_back( SfxStbCtrlFactory* p ); + + size_t size() const; +}; + +class SfxTbxCtrlFactArr_Impl +{ + typedef boost::ptr_vector<SfxTbxCtrlFactory> DataType; + DataType maData; + +public: + const SfxTbxCtrlFactory& operator []( size_t i ) const; + SfxTbxCtrlFactory& operator []( size_t i ); + + void push_back( SfxTbxCtrlFactory* p ); + + size_t size() const; +}; + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index eeea72b6e8c2..fdea01e8890c 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -46,6 +46,7 @@ #include <svl/intitem.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/helper/convert.hxx> +#include <ctrlfactoryimpl.hxx> using namespace ::com::sun::star; diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 3f46f722a67a..c596ee72b16a 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -91,6 +91,7 @@ #include <sfx2/imgmgr.hxx> #include "virtmenu.hxx" #include <sfx2/imagemgr.hxx> +#include <ctrlfactoryimpl.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::beans; diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index c3d21c7bb713..5b3a6ccac95a 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -49,6 +49,7 @@ #include <svl/stritem.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> +#include <vcl/syswin.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; |