[Libreoffice-commits] core.git: Branch 'private/kohei/sort-ref-update' - sc/inc sc/qa sc/source

[Kohei Yoshida]

 sc/inc/document.hxx                              |   17 +++++------------
 sc/qa/unit/filters-test.cxx                      |    1 +
 sc/qa/unit/ucalc.cxx                             |    1 +
 sc/source/core/data/documen3.cxx                 |   10 ++++++++++
 sc/source/filter/xml/XMLExportDatabaseRanges.cxx |    1 +
 sc/source/filter/xml/xmldrani.cxx                |    1 +
 sc/source/ui/undo/undobase.cxx                   |    1 +
 sc/source/ui/unoobj/cellsuno.cxx                 |    1 +
 sc/source/ui/unoobj/datauno.cxx                  |    1 +
 9 files changed, 22 insertions(+), 12 deletions(-)

New commits:
commit d55bcb839bc4e6e6e1ba703ac1e6185e74dacb38
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Mon Jun 30 10:43:49 2014 -0400

    Let's not include sortparam.hxx in document.hxx.
    
    Change-Id: Ie2179c64909845163398b1f0592e1c88151afe8e

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index fef0683..ca2f4ea 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -29,7 +29,6 @@
 #include "rangenam.hxx"
 #include "brdcst.hxx"
 #include "tabopparams.hxx"
-#include "sortparam.hxx"
 #include "types.hxx"
 #include <formula/grammar.hxx>
 #include <formula/types.hxx>
@@ -80,6 +79,7 @@ class RowHeightContext;
 struct SetFormulaDirtyContext;
 class RefMovedHint;
 struct SortUndoParam;
+struct ReorderParam;
 
 }
 
@@ -182,6 +182,8 @@ class EditTextObject;
 struct ScRefCellValue;
 class ScDocumentImport;
 class ScPostIt;
+struct ScSubTotalParam;
+struct ScQueryParam;
 
 namespace com { namespace sun { namespace star {
     namespace lang {
@@ -2035,8 +2037,8 @@ public:
 
     void            InvalidateStyleSheetUsage()
                         { bStyleSheetUsageInvalid = true; }
-    void GetSortParam( ScSortParam& rParam, SCTAB nTab );
-    void SetSortParam( ScSortParam& rParam, SCTAB nTab );
+    void SC_DLLPUBLIC GetSortParam( ScSortParam& rParam, SCTAB nTab );
+    void SC_DLLPUBLIC SetSortParam( ScSortParam& rParam, SCTAB nTab );
 
     inline void     SetVbaEventProcessor( const com::sun::star::uno::Reference< com::sun::star::script::vba::XVBAEventProcessor >& rxVbaEvents )
                         { mxVbaEvents = rxVbaEvents; }
@@ -2163,15 +2165,6 @@ private:
 
     void SharePooledResources( ScDocument* pSrcDoc );
 };
-inline void ScDocument::GetSortParam( ScSortParam& rParam, SCTAB nTab )
-{
-    rParam = mSheetSortParams[ nTab ];
-}
-
-inline void ScDocument::SetSortParam( ScSortParam& rParam, SCTAB nTab )
-{
-    mSheetSortParams[ nTab ] = rParam;
-}
 
 #endif
 
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index bb60b7b..da9ec56 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -35,6 +35,7 @@
 #include <dbdocfun.hxx>
 #include <globalnames.hxx>
 #include <dbdata.hxx>
+#include <sortparam.hxx>
 
 #include <svx/svdpage.hxx>
 
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index b852010..7b41d41 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -63,6 +63,7 @@
 #include <docpool.hxx>
 #include <globalnames.hxx>
 #include <inputopt.hxx>
+#include <sortparam.hxx>
 
 #include <editable.hxx>
 
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 1486092..90ada8c 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -2012,4 +2012,14 @@ bool ScDocument::ReservePatternCount( SCTAB nTab, SCCOL nCol, SCSIZE nReserve )
         return false;
 }
 
+void ScDocument::GetSortParam( ScSortParam& rParam, SCTAB nTab )
+{
+    rParam = mSheetSortParams[ nTab ];
+}
+
+void ScDocument::SetSortParam( ScSortParam& rParam, SCTAB nTab )
+{
+    mSheetSortParams[ nTab ] = rParam;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index a507427..758a1f9 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -35,6 +35,7 @@
 #include "subtotalparam.hxx"
 #include "queryparam.hxx"
 #include "queryentry.hxx"
+#include <sortparam.hxx>
 
 #include <svx/dataaccessdescriptor.hxx>
 
diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx
index 9088e00..38db1b30 100644
--- a/sc/source/filter/xml/xmldrani.cxx
+++ b/sc/source/filter/xml/xmldrani.cxx
@@ -34,6 +34,7 @@
 #include "rangeutl.hxx"
 #include "queryentry.hxx"
 #include "dputil.hxx"
+#include <sortparam.hxx>
 
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx
index 8740c6b..dc7efd4 100644
--- a/sc/source/ui/undo/undobase.cxx
+++ b/sc/source/ui/undo/undobase.cxx
@@ -33,6 +33,7 @@
 #include "globstr.hrc"
 #include <rowheightcontext.hxx>
 #include <column.hxx>
+#include <sortparam.hxx>
 
 TYPEINIT1(ScSimpleUndo,     SfxUndoAction);
 TYPEINIT1(ScBlockUndo,      ScSimpleUndo);
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 3a94df0..7ad0202 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -125,6 +125,7 @@
 #include "tokenarray.hxx"
 #include "stylehelper.hxx"
 #include "dputil.hxx"
+#include <sortparam.hxx>
 
 #include <list>
 #include <boost/scoped_array.hpp>
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index ac260c7..ce71b9e 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -51,6 +51,7 @@
 #include "dpshttab.hxx"
 #include "queryentry.hxx"
 #include "dputil.hxx"
+#include <sortparam.hxx>
 
 #include <comphelper/extract.hxx>
 #include <comphelper/servicehelper.hxx>