diff options
| author | Eike Rathke <erack@redhat.com> | 2017-05-17 15:21:25 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-05-30 10:19:48 +0200 |
| commit | 63defd57dc3ddeae300c1225367ac38a8ffde959 (patch) | |
| tree | 00ed61b6f67f154f62dd877ddd8b6b57adf3829a /include | |
| parent | 5af72a2fc78f77441d255ef8b9297ef5cda01388 (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
(cherry picked from commit 70cb7757f971c4c16d1b0a5585d95816cd4382e6)
Reviewed-on: https://gerrit.libreoffice.org/37712
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 9c89d41ed44c1a4126b82f0c05768f5d640f741b)
Diffstat (limited to 'include')
| -rw-r--r-- | include/formula/FormulaCompiler.hxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx index 96d945f220b7..37da2ef8becc 100644 --- a/include/formula/FormulaCompiler.hxx +++ b/include/formula/FormulaCompiler.hxx @@ -58,6 +58,7 @@ struct FormulaArrayStack { FormulaArrayStack* pNext; FormulaTokenArray* pArr; + FormulaTokenRef mpLastToken; bool bTemp; }; @@ -331,6 +332,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; |