Reducing header dependency on markdata.hxx.

26 files changed, 50 insertions, 15 deletions

diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index e781ffa69ca7..f06e4491fa69 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -67,6 +67,7 @@
 #include "postit.hxx"
 #include "cliputil.hxx"
 #include "clipparam.hxx"
+#include "markdata.hxx"
 
 //------------------------------------------------------------------
 
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 0aab1e5b9908..fd86dbe14375 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -101,6 +101,7 @@
 #include "dbdata.hxx"
 #include "docsh.hxx"
 #include "cliputil.hxx"
+#include "markdata.hxx"
 
 #include "globstr.hrc"
 #include "scui_def.hxx"
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 8a565bcbe81f..a437bfe5996f 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -76,6 +76,7 @@
 #include "impex.hxx"
 #include "asciiopt.hxx"
 #include "queryentry.hxx"
+#include "markdata.hxx"
 
 using namespace com::sun::star;
 
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 0999a3c18cf0..3914d6fca1c1 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -56,7 +56,7 @@
 #include "attrdlg.hrc"      // TP_ALIGNMENT
 #include "inputhdl.hxx"
 #include "editable.hxx"
-
+#include "markdata.hxx"
 #include "scabstdlg.hxx"
 
 #define IS_EDITMODE() GetViewData()->HasEditView( GetViewData()->GetActivePart() )
diff --git a/sc/source/ui/view/cliputil.cxx b/sc/source/ui/view/cliputil.cxx
index bd8be80d537e..74ac721e403d 100644
--- a/sc/source/ui/view/cliputil.cxx
+++ b/sc/source/ui/view/cliputil.cxx
@@ -36,6 +36,7 @@
 #include "clipparam.hxx"
 #include "rangelst.hxx"
 #include "viewutil.hxx"
+#include "markdata.hxx"
 
 #include "vcl/waitobj.hxx"
 
diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx
index 83c5ab9dc829..27ce6d618c6b 100644
--- a/sc/source/ui/view/colrowba.cxx
+++ b/sc/source/ui/view/colrowba.cxx
@@ -43,6 +43,7 @@
 #include "docsh.hxx"
 #include "appoptio.hxx"
 #include "globstr.hrc"
+#include "markdata.hxx"
 
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx
index d1aff8c5dbfa..1565acad07ab 100644
--- a/sc/source/ui/view/dbfunc.cxx
+++ b/sc/source/ui/view/dbfunc.cxx
@@ -51,6 +51,7 @@
 #include "dbdocfun.hxx"
 #include "editable.hxx"
 #include "queryentry.hxx"
+#include "markdata.hxx"
 
 //==================================================================
 
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index e4c4f9e0fa96..78253f8e211b 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -81,6 +81,7 @@
 #include "cell.hxx"
 #include "userlist.hxx"
 #include "queryentry.hxx"
+#include "markdata.hxx"
 
 #include <boost/unordered_set.hpp>
 #include <boost/unordered_map.hpp>
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 092a619e735c..14ed51792284 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -100,6 +100,7 @@
 #include "scresid.hxx"
 #include "tabvwsh.hxx"
 #include "undostyl.hxx"
+#include "markdata.hxx"
 
 
 #define ScFormatShell
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index b533a82e03f0..23e1692517e9 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -133,6 +133,7 @@
 #include "dragdata.hxx"
 #include "cliputil.hxx"
 #include "queryentry.hxx"
+#include "markdata.hxx"
 
 #include <svx/sdrpagewindow.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 1ee84cf3a0d7..e1d582c59daf 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -70,6 +70,7 @@
 #include "dpcontrol.hxx"
 #include "queryparam.hxx"
 #include "queryentry.hxx"
+#include "markdata.hxx"
 #include "sc.hrc"
 #include <vcl/virdev.hxx>
 
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index 407dfeeca691..254d24cd0a8d 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -46,6 +46,7 @@
 #include "inputopt.hxx"     // Optionen
 #include "gridmerg.hxx"
 #include "document.hxx"
+#include "markdata.hxx"
 
 // -----------------------------------------------------------------------
 
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 1e39c3b5a8c9..db4b2c0d515d 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -60,6 +60,7 @@
 #include "undostyl.hxx"
 #include "drwlayer.hxx"
 #include "scmod.hxx"
+#include "markdata.hxx"
 #include "globstr.hrc"
 #include "sc.hrc"           // fuer ShellInvalidate
 #include "AccessibleDocumentPagePreview.hxx"
diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
index dfc38abe0447..eee115e67e77 100644
--- a/sc/source/ui/view/select.cxx
+++ b/sc/source/ui/view/select.cxx
@@ -46,6 +46,7 @@
 #include "transobj.hxx"
 #include "docsh.hxx"
 #include "tabprotection.hxx"
+#include "markdata.hxx"
 
 #define SC_SELENG_REFMODE_UPDATE_INTERVAL_MIN 65
 
diff --git a/sc/source/ui/view/selectionstate.cxx b/sc/source/ui/view/selectionstate.cxx
index 93bcb4c68082..bc5411915e74 100644
--- a/sc/source/ui/view/selectionstate.cxx
+++ b/sc/source/ui/view/selectionstate.cxx
@@ -32,6 +32,7 @@
 
 #include <editeng/editview.hxx>
 #include "viewdata.hxx"
+#include "markdata.hxx"
 
 // ============================================================================
 
diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx
index 10d517b31a5e..e6ca322cc72a 100644
--- a/sc/source/ui/view/spelleng.cxx
+++ b/sc/source/ui/view/spelleng.cxx
@@ -51,7 +51,7 @@
 #include "patattr.hxx"
 #include "waitoff.hxx"
 #include "globstr.hrc"
-
+#include "markdata.hxx"
 
 using namespace ::com::sun::star;
 
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index db140e745adf..37f691438209 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -49,6 +49,7 @@
 #include "transobj.hxx"
 #include "clipparam.hxx"
 #include "dragdata.hxx"
+#include "markdata.hxx"
 
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index 1dcb4e1a6274..c65ae91a5391 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -55,6 +55,7 @@
 #include "globstr.hrc"
 #include "scmod.hxx"
 #include "tabprotection.hxx"
+#include "markdata.hxx"
 
 namespace {
 
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index b7f7ef836f1d..9284d5e16c53 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -78,6 +78,7 @@
 #include "rangeutl.hxx"
 #include "client.hxx"
 #include "tabprotection.hxx"
+#include "markdata.hxx"
 #include "formula/FormulaCompiler.hxx"
 
 #include <com/sun/star/chart2/data/HighlightedRange.hpp>
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 34bd4261a4bc..b23f8c30adf2 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -71,6 +71,7 @@
 #include "shtabdlg.hxx"
 #include "tabprotection.hxx"
 #include "protectiondlg.hxx"
+#include "markdata.hxx"
 
 #include <svl/ilstitem.hxx>
 #include <vector>
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 9de8b210407b..53318b4d89f7 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -66,6 +66,7 @@
 #include "dwfunctr.hxx"
 #include "scabstdlg.hxx"
 #include "compiler.hxx"
+#include "markdata.hxx"
 
 
 sal_Bool ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode )
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 0c1f007868d5..25167ea29311 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -70,6 +70,7 @@
 #include "simpref.hxx"
 #include "funcdesc.hxx"
 #include "dpobject.hxx"
+#include "markdata.hxx"
 
 #include <iostream>
 
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index a9a2cc39f8c3..201fc844dfe9 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -59,6 +59,7 @@
 #include "tabbgcolor.hxx"
 #include "tabbgcolordlg.hxx"
 #include "sccommands.h"
+#include "markdata.hxx"
 
 #include <vector>
 
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 75e404f32773..0e3d6bde6100 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -66,6 +66,7 @@
 #include "unonames.hxx"
 #include "inputopt.hxx"
 #include "viewutil.hxx"
+#include "markdata.hxx"
 #include "stlalgorithm.hxx"
 #include "ViewSettingsSequenceDefines.hxx"
 #include <rtl/ustrbuf.hxx>
@@ -298,6 +299,7 @@ void ScViewDataTable::ReadUserDataSequence(const uno::Sequence <beans::PropertyV
 }
 
 ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh ) :
+        mpMarkData(new ScMarkData),
         pDocShell   ( pDocSh ),
         pDoc        ( NULL ),
         pView       ( pViewSh ),
@@ -462,7 +464,7 @@ void ScViewData::InsertTab( SCTAB nTab )
     CreateTabData( nTab );
 
     UpdateCurrentTab();
-    aMarkData.InsertTab( nTab );
+    mpMarkData->InsertTab( nTab );
 }
 
 void ScViewData::InsertTabs( SCTAB nTab, SCTAB nNewSheets )
@@ -476,7 +478,7 @@ void ScViewData::InsertTabs( SCTAB nTab, SCTAB nNewSheets )
     for (SCTAB i = nTab; i < nTab + nNewSheets; ++i)
     {
         CreateTabData( i );
-        aMarkData.InsertTab( i );
+        mpMarkData->InsertTab( i );
     }
     UpdateCurrentTab();
 }
@@ -487,14 +489,14 @@ void ScViewData::DeleteTab( SCTAB nTab )
 
     maTabData.erase(maTabData.begin() + nTab);
     UpdateCurrentTab();
-    aMarkData.DeleteTab( nTab );
+    mpMarkData->DeleteTab( nTab );
 }
 
 void ScViewData::DeleteTabs( SCTAB nTab, SCTAB nSheets )
 {
     for (SCTAB i = 0; i < nSheets; ++i)
     {
-        aMarkData.DeleteTab( nTab + i );
+        mpMarkData->DeleteTab( nTab + i );
         delete maTabData.at(nTab + i);
     }
 
@@ -524,7 +526,7 @@ void ScViewData::CopyTab( SCTAB nSrcTab, SCTAB nDestTab )
         maTabData.insert(maTabData.begin() + nDestTab, NULL);
 
     UpdateCurrentTab();
-    aMarkData.InsertTab( nDestTab );
+    mpMarkData->InsertTab( nDestTab );
 }
 
 void ScViewData::MoveTab( SCTAB nSrcTab, SCTAB nDestTab )
@@ -547,8 +549,8 @@ void ScViewData::MoveTab( SCTAB nSrcTab, SCTAB nDestTab )
     }
 
     UpdateCurrentTab();
-    aMarkData.DeleteTab( nSrcTab );
-    aMarkData.InsertTab( nDestTab );            // ggf. angepasst
+    mpMarkData->DeleteTab( nSrcTab );
+    mpMarkData->InsertTab( nDestTab );            // ggf. angepasst
 }
 
 void ScViewData::CreateTabData( std::vector< SCTAB >& rvTabs )
@@ -592,7 +594,7 @@ void ScViewData::SetZoomType( SvxZoomType eNew, sal_Bool bAll )
     std::vector< SCTAB > vTabs; // Empty for all tabs
     if ( !bAll ) // get selected tabs
     {
-        ScMarkData::iterator itr = aMarkData.begin(), itrEnd = aMarkData.end();
+        ScMarkData::iterator itr = mpMarkData->begin(), itrEnd = mpMarkData->end();
         vTabs.insert(vTabs.begin(), itr, itrEnd);
     }
     SetZoomType( eNew, vTabs );
@@ -677,7 +679,7 @@ void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, sal_Bool
     std::vector< SCTAB > vTabs;
     if ( !bAll ) // get selected tabs
     {
-        ScMarkData::iterator itr = aMarkData.begin(), itrEnd = aMarkData.end();
+        ScMarkData::iterator itr = mpMarkData->begin(), itrEnd = mpMarkData->end();
         vTabs.insert(vTabs.begin(), itr, itrEnd);
     }
     SetZoom( rNewX, rNewY, vTabs );
@@ -747,7 +749,7 @@ ScMarkType ScViewData::GetSimpleArea( SCCOL& rStartCol, SCROW& rStartRow, SCTAB&
     //  handling itself)
 
     ScRange aRange;
-    ScMarkData aNewMark( aMarkData );       // use a local copy for MarkToSimple
+    ScMarkData aNewMark(*mpMarkData);       // use a local copy for MarkToSimple
     ScMarkType eMarkType = GetSimpleArea( aRange, aNewMark);
     aRange.GetVars( rStartCol, rStartRow, rStartTab, rEndCol, rEndRow, rEndTab);
     return eMarkType;
@@ -757,7 +759,7 @@ ScMarkType ScViewData::GetSimpleArea( ScRange& rRange ) const
 {
     //  parameter bMergeMark is no longer needed, see above
 
-    ScMarkData aNewMark( aMarkData );       // use a local copy for MarkToSimple
+    ScMarkData aNewMark(*mpMarkData);       // use a local copy for MarkToSimple
     return GetSimpleArea( rRange, aNewMark);
 }
 
@@ -765,7 +767,7 @@ void ScViewData::GetMultiArea( ScRangeListRef& rRange ) const
 {
     //  parameter bMergeMark is no longer needed, see GetSimpleArea
 
-    ScMarkData aNewMark( aMarkData );       // use a local copy for MarkToSimple
+    ScMarkData aNewMark(*mpMarkData);       // use a local copy for MarkToSimple
 
     sal_Bool bMulti = aNewMark.IsMultiMarked();
     if (bMulti)
@@ -1427,7 +1429,7 @@ void ScViewData::CreateTabData( SCTAB nNewTab )
 
 void ScViewData::CreateSelectedTabData()
 {
-    ScMarkData::iterator itr = aMarkData.begin(), itrEnd = aMarkData.end();
+    ScMarkData::iterator itr = mpMarkData->begin(), itrEnd = mpMarkData->end();
     for (; itr != itrEnd; ++itr)
         CreateTabData(*itr);
 }
@@ -2076,6 +2078,16 @@ SfxDispatcher& ScViewData::GetDispatcher()
     return *pViewShell->GetViewFrame()->GetDispatcher();
 }
 
+ScMarkData& ScViewData::GetMarkData()
+{
+    return *mpMarkData;
+}
+
+const ScMarkData& ScViewData::GetMarkData() const
+{
+    return *mpMarkData;
+}
+
 Window* ScViewData::GetDialogParent()
 {
     OSL_ENSURE( pViewShell, "GetDialogParent() ohne ViewShell" );
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index 68ae39217af0..f5571aba06e9 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -78,6 +78,7 @@
 #include "asciiopt.hxx"
 #include "scabstdlg.hxx"
 #include "clipparam.hxx"
+#include "markdata.hxx"
 #include <vcl/msgbox.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svx/dbaexchange.hxx>
diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index 47a87a18f0ed..b86fbf26fe6d 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -53,6 +53,7 @@
 #include "reftokenhelper.hxx"
 #include "externalrefmgr.hxx"
 #include "cell.hxx"
+#include "markdata.hxx"
 
 #include <vector>