summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWinfried Donkers <winfrieddonkers@libreoffice.org>2018-07-16 15:35:16 +0200
committerEike Rathke <erack@redhat.com>2018-07-17 09:50:06 +0200
commita51e14849606111e9dcbccb2707786c53e0f732d (patch)
tree9da5ba41adecb63f4fe73041c8322fda51bf5320
parent0c91f8f839d36c8b5af272b1d3c835d2f4af6b65 (diff)
Pop all remaining arguments on stack in ScInterpreter::Iterateparameters().
(And not all but one.) Change-Id: I42c0ea0f188fa16258022041ab8fc898f5d64ab5 Reviewed-on: https://gerrit.libreoffice.org/57503 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
-rw-r--r--sc/source/core/tool/interpr6.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx
index e1769e27b091..b8ffd45e57db 100644
--- a/sc/source/core/tool/interpr6.cxx
+++ b/sc/source/core/tool/interpr6.cxx
@@ -548,6 +548,7 @@ void ScInterpreter::IterateParameters( ScIterFunc eFunc, bool bTextAsZero )
}
else
{
+ Pop();
switch ( eFunc )
{
case ifAVERAGE:
@@ -557,7 +558,6 @@ void ScInterpreter::IterateParameters( ScIterFunc eFunc, bool bTextAsZero )
{
if ( bTextAsZero )
{
- Pop();
nCount++;
if ( eFunc == ifPRODUCT )
fRes = 0.0;
@@ -571,7 +571,6 @@ void ScInterpreter::IterateParameters( ScIterFunc eFunc, bool bTextAsZero )
}
break;
default:
- Pop();
nCount++;
}
}