diff options
| author | Eike Rathke <erack@redhat.com> | 2015-06-21 21:42:53 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-08-06 12:23:39 +0200 |
| commit | ea653726578a2adcd6e8fd498dd680b4edbff431 (patch) | |
| tree | 8b0ceb2d807290847e775e7ac2fd2c35174eb5b8 /formula | |
| parent | 7fc6ec74aff85e4c420effd916ddd11f1fea73e5 (diff) | |
TableRef: include ocTableRef in FormulaToken::IsRef() for HasReferences()
let FormulaTokenArray::HasReferences() also check RPN
Change-Id: Ic97332265c50485691f76b81d8396705d7728ab0
(cherry picked from commit f243e27a37ef49e6e1372ef402cd52fa4b0073b6)
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/core/api/token.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index cc88919e994f..ce40870d2ad6 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -147,7 +147,8 @@ bool FormulaToken::IsRef() const case svExternalDoubleRef: return true; default: - ; + if (eOp == ocTableRef) + return true; } return false; @@ -634,6 +635,12 @@ bool FormulaTokenArray::HasReferences() const return true; } + for (sal_uInt16 i = 0; i < nRPN; ++i) + { + if (pRPN[i]->IsRef()) + return true; + } + return false; } |