summaryrefslogtreecommitdiff
path: root/formula
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2015-06-21 21:42:53 +0200
committerEike Rathke <erack@redhat.com>2015-06-21 21:59:17 +0200
commitc1ade6725452f658547b34e5b8bb891d1f478eda (patch)
tree3625ce303ff4bdd6c39cefbd41c07eb60fa725da /formula
parent187914c75f4fe49bb1204363aac9876b03d88389 (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.cxx9
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;
}