summaryrefslogtreecommitdiff
path: root/include/formula
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2017-05-17 15:21:25 +0200
committerEike Rathke <erack@redhat.com>2017-05-17 15:23:33 +0200
commit70cb7757f971c4c16d1b0a5585d95816cd4382e6 (patch)
tree6aea862c2058f5363454e0d8da21b739461e8db0 /include/formula
parent6a21827e976ddaba9a59e511de66d64592a6a14c (diff)
Resolves: tdf#96426 more whitespace intersection operator in Excel syntax
Handle also stacked token arrays resulting from named expressions like =range1 range2 Change-Id: I1838af155f17b5e4f941e46895303caed75b6075
Diffstat (limited to 'include/formula')
-rw-r--r--include/formula/FormulaCompiler.hxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx
index 8e4999ffc999..f6650201bba1 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -59,6 +59,7 @@ struct FormulaArrayStack
{
FormulaArrayStack* pNext;
FormulaTokenArray* pArr;
+ FormulaTokenRef mpLastToken;
bool bTemp;
};
@@ -330,6 +331,7 @@ protected:
FormulaTokenRef pCurrentFactorToken; // current factor token (of Factor() method)
sal_uInt16 nCurrentFactorParam; // current factor token's parameter, 1-based
FormulaTokenArray* pArr;
+ FormulaTokenRef mpLastToken; // last token
FormulaToken** pCode;
FormulaArrayStack* pStack;