sw/source/core/bastyp/calc.cxx | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit e110397a2816037b421bdcdeed0a2fdab5cd99d7
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Sun Nov 22 09:51:32 2015 +0100
tdf#95687: Wrong function names in Formula Writer are considered as SUM
New fix which deals with specific "foo" case
Change-Id: I479b30abf22315ddca6151cba220574029cb1a91
Reviewed-on: https://gerrit.libreoffice.org/20113
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 1317ec2..d3bdf5d 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -713,7 +713,16 @@ SwCalcOper SwCalc::GetToken()
}
aVarName = aName;
eCurrOper = CALC_NAME;
- bSetError = false;
+ // 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;
}
else if ( aRes.TokenType & KParseType::DOUBLE_QUOTE_STRING )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
