sc: rowcol: tdf#50916 convert core/tool

Change-Id: I0fe5a7ef4a79d0832802945ce1b9da4752f1d5fc
Reviewed-on: https://gerrit.libreoffice.org/81598
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 21 insertions, 21 deletions

diff --git a/sc/qa/unit/helper/shared_test_impl.hxx b/sc/qa/unit/helper/shared_test_impl.hxx
index e75a521f0fce..6dbd67769c85 100644
--- a/sc/qa/unit/helper/shared_test_impl.hxx
+++ b/sc/qa/unit/helper/shared_test_impl.hxx
@@ -281,7 +281,7 @@ void testCeilingFloor_Impl( ScDocument& rDoc )
     const char pORef[] = "Sheet1.K1";
     OUString aRef(pORef);
     ScAddress aPos;
-    aPos.Parse(aRef);
+    aPos.Parse(aRef, &rDoc);
     ASSERT_FORMULA_EQUAL(rDoc, aPos, "AND(K3:K81)", "Wrong formula.");
     CPPUNIT_ASSERT_MESSAGE( OString( pORef + OStringLiteral(" result is error.")).getStr(),
             isFormulaWithoutError( rDoc, aPos));
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx
index 9ee5fd9a0e8c..dcd395784949 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -2786,7 +2786,7 @@ void ScExportTest::testSharedFormulaExportXLS()
                     return false;
                 }
 
-                OUString aFormula = pFC->GetCode()->CreateString(aCxt, aPos);
+                OUString aFormula = pFC->GetCode()->CreateString(&rDoc, aCxt, aPos);
                 aExpected = "Coefficients!RC[-1]";
                 if (aFormula != aExpected)
                 {
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index b5ef29905a07..8524db0273ff 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -3835,13 +3835,13 @@ void ScFiltersTest::testEmptyRowsXLSXML()
         };
 
         ScRange aDataRange;
-        aDataRange.Parse("A1:B9");
+        aDataRange.Parse("A1:B9", &rDoc);
         bool bSuccess = checkOutput(&rDoc, aDataRange, aOutputCheck, "Expected output");
         CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
     }
 
     ScAddress aPos;
-    aPos.Parse("B9");
+    aPos.Parse("B9", &rDoc);
     ASSERT_FORMULA_EQUAL(rDoc, aPos, "SUM(B4:B8)", nullptr);
 
     xDocSh->DoClose();
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 9266c4cca840..7952c0c46e58 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -3690,7 +3690,7 @@ void Test::testFormulaRefUpdateNameDeleteRow()
 
     sc::TokenStringContext aCxt(m_pDoc, formula::FormulaGrammar::GRAM_ENGLISH);
     const ScTokenArray* pCode = pName->GetCode();
-    OUString aExpr = pCode->CreateString(aCxt, ScAddress(0,0,0));
+    OUString aExpr = pCode->CreateString(m_pDoc, aCxt, ScAddress(0,0,0));
     CPPUNIT_ASSERT_EQUAL(OUString("$B$2:$B$4"), aExpr);
 
     // Insert a new name 'MyAddress' to reference $B$3. Note absolute row.
@@ -3702,7 +3702,7 @@ void Test::testFormulaRefUpdateNameDeleteRow()
 
     sc::TokenStringContext aCxt2(m_pDoc, formula::FormulaGrammar::GRAM_ENGLISH);
     const ScTokenArray* pCode2 = pName2->GetCode();
-    OUString aExpr2 = pCode2->CreateString(aCxt2, ScAddress(0,0,0));
+    OUString aExpr2 = pCode2->CreateString(m_pDoc, aCxt2, ScAddress(0,0,0));
     CPPUNIT_ASSERT_EQUAL(OUString("$B$3"), aExpr2);
 
     ScDocFunc& rFunc = getDocShell().GetDocFunc();
@@ -3713,16 +3713,16 @@ void Test::testFormulaRefUpdateNameDeleteRow()
     rFunc.DeleteCells(ScRange(0,2,0,m_pDoc->MaxCol(),2,0), &aMark, DelCellCmd::CellsUp, true);
 
     // The reference in the 'MyRange' name should get updated to B2:B3.
-    aExpr = pCode->CreateString(aCxt, ScAddress(0,0,0));
+    aExpr = pCode->CreateString(m_pDoc, aCxt, ScAddress(0,0,0));
     CPPUNIT_ASSERT_EQUAL(OUString("$B$2:$B$3"), aExpr);
 
     // The reference in the 'MyAddress' name should get updated to $B$#REF!.
-    aExpr2 = pCode2->CreateString(aCxt2, ScAddress(0,0,0));
+    aExpr2 = pCode2->CreateString(m_pDoc, aCxt2, ScAddress(0,0,0));
     CPPUNIT_ASSERT_EQUAL(OUString("$B$#REF!"), aExpr2);
 
     // Delete row 3 again.
     rFunc.DeleteCells(ScRange(0,2,0,m_pDoc->MaxCol(),2,0), &aMark, DelCellCmd::CellsUp, true);
-    aExpr = pCode->CreateString(aCxt, ScAddress(0,0,0));
+    aExpr = pCode->CreateString(m_pDoc, aCxt, ScAddress(0,0,0));
     CPPUNIT_ASSERT_EQUAL(OUString("$B$2:$B$2"), aExpr);
 
     // Undo and check.
@@ -3735,7 +3735,7 @@ void Test::testFormulaRefUpdateNameDeleteRow()
     CPPUNIT_ASSERT(pName);
     pCode = pName->GetCode();
 
-    aExpr = pCode->CreateString(aCxt, ScAddress(0,0,0));
+    aExpr = pCode->CreateString(m_pDoc, aCxt, ScAddress(0,0,0));
     CPPUNIT_ASSERT_EQUAL(OUString("$B$2:$B$3"), aExpr);
 
     // Undo again and check.
@@ -3745,13 +3745,13 @@ void Test::testFormulaRefUpdateNameDeleteRow()
     CPPUNIT_ASSERT(pName);
     pCode = pName->GetCode();
 
-    aExpr = pCode->CreateString(aCxt, ScAddress(0,0,0));
+    aExpr = pCode->CreateString(m_pDoc, aCxt, ScAddress(0,0,0));
     CPPUNIT_ASSERT_EQUAL(OUString("$B$2:$B$4"), aExpr);
 
     // Delete row 2-3.
     rFunc.DeleteCells(ScRange(0,1,0,m_pDoc->MaxCol(),2,0), &aMark, DelCellCmd::CellsUp, true);
 
-    aExpr = pCode->CreateString(aCxt, ScAddress(0,0,0));
+    aExpr = pCode->CreateString(m_pDoc, aCxt, ScAddress(0,0,0));
     CPPUNIT_ASSERT_EQUAL(OUString("$B$2:$B$2"), aExpr);
 
     // Undo and check.
@@ -3761,14 +3761,14 @@ void Test::testFormulaRefUpdateNameDeleteRow()
     CPPUNIT_ASSERT(pName);
     pCode = pName->GetCode();
 
-    aExpr = pCode->CreateString(aCxt, ScAddress(0,0,0));
+    aExpr = pCode->CreateString(m_pDoc, aCxt, ScAddress(0,0,0));
     CPPUNIT_ASSERT_EQUAL(OUString("$B$2:$B$4"), aExpr);
 
     pName2 = m_pDoc->GetRangeName()->findByUpperName("MYADDRESS");
     CPPUNIT_ASSERT(pName2);
     pCode2 = pName2->GetCode();
 
-    aExpr2 = pCode2->CreateString(aCxt2, ScAddress(0,0,0));
+    aExpr2 = pCode2->CreateString(m_pDoc, aCxt2, ScAddress(0,0,0));
     CPPUNIT_ASSERT_EQUAL(OUString("$B$3"), aExpr2);
 
     m_pDoc->InsertTab(1, "test2");
@@ -3781,7 +3781,7 @@ void Test::testFormulaRefUpdateNameDeleteRow()
     CPPUNIT_ASSERT(pName);
     pCode = pName->GetCode();
 
-    aExpr = pCode->CreateString(aCxt, ScAddress(0,0,0));
+    aExpr = pCode->CreateString(m_pDoc, aCxt, ScAddress(0,0,0));
     CPPUNIT_ASSERT_EQUAL(OUString("$B$2:$B$4"), aExpr);
 
     pName2 = m_pDoc->GetRangeName()->findByUpperName("MYADDRESS");
@@ -3794,7 +3794,7 @@ void Test::testFormulaRefUpdateNameDeleteRow()
     // relative to its base position on sheet 0 (same for the 'MyRange' range,
     // which is the reason why it is not updated either).
     // This is a tad confusing...
-    aExpr2 = pCode2->CreateString(aCxt2, ScAddress(0,0,0));
+    aExpr2 = pCode2->CreateString(m_pDoc, aCxt2, ScAddress(0,0,0));
     CPPUNIT_ASSERT_EQUAL(OUString("$B$3"), aExpr2);
 
     m_pDoc->DeleteTab(1);
@@ -4022,7 +4022,7 @@ void Test::testFormulaRefUpdateNameDelete()
     m_pDoc->DeleteCol(1, 0, 3, 0, 0, 1);
     const ScTokenArray* pCode = pName->GetCode();
     sc::TokenStringContext aCxt(m_pDoc, formula::FormulaGrammar::GRAM_ENGLISH);
-    OUString aExpr = pCode->CreateString(aCxt, ScAddress(0,0,0));
+    OUString aExpr = pCode->CreateString(m_pDoc, aCxt, ScAddress(0,0,0));
     CPPUNIT_ASSERT_EQUAL(OUString("$Test.$B$1"), aExpr);
 
     m_pDoc->DeleteTab(0);
@@ -4181,7 +4181,7 @@ void Test::testTokenArrayRefUpdateMove()
         ScCompiler aComp(m_pDoc, aPos, m_pDoc->GetGrammar());
         std::unique_ptr<ScTokenArray> pArray(aComp.CompileString(aTest));
 
-        OUString aStr = pArray->CreateString(aCxt, aPos);
+        OUString aStr = pArray->CreateString(m_pDoc, aCxt, aPos);
 
         CPPUNIT_ASSERT_EQUAL(aTest, aStr);
 
@@ -4189,7 +4189,7 @@ void Test::testTokenArrayRefUpdateMove()
         // string should not change.
         pArray->AdjustReferenceOnMove(aRefCxt, aPos, aPos);
 
-        aStr = pArray->CreateString(aCxt, aPos);
+        aStr = pArray->CreateString(m_pDoc, aCxt, aPos);
         CPPUNIT_ASSERT_EQUAL(aTest, aStr);
     }
 
@@ -8459,7 +8459,7 @@ void Test::testRefR1C1WholeCol()
     ScCompiler aComp(m_pDoc, aPos, FormulaGrammar::GRAM_ENGLISH_XL_R1C1);
     std::unique_ptr<ScTokenArray> pTokens(aComp.CompileString("=C[10]"));
     sc::TokenStringContext aCxt(m_pDoc, formula::FormulaGrammar::GRAM_ENGLISH);
-    OUString aFormula = pTokens->CreateString(aCxt, aPos);
+    OUString aFormula = pTokens->CreateString(m_pDoc, aCxt, aPos);
 
     CPPUNIT_ASSERT_EQUAL(OUString("L:L"), aFormula);
 
@@ -8474,7 +8474,7 @@ void Test::testRefR1C1WholeRow()
     ScCompiler aComp(m_pDoc, aPos, FormulaGrammar::GRAM_ENGLISH_XL_R1C1);
     std::unique_ptr<ScTokenArray> pTokens(aComp.CompileString("=R[3]"));
     sc::TokenStringContext aCxt(m_pDoc, formula::FormulaGrammar::GRAM_ENGLISH);
-    OUString aFormula = pTokens->CreateString(aCxt, aPos);
+    OUString aFormula = pTokens->CreateString(m_pDoc, aCxt, aPos);
 
     CPPUNIT_ASSERT_EQUAL(OUString("5:5"), aFormula);