diff options
author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-08-18 21:35:47 +0100 |
---|---|---|
committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-08-19 15:15:54 +0200 |
commit | a4dfd23e4472b9cea97d5073208b77926e87eef0 (patch) | |
tree | 3a0039184afb50ae570cf9d230336b557c146ffa | |
parent | c3d7113cdfc64a2e954b9f5a1b4f39db97af5a94 (diff) |
cid#1557694 COPY_INSTEAD_OF_MOVE
and
cid#1557162 COPY_INSTEAD_OF_MOVE
cid#1556896 COPY_INSTEAD_OF_MOVE
cid#1556893 COPY_INSTEAD_OF_MOVE
cid#1556873 COPY_INSTEAD_OF_MOVE
cid#1556872 COPY_INSTEAD_OF_MOVE
cid#1556789 COPY_INSTEAD_OF_MOVE
cid#1556570 COPY_INSTEAD_OF_MOVE
cid#1556519 COPY_INSTEAD_OF_MOVE
cid#1556516 COPY_INSTEAD_OF_MOVE
cid#1556451 COPY_INSTEAD_OF_MOVE
cid#1556396 COPY_INSTEAD_OF_MOVE
cid#1556237 COPY_INSTEAD_OF_MOVE
cid#1556113 COPY_INSTEAD_OF_MOVE
cid#1556094 COPY_INSTEAD_OF_MOVE
cid#1555991 COPY_INSTEAD_OF_MOVE
cid#1555982 COPY_INSTEAD_OF_MOVE
cid#1555885 COPY_INSTEAD_OF_MOVE
cid#1555702 COPY_INSTEAD_OF_MOVE
cid#1555610 COPY_INSTEAD_OF_MOVE
cid#1555450 COPY_INSTEAD_OF_MOVE
cid#1555327 COPY_INSTEAD_OF_MOVE
cid#1555145 COPY_INSTEAD_OF_MOVE
Change-Id: I38cc1a38e8cb2c33f33e0fc3afd34a0fb39e5ec1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172028
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
20 files changed, 35 insertions, 27 deletions
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx index 9aa27ec7782f..542787105caa 100644 --- a/binaryurp/source/reader.cxx +++ b/binaryurp/source/reader.cxx @@ -331,7 +331,7 @@ void Reader::readMessage(Unmarshal & unmarshal) { std::unique_ptr< IncomingRequest > req( new IncomingRequest( bridge_, tid, oid, std::move(obj), type, functionId, synchronous, - memberTd, bSetter, std::move(inArgs), ccMode, cc)); + memberTd, bSetter, std::move(inArgs), ccMode, std::move(cc))); if (synchronous) { bridge_->incrementActiveCalls(); } diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index 73645a82e2a9..a754b9babb72 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -397,7 +397,7 @@ void SAL_CALL AccessibleChartView::selectionChanged( const lang::EventObject& /* { NotifyEvent( EventType::GOT_SELECTION, aSelectedOID ); } - m_aCurrentSelectionOID = aSelectedOID; + m_aCurrentSelectionOID = std::move(aSelectedOID); } // XEventListener diff --git a/chart2/source/tools/BaseGFXHelper.cxx b/chart2/source/tools/BaseGFXHelper.cxx index 17bd4f5e1809..765521d6959c 100644 --- a/chart2/source/tools/BaseGFXHelper.cxx +++ b/chart2/source/tools/BaseGFXHelper.cxx @@ -228,7 +228,7 @@ void ReduceToRotationMatrix( ::basegfx::B3DHomMatrix & rB3DMatrix ) B3DTuple aR( GetRotationFromMatrix( rB3DMatrix ) ); ::basegfx::B3DHomMatrix aRotationMatrix; aRotationMatrix.rotate(aR.getX(),aR.getY(),aR.getZ()); - rB3DMatrix = aRotationMatrix; + rB3DMatrix = std::move(aRotationMatrix); } } // namespace chart::BaseGFXHelper diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index 4cc4dcf19d58..ab5f1d79dbd0 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -599,7 +599,7 @@ void ImplEventAttacherManager::attach(std::unique_lock<std::mutex>& l, sal_Int32 aListener.ListenerType = rEvent.ListenerType; aListener.EventMethod = rEvent.EventMethod; aListener.AddListenerParam = rEvent.AddListenerParam; - p[i++] = aListener; + p[i++] = std::move(aListener); } try diff --git a/drawinglayer/source/tools/emfphelperdata.cxx b/drawinglayer/source/tools/emfphelperdata.cxx index d75219986bfa..3d9bef482860 100644 --- a/drawinglayer/source/tools/emfphelperdata.cxx +++ b/drawinglayer/source/tools/emfphelperdata.cxx @@ -2088,7 +2088,7 @@ namespace emfplushelper case EmfPlusCombineModeComplement: { //TODO It is not correct and it should be fixed - aClippedPolyPolygon = polyPolygon; + aClippedPolyPolygon = std::move(polyPolygon); break; } case EmfPlusCombineModeExclude: diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx index e7eb65ce79ee..57a915e6250f 100644 --- a/emfio/source/reader/mtftools.cxx +++ b/emfio/source/reader/mtftools.cxx @@ -1537,7 +1537,7 @@ namespace emfio ImplSetNonPersistentLineColorTransparenz(); mpGDIMetaFile->AddAction( new MetaPolygonAction( rPolygon ) ); UpdateLineStyle(); - mpGDIMetaFile->AddAction( new MetaPolyLineAction( rPolygon, maLineStyle.aLineInfo ) ); + mpGDIMetaFile->AddAction( new MetaPolyLineAction( std::move(rPolygon), maLineStyle.aLineInfo ) ); } else { diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index c58c9023c3a7..f4e7620257a0 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -1547,7 +1547,7 @@ bool FormulaCompiler::GetToken() { // Let IntersectionLine() <- Factor() decide how to treat this, // once the actual arguments are determined in RPN. - mpLastToken = mpToken = pSpacesToken; + mpLastToken = mpToken = std::move(pSpacesToken); maArrIterator.StepBack(); // step back from next non-spaces token return true; } diff --git a/sc/source/core/data/queryiter.cxx b/sc/source/core/data/queryiter.cxx index e1558fcc5304..f1d246868275 100644 --- a/sc/source/core/data/queryiter.cxx +++ b/sc/source/core/data/queryiter.cxx @@ -952,7 +952,7 @@ bool ScQueryCellIterator< accessType >::FindEqualOrSortedLastInRange( SCCOL& nFo bool bColDiff = nCol != nFoundCol; nCol = nFoundCol; nRow = nFoundRow; - maCurPos = aPosSave; + maCurPos = std::move(aPosSave); if (maParam.mbRangeLookup) { // Verify that the found entry does not only fulfill the range diff --git a/sc/source/filter/oox/SparklineFragment.cxx b/sc/source/filter/oox/SparklineFragment.cxx index 5486a0f5cc6f..ab0733d0efc7 100644 --- a/sc/source/filter/oox/SparklineFragment.cxx +++ b/sc/source/filter/oox/SparklineFragment.cxx @@ -250,7 +250,7 @@ void SparklineGroupsContext::onCharacters(const OUString& rChars) } } else if (getCurrentElement() == XM_TOKEN(f)) - rLastSparkline.m_aInputRange = aRange; + rLastSparkline.m_aInputRange = std::move(aRange); } } } diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index fc12d662929c..e0b5ae53c745 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -1328,7 +1328,7 @@ bool lcl_addUpperLeftCornerIfMissing(const ScDocument* pDoc, vector<ScTokenRef>& if (bExternal) { ScTokenRef pCorner( - new ScExternalDoubleRefToken(nFileId, aExtTabName, r)); + new ScExternalDoubleRefToken(nFileId, std::move(aExtTabName), r)); ScRefTokenHelper::join(pDoc, rRefTokens, pCorner, ScAddress()); } else diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx index 74262f1f224c..8ab7f9ba2cf5 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx @@ -100,7 +100,7 @@ namespace sd::slidesorter::cache { if (sCompactionPolicy == sNone) pCompactor.reset(new NoCacheCompaction(rCache,nMaximalCacheSize)); else // default: "Compress" - pCompactor.reset(new CacheCompactionByCompression(rCache,nMaximalCacheSize,pCompressor)); + pCompactor.reset(new CacheCompactionByCompression(rCache, nMaximalCacheSize, std::move(pCompressor))); return pCompactor; } diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index b5926871954e..5169a7a132e1 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -1972,7 +1972,7 @@ sal_Bool SfxDocTplService::addTemplate( const OUString& rGroupName, { if ( !bDocHasTitle ) { - INetURLObject aNewTmpObj( aNewTemplateTargetObj ); + INetURLObject aNewTmpObj(std::move(aNewTemplateTargetObj)); aNewTmpObj.CutExtension(); bCorrectTitle = ( aNewTmpObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset ) == rTemplateName ); } diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 8688abd73117..3cd788f5dc4b 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -766,7 +766,7 @@ sal_Int8 ModelData_Impl::CheckStateForSave() DBG_ASSERT( GetMediaDescr().size() == aAcceptedArgs.size(), "Unacceptable parameters are provided in Save request!\n" ); if ( GetMediaDescr().size() != aAcceptedArgs.size() ) - GetMediaDescr() = aAcceptedArgs; + GetMediaDescr() = std::move(aAcceptedArgs); // check that the old filter is acceptable return CheckFilter( GetDocProps().getUnpackedValueOrDefault(aFilterNameString, OUString()) ); diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx index 7b2f7a1969ee..a33780d1b3ed 100644 --- a/sfx2/source/notebookbar/SfxNotebookBar.cxx +++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx @@ -475,8 +475,8 @@ bool SfxNotebookBar::StateMethod(SystemWindow* pSysWindow, std::vector<css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > > aExtensionValues; NotebookBarAddonsItem aNotebookBarAddonsItem; NotebookbarAddonValues(aImageValues , aExtensionValues); - aNotebookBarAddonsItem.aAddonValues = aExtensionValues; - aNotebookBarAddonsItem.aImageValues = aImageValues; + aNotebookBarAddonsItem.aAddonValues = std::move(aExtensionValues); + aNotebookBarAddonsItem.aImageValues = std::move(aImageValues); if (bIsLOK) { diff --git a/slideshow/source/engine/transitions/snakewipe.cxx b/slideshow/source/engine/transitions/snakewipe.cxx index ceaa1d00192b..7196989abd39 100644 --- a/slideshow/source/engine/transitions/snakewipe.cxx +++ b/slideshow/source/engine/transitions/snakewipe.cxx @@ -191,7 +191,9 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) else res = calcSnake(t); - return m_flipOnYAxis ? flipOnYAxis(res) : res; + if (m_flipOnYAxis) + return flipOnYAxis(res); + return res; } ::basegfx::B2DPolyPolygon ParallelSnakesWipe::operator () ( double t ) @@ -227,10 +229,15 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) aTransform.translate( 0.5, 0.5 ); half.transform( aTransform ); res.append( flipOnYAxis(half) ); - res.append( m_opposite ? flipOnXAxis(half) : half ); + if (m_opposite) + res.append(flipOnXAxis(half)); + else + res.append(half); } - return m_flipOnYAxis ? flipOnYAxis(res) : res; + if (m_flipOnYAxis) + return flipOnYAxis(res); + return res; } } diff --git a/slideshow/source/engine/transitions/spiralwipe.cxx b/slideshow/source/engine/transitions/spiralwipe.cxx index 3d1dc0282ea1..8f6aed92a2bd 100644 --- a/slideshow/source/engine/transitions/spiralwipe.cxx +++ b/slideshow/source/engine/transitions/spiralwipe.cxx @@ -85,7 +85,9 @@ SpiralWipe::SpiralWipe( sal_Int32 nElements, bool flipOnYAxis ) ::basegfx::B2DPolyPolygon innerSpiral( calcNegSpiral( 1.0 - t ) ); innerSpiral.flip(); res.append(innerSpiral); - return m_flipOnYAxis ? flipOnYAxis(res) : res; + if (m_flipOnYAxis) + return flipOnYAxis(res); + return res; } ::basegfx::B2DPolyPolygon BoxSnakesWipe::operator () ( double t ) @@ -112,7 +114,9 @@ SpiralWipe::SpiralWipe( sal_Int32 nElements, bool flipOnYAxis ) res.append( flipOnXAxis(innerSpiral) ); } - return m_flipOnYAxis ? flipOnYAxis(res) : res; + if (m_flipOnYAxis) + return flipOnYAxis(res); + return res; } } diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx index 7f4b27ed1bab..08ca12fb28e7 100644 --- a/sw/inc/unocrsr.hxx +++ b/sw/inc/unocrsr.hxx @@ -155,7 +155,7 @@ namespace sw } explicit operator bool() const { return static_cast<bool>(m_pCursor); } - void reset(std::shared_ptr<SwUnoCursor> pNew) + void reset(const std::shared_ptr<SwUnoCursor>& pNew) { if(pNew) StartListening(pNew->m_aNotifier); diff --git a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx index b195c5280b09..268a1d72d819 100644 --- a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx +++ b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx @@ -8729,7 +8729,7 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult) aValue >>= titleStr; titleStr += rResult; propertyVal.Value <<= titleStr; - aValues.getArray()[nTitleFoundIndex] = propertyVal; + aValues.getArray()[nTitleFoundIndex] = std::move(propertyVal); } else { diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index 935d639460fc..2187b748f7d3 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -1075,10 +1075,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( beans::PropertyChangeEvent aEvent; aEvent.Source = getXWeak(); aEvent.Further = false; - // aEvent.PropertyName = aEvent.PropertyHandle = -1; - // aEvent.OldValue = - // aEvent.NewValue = const beans::PropertyValue* pValues = rValues.getConstArray(); sal_Int32 nCount = rValues.getLength(); @@ -1297,7 +1294,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( aEvent.OldValue <<= aOldTitle; aEvent.NewValue <<= m_aProps.getTitle(); - aChanges.getArray()[ nChanged ] = aEvent; + aChanges.getArray()[ nChanged ] = std::move(aEvent); nChanged++; } diff --git a/vcl/source/control/notebookbar.cxx b/vcl/source/control/notebookbar.cxx index bbba5ebde7b9..26feb902fe40 100644 --- a/vcl/source/control/notebookbar.cxx +++ b/vcl/source/control/notebookbar.cxx @@ -369,7 +369,7 @@ void NotebookBar::UpdatePersonaSettings() aStyleSet.SetToolTextColor(aTextColor); aAllSettings.SetStyleSettings(aStyleSet); - PersonaSettings = aAllSettings; + PersonaSettings = std::move(aAllSettings); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |