[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-6' - sc/source

[Eike Rathke]

 sc/source/core/tool/interpr1.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 874859a8feb8cfadd7f491ebae99ff8aa5fd43c7
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Jul 10 16:13:40 2014 +0200

    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 at googlemail.com>
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: Kohei Yoshida <libreoffice at kohei.us>
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index a834488..a42dbad 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();