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

[Eike Rathke]

 sc/source/core/tool/compiler.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a8a8ff59c5749bbe1f2f58ea8fd42d66e6ae2a81
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Sep 20 22:37:59 2016 +0200

    sc-perf: tdf#79023 do not call SvNumberFormatter also for numbers in OOXML
    
    Change-Id: Ib565687bff2205da0213f6d523dd2bc42c96ad47

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index e620032..2a49e89 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2894,7 +2894,8 @@ static bool lcl_ParenthesisFollows( const sal_Unicode* p )
 
 bool ScCompiler::IsValue( const OUString& rSym )
 {
-    if (FormulaGrammar::isODFF( GetGrammar()))
+    const sal_Int32 nFormulaLanguage = FormulaGrammar::extractFormulaLanguage( GetGrammar());
+    if (nFormulaLanguage == css::sheet::FormulaLanguage::ODFF || nFormulaLanguage == css::sheet::FormulaLanguage::OOXML)
     {
         // Speedup things for ODFF, only well-formed numbers, not locale
         // dependent nor user input.