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

[Eike Rathke]

 sc/source/core/tool/interpr5.cxx |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 70dd07cf82746362f621fb6510239e2c0034aa5f
Author: Eike Rathke <erack at redhat.com>
Date:   Mon May 22 22:10:16 2017 +0200

    Revert "Handle SUMPRODUCT with svRefList arguments, tdf#58874" (Excel can't)
    
    This reverts commit 6b417ec3daaec72c736fcfe0d980ce205e589633.

diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 3d994f4852ea..4e0ee214897c 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -1690,30 +1690,28 @@ public:
 
 void ScInterpreter::ScSumProduct()
 {
-    short nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCount( nParamCount, 1, 30 ) )
         return;
 
     ScMatrixRef pMatLast;
     ScMatrixRef pMat;
-    size_t nRefInList = 0;
 
-    pMatLast = GetMatrix( nParamCount, nRefInList);
+    pMatLast = GetMatrix();
     if (!pMatLast)
     {
         PushIllegalParameter();
         return;
     }
-    --nParamCount;
 
     SCSIZE nC, nCLast, nR, nRLast;
     pMatLast->GetDimensions(nCLast, nRLast);
     std::vector<double> aResArray;
     pMatLast->GetDoubleArray(aResArray);
 
-    while (nParamCount--)
+    for (sal_uInt16 i = 1; i < nParamCount; ++i)
     {
-        pMat = GetMatrix( nParamCount, nRefInList);
+        pMat = GetMatrix();
         if (!pMat)
         {
             PushIllegalParameter();