diff options
author | Benjamin Ni <benjaminniri@hotmail.com> | 2015-07-22 15:49:23 +0100 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-01-05 16:07:05 +0000 |
commit | 375d0cd087f8a2d76f8682109e585ff0e0837198 (patch) | |
tree | f70d597da54308b2bd3012f8ac99ba93f5e97751 | |
parent | unit-verification: more convert Link<> to typed (diff) | |
download | core-feature/unitver.tar.gz core-feature/unitver.zip |
cosmetic changes
feature/unitver
Change-Id: I6826a23655c9556dac2be49a8f28d67e95e91ff2
Reviewed-on: https://gerrit.libreoffice.org/17582
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-rw-r--r-- | include/formula/token.hxx | 1 | ||||
-rw-r--r-- | sc/inc/formulacell.hxx | 1 | ||||
-rw-r--r-- | sc/inc/units.hxx | 1 | ||||
-rw-r--r-- | sc/source/core/tool/interpr4.cxx | 3 | ||||
-rw-r--r-- | sc/source/core/units/unitsimpl.cxx | 4 | ||||
-rw-r--r-- | sc/source/core/units/unitsimpl.hxx | 1 |
6 files changed, 7 insertions, 4 deletions
diff --git a/include/formula/token.hxx b/include/formula/token.hxx index 23d978757771..9bb39b1cfc6e 100644 --- a/include/formula/token.hxx +++ b/include/formula/token.hxx @@ -103,7 +103,6 @@ protected: public: FormulaToken( StackVar eTypeP,OpCode e = ocPush ); FormulaToken( const FormulaToken& r ); - virtual ~FormulaToken(); inline void Delete() { delete this; } diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx index 724b1e20f322..ff110fb5ee9f 100644 --- a/sc/inc/formulacell.hxx +++ b/sc/inc/formulacell.hxx @@ -31,6 +31,7 @@ #include <svl/listener.hxx> #include "types.hxx" +#include "units.hxx" #include "formularesult.hxx" diff --git a/sc/inc/units.hxx b/sc/inc/units.hxx index 1e0c5ea8ae95..e93d7459913a 100644 --- a/sc/inc/units.hxx +++ b/sc/inc/units.hxx @@ -58,7 +58,6 @@ public: static ::boost::shared_ptr< Units > GetUnits(); virtual FormulaStatus verifyFormula(ScTokenArray* pArray, const ScAddress& rFormulaAddress, ScDocument* pDoc) = 0; - /* * Split the input into value and unit, where rInput == rValue + rUnit. * (We assume that the unit is always the last part of the input string.) diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index bd84fa625afd..fe93ec08f856 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -65,6 +65,9 @@ #include "doubleref.hxx" #include "queryparam.hxx" #include "tokenarray.hxx" +#include "units.hxx" +#include "scmod.hxx" +#include "viewfunc.hxx" #include <math.h> #include <float.h> diff --git a/sc/source/core/units/unitsimpl.cxx b/sc/source/core/units/unitsimpl.cxx index 0c8920164b95..f2101c292a1f 100644 --- a/sc/source/core/units/unitsimpl.cxx +++ b/sc/source/core/units/unitsimpl.cxx @@ -526,11 +526,11 @@ HeaderUnitDescriptor UnitsImpl::findHeaderUnitForCell(const ScAddress& rCellAddr return { false, UtUnit(), boost::optional< ScAddress >(), OUString(""), -1 }; } -FormulaStatus UnitsImpl::verifyFormula(ScTokenArray* pArray, const ScAddress& rFormulaAddress, ScDocument* pDoc) { +FormulaStatus UnitsImpl::verifyFormula(ScTokenArray* pArray, const ScAddress& rFormulaAddress, ScDocument* pDoc) +{ #if DEBUG_FORMULA_COMPILER pArray->Dump(); #endif - stack< RAUSItem > aStack; for (FormulaToken* pToken = pArray->FirstRPN(); pToken != 0; pToken = pArray->NextRPN()) { diff --git a/sc/source/core/units/unitsimpl.hxx b/sc/source/core/units/unitsimpl.hxx index f3e2cb8484a7..5bdee2af115e 100644 --- a/sc/source/core/units/unitsimpl.hxx +++ b/sc/source/core/units/unitsimpl.hxx @@ -137,6 +137,7 @@ private: HeaderUnitDescriptor extractUnitFromHeaderString(const OUString& rHeader); static OUString extractUnitStringFromFormat(const OUString& rFormatString); + static OUString extractUnitStringForCell(const ScAddress& rAddress, ScDocument* pDoc); /** |