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

[Eike Rathke]

 sc/source/core/tool/interpr6.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a8a8559a24d043b4b1180acb3a0ff60052be5fad
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Dec 19 16:28:04 2017 +0100

    Resolves: tdf#114539 only pop own parameters from stack
    
    ... and not another pending one..
    
    Change-Id: Ief5c27ccfb0b4121f2ba019e0fb8770dabbf60cf
    (cherry picked from commit 4b444b4c1efc2be219e6975e30048ff616fdac0f)
    Reviewed-on: https://gerrit.libreoffice.org/46801
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx
index c42f0f4545d3..cf0553b813b9 100644
--- a/sc/source/core/tool/interpr6.cxx
+++ b/sc/source/core/tool/interpr6.cxx
@@ -926,10 +926,11 @@ void ScInterpreter::ScRawSubtract()
     // Obtain the minuend.
     double fRes = GetDouble();
 
-    while (nGlobalError == FormulaError::NONE && nParamCount-- > 1)
+    while (nGlobalError == FormulaError::NONE && nParamCount > 1)
     {
         // Simple single values without matrix support.
         fRes -= GetDouble();
+        --nParamCount;
     }
     while (nParamCount-- > 0)
         PopError();