diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-08-14 20:11:07 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-08-15 09:04:30 +0200 |
commit | c77e30cbc0e7fb56593dac345291fd33998fbaf0 (patch) | |
tree | 2f8c5114f5176ea38ca2623b39734fbaf2784b99 /sc | |
parent | d72f68e91b595d1a8120f39b80483c3f06838099 (diff) |
replace ".get->" with "->"
Change-Id: I327a6fda1fe0170da33e06b735f09a39421c8a58
Reviewed-on: https://gerrit.libreoffice.org/77469
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/core/data/formulacell.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/table3.cxx | 34 | ||||
-rw-r--r-- | sc/source/core/tool/interpr1.cxx | 10 | ||||
-rw-r--r-- | sc/source/core/tool/interpr4.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/oox/condformatbuffer.cxx | 4 |
5 files changed, 26 insertions, 26 deletions
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index abea9faf0318..3daf8c4442af 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -1088,7 +1088,7 @@ void ScFormulaCell::GetResultDimensions( SCSIZE& rCols, SCSIZE& rRows ) const ScMatrix* pMat = nullptr; if (pCode->GetCodeError() == FormulaError::NONE && aResult.GetType() == svMatrixCell && - ((pMat = aResult.GetToken().get()->GetMatrix()) != nullptr)) + ((pMat = aResult.GetToken()->GetMatrix()) != nullptr)) pMat->GetDimensions( rCols, rRows ); else { diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index a5779276c019..270603aa97e8 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -696,7 +696,7 @@ void fillSortedColumnArray( ScSortInfoArray::Cell& rCell = rRow.maCells[j]; - sc::CellStoreType& rCellStore = aSortedCols.at(j).get()->maCells; + sc::CellStoreType& rCellStore = aSortedCols.at(j)->maCells; switch (rCell.maCell.meType) { case CELLTYPE_STRING: @@ -750,7 +750,7 @@ void fillSortedColumnArray( rCellStore.push_back_empty(); } - sc::CellTextAttrStoreType& rAttrStore = aSortedCols.at(j).get()->maCellTextAttrs; + sc::CellTextAttrStoreType& rAttrStore = aSortedCols.at(j)->maCellTextAttrs; if (rCell.mpAttr) rAttrStore.push_back(*rCell.mpAttr); else @@ -762,7 +762,7 @@ void fillSortedColumnArray( // containers. We will release those in the original storage // below before transferring them to the document. const SvtBroadcaster* pBroadcaster = pTable->GetBroadcaster( nCol1 + j, aOrderIndices[i]); - sc::BroadcasterStoreType& rBCStore = aSortedCols.at(j).get()->maBroadcasters; + sc::BroadcasterStoreType& rBCStore = aSortedCols.at(j)->maBroadcasters; if (pBroadcaster) // A const pointer would be implicitly converted to a bool type. rBCStore.push_back(const_cast<SvtBroadcaster*>(pBroadcaster)); @@ -771,17 +771,17 @@ void fillSortedColumnArray( } // The same with cell note instances ... - sc::CellNoteStoreType& rNoteStore = aSortedCols.at(j).get()->maCellNotes; + sc::CellNoteStoreType& rNoteStore = aSortedCols.at(j)->maCellNotes; if (rCell.mpNote) rNoteStore.push_back(const_cast<ScPostIt*>(rCell.mpNote)); else rNoteStore.push_back_empty(); // Add cell anchored images - aSortedCols.at(j).get()->maCellDrawObjects.push_back(rCell.maDrawObjects); + aSortedCols.at(j)->maCellDrawObjects.push_back(rCell.maDrawObjects); if (rCell.mpPattern) - aSortedCols.at(j).get()->setPattern(aCellPos.Row(), rCell.mpPattern); + aSortedCols.at(j)->setPattern(aCellPos.Row(), rCell.mpPattern); } if (pArray->IsKeepQuery()) @@ -1070,18 +1070,18 @@ void ScTable::SortReorderByRow( { sc::CellStoreType& rDest = aCol[nThisCol].maCells; - sc::CellStoreType& rSrc = aSortedCols[i].get()->maCells; + sc::CellStoreType& rSrc = aSortedCols[i]->maCells; rSrc.transfer(nRow1, nRow2, rDest, nRow1); } { sc::CellTextAttrStoreType& rDest = aCol[nThisCol].maCellTextAttrs; - sc::CellTextAttrStoreType& rSrc = aSortedCols[i].get()->maCellTextAttrs; + sc::CellTextAttrStoreType& rSrc = aSortedCols[i]->maCellTextAttrs; rSrc.transfer(nRow1, nRow2, rDest, nRow1); } { - sc::CellNoteStoreType& rSrc = aSortedCols[i].get()->maCellNotes; + sc::CellNoteStoreType& rSrc = aSortedCols[i]->maCellNotes; sc::CellNoteStoreType& rDest = aCol[nThisCol].maCellNotes; // Do the same as broadcaster storage transfer (to prevent double deletion). @@ -1091,13 +1091,13 @@ void ScTable::SortReorderByRow( } // Update draw object positions - aCol[nThisCol].UpdateDrawObjects(aSortedCols[i].get()->maCellDrawObjects, nRow1, nRow2); + aCol[nThisCol].UpdateDrawObjects(aSortedCols[i]->maCellDrawObjects, nRow1, nRow2); { // Get all row spans where the pattern is not NULL. std::vector<PatternSpan> aSpans = sc::toSpanArrayWithValue<SCROW,const ScPatternAttr*,PatternSpan>( - aSortedCols[i].get()->maPatterns); + aSortedCols[i]->maPatterns); for (const auto& rSpan : aSpans) { @@ -1256,18 +1256,18 @@ void ScTable::SortReorderByRowRefUpdate( { sc::CellStoreType& rDest = aCol[nThisCol].maCells; - sc::CellStoreType& rSrc = aSortedCols[i].get()->maCells; + sc::CellStoreType& rSrc = aSortedCols[i]->maCells; rSrc.transfer(nRow1, nRow2, rDest, nRow1); } { sc::CellTextAttrStoreType& rDest = aCol[nThisCol].maCellTextAttrs; - sc::CellTextAttrStoreType& rSrc = aSortedCols[i].get()->maCellTextAttrs; + sc::CellTextAttrStoreType& rSrc = aSortedCols[i]->maCellTextAttrs; rSrc.transfer(nRow1, nRow2, rDest, nRow1); } { - sc::BroadcasterStoreType& rSrc = aSortedCols[i].get()->maBroadcasters; + sc::BroadcasterStoreType& rSrc = aSortedCols[i]->maBroadcasters; sc::BroadcasterStoreType& rDest = aCol[nThisCol].maBroadcasters; // Release current broadcasters first, to prevent them from getting deleted. @@ -1278,7 +1278,7 @@ void ScTable::SortReorderByRowRefUpdate( } { - sc::CellNoteStoreType& rSrc = aSortedCols[i].get()->maCellNotes; + sc::CellNoteStoreType& rSrc = aSortedCols[i]->maCellNotes; sc::CellNoteStoreType& rDest = aCol[nThisCol].maCellNotes; // Do the same as broadcaster storage transfer (to prevent double deletion). @@ -1288,13 +1288,13 @@ void ScTable::SortReorderByRowRefUpdate( } // Update draw object positions - aCol[nThisCol].UpdateDrawObjects(aSortedCols[i].get()->maCellDrawObjects, nRow1, nRow2); + aCol[nThisCol].UpdateDrawObjects(aSortedCols[i]->maCellDrawObjects, nRow1, nRow2); { // Get all row spans where the pattern is not NULL. std::vector<PatternSpan> aSpans = sc::toSpanArrayWithValue<SCROW,const ScPatternAttr*,PatternSpan>( - aSortedCols[i].get()->maPatterns); + aSortedCols[i]->maPatterns); for (const auto& rSpan : aSpans) { diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index e94bdab3f25b..435dbe498037 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -2592,7 +2592,7 @@ void ScInterpreter::ScIsRef() { FormulaConstTokenRef x = PopToken(); if ( nGlobalError == FormulaError::NONE ) - bRes = !x.get()->GetRefList()->empty(); + bRes = !x->GetRefList()->empty(); } break; case svExternalSingleRef: @@ -8609,7 +8609,7 @@ void ScInterpreter::ScIndex() return; } ScRange aRange( ScAddress::UNINITIALIZED); - DoubleRefToRange( (*(xRef.get()->GetRefList()))[nArea-1], aRange); + DoubleRefToRange( (*(xRef->GetRefList()))[nArea-1], aRange); aRange.GetVars( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2); if ( nParamCount == 2 && nRow1 == nRow2 ) bRowArray = true; @@ -8702,8 +8702,8 @@ void ScInterpreter::ScAreas() case svRefList: { FormulaConstTokenRef xT = PopToken(); - ValidateRef( *(xT.get()->GetRefList())); - nCount += xT.get()->GetRefList()->size(); + ValidateRef( *(xT->GetRefList())); + nCount += xT->GetRefList()->size(); } break; default: @@ -9695,7 +9695,7 @@ FormulaError ScInterpreter::GetErrorType() nErr = nGlobalError; else { - const ScRefList* pRefList = x.get()->GetRefList(); + const ScRefList* pRefList = x->GetRefList(); size_t n = pRefList->size(); if (!n) nErr = FormulaError::NoRef; diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index bb6583a2c460..cb6a6aef98bb 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -4707,7 +4707,7 @@ StackVar ScInterpreter::Interpret() if (eType == svMatrix) // Results are immutable in case they would be reused as input for new // interpreters. - xResult.get()->GetMatrix()->SetImmutable(); + xResult->GetMatrix()->SetImmutable(); return eType; } diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index 0d75b4399200..af58c026c4af 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -1166,12 +1166,12 @@ void CondFormatBuffer::finalizeImport() for( const auto& rxCondFormat : maCondFormats ) { if ( rxCondFormat.get()) - rxCondFormat.get()->finalizeImport(); + rxCondFormat->finalizeImport(); } for ( const auto& rxCfRule : maCfRules ) { if ( rxCfRule.get() ) - rxCfRule.get()->finalizeImport(); + rxCfRule->finalizeImport(); } nExtCFIndex = 0; |