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

[Xisco Fauli (via logerrit)]

 sc/qa/unit/subsequent_export_test.cxx  |    2 +-
 sc/qa/unit/subsequent_export_test2.cxx |    4 ++--
 sc/qa/unit/ucalc_formula.cxx           |    4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 18f1e7ae9d57e888e316e9134ea321be98bf705a
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri Jan 13 17:08:12 2023 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Jan 17 13:35:07 2023 +0000

    sc: Use FormulaGrammarSwitch
    
    Change-Id: Ia4d21886a5a8536f20fed87bfea9676ac8603d86
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145481
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sc/qa/unit/subsequent_export_test.cxx 
b/sc/qa/unit/subsequent_export_test.cxx
index a010a9820ea4..5b66ae23f3d9 100644
--- a/sc/qa/unit/subsequent_export_test.cxx
+++ b/sc/qa/unit/subsequent_export_test.cxx
@@ -3053,7 +3053,7 @@ void ScExportTest::testSharedFormulaExportXLS()
         bool checkContent(ScDocument& rDoc)
         {
             formula::FormulaGrammar::Grammar eGram = 
formula::FormulaGrammar::GRAM_ENGLISH_XL_R1C1;
-            rDoc.SetGrammar(eGram);
+            FormulaGrammarSwitch aFGSwitch(&rDoc, eGram);
             sc::TokenStringContext aCxt(rDoc, eGram);
 
             // Check the title row.
diff --git a/sc/qa/unit/subsequent_export_test2.cxx 
b/sc/qa/unit/subsequent_export_test2.cxx
index 9ac4aa7704b8..ab57145096a5 100644
--- a/sc/qa/unit/subsequent_export_test2.cxx
+++ b/sc/qa/unit/subsequent_export_test2.cxx
@@ -423,7 +423,7 @@ void ScExportTest2::testRefStringUnspecified()
                                  aConfig.meStringRefAddressSyntax);
 
     // change formula syntax (i.e. not string ref syntax) to ExcelA1
-    pDoc->SetGrammar(formula::FormulaGrammar::GRAM_NATIVE_XL_A1);
+    FormulaGrammarSwitch aFGSwitch(pDoc, 
formula::FormulaGrammar::GRAM_NATIVE_XL_A1);
 
     saveAndReload("calc8");
 
@@ -502,7 +502,7 @@ void ScExportTest2::testTdf121260()
 
     ScDocument* pDoc = getScDoc();
     // change formula syntax (i.e. not string ref syntax) to ExcelA1
-    pDoc->SetGrammar(formula::FormulaGrammar::GRAM_NATIVE_XL_A1);
+    FormulaGrammarSwitch aFGSwitch(pDoc, 
formula::FormulaGrammar::GRAM_NATIVE_XL_A1);
 
     save("Calc Office Open XML");
     xmlDocUniquePtr pChart1 = parseExport("xl/charts/chart1.xml");
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 3cc36c60615d..cdefff3cf434 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -9085,7 +9085,7 @@ void TestFormula::testIntersectionOpExcel()
     // Data in C2.
     m_pDoc->SetValue(2,1,0, 1.0);
 
-    m_pDoc->SetGrammar(FormulaGrammar::GRAM_ENGLISH_XL_A1);
+    FormulaGrammarSwitch aFGSwitch(m_pDoc, 
formula::FormulaGrammar::GRAM_ENGLISH_XL_A1);
 
     // Choose formula positions that don't intersect with those data ranges.
     ScAddress aPos(0,3,0);
@@ -9101,8 +9101,6 @@ void TestFormula::testIntersectionOpExcel()
     m_pDoc->SetString(aPos,"=2*(horz vert)");
     CPPUNIT_ASSERT_EQUAL_MESSAGE("A7 calculating with intersecting named 
expressions failed", 2.0, m_pDoc->GetValue(aPos));
 
-    m_pDoc->SetGrammar(FormulaGrammar::GRAM_ENGLISH);
-
     m_pDoc->DeleteTab(0);
 }