include/formula/token.hxx | 1 -
sc/inc/formulacell.hxx | 1 +
sc/inc/units.hxx | 1 -
sc/source/core/tool/interpr4.cxx | 3 +++
sc/source/core/units/unitsimpl.cxx | 4 ++--
sc/source/core/units/unitsimpl.hxx | 1 +
6 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 375d0cd087f8a2d76f8682109e585ff0e0837198
Author: Benjamin Ni <benjaminn...@hotmail.com>
Date: Wed Jul 22 15:49:23 2015 +0100
cosmetic changes
Change-Id: I6826a23655c9556dac2be49a8f28d67e95e91ff2
Reviewed-on: https://gerrit.libreoffice.org/17582
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
diff --git a/include/formula/token.hxx b/include/formula/token.hxx
index 23d9787..9bb39b1 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 724b1e2..ff110fb 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 1e0c5ea..e93d745 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 bd84fa6..fe93ec0 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 0c89201..f2101c2 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 f3e2cb8..5bdee2a 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);
/**
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
