[Libreoffice-commits] core.git: sc/inc sc/qa sc/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Thu Sep 17 08:50:16 UTC 2020
sc/inc/tokenstringcontext.hxx | 2 +-
sc/qa/unit/subsequent_export-test.cxx | 2 +-
sc/qa/unit/ucalc_formula.cxx | 14 +++++++-------
sc/source/core/data/column2.cxx | 2 +-
sc/source/core/data/formulacell.cxx | 2 +-
sc/source/core/tool/formulalogger.cxx | 2 +-
sc/source/core/tool/tokenstringcontext.cxx | 17 +++++++----------
sc/source/filter/oox/formulabuffer.cxx | 2 +-
sc/source/ui/view/cellsh1.cxx | 2 +-
9 files changed, 21 insertions(+), 24 deletions(-)
New commits:
commit f7df7a6efcc6fe31915e031e6dbab0ad8633ac48
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Sep 15 15:54:53 2020 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Sep 17 10:49:28 2020 +0200
TokenStringContext never called with a null ScDocument*
so we can drop the nullptr check
Change-Id: I588619f3e6f701a003447c59f5c0530801b5e1ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102886
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sc/inc/tokenstringcontext.hxx b/sc/inc/tokenstringcontext.hxx
index a29f26fc2515..34d9bc99b50f 100644
--- a/sc/inc/tokenstringcontext.hxx
+++ b/sc/inc/tokenstringcontext.hxx
@@ -43,7 +43,7 @@ struct SC_DLLPUBLIC TokenStringContext
std::vector<OUString> maExternalFileNames;
IndexNamesMapType maExternalCachedTabNames;
- TokenStringContext( const ScDocument* pDoc, formula::FormulaGrammar::Grammar eGram );
+ TokenStringContext( const ScDocument& rDoc, formula::FormulaGrammar::Grammar eGram );
};
class SC_DLLPUBLIC CompileFormulaContext
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx
index 64ddcd550ef5..37e32930848d 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -3006,7 +3006,7 @@ void ScExportTest::testSharedFormulaExportXLS()
{
formula::FormulaGrammar::Grammar eGram = formula::FormulaGrammar::GRAM_ENGLISH_XL_R1C1;
rDoc.SetGrammar(eGram);
- sc::TokenStringContext aCxt(&rDoc, eGram);
+ sc::TokenStringContext aCxt(rDoc, eGram);
// Check the title row.
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 08fe30987e7f..371692f01a56 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -174,7 +174,7 @@ void Test::testFormulaCreateStringFromTokens()
};
(void) aTests;
- sc::TokenStringContext aCxt(m_pDoc, formula::FormulaGrammar::GRAM_ENGLISH);
+ sc::TokenStringContext aCxt(*m_pDoc, formula::FormulaGrammar::GRAM_ENGLISH);
// Artificially add external reference data after the context object is
// initialized.
@@ -3682,7 +3682,7 @@ void Test::testFormulaRefUpdateNameDeleteRow()
const ScRangeData* pName = m_pDoc->GetRangeName()->findByUpperName("MYRANGE");
CPPUNIT_ASSERT(pName);
- sc::TokenStringContext aCxt(m_pDoc, formula::FormulaGrammar::GRAM_ENGLISH);
+ sc::TokenStringContext aCxt(*m_pDoc, formula::FormulaGrammar::GRAM_ENGLISH);
const ScTokenArray* pCode = pName->GetCode();
OUString aExpr = pCode->CreateString(aCxt, ScAddress(0,0,0));
CPPUNIT_ASSERT_EQUAL(OUString("$B$2:$B$4"), aExpr);
@@ -3694,7 +3694,7 @@ void Test::testFormulaRefUpdateNameDeleteRow()
const ScRangeData* pName2 = m_pDoc->GetRangeName()->findByUpperName("MYADDRESS");
CPPUNIT_ASSERT(pName2);
- sc::TokenStringContext aCxt2(m_pDoc, formula::FormulaGrammar::GRAM_ENGLISH);
+ sc::TokenStringContext aCxt2(*m_pDoc, formula::FormulaGrammar::GRAM_ENGLISH);
const ScTokenArray* pCode2 = pName2->GetCode();
OUString aExpr2 = pCode2->CreateString(aCxt2, ScAddress(0,0,0));
CPPUNIT_ASSERT_EQUAL(OUString("$B$3"), aExpr2);
@@ -4175,7 +4175,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);
+ sc::TokenStringContext aCxt(*m_pDoc, formula::FormulaGrammar::GRAM_ENGLISH);
OUString aExpr = pCode->CreateString(aCxt, ScAddress(0,0,0));
CPPUNIT_ASSERT_EQUAL(OUString("$Test.$B$1"), aExpr);
@@ -4312,7 +4312,7 @@ void Test::testTokenArrayRefUpdateMove()
ScAddress aPos(0,0,0); // A1
- sc::TokenStringContext aCxt(m_pDoc, m_pDoc->GetGrammar());
+ sc::TokenStringContext aCxt(*m_pDoc, m_pDoc->GetGrammar());
// Emulate cell movement from Sheet1.C3 to Sheet2.C3.
sc::RefUpdateContext aRefCxt(*m_pDoc);
@@ -8618,7 +8618,7 @@ void Test::testRefR1C1WholeCol()
ScAddress aPos(1, 1, 1);
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);
+ sc::TokenStringContext aCxt(*m_pDoc, formula::FormulaGrammar::GRAM_ENGLISH);
OUString aFormula = pTokens->CreateString(aCxt, aPos);
CPPUNIT_ASSERT_EQUAL(OUString("L:L"), aFormula);
@@ -8633,7 +8633,7 @@ void Test::testRefR1C1WholeRow()
ScAddress aPos(1, 1, 1);
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);
+ sc::TokenStringContext aCxt(*m_pDoc, formula::FormulaGrammar::GRAM_ENGLISH);
OUString aFormula = pTokens->CreateString(aCxt, aPos);
CPPUNIT_ASSERT_EQUAL(OUString("5:5"), aFormula);
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 8e209b65eeb1..ce221435a30a 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1732,7 +1732,7 @@ struct ColumnStorageDumper
void printFormula(const ScFormulaCell* pCell) const
{
- sc::TokenStringContext aCxt(&mrDoc, mrDoc.GetGrammar());
+ sc::TokenStringContext aCxt(mrDoc, mrDoc.GetGrammar());
OUString aFormula = pCell->GetCode()->CreateString(aCxt, pCell->aPos);
cout << " * formula: " << aFormula << endl;
}
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 915a0468b242..ece248cef842 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -5522,7 +5522,7 @@ void ScFormulaCell::Dump() const
cout << " * shared calc state: " << mxGroup->meCalcState << endl;
}
- sc::TokenStringContext aCxt(&rDocument, rDocument.GetGrammar());
+ sc::TokenStringContext aCxt(rDocument, rDocument.GetGrammar());
cout << " * code: " << pCode->CreateString(aCxt, aPos) << endl;
FormulaError nErrCode = pCode->GetCodeError();
diff --git a/sc/source/core/tool/formulalogger.cxx b/sc/source/core/tool/formulalogger.cxx
index 3f600cdb9743..f32017b4d4c3 100644
--- a/sc/source/core/tool/formulalogger.cxx
+++ b/sc/source/core/tool/formulalogger.cxx
@@ -78,7 +78,7 @@ struct FormulaLogger::GroupScope::Impl
if (!mbOutputEnabled)
return;
- sc::TokenStringContext aCxt(&rDoc, rDoc.GetGrammar());
+ sc::TokenStringContext aCxt(rDoc, rDoc.GetGrammar());
OUString aFormula = rCell.GetCode()->CreateString(aCxt, rCell.aPos);
mrLogger.write(maPrefix);
diff --git a/sc/source/core/tool/tokenstringcontext.cxx b/sc/source/core/tool/tokenstringcontext.cxx
index 8e15db4ee592..8d3503804d08 100644
--- a/sc/source/core/tool/tokenstringcontext.cxx
+++ b/sc/source/core/tool/tokenstringcontext.cxx
@@ -32,7 +32,7 @@ void insertAllNames( TokenStringContext::IndexNameMapType& rMap, const ScRangeNa
}
-TokenStringContext::TokenStringContext( const ScDocument* pDoc, formula::FormulaGrammar::Grammar eGram ) :
+TokenStringContext::TokenStringContext( const ScDocument& rDoc, formula::FormulaGrammar::Grammar eGram ) :
meGram(eGram),
mpRefConv(ScCompiler::GetRefConvention(formula::FormulaGrammar::extractRefConvention(eGram)))
{
@@ -46,25 +46,22 @@ TokenStringContext::TokenStringContext( const ScDocument* pDoc, formula::Formula
maErrRef = ScResId(STR_NO_REF_TABLE);
}
- if (!pDoc)
- return;
-
// Fetch all sheet names.
- maTabNames = pDoc->GetAllTableNames();
+ maTabNames = rDoc.GetAllTableNames();
{
for (auto& rTabName : maTabNames)
ScCompiler::CheckTabQuotes(rTabName, formula::FormulaGrammar::extractRefConvention(eGram));
}
// Fetch all named range names.
- const ScRangeName* pNames = pDoc->GetRangeName();
+ const ScRangeName* pNames = rDoc.GetRangeName();
if (pNames)
// global names
insertAllNames(maGlobalRangeNames, *pNames);
{
ScRangeName::TabNameCopyMap aTabRangeNames;
- pDoc->GetAllTabRangeNames(aTabRangeNames);
+ rDoc.GetAllTabRangeNames(aTabRangeNames);
for (const auto& [nTab, pSheetNames] : aTabRangeNames)
{
if (!pSheetNames)
@@ -77,7 +74,7 @@ TokenStringContext::TokenStringContext( const ScDocument* pDoc, formula::Formula
}
// Fetch all named database ranges names.
- const ScDBCollection* pDBs = pDoc->GetDBCollection();
+ const ScDBCollection* pDBs = rDoc.GetDBCollection();
if (pDBs)
{
const ScDBCollection::NamedDBs& rNamedDBs = pDBs->getNamedDBs();
@@ -89,10 +86,10 @@ TokenStringContext::TokenStringContext( const ScDocument* pDoc, formula::Formula
}
// Fetch all relevant bits for external references.
- if (!pDoc->HasExternalRefManager())
+ if (!rDoc.HasExternalRefManager())
return;
- const ScExternalRefManager* pRefMgr = pDoc->GetExternalRefManager();
+ const ScExternalRefManager* pRefMgr = rDoc.GetExternalRefManager();
maExternalFileNames = pRefMgr->getAllCachedExternalFileNames();
for (size_t i = 0, n = maExternalFileNames.size(); i < n; ++i)
{
diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx
index f900d0fe1835..50e93944850a 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -55,7 +55,7 @@ public:
};
explicit CachedTokenArray( ScDocument& rDoc ) :
- maCxt(&rDoc, formula::FormulaGrammar::GRAM_OOXML) {}
+ maCxt(rDoc, formula::FormulaGrammar::GRAM_OOXML) {}
Item* get( const ScAddress& rPos, const OUString& rFormula )
{
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 41da6c45b114..df150de2b0cd 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -3119,7 +3119,7 @@ void ScCellShell::ExecuteFillSingleEdit()
{
aInit = "=";
const ScTokenArray* pCode = aCell.mpFormula->GetCode();
- sc::TokenStringContext aCxt(&rDoc, rDoc.GetGrammar());
+ sc::TokenStringContext aCxt(rDoc, rDoc.GetGrammar());
aInit += pCode->CreateString(aCxt, aCurPos);
}
else
More information about the Libreoffice-commits
mailing list