[Libreoffice-commits] core.git: sc/source

[Eike Rathke]

 sc/source/core/tool/interpr3.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 2e832eff2fea4005fb43521593f979657ef7c111
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Jan 19 18:30:45 2018 +0100

    Don't push error twice
    
    No harm was done as the stack is cleaned up afterwards, but it's wrong
    anyway and having to push the result downwards during cleanup is
    unnecessary.
    
    Change-Id: I0b2c153c9791ce5c287d340bac466c19cd6a5703

diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 55b80a6612e9..cee396128f53 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -2704,13 +2704,14 @@ void ScInterpreter::ScTTest()
     }
     else if (fTyp == 2.0)
     {
-        CalculateTest(false,nC1, nC2,nR1, nR2,pMat1,pMat2,fT,fF);
+        if (!CalculateTest(false,nC1, nC2,nR1, nR2,pMat1,pMat2,fT,fF))
+            return;     // error was pushed
     }
     else if (fTyp == 3.0)
     {
-        CalculateTest(true,nC1, nC2,nR1, nR2,pMat1,pMat2,fT,fF);
+        if (!CalculateTest(true,nC1, nC2,nR1, nR2,pMat1,pMat2,fT,fF))
+            return;     // error was pushed
     }
-
     else
     {
         PushIllegalArgument();