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

[Eike Rathke]

 sc/source/core/tool/interpr1.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit ee75263f6c942c0a8f59beb84c21a98c141bc7f1
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Apr 25 11:12:12 2014 +0100

    we need to push a return value in any case, fdo#73148 related
    
    ... not just if there is no error; popping a value from the stack also
    pops an error value, and the error is pushed again instead of the value
    to be pushed, see call of IfErrorPushError() in PushDouble().
    
    Change-Id: I92f486fa226c90870990f608cd43d4a1379a2361

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index a7440f4..b2a77b2 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -6703,8 +6703,7 @@ void ScInterpreter::ScAggregate()
         // Get rid of the 1st and 2nd (fished) parameters.
         Pop();
         Pop();
-        if ( !nGlobalError )
-            PushDouble( nVal );
+        PushDouble( nVal );
     }
 }
 
commit 9c78e71903146acec47e0d32b23b9e5cc3e021a1
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Apr 25 10:55:12 2014 +0100

    return early once we pushed an error, fdo#73148 related
    
    Change-Id: Iadc520fe897966bf41c793ae37f510addfd68cef

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 4b6140a..a7440f4 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -6663,7 +6663,7 @@ void ScInterpreter::ScAggregate()
                     break;
                 default :
                     PushIllegalArgument();
-                    break;
+                    return;
             }
             // TODO: implement filter options
             if ( nAggrFlags != 0x00 )