[Libreoffice-commits] core.git: Branch 'private/bubli/lhm-4-1-6-backports' - sc/source

[Katarina Behrens]

Rebased ref, commits from common ancestor:
commit 42ae46c91e6cae23a6ded1ac4ef1654630ac1890
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Fri Oct 16 16:34:28 2015 +0200

    Related tdf#92256: Set legacy mode also for all xls files
    
    Change-Id: I23854ffcd170670f70f5fc386c3b8d35295fa4c3

diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index d1ec8ae..17a7d28 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include "calcconfig.hxx"
 #include "document.hxx"
 #include "scerrors.hxx"
 #include "fprogressbar.hxx"
@@ -752,6 +753,10 @@ FltError ImportExcel::Read( void )
 
         pD->CalcAfterLoad();
 
+        ScCalcConfig aConfig = pD->GetCalcConfig();
+        aConfig.SetStringRefSyntax( formula::FormulaGrammar::CONV_A1_XL_A1 );
+        pD->SetCalcConfig( aConfig );
+
         const XclImpAddressConverter& rAddrConv = GetAddressConverter();
         if( rAddrConv.IsTabTruncated() )
             eLastErr = SCWARN_IMPORT_SHEET_OVERFLOW;
@@ -1297,6 +1302,10 @@ FltError ImportExcel8::Read( void )
 
         pD->CalcAfterLoad();
 
+        ScCalcConfig aConfig = pD->GetCalcConfig();
+        aConfig.SetStringRefSyntax( formula::FormulaGrammar::CONV_A1_XL_A1 );
+        pD->SetCalcConfig( aConfig );
+
         // import change tracking data
         XclImpChangeTrack aImpChTr( GetRoot(), maStrm );
         aImpChTr.Apply();