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

[Libreoffice Gerrit user]

 sc/source/core/tool/interpr6.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit a51e14849606111e9dcbccb2707786c53e0f732d
Author:     Winfried Donkers <winfrieddonkers at libreoffice.org>
AuthorDate: Mon Jul 16 15:35:16 2018 +0200
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Tue Jul 17 09:50:06 2018 +0200

    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 at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

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++;
                     }
                 }