diff options
37 files changed, 82 insertions, 47 deletions
diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx index 217cfab38647..60a70f57d350 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 8bdcbc04d225..45a708dd1fc1 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 c287f10e1fb5..c3a333c9b539 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 c04619210baf..5b18f3cd4f60 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 2e878e28b280..afd0cff943e7 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 bd7586e963d1..06472a4accb9 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 237c7f08da68..be84d583af81 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 6dfad050c071..ea13837ca181 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 85c3cf9061c1..191ca7d8d4af 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 00912d2f51e7..dc01d58558d0 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 29c2bb83f5b5..5a7152de3796 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 85b494629a76..f7521c2f6077 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 5468ecb89394..13bbec7d2291 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 16267bfd7a4f..588e05b4abf8 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 3c41eb65bb99..cf0212851878 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 7cee7f6d5449..e17500d48f8a 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 a27be8529abc..1d7309aec4f9 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 1d9e857fcc88..0bbeab951802 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 7768a08cce91..cdb1535d6518 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 83d02f16060b..6247e51575e3 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 027a123b47ac..8c2b451cb7dc 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 0f541b516baf..2356793ffdef 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 2366e7093c79..423798851c24 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 59286f5c30bc..d2f49e6e1802 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 6a53ea124922..295d5e6e2caf 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 4bd0c0115d44..349b1e29b6d7 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 09e571c870a8..fbdfdc07e8a8 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 a08787bc8509..4aa8b99d629c 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 4de384acc760..8077cd34795a 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 1b825af054ea..e0db50c19f57 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 52f0c3ae1807..e6d9aec151fd 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 5a9e6b28542d..2c0c2b71e361 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 e32ad531b22c..a3e6797452c2 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 8594c631ddd3..558d17012067 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 45e2c38920e0..43a04a41bfea 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 7f15a3fc56fe..22a25ec3adb7 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 5316300c7c30..4bb63bcbd4f8 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 ) |