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

[Julien Nabet]

 sw/source/core/bastyp/calc.cxx |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 0bba0524c5090831653e7acae09e26b18f6bb481
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Nov 22 15:03:06 2015 +0100

    Revert "tdf#95687: Wrong function names in Formula Writer are considered as SUM"
    
    This reverts commit e110397a2816037b421bdcdeed0a2fdab5cd99d7.
    
    Variables weren't dealt with this.

diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index d3bdf5d..1317ec2 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -713,16 +713,7 @@ SwCalcOper SwCalc::GetToken()
             }
             aVarName = aName;
             eCurrOper = CALC_NAME;
-            // Deal with specific "foo" case
-            if (sLowerCaseName.equals("foo"))
-            {
-                // "foo" function doesn't really exist but is sometimes used
-                // internally for setProperties method for example
-                // (see PythonTest_sw_python, set_expression)
-                bSetError = (sCommand.startsWith("foo("))?true:false;
-            }
-            else
-                bSetError = true;
+            bSetError = false;
         }
         else if ( aRes.TokenType & KParseType::DOUBLE_QUOTE_STRING )
         {