[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
Kohei Yoshida
kohei.yoshida at gmail.com
Thu Mar 28 12:50:42 PDT 2013
sc/inc/cell.hxx | 19 ++++---------------
sc/inc/formulacell.hxx | 11 +++++++++--
sc/source/core/data/cellvalue.cxx | 1 +
sc/source/core/data/column.cxx | 1 +
sc/source/core/data/column2.cxx | 1 +
sc/source/core/data/column3.cxx | 1 +
sc/source/core/data/conditio.cxx | 1 +
sc/source/core/data/documen4.cxx | 1 +
sc/source/core/data/documen7.cxx | 2 ++
sc/source/core/data/formulacell.cxx | 6 ++++++
sc/source/core/data/formulaiter.cxx | 1 +
sc/source/core/data/table2.cxx | 19 ++++++++++---------
sc/source/core/data/table3.cxx | 1 +
sc/source/core/data/validat.cxx | 1 +
sc/source/core/tool/chgtrack.cxx | 1 +
sc/source/core/tool/compiler.cxx | 1 +
sc/source/core/tool/consoli.cxx | 1 +
sc/source/core/tool/interpr1.cxx | 24 +++++++++++++-----------
sc/source/core/tool/interpr2.cxx | 4 +++-
sc/source/core/tool/interpr4.cxx | 4 +++-
sc/source/filter/excel/xelink.cxx | 1 +
sc/source/filter/excel/xestream.cxx | 1 +
sc/source/filter/excel/xetable.cxx | 1 +
sc/source/filter/oox/formulabuffer.cxx | 1 +
sc/source/filter/xml/xmlcelli.cxx | 1 +
sc/source/ui/app/inputhdl.cxx | 5 ++---
sc/source/ui/docshell/docfunc.cxx | 1 +
sc/source/ui/docshell/impex.cxx | 1 +
sc/source/ui/docshell/tablink.cxx | 3 +--
sc/source/ui/inc/inputhdl.hxx | 4 ++--
sc/source/ui/miscdlgs/anyrefdg.cxx | 2 +-
sc/source/ui/unoobj/cellsuno.cxx | 1 +
sc/source/ui/unoobj/chart2uno.cxx | 1 +
sc/source/ui/unoobj/funcuno.cxx | 1 +
sc/source/ui/view/tabvwsha.cxx | 1 +
sc/source/ui/view/viewfun2.cxx | 1 +
sc/source/ui/view/viewfunc.cxx | 2 ++
37 files changed, 82 insertions(+), 47 deletions(-)
New commits:
commit 2cfc8edab4291a389121582281999076c56d1462
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Thu Mar 28 15:52:57 2013 -0400
Remove some headers in cell.hxx.
Change-Id: Ic99967a3ef6a35ca4fc465054e0d4de512cafb43
diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index 217cfab..60a70f5 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -20,23 +20,12 @@
#ifndef SC_CELL_HXX
#define SC_CELL_HXX
-#include <stddef.h>
+#include "scdllapi.h"
+#include "global.hxx"
-#include <set>
-#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <boost/intrusive_ptr.hpp>
+#include "tools/mempool.hxx"
-#include <tools/mempool.hxx>
-#include <svl/listener.hxx>
-#include "global.hxx"
-#include "rangenam.hxx"
-#include "formula/grammar.hxx"
-#include "tokenarray.hxx"
-#include "formularesult.hxx"
-#include <rtl/ustrbuf.hxx>
-#include <unotools/fontcvt.hxx>
-#include "scdllapi.h"
+#include <boost/shared_ptr.hpp>
#define USE_MEMPOOL
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 8bdcbc0..45a708d 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -21,7 +21,14 @@
#define SC_FORMULACELL_HXX
#include "cell.hxx"
+#include "formularesult.hxx"
+#include "formula/tokenarray.hxx"
+#include "svl/listener.hxx"
+
+#include <set>
+
+class ScTokenArray;
struct ScSimilarFormulaDelta;
struct SC_DLLPUBLIC ScFormulaCellGroup
@@ -276,9 +283,9 @@ public:
void SetResultDouble( double n ) { aResult.SetDouble( n); }
void SetErrCode( sal_uInt16 n );
- inline bool IsHyperLinkCell() const { return pCode && pCode->IsHyperLink(); }
+ bool IsHyperLinkCell() const;
EditTextObject* CreateURLObject();
- void GetURLResult( rtl::OUString& rURL, rtl::OUString& rCellText );
+ void GetURLResult( OUString& rURL, OUString& rCellText );
/** Determines whether or not the result string contains more than one paragraph */
bool IsMultilineResult();
diff --git a/sc/source/core/data/cellvalue.cxx b/sc/source/core/data/cellvalue.cxx
index c287f10..c3a333c 100644
--- a/sc/source/core/data/cellvalue.cxx
+++ b/sc/source/core/data/cellvalue.cxx
@@ -15,6 +15,7 @@
#include "editeng/editstat.hxx"
#include "stringutil.hxx"
#include "editutil.hxx"
+#include "tokenarray.hxx"
#include "formula/token.hxx"
namespace {
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index c046192..5b18f3c 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -32,6 +32,7 @@
#include "postit.hxx"
#include "globalnames.hxx"
#include "cellvalue.hxx"
+#include "tokenarray.hxx"
#include <svl/poolcach.hxx>
#include <svl/zforlist.hxx>
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 2e878e2..afd0cff 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -55,6 +55,7 @@
#include "segmenttree.hxx"
#include "docparam.hxx"
#include "cellvalue.hxx"
+#include "tokenarray.hxx"
#include <math.h>
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index bd7586e..06472a4 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -47,6 +47,7 @@
#include "docpool.hxx"
#include "globalnames.hxx"
#include "cellvalue.hxx"
+#include "tokenarray.hxx"
#include <com/sun/star/i18n/LocaleDataItem.hpp>
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 237c7f0..be84d58 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -38,6 +38,7 @@
#include "colorscale.hxx"
#include "cellvalue.hxx"
#include "editutil.hxx"
+#include "tokenarray.hxx"
using namespace formula;
//------------------------------------------------------------------------
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index 6dfad05..ea13837 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -43,6 +43,7 @@
#include "attrib.hxx"
#include "cell.hxx"
#include "formulacell.hxx"
+#include "tokenarray.hxx"
using namespace formula;
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index 85c3cf9..191ca7d 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -35,6 +35,8 @@
#include "conditio.hxx"
#include "colorscale.hxx"
#include "sheetevents.hxx"
+#include "tokenarray.hxx"
+
#include <tools/shl.hxx>
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 00912d2..dc01d58 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -37,6 +37,7 @@
#include "validat.hxx"
#include "editutil.hxx"
#include "chgtrack.hxx"
+#include "tokenarray.hxx"
#include "formula/errorcodes.hxx"
#include "svl/intitem.hxx"
@@ -1693,6 +1694,11 @@ void ScFormulaCell::MaybeInterpret()
Interpret();
}
+bool ScFormulaCell::IsHyperLinkCell() const
+{
+ return pCode && pCode->IsHyperLink();
+}
+
EditTextObject* ScFormulaCell::CreateURLObject()
{
rtl::OUString aCellText;
diff --git a/sc/source/core/data/formulaiter.cxx b/sc/source/core/data/formulaiter.cxx
index 29c2bb8..5a7152d 100644
--- a/sc/source/core/data/formulaiter.cxx
+++ b/sc/source/core/data/formulaiter.cxx
@@ -20,6 +20,7 @@
#include "formulaiter.hxx"
#include "formulacell.hxx"
+#include "tokenarray.hxx"
#include "formula/token.hxx"
using namespace formula;
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 85b4946..f7521c2 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -17,15 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "scitems.hxx"
-#include <editeng/boxitem.hxx>
-#include "editeng/editobj.hxx"
-#include <svl/poolcach.hxx>
-#include <unotools/charclass.hxx>
-#include <math.h>
-#include <svl/PasswordHelper.hxx>
-#include <unotools/transliterationwrapper.hxx>
-
#include "table.hxx"
#include "patattr.hxx"
#include "docpool.hxx"
@@ -51,6 +42,16 @@
#include "queryentry.hxx"
#include "dbdata.hxx"
#include "colorscale.hxx"
+#include "tokenarray.hxx"
+
+#include "scitems.hxx"
+#include <editeng/boxitem.hxx>
+#include "editeng/editobj.hxx"
+#include <svl/poolcach.hxx>
+#include <unotools/charclass.hxx>
+#include <math.h>
+#include <svl/PasswordHelper.hxx>
+#include <unotools/transliterationwrapper.hxx>
// STATIC DATA -----------------------------------------------------------
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 5468ecb..13bbec7 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -53,6 +53,7 @@
#include "subtotalparam.hxx"
#include "docpool.hxx"
#include "cellvalue.hxx"
+#include "tokenarray.hxx"
#include <vector>
#include <boost/unordered_set.hpp>
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 16267bf..588e05b 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -42,6 +42,7 @@
#include "typedstrdata.hxx"
#include "dociter.hxx"
#include "editutil.hxx"
+#include "tokenarray.hxx"
#include <math.h>
#include <memory>
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 3c41eb6..cf02128 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -31,6 +31,7 @@
#include "markdata.hxx"
#include "globstr.hrc"
#include "editutil.hxx"
+#include "tokenarray.hxx"
#include <tools/shl.hxx> // SHL_CALC
#include <tools/rtti.hxx>
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 7cee7f6..e17500d 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -62,6 +62,7 @@
#include "convuno.hxx"
#include "tokenuno.hxx"
#include "formulaparserpool.hxx"
+#include "tokenarray.hxx"
using namespace formula;
using namespace ::com::sun::star;
diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx
index a27be85..1d7309a 100644
--- a/sc/source/core/tool/consoli.cxx
+++ b/sc/source/core/tool/consoli.cxx
@@ -24,6 +24,7 @@
#include "subtotal.hxx"
#include "formula/errorcodes.hxx"
#include "formulacell.hxx"
+#include "tokenarray.hxx"
#include <math.h>
#include <string.h>
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 1d9e857..0bbeab95 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "interpre.hxx"
+
#include "scitems.hxx"
#include <editeng/langitem.hxx>
#include <editeng/justifyitem.hxx>
@@ -33,7 +35,6 @@
#include <rtl/ustring.hxx>
#include <rtl/logfile.hxx>
-#include "interpre.hxx"
#include "patattr.hxx"
#include "global.hxx"
#include "document.hxx"
@@ -45,16 +46,6 @@
#include "attrib.hxx"
#include "jumpmatrix.hxx"
#include "random.hxx"
-
-#include <comphelper/processfactory.hxx>
-#include <comphelper/string.hxx>
-
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <vector>
-#include <memory>
-#include <limits>
#include "cellkeytranslator.hxx"
#include "lookupcache.hxx"
#include "rangenam.hxx"
@@ -65,6 +56,17 @@
#include "doubleref.hxx"
#include "queryparam.hxx"
#include "queryentry.hxx"
+#include "tokenarray.hxx"
+
+#include <comphelper/processfactory.hxx>
+#include <comphelper/string.hxx>
+
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <vector>
+#include <memory>
+#include <limits>
static const sal_uInt64 n2power48 = SAL_CONST_UINT64( 281474976710656); // 2^48
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 7768a08..cdb1535 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "interpre.hxx"
+
#include <comphelper/string.hxx>
#include <sfx2/linkmgr.hxx>
#include <sfx2/dispatch.hxx>
@@ -26,7 +28,6 @@
#include <rtl/logfile.hxx>
#include <sal/macros.h>
-#include "interpre.hxx"
#include "attrib.hxx"
#include "sc.hrc"
#include "ddelink.hxx"
@@ -41,6 +42,7 @@
#include "hints.hxx"
#include "dpobject.hxx"
#include "postit.hxx"
+#include "tokenarray.hxx"
#include <string.h>
#include <math.h>
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 83d02f1..6247e51 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "interpre.hxx"
+
#include <rangelst.hxx>
#include <sfx2/app.hxx>
#include <sfx2/docfile.hxx>
@@ -38,7 +40,6 @@
#include <com/sun/star/sheet/XSheetCellRange.hpp>
#include <comphelper/processfactory.hxx>
-#include "interpre.hxx"
#include "global.hxx"
#include "dbdata.hxx"
#include "formulacell.hxx"
@@ -61,6 +62,7 @@
#include "macromgr.hxx"
#include "doubleref.hxx"
#include "queryparam.hxx"
+#include "tokenarray.hxx"
#include <math.h>
#include <float.h>
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index 027a123..8c2b451 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -26,6 +26,7 @@
#include "formulacell.hxx"
#include "scextopt.hxx"
#include "externalrefmgr.hxx"
+#include "tokenarray.hxx"
#include <vector>
#include <memory>
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 0f541b5..2356793 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -38,6 +38,7 @@
#include "rangelst.hxx"
#include "compiler.hxx"
#include "formulacell.hxx"
+#include "tokenarray.hxx"
#include <../../ui/inc/docsh.hxx>
#include <../../ui/inc/viewdata.hxx>
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index 2366e70..4237988 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -33,6 +33,7 @@
#include "xecontent.hxx"
#include "xeescher.hxx"
#include "xeextlst.hxx"
+#include "tokenarray.hxx"
using namespace ::oox;
diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx
index 59286f5..d2f49e6 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -21,6 +21,7 @@
#include "rangelst.hxx"
#include "autonamecache.hxx"
#include "tokenuno.hxx"
+#include "tokenarray.hxx"
namespace oox {
namespace xls {
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 6a53ea1..295d5e6 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -49,6 +49,7 @@
#include "formulacell.hxx"
#include "editattributemap.hxx"
#include "stringutil.hxx"
+#include "tokenarray.hxx"
#include <xmloff/xmltkmap.hxx>
#include <xmloff/xmltoken.hxx>
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 4bd0c01..349b1e2 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "inputhdl.hxx"
#include "scitems.hxx"
#include <editeng/eeitem.hxx>
@@ -74,9 +75,7 @@
#include "editable.hxx"
#include "funcdesc.hxx"
#include "markdata.hxx"
-
-#define _INPUTHDL_CXX
-#include "inputhdl.hxx"
+#include "tokenarray.hxx"
// max. Ranges im RangeFinder
#define RANGEFIND_MAX 32
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 09e571c..fbdfdc0 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -82,6 +82,7 @@
#include "dpobject.hxx"
#include "stringutil.hxx"
#include "cellvalue.hxx"
+#include "tokenarray.hxx"
#include <memory>
#include <basic/basmgr.hxx>
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index a08787b..4aa8b99 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -49,6 +49,7 @@
#include "docpool.hxx"
#include "stringutil.hxx"
#include "cellvalue.hxx"
+#include "tokenarray.hxx"
#include "globstr.hrc"
#include <vcl/svapp.hxx>
diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index 4de384a..8077cd3 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -43,8 +43,7 @@
#include "formula/opcode.hxx"
#include "formulacell.hxx"
#include "formulaiter.hxx"
-
-using ::rtl::OUString;
+#include "tokenarray.hxx"
struct TableLink_Impl
{
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index 1b825af..e0db50c 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -26,6 +26,8 @@
#include <tools/fract.hxx>
#include <tools/gen.hxx>
+#include "tools/link.hxx"
+#include "vcl/vclevent.hxx"
#include <editeng/svxenum.hxx>
#include <set>
@@ -118,7 +120,6 @@ private:
static bool bAutoComplete; // from app options
static bool bOptLoaded;
-#ifdef _INPUTHDL_CXX
private:
void UpdateActiveView();
void SyncViews( EditView* pSourceView = NULL );
@@ -157,7 +158,6 @@ private:
DECL_LINK( ModifyHdl, void* );
DECL_LINK( ShowHideTipVisibleParentListener, VclWindowEvent* );
DECL_LINK( ShowHideTipVisibleSecParentListener, VclWindowEvent* );
-#endif
public:
ScInputHandler();
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 52f0c3a..e6d9aec 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -41,7 +41,7 @@
#include "global.hxx"
#include "inputopt.hxx"
#include "rangeutl.hxx"
-
+#include "tokenarray.hxx"
ScFormulaReferenceHelper::ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindings* _pBindings)
: m_pDlg(_pDlg)
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 5a9e6b2..2c0c2b7 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -121,6 +121,7 @@
#include "editeng/escapementitem.hxx"
#include "stringutil.hxx"
#include "formulaiter.hxx"
+#include "tokenarray.hxx"
#include <list>
#include <boost/scoped_ptr.hpp>
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index e32ad53..a3e6797 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -36,6 +36,7 @@
#include "tokenuno.hxx"
#include "docsh.hxx"
#include "cellvalue.hxx"
+#include "tokenarray.hxx"
#include "formula/opcode.hxx"
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index 8594c63..558d170 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -43,6 +43,7 @@
#include "clipparam.hxx"
#include "dociter.hxx"
#include "stringutil.hxx"
+#include "tokenarray.hxx"
using namespace com::sun::star;
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 45e2c38..43a04a4 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -51,6 +51,7 @@
#include "compiler.hxx"
#include "markdata.hxx"
#include "cellvalue.hxx"
+#include "tokenarray.hxx"
sal_Bool ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode )
{
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 7f15a3f..22a25ec 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -78,6 +78,7 @@
#include "tabbgcolor.hxx"
#include "clipparam.hxx"
#include "prnsave.hxx"
+#include "tokenarray.hxx"
#include <boost/scoped_ptr.hpp>
#include <vector>
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 5316300..4bb63bc 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -74,6 +74,8 @@
#include "funcdesc.hxx"
#include "docuno.hxx"
#include "cellsuno.hxx"
+#include "tokenarray.hxx"
+
//==================================================================
static void lcl_PostRepaintCondFormat( const ScConditionalFormat *pCondFmt, ScDocShell *pDocSh )
More information about the Libreoffice-commits
mailing list