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

Eike Rathke erack at redhat.com
Tue May 23 12:05:40 UTC 2017


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

New commits:
commit 869b92d186840adfa17c5f56ccaf923e89f9618f
Author: Eike Rathke <erack at redhat.com>
Date:   Tue May 23 14:01:41 2017 +0200

    PushError() instead of SetError() so there's a result token
    
    Change-Id: I8c2a7e01b04c26e008c8cbea9332f71d47293c75
    (cherry picked from commit cd87661b4761ee9f512fc01f95d84f786c97bb66)
    Reviewed-on: https://gerrit.libreoffice.org/37949
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 29f51d6326a1..6d03201f0494 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -5705,7 +5705,7 @@ void ScInterpreter::ScSumIfs()
 
     if (nParamCount < 3 || (nParamCount % 2 != 1))
     {
-        SetError( FormulaError::ParameterExpected);
+        PushError( FormulaError::ParameterExpected);
         return;
     }
 
@@ -5720,7 +5720,7 @@ void ScInterpreter::ScAverageIfs()
 
     if (nParamCount < 3 || (nParamCount % 2 != 1))
     {
-        SetError( FormulaError::ParameterExpected);
+        PushError( FormulaError::ParameterExpected);
         return;
     }
 
@@ -5735,7 +5735,7 @@ void ScInterpreter::ScCountIfs()
 
     if (nParamCount < 2 || (nParamCount % 2 != 0))
     {
-        SetError( FormulaError::ParameterExpected);
+        PushError( FormulaError::ParameterExpected);
         return;
     }
 
@@ -5750,7 +5750,7 @@ void ScInterpreter::ScMinIfs_MS()
 
     if (nParamCount < 3 || (nParamCount % 2 != 1))
     {
-        SetError( FormulaError::ParameterExpected);
+        PushError( FormulaError::ParameterExpected);
         return;
     }
 
@@ -5766,7 +5766,7 @@ void ScInterpreter::ScMaxIfs_MS()
 
     if (nParamCount < 3 || (nParamCount % 2 != 1))
     {
-        SetError( FormulaError::ParameterExpected);
+        PushError( FormulaError::ParameterExpected);
         return;
     }
 


More information about the Libreoffice-commits mailing list