summaryrefslogtreecommitdiff
path: root/formula
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2012-08-27 22:02:45 +0200
committerEike Rathke <erack@redhat.com>2012-08-27 22:03:49 +0200
commit0bb0937b65200382d3d8ad8f36472067ff0cbb40 (patch)
treef1f8b29b185bb6bae42da462044855556450b1d4 /formula
parent34091bc0e33a0aa6e839f5474e53d22a79960e68 (diff)
do not silently ignore a token API error, fdo#51926 related
Change-Id: Ie187dad84bd55bb76c795b5c4807566e80349b56
Diffstat (limited to 'formula')
-rw-r--r--formula/source/core/api/token.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 4649732a1eb1..c18ca4fdc8de 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -328,7 +328,12 @@ bool FormulaTokenArray::Fill(const uno::Sequence< sheet::FormulaToken >& _aSeque
const sal_Int32 nCount = _aSequence.getLength();
for (sal_Int32 nPos=0; nPos<nCount; nPos++)
{
- bError |= AddFormulaToken( _aSequence[nPos] ,_pRef);
+ bool bOneError = AddFormulaToken( _aSequence[nPos] ,_pRef);
+ if (bOneError)
+ {
+ AddOpCode( ocErrName); // add something that indicates an error
+ bError = true;
+ }
}
return bError;
}