summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2017-05-22 22:10:16 +0200
committerEike Rathke <erack@redhat.com>2017-05-22 22:12:19 +0200
commit70dd07cf82746362f621fb6510239e2c0034aa5f (patch)
tree8bedf807dbf3c54748480e7feb82dd8621884995
parent39adbb9593c764429e9ed2176dde755809b3af0f (diff)
Revert "Handle SUMPRODUCT with svRefList arguments, tdf#58874" (Excel can't)
-rw-r--r--sc/source/core/tool/interpr5.cxx10
1 files changed, 4 insertions, 6 deletions
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();