Forward declare SfxTbxCtrlFactArr_Impl and SfxStbCtrlFactArr_Impl in app.hxx.

Now we can finally remove ptr_vector include from this header.

Change-Id: I7aeaa520e10b4eacb1a24ad666086739821e56b0

include/sfx2/app.hxx

@@ -36,9 +36,6 @@
 #include <vcl/svapp.hxx>
 
 #include <sfx2/shell.hxx>
-#include <sfx2/stbitem.hxx>
-#include <sfx2/tbxctrl.hxx>
-#include <boost/ptr_container/ptr_vector.hpp>
 #include <vector>
 
 class Timer;
@@ -67,8 +64,8 @@ class SfxObjectShell;
 typedef ::std::vector<SfxObjectShell*> SfxObjectShellArr_Impl;
 class SfxProgress;
 class SfxSlotPool;
-typedef boost::ptr_vector<SfxStbCtrlFactory> SfxStbCtrlFactArr_Impl;
-typedef boost::ptr_vector<SfxTbxCtrlFactory> SfxTbxCtrlFactArr_Impl;
+class SfxStbCtrlFactArr_Impl;
+class SfxTbxCtrlFactArr_Impl;
 class SfxViewFrame;
 typedef ::std::vector<SfxViewFrame*> SfxViewFrameArr_Impl;
 class SfxViewShell;

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"

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: */

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;

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: */

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;
 

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;

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;