[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sc/source

[Kohei Yoshida]

 sc/source/core/tool/interpr2.cxx |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit e1aa6471c514402d5ef1d5053b989b38a1f22981
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Thu Apr 14 17:36:05 2011 -0400

    Revert "fdo#34306: Append fake parameter in case of un-even parameter count."
    
    This reverts commit b45254a0d973e1da278d5e8d269b688628f2603f.
    
    This is not the right approach, as re-saving the document to xls would
    mess it up again.

diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 39ab253..aa06d91 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2943,11 +2943,7 @@ void ScInterpreter::ScGetPivotData()
         // there must be an even number of args
         //      target, ref, then field/item pairs
         if( (nParamCount % 2) == 1)
-        {
-            // if not, append an extra fake parameter to compensate for it.
-            PushString(ScGlobal::GetEmptyString());
-            ++nParamCount;
-        }
+            goto failed;
 
         bool bOldSyntax = false;
         if ( nParamCount == 2 )