summaryrefslogtreecommitdiff
path: root/sc/source/core/data/documentimport.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/core/data/documentimport.cxx')
-rw-r--r--sc/source/core/data/documentimport.cxx32
1 files changed, 16 insertions, 16 deletions
diff --git a/sc/source/core/data/documentimport.cxx b/sc/source/core/data/documentimport.cxx
index 3b6a1e5315bf..fb44fb958545 100644
--- a/sc/source/core/data/documentimport.cxx
+++ b/sc/source/core/data/documentimport.cxx
@@ -290,7 +290,7 @@ void ScDocumentImport::setFormulaCell(
return;
std::unique_ptr<ScFormulaCell> pFC =
- std::make_unique<ScFormulaCell>(&mpImpl->mrDoc, rPos, rFormula, eGrammar);
+ std::make_unique<ScFormulaCell>(mpImpl->mrDoc, rPos, rFormula, eGrammar);
mpImpl->mrDoc.CheckLinkFormulaNeedingCheck( *pFC->GetCode());
@@ -319,7 +319,7 @@ void ScDocumentImport::setFormulaCell(
return;
std::unique_ptr<ScFormulaCell> pFC =
- std::make_unique<ScFormulaCell>(&mpImpl->mrDoc, rPos, rFormula, eGrammar);
+ std::make_unique<ScFormulaCell>(mpImpl->mrDoc, rPos, rFormula, eGrammar);
mpImpl->mrDoc.CheckLinkFormulaNeedingCheck( *pFC->GetCode());
@@ -461,7 +461,7 @@ void ScDocumentImport::setTableOpCells(const ScRange& rRange, const ScTabOpParam
if (!pTab)
return;
- ScDocument* pDoc = &mpImpl->mrDoc;
+ ScDocument& rDoc = mpImpl->mrDoc;
ScRefAddress aRef;
OUStringBuffer aFormulaBuf;
aFormulaBuf.append('=');
@@ -472,12 +472,12 @@ void ScDocumentImport::setTableOpCells(const ScRange& rRange, const ScTabOpParam
if (rParam.meMode == ScTabOpParam::Column) // column only
{
aRef.Set(rParam.aRefFormulaCell.GetAddress(), true, false, false);
- aFormulaBuf.append(aRef.GetRefString(pDoc, nTab));
+ aFormulaBuf.append(aRef.GetRefString(&rDoc, nTab));
aFormulaBuf.append(aSep);
- aFormulaBuf.append(rParam.aRefColCell.GetRefString(pDoc, nTab));
+ aFormulaBuf.append(rParam.aRefColCell.GetRefString(&rDoc, nTab));
aFormulaBuf.append(aSep);
aRef.Set(nCol1, nRow1, nTab, false, true, true);
- aFormulaBuf.append(aRef.GetRefString(pDoc, nTab));
+ aFormulaBuf.append(aRef.GetRefString(&rDoc, nTab));
nCol1++;
nCol2 = std::min( nCol2, static_cast<SCCOL>(rParam.aRefFormulaEnd.Col() -
rParam.aRefFormulaCell.Col() + nCol1 + 1));
@@ -485,29 +485,29 @@ void ScDocumentImport::setTableOpCells(const ScRange& rRange, const ScTabOpParam
else if (rParam.meMode == ScTabOpParam::Row) // row only
{
aRef.Set(rParam.aRefFormulaCell.GetAddress(), false, true, false);
- aFormulaBuf.append(aRef.GetRefString(pDoc, nTab));
+ aFormulaBuf.append(aRef.GetRefString(&rDoc, nTab));
aFormulaBuf.append(aSep);
- aFormulaBuf.append(rParam.aRefRowCell.GetRefString(pDoc, nTab));
+ aFormulaBuf.append(rParam.aRefRowCell.GetRefString(&rDoc, nTab));
aFormulaBuf.append(aSep);
aRef.Set(nCol1, nRow1, nTab, true, false, true);
- aFormulaBuf.append(aRef.GetRefString(pDoc, nTab));
+ aFormulaBuf.append(aRef.GetRefString(&rDoc, nTab));
++nRow1;
nRow2 = std::min(
nRow2, rParam.aRefFormulaEnd.Row() - rParam.aRefFormulaCell.Row() + nRow1 + 1);
}
else // both
{
- aFormulaBuf.append(rParam.aRefFormulaCell.GetRefString(pDoc, nTab));
+ aFormulaBuf.append(rParam.aRefFormulaCell.GetRefString(&rDoc, nTab));
aFormulaBuf.append(aSep);
- aFormulaBuf.append(rParam.aRefColCell.GetRefString(pDoc, nTab));
+ aFormulaBuf.append(rParam.aRefColCell.GetRefString(&rDoc, nTab));
aFormulaBuf.append(aSep);
aRef.Set(nCol1, nRow1 + 1, nTab, false, true, true);
- aFormulaBuf.append(aRef.GetRefString(pDoc, nTab));
+ aFormulaBuf.append(aRef.GetRefString(&rDoc, nTab));
aFormulaBuf.append(aSep);
- aFormulaBuf.append(rParam.aRefRowCell.GetRefString(pDoc, nTab));
+ aFormulaBuf.append(rParam.aRefRowCell.GetRefString(&rDoc, nTab));
aFormulaBuf.append(aSep);
aRef.Set(nCol1 + 1, nRow1, nTab, true, false, true);
- aFormulaBuf.append(aRef.GetRefString(pDoc, nTab));
+ aFormulaBuf.append(aRef.GetRefString(&rDoc, nTab));
++nCol1;
++nRow1;
}
@@ -515,7 +515,7 @@ void ScDocumentImport::setTableOpCells(const ScRange& rRange, const ScTabOpParam
aFormulaBuf.append(ScCompiler::GetNativeSymbol(ocClose));
ScFormulaCell aRefCell(
- pDoc, ScAddress(nCol1, nRow1, nTab), aFormulaBuf.makeStringAndClear(),
+ rDoc, ScAddress(nCol1, nRow1, nTab), aFormulaBuf.makeStringAndClear(),
formula::FormulaGrammar::GRAM_NATIVE, ScMatrixMode::NONE);
for (SCCOL nCol = nCol1; nCol <= nCol2; ++nCol)
@@ -531,7 +531,7 @@ void ScDocumentImport::setTableOpCells(const ScRange& rRange, const ScTabOpParam
for (SCROW nRow = nRow1; nRow <= nRow2; ++nRow)
{
ScAddress aPos(nCol, nRow, nTab);
- ScFormulaCell* pCell = new ScFormulaCell(aRefCell, *pDoc, aPos);
+ ScFormulaCell* pCell = new ScFormulaCell(aRefCell, rDoc, aPos);
pBlockPos->miCellPos =
rColCells.set(pBlockPos->miCellPos, nRow, pCell);
}