diff options
| author | Eike Rathke <erack@redhat.com> | 2015-03-11 14:26:39 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-03-11 14:32:41 +0100 |
| commit | a4d67c9c9c2672ca6d2405075790e0891930b2e0 (patch) | |
| tree | 2303b4373ab81d8e045567e6c309adc89feb0e0b /sc | |
| parent | 519d2f6e5e820229d3548a33313ba15155121537 (diff) | |
TableRef: need to distinguish between entire table and All specified
Change-Id: I507b6dfc0ce1a7b0f28142b05e15834ad6e6ac80
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/token.hxx | 11 | ||||
| -rw-r--r-- | sc/source/core/tool/compiler.cxx | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx index a0a12abf4cd8..0d1aca1cca82 100644 --- a/sc/inc/token.hxx +++ b/sc/inc/token.hxx @@ -215,11 +215,12 @@ public: enum Item { - ALL = 0, - HEADERS = 1, - DATA = 2, - TOTALS = 4, - THIS_ROW = 8 + TABLE = 0, + ALL = 1, + HEADERS = 2, + DATA = 4, + TOTALS = 8, + THIS_ROW = 16 }; ScTableRefToken( sal_uInt16 nIndex, Item eItem ); diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index fd5edd4da0d9..e3d00e528165 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -3938,7 +3938,7 @@ ScTokenArray* ScCompiler::CompileString( const OUString& rFormula ) const FormulaToken* pPrev = pArr->PeekPrev( nIdx); if (pPrev && pPrev->GetOpCode() == ocDBArea) { - FormulaToken* pTableRefToken = new ScTableRefToken( pPrev->GetIndex(), ScTableRefToken::ALL); + FormulaToken* pTableRefToken = new ScTableRefToken( pPrev->GetIndex(), ScTableRefToken::TABLE); maTableRefs.push_back( TableRefEntry( pTableRefToken)); // pPrev may be dead hereafter. static_cast<ScTokenArray*>(pArr)->ReplaceToken( 1, pTableRefToken); @@ -4700,7 +4700,7 @@ bool ScCompiler::HandleTableRef() ScTokenArray* pNew = new ScTokenArray(); ScTableRefToken::Item eItem = pTR->GetItem(); bool bGotToken = false; - if (eItem == ScTableRefToken::ALL) + if (eItem == ScTableRefToken::TABLE || eItem == ScTableRefToken::ALL) { ScComplexRefData aRefData; aRefData.InitFlags(); |