canvas/source/vcl/canvashelper.cxx | 4 +- chart2/source/tools/InternalData.cxx | 6 +--- dbaccess/source/ui/app/AppControllerDnD.cxx | 2 - dbaccess/source/ui/dlg/queryfilter.cxx | 4 +- drawinglayer/source/primitive2d/textbreakuphelper.cxx | 2 - emfio/source/reader/mtftools.cxx | 2 - extensions/source/scanner/scanunx.cxx | 2 - linguistic/source/gciterator.cxx | 2 - sc/source/core/data/clipparam.cxx | 2 - sc/source/core/data/queryiter.cxx | 2 - sc/source/core/opencl/formulagroupcl.cxx | 2 - sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 16 ++++++----- sc/source/ui/drawfunc/drawsh.cxx | 2 - sd/source/console/PresenterButton.cxx | 4 +- sfx2/source/appl/helpinterceptor.cxx | 4 -- sfx2/source/doc/docfile.cxx | 2 - sw/source/core/bastyp/calc.cxx | 2 - sw/source/core/frmedt/fecopy.cxx | 6 ++-- sw/source/ui/misc/contentcontroldlg.cxx | 2 - sw/source/uibase/uiview/view2.cxx | 2 - sw/source/writerfilter/rtftok/rtfsdrimport.cxx | 2 - tools/source/fsys/urlobj.cxx | 2 - vcl/source/bitmap/BitmapMedianFilter.cxx | 2 - vcl/source/gdi/TypeSerializer.cxx | 2 - vcl/unx/generic/dtrans/X11_selection.cxx | 2 - 25 files changed, 40 insertions(+), 40 deletions(-)
New commits: commit 4177e553e067a6bbbf113c39ba3b81aa8ee194fe Author: Caolán McNamara <caolan.mcnam...@collabora.com> AuthorDate: Wed Jul 31 08:35:04 2024 +0100 Commit: Caolán McNamara <caolan.mcnam...@collabora.com> CommitDate: Wed Jul 31 17:37:14 2024 +0200 cid#1555587 COPY_INSTEAD_OF_MOVE and cid#1555589 COPY_INSTEAD_OF_MOVE cid#1555593 COPY_INSTEAD_OF_MOVE cid#1555596 COPY_INSTEAD_OF_MOVE cid#1555602 COPY_INSTEAD_OF_MOVE cid#1555608 COPY_INSTEAD_OF_MOVE cid#1555610 COPY_INSTEAD_OF_MOVE cid#1555620 COPY_INSTEAD_OF_MOVE cid#1555623 COPY_INSTEAD_OF_MOVE cid#1555625 COPY_INSTEAD_OF_MOVE cid#1555626 COPY_INSTEAD_OF_MOVE cid#1555634 COPY_INSTEAD_OF_MOVE cid#1555638 COPY_INSTEAD_OF_MOVE cid#1555667 COPY_INSTEAD_OF_MOVE cid#1555682 COPY_INSTEAD_OF_MOVE cid#1555686 COPY_INSTEAD_OF_MOVE cid#1555702 COPY_INSTEAD_OF_MOVE cid#1555710 COPY_INSTEAD_OF_MOVE cid#1555750 COPY_INSTEAD_OF_MOVE cid#1555752 COPY_INSTEAD_OF_MOVE cid#1555761 COPY_INSTEAD_OF_MOVE cid#1555762 COPY_INSTEAD_OF_MOVE cid#1555771 COPY_INSTEAD_OF_MOVE cid#1555772 COPY_INSTEAD_OF_MOVE cid#1555784 COPY_INSTEAD_OF_MOVE cid#1555785 COPY_INSTEAD_OF_MOVE Change-Id: Ib9724230c05b2027b4edf64e6a0bb5e22a270a88 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171274 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com> diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index 861f74402134..5c504136ddae 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -351,7 +351,7 @@ namespace vclcanvas // aDashArray ) ); } - aPolyPoly = aDashedPolyPoly; + aPolyPoly = std::move(aDashedPolyPoly); } ::basegfx::B2DSize aLinePixelSize(strokeAttributes.StrokeWidth, @@ -364,7 +364,7 @@ namespace vclcanvas // simple hairline poly-polygon setupOutDevState( viewState, renderState, LINE_COLOR ); - aStrokedPolyPoly = aPolyPoly; + aStrokedPolyPoly = std::move(aPolyPoly); } else { diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx index 82537baf3d60..b4638719f48b 100644 --- a/chart2/source/tools/InternalData.cxx +++ b/chart2/source/tools/InternalData.cxx @@ -328,8 +328,7 @@ void InternalData::insertColumn( sal_Int32 nAfterIndex ) m_aData[ std::slice( nCol - 1, m_nRowCount, m_nColumnCount ) ] ); m_nColumnCount = nNewColumnCount; - m_aData.resize( nNewSize ); - m_aData = aNewData; + m_aData = std::move(aNewData); // labels if( nAfterIndex < static_cast< sal_Int32 >( m_aColumnLabels.size())) @@ -386,8 +385,7 @@ void InternalData::insertRow( sal_Int32 nAfterIndex ) } m_nRowCount = nNewRowCount; - m_aData.resize( nNewSize ); - m_aData = aNewData; + m_aData = std::move(aNewData); // labels if( nAfterIndex < static_cast< sal_Int32 >( m_aRowLabels.size())) diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index 38c3e67dbc24..53605f046710 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -363,7 +363,7 @@ const SharedConnection& OApplicationController::ensureConnection( ::dbtools::SQL { if ( _pErrorInfo ) { - *_pErrorInfo = aError; + *_pErrorInfo = std::move(aError); } else { diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index a7da34927170..5ab9766bae9a 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -667,11 +667,11 @@ void DlgFilterCrit::BuildWherePart() PropertyValue aValue; if ( getCondition(*m_xLB_WHEREFIELD1,*m_xLB_WHERECOMP1,*m_xET_WHEREVALUE1,aValue) ) { - aHaving = { { aValue } }; + aHaving = { { std::move(aValue) } }; } else { - aFilter = { { aValue} }; + aFilter = { { std::move(aValue) } }; } } diff --git a/drawinglayer/source/primitive2d/textbreakuphelper.cxx b/drawinglayer/source/primitive2d/textbreakuphelper.cxx index 8f92d9817a0e..792a77e78195 100644 --- a/drawinglayer/source/primitive2d/textbreakuphelper.cxx +++ b/drawinglayer/source/primitive2d/textbreakuphelper.cxx @@ -268,7 +268,7 @@ namespace drawinglayer::primitive2d } } - mxResult = aTempResult; + mxResult = std::move(aTempResult); } Primitive2DContainer TextBreakupHelper::extractResult(BreakupUnit aBreakupUnit) diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx index 5e1b36c861c2..e7eb65ce79ee 100644 --- a/emfio/source/reader/mtftools.cxx +++ b/emfio/source/reader/mtftools.cxx @@ -1544,7 +1544,7 @@ namespace emfio UpdateLineStyle(); if (maLatestFillStyle.aType != WinMtfFillStyleType::Pattern) - mpGDIMetaFile->AddAction( new MetaPolygonAction( rPolygon ) ); + mpGDIMetaFile->AddAction( new MetaPolygonAction( std::move(rPolygon) ) ); else { SvtGraphicFill aFill( tools::PolyPolygon( rPolygon ), Color(), diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx index 92b53915ae42..c2bbca99c982 100644 --- a/extensions/source/scanner/scanunx.cxx +++ b/extensions/source/scanner/scanunx.cxx @@ -295,7 +295,7 @@ void ScannerManager::startScan( const ScannerContext& scanner_context, ); pHolder->m_bBusy = true; - ScannerThread* pThread = new ScannerThread( pHolder, listener, this ); + ScannerThread* pThread = new ScannerThread( std::move(pHolder), listener, this ); pThread->create(); } diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index a3a18ddecaac..2c8f5f4dbb3b 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -699,7 +699,7 @@ void GrammarCheckingIterator::DequeueAndCheck() aRes.aDocumentIdentifier = aCurDocId; aRes.xFlatParagraph = xFlatPara; aRes.aText = aCurTxt; - aRes.aLocale = aCurLocale; + aRes.aLocale = std::move(aCurLocale); aRes.nStartOfSentencePosition = nStartPos; aRes.nBehindEndOfSentencePosition = nSuggestedEnd; } diff --git a/sc/source/core/data/clipparam.cxx b/sc/source/core/data/clipparam.cxx index c2255adee348..271685d473b6 100644 --- a/sc/source/core/data/clipparam.cxx +++ b/sc/source/core/data/clipparam.cxx @@ -183,7 +183,7 @@ void ScClipParam::transpose(const ScDocument& rSrcDoc, bool bIncludeFiltered, nRowOrigin + nRow2, rRange1.aStart.Tab())); } } - maRanges = aNewRanges; + maRanges = std::move(aNewRanges); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/queryiter.cxx b/sc/source/core/data/queryiter.cxx index ee02e8d6f5e2..5c93502db908 100644 --- a/sc/source/core/data/queryiter.cxx +++ b/sc/source/core/data/queryiter.cxx @@ -1068,7 +1068,7 @@ bool ScQueryCellIterator< accessType >::FindEqualOrSortedLastInRange( SCCOL& nFo } while (GetNext()); nCol = nFoundCol; nRow = nFoundRow; - maCurPos = aPosSave; + maCurPos = std::move(aPosSave); } } return (nFoundCol <= rDoc.MaxCol()) && (nFoundRow <= rDoc.MaxRow()); diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index 4d61b00ed36b..81a796886110 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -2793,7 +2793,7 @@ std::shared_ptr<DynamicKernel> DynamicKernel::create( const ScCalcConfig& rConfi } } std::reverse(pCurNode->Children.begin(), pCurNode->Children.end()); - aHashMap[pCur] = pCurNode; + aHashMap[pCur] = std::move(pCurNode); } aTokenVector.push_back(pCur); } diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 2715dbf0ae35..fadce1cd0c2c 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -475,12 +475,16 @@ void ScNotesChildren::DataChanged(const tools::Rectangle& rVisRect) ScXAccVector aNewParas; ScXAccVector aOldParas; - ScAccNotes aNewMarks; - mnParagraphs = CheckChanges(mpViewShell->GetLocationData(), rVisRect, true, maMarks, aNewMarks, aOldParas, aNewParas); - maMarks = aNewMarks; - ScAccNotes aNewNotes; - mnParagraphs += CheckChanges(mpViewShell->GetLocationData(), rVisRect, false, maNotes, aNewNotes, aOldParas, aNewParas); - maNotes = aNewNotes; + { + ScAccNotes aNewMarks; + mnParagraphs = CheckChanges(mpViewShell->GetLocationData(), rVisRect, true, maMarks, aNewMarks, aOldParas, aNewParas); + maMarks = std::move(aNewMarks); + } + { + ScAccNotes aNewNotes; + mnParagraphs += CheckChanges(mpViewShell->GetLocationData(), rVisRect, false, maNotes, aNewNotes, aOldParas, aNewParas); + maNotes = std::move(aNewNotes); + } std::for_each(aOldParas.begin(), aOldParas.end(), ScChildGone(mpAccDoc)); std::for_each(aNewParas.begin(), aNewParas.end(), ScChildNew(mpAccDoc)); diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index 53ca99000933..bf85256afc42 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -355,7 +355,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) aCombSet.Put( aNewGeoAttr ); pDlg->SetInputSet( &aCombSet ); - pDlg->StartExecuteAsync([pDlg, pRequest, pView, this]( + pDlg->StartExecuteAsync([pDlg, pRequest=std::move(pRequest), pView, this]( sal_Int32 nResult){ if (nResult == RET_OK) { diff --git a/sd/source/console/PresenterButton.cxx b/sd/source/console/PresenterButton.cxx index ca259a98aa28..148ae0cde58f 100644 --- a/sd/source/console/PresenterButton.cxx +++ b/sd/source/console/PresenterButton.cxx @@ -70,8 +70,8 @@ const double gnVerticalBorder (5); rpPresenterController, rpTheme, rxParentWindow, - pFont, - pMouseOverFont, + std::move(pFont), + std::move(pMouseOverFont), sText, sAction)); pButton->SetCanvas(rxParentCanvas, rxParentWindow); diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx index b8e1e18bff33..bec1d42708d7 100644 --- a/sfx2/source/appl/helpinterceptor.cxx +++ b/sfx2/source/appl/helpinterceptor.cxx @@ -65,9 +65,7 @@ void HelpInterceptor_Impl::addURL( const OUString& rURL ) if ( m_xListener.is() ) { css::frame::FeatureStateEvent aEvent; - URL aURL; - aURL.Complete = rURL; - aEvent.FeatureURL = aURL; + aEvent.FeatureURL.Complete = rURL; aEvent.Source = static_cast<css::frame::XDispatch*>(this); m_xListener->statusChanged( aEvent ); } diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 3b50588de93d..08c2ebfe99f5 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -4773,7 +4773,7 @@ void SfxMedium::AddToCheckEditableWorkerList() if (newEntry != nullptr) { - g_newReadOnlyDocs[this] = newEntry; + g_newReadOnlyDocs[this] = std::move(newEntry); } } } diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index 587b908f4556..26ea024c511c 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -282,7 +282,7 @@ SwCalc::SwCalc( SwDoc& rD ) rUserOptions.GetToken( aAdrToken[ n ] )); nVal.PutString( rUserOptions.GetToken( aAdrToken[ 11 ] )); - m_aVarTable.insert( { sNTypeTab[ 25 ], SwCalcExp( nVal, nullptr ) } ); + m_aVarTable.insert( { sNTypeTab[ 25 ], SwCalcExp( std::move(nVal), nullptr ) } ); } // SwCalc::SwCalc diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index 82a27c4a36f5..84fb8c968224 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -1264,7 +1264,7 @@ bool SwFEShell::GetDrawObjGraphic( SotClipboardFormatId nFormat, Graphic& rGrf ) { if( GraphicType::Bitmap != aGrf.GetType() ) { - rGrf = aGrf; + rGrf = std::move(aGrf); bConvert = false; } else if( GetWin() ) @@ -1291,7 +1291,7 @@ bool SwFEShell::GetDrawObjGraphic( SotClipboardFormatId nFormat, Graphic& rGrf ) } else if( GraphicType::Bitmap == aGrf.GetType() ) { - rGrf = aGrf; + rGrf = std::move(aGrf); bConvert = false; } else @@ -1311,7 +1311,7 @@ bool SwFEShell::GetDrawObjGraphic( SotClipboardFormatId nFormat, Graphic& rGrf ) } else { - rGrf = aGrf; + rGrf = std::move(aGrf); bConvert = false; } } diff --git a/sw/source/ui/misc/contentcontroldlg.cxx b/sw/source/ui/misc/contentcontroldlg.cxx index 752ddf8e1ae4..a189a0ef7c19 100644 --- a/sw/source/ui/misc/contentcontroldlg.cxx +++ b/sw/source/ui/misc/contentcontroldlg.cxx @@ -335,7 +335,7 @@ IMPL_LINK_NOARG(SwContentControlDlg, InsertHdl, weld::Button&, void) std::shared_ptr<SwContentControlListItem> aItem = std::make_shared<SwContentControlListItem>(); SwAbstractDialogFactory& rFact = swui::GetFactory(); m_xListItemDialog = rFact.CreateSwContentControlListItemDlg(m_xDialog.get(), *aItem); - m_xListItemDialog->StartExecuteAsync([this, aItem](sal_Int32 nResult) { + m_xListItemDialog->StartExecuteAsync([ this, aItem = std::move(aItem) ](sal_Int32 nResult) { if (nResult == RET_OK) { if (aItem->m_aDisplayText.isEmpty() && aItem->m_aValue.isEmpty()) diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 988c31b5d238..ed8107b48000 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -2805,7 +2805,7 @@ tools::Long SwView::InsertDoc( sal_uInt16 nSlotId, const OUString& rFileName, co pMed->SetFilter( pFilter ); } else - pMed.reset(new SfxMedium(rFileName, StreamMode::READ, pFilter, nullptr)); + pMed.reset(new SfxMedium(rFileName, StreamMode::READ, std::move(pFilter), nullptr)); } else { diff --git a/sw/source/writerfilter/rtftok/rtfsdrimport.cxx b/sw/source/writerfilter/rtftok/rtfsdrimport.cxx index 4efe36cb6b5f..961cd5186640 100644 --- a/sw/source/writerfilter/rtftok/rtfsdrimport.cxx +++ b/sw/source/writerfilter/rtftok/rtfsdrimport.cxx @@ -862,7 +862,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap new RTFValue(aPathAttributes), RTFOverwrite::NO_APPEND); } } while (nCharIndex >= 0); - rShape.getWrapPolygonSprms() = aPolygonSprms; + rShape.getWrapPolygonSprms() = std::move(aPolygonSprms); } else if (rProperty.first == "fRelFlipV") obRelFlipV = rProperty.second.toInt32() == 1; diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index d42ad3181fbc..c77e7f84cd93 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -1656,7 +1656,7 @@ bool INetURLObject::convertRelToAbs(OUString const & rTheRelURIRef, eCharset, true, eStyle); if (!aNewURI.HasError()) { - rTheAbsURIRef = aNewURI; + rTheAbsURIRef = std::move(aNewURI); rWasAbsolute = true; return true; } diff --git a/vcl/source/bitmap/BitmapMedianFilter.cxx b/vcl/source/bitmap/BitmapMedianFilter.cxx index 222451d0a9b7..ccae104b4c20 100644 --- a/vcl/source/bitmap/BitmapMedianFilter.cxx +++ b/vcl/source/bitmap/BitmapMedianFilter.cxx @@ -193,7 +193,7 @@ BitmapEx BitmapMedianFilter::execute(BitmapEx const& rBitmapEx) const const MapMode aMap(aBitmap.GetPrefMapMode()); const Size aPrefSize(aBitmap.GetPrefSize()); - aBitmap = aNewBmp; + aBitmap = std::move(aNewBmp); aBitmap.SetPrefMapMode(aMap); aBitmap.SetPrefSize(aPrefSize); diff --git a/vcl/source/gdi/TypeSerializer.cxx b/vcl/source/gdi/TypeSerializer.cxx index c4fd54c14dba..4a0a0bfba118 100644 --- a/vcl/source/gdi/TypeSerializer.cxx +++ b/vcl/source/gdi/TypeSerializer.cxx @@ -204,7 +204,7 @@ void TypeSerializer::readGraphic(Graphic& rGraphic) mrStream.Seek(nInitialStreamPosition); mrStream.SetError(ERRCODE_IO_WRONGFORMAT); } - rGraphic = aGraphic; + rGraphic = std::move(aGraphic); } else { diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 73c2e9c33616..f9c3201b68fd 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -1382,7 +1382,7 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor > if( bSuccess ) { it->second->m_aTypes = rTypes; - it->second->m_aNativeTypes = aNativeTypes; + it->second->m_aNativeTypes = std::move(aNativeTypes); it->second->m_nLastTimestamp = time( nullptr ); it->second->m_bHaveUTF16 = bHaveUTF16; it->second->m_aUTF8Type = aUTF8Type;