diff options
29 files changed, 83 insertions, 83 deletions
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index 34150abe2889..e07c035eda70 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -232,13 +232,13 @@ void Connection::close() // close all created statements for (auto const& elem : vectorCloseable) - elem.get()->close(); + elem->close(); // close all created statements for (auto const& elem : vectorDispose) { if( elem.is() ) - elem.get()->dispose(); + elem->dispose(); } } diff --git a/cui/source/customize/CommandCategoryListBox.cxx b/cui/source/customize/CommandCategoryListBox.cxx index 6c8d0118f1ee..3335836afe3a 100644 --- a/cui/source/customize/CommandCategoryListBox.cxx +++ b/cui/source/customize/CommandCategoryListBox.cxx @@ -340,7 +340,7 @@ void CommandCategoryListBox::categorySelected(CuiConfigFunctionListBox* pFunctio // TODO exception handling } - if ( rootNode.is() && rootNode.get()->hasChildNodes() ) + if ( rootNode.is() && rootNode->hasChildNodes() ) { //We call acquire on the XBrowseNode so that it does not //get autodestructed and become invalid when accessed later. @@ -351,24 +351,24 @@ void CommandCategoryListBox::categorySelected(CuiConfigFunctionListBox* pFunctio SfxCfgKind::GROUP_SCRIPTCONTAINER, 0, static_cast<void *>(rootNode.get()) ) ); // Add main macro groups - for ( auto const & childGroup : rootNode.get()->getChildNodes() ) + for ( auto const & childGroup : rootNode->getChildNodes() ) { OUString sUIName; - childGroup.get()->acquire(); + childGroup->acquire(); - if ( childGroup.get()->hasChildNodes() ) + if ( childGroup->hasChildNodes() ) { - if ( childGroup.get()->getName() == "user" ) + if ( childGroup->getName() == "user" ) { sUIName = CuiResId( RID_SVXSTR_MYMACROS ); } - else if ( childGroup.get()->getName() == "share" ) + else if ( childGroup->getName() == "share" ) { sUIName = CuiResId( RID_SVXSTR_PRODMACROS ); } else { - sUIName = childGroup.get()->getName(); + sUIName = childGroup->getName(); } if (sUIName.isEmpty()) @@ -490,14 +490,14 @@ void CommandCategoryListBox::addChildren( m_searchOptions.searchString = filterTerm; utl::TextSearch textSearch( m_searchOptions ); - for (auto const & child : parentNode.get()->getChildNodes()) + for (auto const & child : parentNode->getChildNodes()) { // Acquire to prevent auto-destruction - child.get()->acquire(); + child->acquire(); - if (child.get()->hasChildNodes()) + if (child->hasChildNodes()) { - OUString sUIName = child.get()->getName(); + OUString sUIName = child->getName(); m_aGroupInfo.push_back( std::make_unique<SfxGroupInfo_Impl>(SfxCfgKind::GROUP_SCRIPTCONTAINER, 0, static_cast<void *>( child.get()))); @@ -511,10 +511,10 @@ void CommandCategoryListBox::addChildren( else rNodesToExpand.emplace_back(std::move(xNewEntry)); } - else if ( child.get()->getType() == css::script::browse::BrowseNodeTypes::SCRIPT ) + else if ( child->getType() == css::script::browse::BrowseNodeTypes::SCRIPT ) { // Prepare for filtering - OUString sUIName = child.get()->getName(); + OUString sUIName = child->getName(); sal_Int32 aStartPos = 0; sal_Int32 aEndPos = sUIName.getLength(); diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx index 1f4eed7ad1f0..42980eeeaff7 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.cxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx @@ -218,7 +218,7 @@ namespace XSLT return -1; sal_Int32 n; css::uno::Reference<XInputStream> xis = m_transformer->getInputStream(); - n = xis.get()->readBytes(m_readBuf, len); + n = xis->readBytes(m_readBuf, len); if (n > 0) { memcpy(buffer, m_readBuf.getArray(), n); @@ -244,7 +244,7 @@ namespace XSLT m_writeBuf.realloc(n); memcpy(m_writeBuf.getArray(), memPtr, static_cast<size_t> (n)); - xos.get()->writeBytes(m_writeBuf); + xos->writeBytes(m_writeBuf); memPtr += n; writeLen -= n; } @@ -258,8 +258,8 @@ namespace XSLT css::uno::Reference<XOutputStream> xos = m_transformer->getOutputStream(); if (xos.is()) { - xos.get()->flush(); - xos.get()->closeOutput(); + xos->flush(); + xos->closeOutput(); } m_transformer->done(); } @@ -423,7 +423,7 @@ namespace XSLT { for (const css::uno::Reference<XStreamListener>& xl : m_listeners) { - xl.get()->started(); + xl->started(); } OSL_ENSURE(!m_Reader.is(), "Somebody forgot to call terminate *and* holds a reference to this LibXSLTTransformer instance"); m_Reader = new Reader(this); @@ -439,7 +439,7 @@ namespace XSLT { if (xl.is()) { - xl.get()->error(arg); + xl->error(arg); } } } @@ -451,7 +451,7 @@ namespace XSLT { if (xl.is()) { - xl.get()->closed(); + xl->closed(); } } } diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx index 35bb23a2ccf0..ea02d5ca548b 100644 --- a/oox/source/drawingml/chart/typegroupconverter.cxx +++ b/oox/source/drawingml/chart/typegroupconverter.cxx @@ -283,7 +283,7 @@ Reference< XLabeledDataSequence > TypeGroupConverter::createCategorySequence() { DataSourceModel *pValues = elem->maSources.get( SeriesModel::VALUES ).get(); if( pValues->mxDataSeq.is() ) - nMaxValues = pValues->mxDataSeq.get()->maData.size(); + nMaxValues = pValues->mxDataSeq->maData.size(); } } /* n#839727 Create Category Sequence when none are found */ 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; diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx index ea9fe891e8a3..d924cdad47cf 100644 --- a/sfx2/source/sidebar/FocusManager.cxx +++ b/sfx2/source/sidebar/FocusManager.cxx @@ -401,7 +401,7 @@ void FocusManager::HandleKeyEvent ( case PC_PanelTitle: // Toggle panel between expanded and collapsed. maPanels[aLocation.mnIndex]->SetExpanded( ! maPanels[aLocation.mnIndex]->IsExpanded()); - maPanels[aLocation.mnIndex]->GetTitleBar().get()->Invalidate(); + maPanels[aLocation.mnIndex]->GetTitleBar()->Invalidate(); break; default: @@ -472,7 +472,7 @@ void FocusManager::HandleKeyEvent ( { // Focus the last button. sal_Int32 nIndex(maButtons.size()-1); - while(!maButtons[nIndex].get()->IsVisible() && --nIndex > 0); + while(!maButtons[nIndex]->IsVisible() && --nIndex > 0); FocusButton(nIndex); } break; @@ -482,7 +482,7 @@ void FocusManager::HandleKeyEvent ( { // Focus the last button. sal_Int32 nIndex(maButtons.size()-1); - while(!maButtons[nIndex].get()->IsVisible() && --nIndex > 0); + while(!maButtons[nIndex]->IsVisible() && --nIndex > 0); FocusButton(nIndex); break; } @@ -494,7 +494,7 @@ void FocusManager::HandleKeyEvent ( else { sal_Int32 nIndex((aLocation.mnIndex + maButtons.size() - 1) % maButtons.size()); - while(!maButtons[nIndex].get()->IsVisible() && --nIndex > 0); + while(!maButtons[nIndex]->IsVisible() && --nIndex > 0); FocusButton(nIndex); } break; @@ -532,7 +532,7 @@ void FocusManager::HandleKeyEvent ( if (aLocation.mnIndex < static_cast<sal_Int32>(maButtons.size())-1) { sal_Int32 nIndex(aLocation.mnIndex + 1); - while(!maButtons[nIndex].get()->IsVisible() && ++nIndex < static_cast<sal_Int32>(maButtons.size())); + while(!maButtons[nIndex]->IsVisible() && ++nIndex < static_cast<sal_Int32>(maButtons.size())); if (nIndex < static_cast<sal_Int32>(maButtons.size())) { FocusButton(nIndex); diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index a109cb8eec06..ffefcf1d5f8a 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -890,7 +890,7 @@ VclPtr<Panel> SidebarController::CreatePanel ( *xPanelDescriptor, pParentWindow, bIsInitiallyExpanded, - [pDeck]() { return pDeck.get()->RequestLayout(); }, + [pDeck]() { return pDeck->RequestLayout(); }, [this]() { return this->GetCurrentContext(); }, mxFrame); diff --git a/starmath/qa/extras/mmlimport-test.cxx b/starmath/qa/extras/mmlimport-test.cxx index 3e9ca5e93150..ac9649258054 100644 --- a/starmath/qa/extras/mmlimport-test.cxx +++ b/starmath/qa/extras/mmlimport-test.cxx @@ -64,7 +64,7 @@ private: OUString(), OUString(), "private:factory/smath*")); - pFilter.get()->SetVersion(SOFFICE_FILEFORMAT_60); + pFilter->SetVersion(SOFFICE_FILEFORMAT_60); mxDocShell = new SmDocShell(SfxModelFlags::EMBEDDED_OBJECT | SfxModelFlags::DISABLE_EMBEDDED_SCRIPTS | diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index 72787b5c6a12..bee538346307 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -1044,7 +1044,7 @@ bool SmElementsControl::itemIsSeparator(sal_uInt16 nPos) const { if (nPos < m_nCurrentOffset || (nPos -= m_nCurrentOffset) >= maElementList.size()) return true; - return maElementList[nPos].get()->isSeparator(); + return maElementList[nPos]->isSeparator(); } css::uno::Reference<css::accessibility::XAccessible> SmElementsControl::CreateAccessible() diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index 45428bf26dd5..5188746d5653 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -78,7 +78,7 @@ SvtValueSetItem::~SvtValueSetItem() { if( mxAcc.is() ) { - mxAcc.get()->ParentDestroyed(); + mxAcc->ParentDestroyed(); } } diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx index 8326c78f4f5a..c5c17c289e7f 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx @@ -602,14 +602,14 @@ public: else if ( mpSecondArg->isConstant() && (*mpSecondArg)() == 1 ) aRet = mpFirstArg->fillNode( rEquations, nullptr, nFlags ); else if ( ( mpFirstArg->getType() == ExpressionFunct::BinaryDiv ) // don't care of (pi/180) - && ( static_cast<BinaryFunctionExpression*>(mpFirstArg.get())->mpFirstArg.get()->getType() == ExpressionFunct::EnumPi ) - && ( static_cast<BinaryFunctionExpression*>(mpFirstArg.get())->mpSecondArg.get()->getType() == ExpressionFunct::Const ) ) + && ( static_cast<BinaryFunctionExpression*>(mpFirstArg.get())->mpFirstArg->getType() == ExpressionFunct::EnumPi ) + && ( static_cast<BinaryFunctionExpression*>(mpFirstArg.get())->mpSecondArg->getType() == ExpressionFunct::Const ) ) { aRet = mpSecondArg->fillNode( rEquations, nullptr, nFlags ); } else if ( ( mpSecondArg->getType() == ExpressionFunct::BinaryDiv ) // don't care of (pi/180) - && ( static_cast<BinaryFunctionExpression*>(mpSecondArg.get())->mpFirstArg.get()->getType() == ExpressionFunct::EnumPi ) - && ( static_cast<BinaryFunctionExpression*>(mpSecondArg.get())->mpSecondArg.get()->getType() == ExpressionFunct::Const ) ) + && ( static_cast<BinaryFunctionExpression*>(mpSecondArg.get())->mpFirstArg->getType() == ExpressionFunct::EnumPi ) + && ( static_cast<BinaryFunctionExpression*>(mpSecondArg.get())->mpSecondArg->getType() == ExpressionFunct::Const ) ) { aRet = mpFirstArg->fillNode( rEquations, nullptr, nFlags ); } diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index 508df785cd1b..9001e601ca8c 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -162,7 +162,7 @@ void SdrMarkList::ImpForceSort() if(nCount > 0 ) { maList.erase(std::remove_if(maList.begin(), maList.end(), - [](std::unique_ptr<SdrMark>& rItem) { return rItem.get()->GetMarkedSdrObj() == nullptr; }), + [](std::unique_ptr<SdrMark>& rItem) { return rItem->GetMarkedSdrObj() == nullptr; }), maList.end()); nCount = maList.size(); } diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 4f87f9ca8b47..60942150bdf6 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -86,7 +86,7 @@ void AccessibleCell::Init() // non-empty text -> use full-fledged edit source right away mpText.reset( new AccessibleTextHelper( std::make_unique<SvxTextEditSource>(mxCell->GetObject(), mxCell.get(), *pView, *pWindow) ) ); - if( mxCell.is() && mxCell.get()->IsActiveCell() ) + if( mxCell.is() && mxCell->IsActiveCell() ) mpText->SetFocus(); mpText->SetEventSource(this); } diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx index 09ca19e52dec..b62490995652 100644 --- a/sw/source/core/doc/CntntIdxStore.cxx +++ b/sw/source/core/doc/CntntIdxStore.cxx @@ -412,7 +412,7 @@ void ContentIdxStoreImpl::SaveUnoCursors(SwDoc* pDoc, sal_uLong nNode, sal_Int32 auto pUnoCursor(pWeakUnoCursor.lock()); if(!pUnoCursor) continue; - for(SwPaM& rPaM : pUnoCursor.get()->GetRingContainer()) + for(SwPaM& rPaM : pUnoCursor->GetRingContainer()) { lcl_ChkUnoCrsrPaMBoth(m_aUnoCursorEntries, nNode, nContent, rPaM); } diff --git a/sw/source/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx index 3605ac4f5f57..51724d83e16e 100644 --- a/sw/source/uibase/app/swdll.cxx +++ b/sw/source/uibase/app/swdll.cxx @@ -73,7 +73,7 @@ namespace SwGlobals sw::Filters & getFilters() { - return theSwDLLInstance::get().get()->getFilters(); + return theSwDLLInstance::get()->getFilters(); } } diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 9e0fc941984a..a763e2c56ead 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -751,7 +751,7 @@ void SwPostItMgr::LayoutPostIts() if (mpAnswer) { if (static_cast<bool>(pPostIt->CalcParent())) //do we really have another note in front of this one - pPostIt.get()->InitAnswer(mpAnswer); + pPostIt->InitAnswer(mpAnswer); delete mpAnswer; mpAnswer = nullptr; } @@ -1546,7 +1546,7 @@ void SwPostItMgr::Delete(sal_uInt32 nPostItId) { mpWrtShell->StartAllAction(); if (HasActiveSidebarWin() && - mpActivePostIt.get()->GetPostItField()->GetPostItId() == nPostItId) + mpActivePostIt->GetPostItField()->GetPostItId() == nPostItId) { SetActiveSidebarWin(nullptr); } diff --git a/sw/source/uibase/wrtsh/navmgr.cxx b/sw/source/uibase/wrtsh/navmgr.cxx index 5222c6cc1841..c43992662914 100644 --- a/sw/source/uibase/wrtsh/navmgr.cxx +++ b/sw/source/uibase/wrtsh/navmgr.cxx @@ -65,7 +65,7 @@ void SwNavigationMgr::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) if (typeid(rHint) == typeid(sw::UnoCursorHint)) { auto it = std::find_if(m_entries.begin(), m_entries.end(), - [&rBC](const sw::UnoCursorPointer& rItem) { return !rItem || &rBC == &rItem.get()->m_aNotifier; }); + [&rBC](const sw::UnoCursorPointer& rItem) { return !rItem || &rBC == &rItem->m_aNotifier; }); if (it != m_entries.end()) { EndListening(rBC); diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index 147a1732885c..e08d8c24e3e8 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -543,19 +543,19 @@ void ControlModelContainerBase::insertByName( const OUString& aName, const Any& if ( xProps.is() ) { - Reference< beans::XPropertySetInfo > xPropInfo = xProps.get()->getPropertySetInfo(); + Reference< beans::XPropertySetInfo > xPropInfo = xProps->getPropertySetInfo(); const OUString& sImageSourceProperty = GetPropertyName( BASEPROPERTY_IMAGEURL ); - if ( xPropInfo.get()->hasPropertyByName( sImageSourceProperty ) && ImplHasProperty(BASEPROPERTY_DIALOGSOURCEURL) ) + if ( xPropInfo->hasPropertyByName( sImageSourceProperty ) && ImplHasProperty(BASEPROPERTY_DIALOGSOURCEURL) ) { - Any aUrl = xProps.get()->getPropertyValue( sImageSourceProperty ); + Any aUrl = xProps->getPropertyValue( sImageSourceProperty ); OUString absoluteUrl = getPhysicalLocation( getPropertyValue( GetPropertyName( BASEPROPERTY_DIALOGSOURCEURL ) ), aUrl ); aUrl <<= absoluteUrl; - xProps.get()->setPropertyValue( sImageSourceProperty , aUrl ); + xProps->setPropertyValue( sImageSourceProperty , aUrl ); } } } diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx index ed0d43723d05..631f4595738d 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.cxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx @@ -480,7 +480,7 @@ int NeonSession::CertificationNotify(const ne_ssl_certificate *cert) ::comphelper::containerToSequence( vecCerts ) ); if ( isDomainMatch( - GetHostnamePart( xEECert.get()->getSubjectName() ) ) ) + GetHostnamePart( xEECert->getSubjectName() ) ) ) { // if host name matched with certificate then look if the // certificate was ok diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 7814e6755fc6..bbabe2aa9083 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -953,8 +953,8 @@ IMPL_STATIC_LINK( Application, PostEventHandler, void*, pCallData, void ) break; }; - if( pData->mpWin && pData->mpWin.get()->mpWindowImpl->mpFrameWindow.get() && pEventData ) - ImplWindowFrameProc( pData->mpWin.get()->mpWindowImpl->mpFrameWindow.get(), nEvent, pEventData ); + if( pData->mpWin && pData->mpWin->mpWindowImpl->mpFrameWindow.get() && pEventData ) + ImplWindowFrameProc( pData->mpWin->mpWindowImpl->mpFrameWindow.get(), nEvent, pEventData ); // remove this event from list of posted events, watch for destruction of internal data auto svdata = ImplGetSVData(); diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx index 10b58b208db5..26df329d4146 100644 --- a/vcl/source/outdev/bitmap.cxx +++ b/vcl/source/outdev/bitmap.cxx @@ -429,7 +429,7 @@ Bitmap OutputDevice::GetBitmap( const Point& rSrcPt, const Size& rSize ) const if ( aVDev->SetOutputSizePixel( aRect.GetSize() ) ) { - if ( aVDev.get()->mpGraphics || aVDev.get()->AcquireGraphics() ) + if ( aVDev->mpGraphics || aVDev->AcquireGraphics() ) { if ( (nWidth > 0) && (nHeight > 0) ) { @@ -437,7 +437,7 @@ Bitmap OutputDevice::GetBitmap( const Point& rSrcPt, const Size& rSize ) const (aRect.Left() < mnOutOffX) ? (mnOutOffX - aRect.Left()) : 0L, (aRect.Top() < mnOutOffY) ? (mnOutOffY - aRect.Top()) : 0L, nWidth, nHeight); - aVDev.get()->mpGraphics->CopyBits( aPosAry, mpGraphics, this, this ); + aVDev->mpGraphics->CopyBits( aPosAry, mpGraphics, this, this ); } else { diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx index a2fbbf6c6ac2..34c76e6d7878 100644 --- a/vcl/source/outdev/transparent.cxx +++ b/vcl/source/outdev/transparent.cxx @@ -738,8 +738,8 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos, { ScopedVclPtrInstance< VirtualDevice > xVDev; - xVDev.get()->mnDPIX = mnDPIX; - xVDev.get()->mnDPIY = mnDPIY; + xVDev->mnDPIX = mnDPIX; + xVDev->mnDPIY = mnDPIY; if( xVDev->SetOutputSizePixel( aDstRect.GetSize() ) ) { diff --git a/writerfilter/source/dmapper/CellMarginHandler.cxx b/writerfilter/source/dmapper/CellMarginHandler.cxx index a30b56a1c9a2..08ff20cc675f 100644 --- a/writerfilter/source/dmapper/CellMarginHandler.cxx +++ b/writerfilter/source/dmapper/CellMarginHandler.cxx @@ -98,7 +98,7 @@ void CellMarginHandler::lcl_sprm(Sprm & rSprm) writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); if( pProperties.get()) { - pProperties.get()->resolve( *this ); + pProperties->resolve( *this ); const bool rtl = false; // TODO switch( rSprm.getId() ) { diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx b/writerfilter/source/dmapper/TextEffectsHandler.cxx index 6d870a975fbc..30fdd7b9cc5b 100644 --- a/writerfilter/source/dmapper/TextEffectsHandler.cxx +++ b/writerfilter/source/dmapper/TextEffectsHandler.cxx @@ -734,7 +734,7 @@ void TextEffectsHandler::lcl_sprm(Sprm& rSprm) if( !pProperties.get()) return; - pProperties.get()->resolve( *this ); + pProperties->resolve( *this ); if (mpGrabBagStack->getCurrentName() == constAttributesSequenceName) mpGrabBagStack->pop(); diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 280f3245d687..c1312437d2fd 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -1215,7 +1215,7 @@ void OOXMLFastContextHandlerValue::setDefaultStringValue() void OOXMLFastContextHandlerValue::pushBiDiEmbedLevel() { const bool bRtl - = mpValue.get() && mpValue.get()->getInt() == NS_ooxml::LN_Value_ST_Direction_rtl; + = mpValue.get() && mpValue->getInt() == NS_ooxml::LN_Value_ST_Direction_rtl; OOXMLFactory::characters(this, bRtl ? u"\u202B" : u"\u202A"); // RLE / LRE } |