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

[Eike Rathke]

 sc/source/filter/excel/xestream.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ce2c62175858a6dd1fc9c5e62904442009177833
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Apr 2 16:54:17 2014 +0200

    resolved fdo#76949 correct grammar is GRAM_OOXML
    
    Regression introduced with ca8ca8c28742879220f3ff88ae0d71c8d69b11cd that
    used GRAM_ENGLISH_XL_OOX instead, which is English UI function names
    with OOXML reference syntax.
    
    Change-Id: If6b73e85a45e57f6ef281d1edf8e34dec7cb9bb8
    (cherry picked from commit 31e4419ac7581aa7864905bcd4ce42e14df6c9bb)
    Reviewed-on: https://gerrit.libreoffice.org/8818
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 3e9935d..035a827 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -824,7 +824,7 @@ OUString XclXmlUtils::ToOUString(
     ScDocument& rDocument, const ScAddress& rAddress, const ScTokenArray* pTokenArray )
 {
     ScCompiler aCompiler( &rDocument, rAddress, const_cast<ScTokenArray&>(*pTokenArray));
-    aCompiler.SetGrammar(FormulaGrammar::GRAM_ENGLISH_XL_OOX);
+    aCompiler.SetGrammar(FormulaGrammar::GRAM_OOXML);
 
     OUStringBuffer aBuffer( pTokenArray->GetLen() * 5 );
     aCompiler.CreateStringFromTokenArray( aBuffer );