summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2015-11-22 15:03:06 +0100
committerJulien Nabet <serval2412@yahoo.fr>2015-11-22 15:04:03 +0100
commit0bba0524c5090831653e7acae09e26b18f6bb481 (patch)
tree8641edfde4eb80945171e58a0fc1442a5c15adac
parent1fdddad68aa166c7fa3ebf18d7ba78eba319d2bc (diff)
Revert "tdf#95687: Wrong function names in Formula Writer are considered as SUM"
This reverts commit e110397a2816037b421bdcdeed0a2fdab5cd99d7. Variables weren't dealt with this.
-rw-r--r--sw/source/core/bastyp/calc.cxx11
1 files changed, 1 insertions, 10 deletions
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index d3bdf5d7ea1c..1317ec2bb204 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 )
{