summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2014-07-10 16:13:40 +0200
committerKohei Yoshida <libreoffice@kohei.us>2014-07-14 20:58:53 +0000
commit874859a8feb8cfadd7f491ebae99ff8aa5fd43c7 (patch)
treeacd71f4977772b9c75922380b177449dab160cbf
parentaea934f29fcc435c3cca8cc3feabcf5c9d7f44d6 (diff)
resolved fdo#80195 act on implicitly propagated error, if any
Change-Id: I1d5a55a14fc3e25edc2cddec5b53ed2afa96bd3e (cherry picked from commit 1093b900b43d819c9a730ef6435fed0f3687a085) Reviewed-on: https://gerrit.libreoffice.org/10199 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: Kohei Yoshida <libreoffice@kohei.us> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
-rw-r--r--sc/source/core/tool/interpr1.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index a834488ee091..a42dbad7da9f 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -255,6 +255,11 @@ void ScInterpreter::ScIfError( bool bNAonly )
{
default:
Pop();
+ // Act on implicitly propagated error, if any.
+ if (nOldGlobalError)
+ nGlobalError = nOldGlobalError;
+ if (nGlobalError)
+ bError = true;
break;
case svError:
PopError();