diff options
| author | Eike Rathke <erack@redhat.com> | 2015-03-04 20:55:17 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-03-05 11:45:00 +0100 |
| commit | 338d006c9da54ecdd211144dbfe76a076fe20b27 (patch) | |
| tree | cd003487cfde11b79a0c9edcef59d9cef9f198b6 /sc | |
| parent | 20e95bcd836baba16909149ded5b54f978b70ce3 (diff) | |
use ScTableRefToken in ScRawToken::CreateToken()
Change-Id: I895f142667a593bc5fc4f33f2417cbee991e503a
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/compiler.hxx | 3 | ||||
| -rw-r--r-- | sc/source/core/tool/token.cxx | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index f1b83d90126c..acfdad69fcdb 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -137,6 +137,9 @@ public: sal_uInt16 nIndex; } name; struct { + sal_uInt16 nIndex; + } table; + struct { rtl_uString* mpData; rtl_uString* mpDataIgnoreCase; } sharedstring; diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 47e9237027f5..96e3b58e8d65 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -328,7 +328,10 @@ FormulaToken* ScRawToken::CreateToken() const IF_NOT_OPCODE_ERROR( ocPush, ScMatrixToken); return new ScMatrixToken( pMat ); case svIndex : - return new FormulaIndexToken( eOp, name.nIndex, name.bGlobal); + if (eOp == ocTableRef) + return new ScTableRefToken( table.nIndex); + else + return new FormulaIndexToken( eOp, name.nIndex, name.bGlobal); case svExternalSingleRef: { OUString aTabName(extref.cTabName); |