Make SwFrameControlManager an EditWin ptr member to reduce re-compiles.

Change-Id: Ic2491948aa555fa71f9e14af554bdf204c12247d
Reviewed-on: https://gerrit.libreoffice.org/16236
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>

8 files changed, 25 insertions, 13 deletions

diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index b724fbdc3313..33b7876d4c6b 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -283,6 +283,13 @@ enum PrepareHint
     PREP_END                // END.
 };
 
+enum FrameControlType
+{
+    PageBreak,
+    Header,
+    Footer
+};
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 4d34d5a9b3a3..cb7f1a399442 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -85,13 +85,6 @@ namespace vcl
     class OldStylePrintAdaptor;
 }
 
-enum FrameControlType
-{
-    PageBreak,
-    Header,
-    Footer
-};
-
 // Define for flags needed in ctor or layers below.
 // Currently the Preview flag is needed for DrawPage.
 #define VSHELLFLAG_ISPREVIEW            ((long)0x1)
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 4dd76a03e7bf..8a070d8cdf17 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -42,6 +42,7 @@
 #include <IDocumentFieldsAccess.hxx>
 #include "dcontact.hxx"
 #include "hints.hxx"
+#include <FrameControlsManager.hxx>
 
 #include "ftnidx.hxx"
 #include "bodyfrm.hxx"
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 95493a149f6a..9f1393df1a7f 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -70,6 +70,7 @@
 
 #include <ndole.hxx>
 #include <PostItMgr.hxx>
+#include <FrameControlsManager.hxx>
 #include <vcl/settings.hxx>
 
 #include <svx/sdr/attribute/sdrallfillattributeshelper.hxx>
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx
index db26491a7480..cbee4668b767 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -22,6 +22,7 @@
 #include <PageBreakWin.hxx>
 #include <pagefrm.hxx>
 #include <PostItMgr.hxx>
+#include <FrameControlsManager.hxx>
 #include <uiitems.hxx>
 #include <view.hxx>
 #include <viewopt.hxx>
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 95e8b37f8205..427faafe85b2 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -143,6 +143,7 @@
 #include <xmloff/odffields.hxx>
 
 #include <PostItMgr.hxx>
+#include <FrameControlsManager.hxx>
 
 #include <algorithm>
 #include <vector>
@@ -4933,7 +4934,7 @@ SwEditWin::SwEditWin(vcl::Window *pParent, SwView &rMyView):
     m_bObjectSelect(false),
     m_nKS_NUMDOWN_Count(0),
     m_nKS_NUMINDENTINC_Count(0),
-    m_aFrameControlsManager( this )
+    m_pFrameControlsManager(new SwFrameControlsManager(this))
 {
     SetHelpId(HID_EDIT_WIN);
     EnableChildTransparentMode();
@@ -4974,6 +4975,7 @@ SwEditWin::SwEditWin(vcl::Window *pParent, SwView &rMyView):
 SwEditWin::~SwEditWin()
 {
     disposeOnce();
+    delete m_pFrameControlsManager;
 }
 
 void SwEditWin::dispose()
@@ -5000,7 +5002,7 @@ void SwEditWin::dispose()
     delete m_pAnchorMarker;
     m_pAnchorMarker = NULL;
 
-    m_aFrameControlsManager.dispose();
+    m_pFrameControlsManager->dispose();
 
     vcl::Window::dispose();
 }
@@ -6305,4 +6307,9 @@ void SwEditWin::SetGraphicTwipPosition(bool bStart, const Point& rPosition)
     }
 }
 
+SwFrameControlsManager& SwEditWin::GetFrameControlsManager()
+{
+    return *m_pFrameControlsManager;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index ed65f1e9d1d6..44eead671837 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_EDTWIN_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_EDTWIN_HXX
 
-#include <FrameControlsManager.hxx>
-
 #include <sot/exchange.hxx>
 #include <svx/svdobj.hxx>
 #include <tools/link.hxx>
@@ -29,6 +27,7 @@
 #include <vcl/window.hxx>
 #include <svtools/transfer.hxx>
 #include <swevent.hxx>
+#include <swtypes.hxx>
 
 class   SwWrtShell;
 class   SwView;
@@ -44,6 +43,7 @@ class   SwPaM;
 struct  SwApplyTemplate;
 struct  QuickHelpData;
 class   SdrDropMarkerOverlay;
+class   SwFrameControlsManager;
 
 // input window
 
@@ -138,7 +138,7 @@ friend void     PageNumNotify(  SwViewShell* pVwSh,
     sal_uInt16          m_nKS_NUMDOWN_Count; // #i23725#
     sal_uInt16          m_nKS_NUMINDENTINC_Count;
 
-    SwFrameControlsManager m_aFrameControlsManager;
+    SwFrameControlsManager *m_pFrameControlsManager;
 
     void            LeaveArea(const Point &);
     void            JustifyAreaTimer();
@@ -291,7 +291,7 @@ public:
      */
     OUString ClipLongToolTip(const OUString& rText);
 
-    SwFrameControlsManager& GetFrameControlsManager() { return m_aFrameControlsManager; }
+    SwFrameControlsManager& GetFrameControlsManager();
 
     SwEditWin(vcl::Window *pParent, SwView &);
     virtual ~SwEditWin();
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index dcf28a84fc1c..31315ec0f4ff 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -102,6 +102,8 @@
 #include <sfx2/viewfrm.hxx>
 
 #include "PostItMgr.hxx"
+#include "FrameControlsManager.hxx"
+
 #include <sfx2/msgpool.hxx>
 #include <boost/scoped_ptr.hpp>