Forward-declare SfxFrameArr_Impl in sfx2/frame.hxx.

Change-Id: I49f0a16655114bf212ffec957bc6560075115e5c

7 files changed, 68 insertions, 7 deletions

diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index 954846855339..ecf87e437df7 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -76,9 +76,7 @@ class Rectangle;
 class SfxRequest;
 class SfxUnoControllerItem;
 class SystemWindow;
-
-class SfxFrame;
-typedef ::std::vector<SfxFrame*> SfxFrameArr_Impl;
+class SfxFrameArr_Impl;
 
 typedef ::std::vector<OUString> TargetList;
 
diff --git a/sfx2/inc/arrdecl.hxx b/sfx2/inc/arrdecl.hxx
index a5bcbe6069cb..837f90904fb7 100644
--- a/sfx2/inc/arrdecl.hxx
+++ b/sfx2/inc/arrdecl.hxx
@@ -21,9 +21,6 @@
 
 #include <vector>
 
-class SfxFrame;
-typedef ::std::vector<SfxFrame*> SfxFrameArr_Impl;
-
 class SfxFilter;
 typedef ::std::vector< SfxFilter* > SfxFilterList_Impl;
 
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index c07c94ccaf5c..88bfb1ce4158 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -43,6 +43,7 @@
 #include "objshimp.hxx"
 #include "imestatuswindow.hxx"
 #include "appbaslib.hxx"
+#include <childwinimpl.hxx>
 
 #include <basic/basicmanagerrepository.hxx>
 #include <basic/basmgr.hxx>
diff --git a/sfx2/source/appl/childwinimpl.cxx b/sfx2/source/appl/childwinimpl.cxx
index acdc15f3fa0f..9b64734ad9d5 100644
--- a/sfx2/source/appl/childwinimpl.cxx
+++ b/sfx2/source/appl/childwinimpl.cxx
@@ -74,4 +74,44 @@ SfxChildWinFactArr_Impl::const_iterator SfxChildWinFactArr_Impl::begin() const
     return maData.begin();
 }
 
+SfxFrameArr_Impl::iterator SfxFrameArr_Impl::begin()
+{
+    return maData.begin();
+}
+
+SfxFrameArr_Impl::iterator SfxFrameArr_Impl::end()
+{
+    return maData.end();
+}
+
+SfxFrame* SfxFrameArr_Impl::front()
+{
+    return maData.front();
+}
+
+void SfxFrameArr_Impl::erase( iterator it )
+{
+    maData.erase(it);
+}
+
+SfxFrame* SfxFrameArr_Impl::operator[] ( size_t i )
+{
+    return maData[i];
+}
+
+void SfxFrameArr_Impl::push_back( SfxFrame* p )
+{
+    maData.push_back(p);
+}
+
+size_t SfxFrameArr_Impl::size() const
+{
+    return maData.size();
+}
+
+bool SfxFrameArr_Impl::empty() const
+{
+    return maData.empty();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index c3000407371c..65e0402cf91a 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -45,7 +45,7 @@ class SfxStatusDispatcher;
 class SfxDdeTriggerTopic_Impl;
 class SfxDocumentTemplates;
 class SfxFrame;
-typedef ::std::vector<SfxFrame*> SfxFrameArr_Impl;
+class SfxFrameArr_Impl;
 class SvtSaveOptions;
 class SvtHelpOptions;
 class ResMgr;
diff --git a/sfx2/source/inc/childwinimpl.hxx b/sfx2/source/inc/childwinimpl.hxx
index 8b414e743baf..8a78dfca7262 100644
--- a/sfx2/source/inc/childwinimpl.hxx
+++ b/sfx2/source/inc/childwinimpl.hxx
@@ -24,6 +24,8 @@
 
 #include <boost/ptr_container/ptr_vector.hpp>
 
+class SfxFrame;
+
 class SfxChildWinContextArr_Impl
 {
     typedef boost::ptr_vector<SfxChildWinContextFactory> DataType;
@@ -55,6 +57,28 @@ public:
     const_iterator begin() const;
 };
 
+class SfxFrameArr_Impl
+{
+    typedef std::vector<SfxFrame*> DataType;
+    DataType maData;
+
+public:
+    typedef DataType::iterator iterator;
+
+    iterator begin();
+    iterator end();
+
+    SfxFrame* front();
+
+    void erase( iterator it );
+
+    SfxFrame* operator[] ( size_t i );
+
+    void push_back( SfxFrame* p );
+    size_t size() const;
+    bool empty() const;
+};
+
 #endif
 
 
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index d3c299608512..4c9744af5dd0 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -60,6 +60,7 @@
 #include <sfx2/msgpool.hxx>
 #include "objshimp.hxx"
 #include <sfx2/ipclient.hxx>
+#include <childwinimpl.hxx>
 
 #ifdef DBG_UTIL
 #include <sfx2/frmhtmlw.hxx>