[Libreoffice-commits] core.git: Branch 'feature/fixes27' - sc/source

László Németh laszlo.nemeth at collabora.com
Tue Jul 26 11:51:26 UTC 2016


 sc/source/core/tool/interpr1.cxx |   11 -----------
 1 file changed, 11 deletions(-)

New commits:
commit bb3994f753e9440262d4e492f4cbe75f20be9705
Author: László Németh <laszlo.nemeth at collabora.com>
Date:   Tue Jul 26 13:46:53 2016 +0200

    Revert "tdf#100753 - Move error checking out of the inner loop."
    
    This reverts commit d355837860131e99e83bc3fb34477e13abbd39ff.
    
    Revert "tdf#100753 propagate error with VAR and STDEV functions."
    
    This reverts commit 88065eebdf9bc557b2c5d982b0beacb19ef2ad36.

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 95ac726..fa9d70a 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -3652,11 +3652,6 @@ void ScInterpreter::GetStVarParams( double& rVal, double& rValCount,
                     }
                     while ((nErr == 0) && aValIter.GetNext(fVal, nErr));
                 }
-                if ( nErr )
-                {
-                    SetError(nErr);
-                    return;
-                }
             }
             break;
             case svMatrix :
@@ -3705,12 +3700,6 @@ void ScInterpreter::GetStVarParams( double& rVal, double& rValCount,
         }
     }
 
-    if ( nGlobalError )
-    {
-        rValCount = 0.0;
-        return;
-    }
-
     ::std::vector<double>::size_type n = values.size();
     vMean = fSum / n;
     for (::std::vector<double>::size_type i = 0; i < n; i++)


More information about the Libreoffice-commits mailing list