summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2016-05-20 11:51:33 +0200
committerEike Rathke <erack@redhat.com>2016-05-20 12:14:19 +0200
commit7de92ad48d8c4fe7a1f9fb24ef8afc7d8907788e (patch)
tree7d21d55911805a7292623cfed1cf8484526522f7
parentb5245993c0450b49607a352b642a1cc97031c29e (diff)
tdf#93101 propagate external reference error from refcache token
Change-Id: I90491a7b18fddaddb3bbb4d7a3f8b9555b9b1198
-rw-r--r--sc/source/core/tool/interpr4.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index e6985dc5447e..fb172179ecbd 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1200,6 +1200,9 @@ void ScInterpreter::PopExternalSingleRef(
return;
}
+ if (xNew->GetType() == svError)
+ SetError( xNew->GetError());
+
rToken = xNew;
if (pFmt)
*pFmt = aFmt;
@@ -1298,6 +1301,11 @@ void ScInterpreter::GetExternalDoubleRef(
}
formula::FormulaToken* pToken = pArray->First();
+ if (pToken->GetType() == svError)
+ {
+ SetError( pToken->GetError());
+ return;
+ }
if (pToken->GetType() != svMatrix)
{
SetError(errIllegalArgument);