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

[Katarina Behrens]

 sc/source/core/tool/formulaopt.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 0d8b54e38fc4aeb12624ef457de26e5646c79a6a
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Thu Oct 8 12:55:21 2015 +0200

    Related tdf#93688: save CalcA1|ExcelA1 also as a global option
    
    without this patch, it's only possible to save it on per-document
    basis
    
    Change-Id: I13359b751ef766c7de53e9e21c299aadbbc0fbf4

diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx
index 8e5caea..244f667 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -327,6 +327,9 @@ ScFormulaCfg::ScFormulaCfg() :
                             case 2: // Excel R1C1
                                 eConv = formula::FormulaGrammar::CONV_XL_R1C1;
                             break;
+                            case 3: // Calc A1 | Excel A1
+                                eConv = formula::FormulaGrammar::CONV_A1_XL_A1;
+                            break;
                             default:
                                 ;
                         }
@@ -443,6 +446,7 @@ void ScFormulaCfg::Commit()
                     case ::formula::FormulaGrammar::CONV_OOO:     nVal = 0; break;
                     case ::formula::FormulaGrammar::CONV_XL_A1:   nVal = 1; break;
                     case ::formula::FormulaGrammar::CONV_XL_R1C1: nVal = 2; break;
+                    case ::formula::FormulaGrammar::CONV_A1_XL_A1: nVal = 3; break;
                     default: break;
                 }
                 pValues[nProp] <<= nVal;