[Libreoffice-commits] core.git: include/sfx2 sfx2/source

[Kohei Yoshida]

 include/sfx2/app.hxx              |    3 +--
 sfx2/source/appl/appquit.cxx      |    1 +
 sfx2/source/appl/childwinimpl.cxx |   35 +++++++++++++++++++++++++++++++++++
 sfx2/source/appl/childwinimpl.hxx |   19 +++++++++++++++++++
 sfx2/source/appl/module.cxx       |    1 +
 sfx2/source/appl/workwin.cxx      |    1 +
 6 files changed, 58 insertions(+), 2 deletions(-)

New commits:
commit 721edde36b98a878a6d0031119fdae74fc6fb010
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Fri Nov 21 00:01:17 2014 -0500

    Forward declare SfxChildWinFactArr_Impl in sfx2/app.hxx.
    
    Change-Id: I52128b405e861551a933d9c1625d7741b43ad2b6

diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index b2e5878..d0a0459 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 1fba871..b601bfa 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 5022fa5..acdc15f 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 5095de4..8b414e7 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 5d4fdbc..974276b 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 32c33e2..e1c0867 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>