[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source

[Eike Rathke]

 sc/source/filter/excel/xename.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 81e6799d376f23d5079121a4c830f3662c2e7750
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Jun 22 18:47:31 2015 +0200

    Excel export: set correct grammar for named expressions symbols
    
    This was always wrong for OOXML export, function names may have been
    written without _xlfn. prefix or substitutions not been processed, but
    will be vital for TableRef transformation to A1 notation.
    
    Change-Id: Ieffd7d78e2c744d3c12228a0a815b5ce68b26c81
    (cherry picked from commit 17815049103b920df054b4f1bb8b1e99486972f2)

diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx
index 8c8a010..4466a1e 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -548,7 +548,8 @@ sal_uInt16 XclExpNameManagerImpl::CreateName( SCTAB nTab, const ScRangeData& rRa
         xName->SetTokenArray( xTokArr );
 
         OUString sSymbol;
-        rRangeData.GetSymbol( sSymbol, formula::FormulaGrammar::GRAM_ENGLISH_XL_A1 );
+        rRangeData.GetSymbol( sSymbol, ((GetOutput() == EXC_OUTPUT_BINARY) ?
+                    formula::FormulaGrammar::GRAM_ENGLISH_XL_A1 : formula::FormulaGrammar::GRAM_OOXML));
         xName->SetSymbol( sSymbol );
 
         /*  Try to replace by existing built-in name - complete token array is