compilerplugins/clang/moveit.cxx | 41 +++++++++++++++++---- editeng/source/editeng/impedit.cxx | 2 - editeng/source/items/legacyitem.cxx | 2 - emfio/source/reader/mtftools.cxx | 2 - filter/source/msfilter/escherex.cxx | 9 ++-- reportdesign/source/ui/misc/UITools.cxx | 3 - reportdesign/source/ui/report/ReportController.cxx | 3 - sc/source/core/data/column2.cxx | 2 - sc/source/core/tool/token.cxx | 4 +- sc/source/filter/excel/xilink.cxx | 2 - sc/source/filter/oox/formulabuffer.cxx | 4 +- sc/source/filter/xml/xmlexternaltabi.cxx | 2 - sc/source/ui/docshell/externalrefmgr.cxx | 10 ++--- sc/source/ui/unoobj/linkuno.cxx | 2 - sd/source/ui/func/fupage.cxx | 2 - slideshow/source/engine/shapes/shapeimporter.cxx | 2 - svtools/source/graphic/renderer.cxx | 2 - svtools/source/misc/templatefoldercache.cxx | 5 +- svtools/source/uno/framestatuslistener.cxx | 3 - svtools/source/uno/popupmenucontrollerbase.cxx | 2 - svtools/source/uno/statusbarcontroller.cxx | 3 - svtools/source/uno/toolboxcontroller.cxx | 5 +- svx/source/dialog/_bmpmask.cxx | 4 +- svx/source/gallery2/galmisc.cxx | 4 +- svx/source/unodraw/XPropertyTable.cxx | 2 - svx/source/xml/xmlgrhlp.cxx | 5 +- svx/source/xoutdev/xpool.cxx | 3 - sw/source/core/unocore/unoframe.cxx | 8 ++-- sw/source/core/unocore/unostyle.cxx | 8 ++-- sw/source/ui/vba/vbaaddins.cxx | 2 - sw/source/ui/vba/vbavariables.cxx | 2 - sw/source/uibase/shells/drawsh.cxx | 2 - vbahelper/source/vbahelper/vbashape.cxx | 2 - vbahelper/source/vbahelper/vbashapes.cxx | 4 +- vcl/source/bitmap/impvect.cxx | 5 +- vcl/source/filter/ieps/ieps.cxx | 2 - vcl/source/gdi/gdimtf.cxx | 12 +++--- vcl/source/graphic/GraphicObject2.cxx | 2 - vcl/source/outdev/gradient.cxx | 2 - vcl/source/outdev/polyline.cxx | 8 ++-- 40 files changed, 103 insertions(+), 86 deletions(-)
New commits: commit 2d009c405714934ae5f95f4131510cb4e9c2493f Author: Noel Grandin <[email protected]> AuthorDate: Thu Jul 14 09:44:20 2022 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Thu Jul 14 11:18:21 2022 +0200 loplugin:moveit Change-Id: I2702e716dc669ffbb870d36d060e110288d7a744 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137043 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/compilerplugins/clang/moveit.cxx b/compilerplugins/clang/moveit.cxx index b9ae723def60..5beb3479216c 100644 --- a/compilerplugins/clang/moveit.cxx +++ b/compilerplugins/clang/moveit.cxx @@ -41,21 +41,40 @@ public: std::string fn(handler.getMainFileName()); loplugin::normalizeDotDotInFilePath(fn); // false + + if (loplugin::hasPathnamePrefix(fn, SRCDIR "/basctl/source/basicide/moduldlg.cxx")) + return false; if (loplugin::hasPathnamePrefix(fn, SRCDIR "/basic/source/classes/sbunoobj.cxx")) return false; + if (loplugin::hasPathnamePrefix(fn, + SRCDIR "/connectivity/source/drivers/dbase/dindexnode.cxx")) + return false; if (loplugin::hasPathnamePrefix( - fn, SRCDIR "/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx")) + fn, SRCDIR "/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx")) return false; if (loplugin::hasPathnamePrefix( fn, SRCDIR "/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx")) return false; if (loplugin::hasPathnamePrefix( - fn, SRCDIR "/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx")) + fn, SRCDIR "/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx")) return false; if (loplugin::hasPathnamePrefix(fn, SRCDIR "/drawinglayer/source/tools/emfphelperdata.cxx")) return false; + if (loplugin::hasPathnamePrefix(fn, SRCDIR "/editeng/source/items/frmitems.cxx")) + return false; + if (loplugin::hasPathnamePrefix(fn, SRCDIR "/emfio/source/reader/mtftools.cxx")) + return false; + if (loplugin::hasPathnamePrefix(fn, SRCDIR "/filter/source/msfilter/msdffimp.cxx")) + return false; + if (loplugin::hasPathnamePrefix(fn, SRCDIR "/filter/source/msfilter/escherex.cxx")) + return false; if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sc/source/ui/view/hintwin.cxx")) return false; + if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sc/source/core/tool/scmatrix.cxx")) + return false; + if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sd/source/filter/eppt/epptso.cxx")) + return false; + if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sdext/source/pdfimport/pdfparse/pdfparse.cxx")) + return false; if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sfx2/source/control/dispatch.cxx")) return false; if (loplugin::hasPathnamePrefix(fn, SRCDIR "/svgio/source/svgreader/svgcharacternode.cxx")) @@ -73,15 +92,13 @@ public: if (loplugin::hasPathnamePrefix(fn, SRCDIR "/svx/source/svdraw/svdotextpathdecomposition.cxx")) return false; - if (loplugin::hasPathnamePrefix(fn, - SRCDIR "/connectivity/source/drivers/dbase/dindexnode.cxx")) + if (loplugin::hasPathnamePrefix(fn, SRCDIR + "/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx")) return false; - if (loplugin::hasPathnamePrefix(fn, SRCDIR "/basctl/source/basicide/moduldlg.cxx")) + if (loplugin::hasPathnamePrefix(fn, SRCDIR "/svx/source/xml/xmlgrhlp.cxx")) return false; if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sw/source/core/SwNumberTree/SwNumberTree.cxx")) return false; - if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sc/source/core/tool/scmatrix.cxx")) - return false; if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sw/source/core/bastyp/calc.cxx")) return false; if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sw/source/core/edit/edattr.cxx")) @@ -96,6 +113,16 @@ public: return false; if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sw/source/uibase/docvw/DashedLine.cxx")) return false; + if (loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/source/gdi/gradient.cxx")) + return false; + if (loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/source/graphic/GraphicObject.cxx")) + return false; + if (loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/source/graphic/GraphicObject2.cxx")) + return false; + if (loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/source/filter/svm/SvmConverter.cxx")) + return false; + if (loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/source/outdev/font.cxx")) + return false; if (loplugin::hasPathnamePrefix( fn, SRCDIR "/writerfilter/source/dmapper/DomainMapperTableHandler.cxx")) return false; diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index 53aefa9b8cc1..1a425cbe64f4 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -1477,7 +1477,7 @@ void ImpEditView::ShowCursor( bool bGotoCursor, bool bForceVisCursor ) SvxFont aFont; pEditEngine->SeekCursor( aPaM.GetNode(), aPaM.GetIndex()+1, aFont ); - InputContext aInputContext(aFont, InputContextFlags::Text | InputContextFlags::ExtText); + InputContext aInputContext(std::move(aFont), InputContextFlags::Text | InputContextFlags::ExtText); if (EditViewCallbacks* pCallbacks = getEditViewCallbacks()) pCallbacks->EditViewInputContext(aInputContext); else if (auto xWindow = GetWindow()) diff --git a/editeng/source/items/legacyitem.cxx b/editeng/source/items/legacyitem.cxx index 89c15dd5aa93..786b86c917ab 100644 --- a/editeng/source/items/legacyitem.cxx +++ b/editeng/source/items/legacyitem.cxx @@ -557,7 +557,7 @@ namespace legacy { Graphic aGraphic; aSerializer.readGraphic(aGraphic); - rItem.SetGraphicObject(GraphicObject(aGraphic)); + rItem.SetGraphicObject(GraphicObject(std::move(aGraphic))); if( SVSTREAM_FILEFORMAT_ERROR == rStrm.GetError() ) { diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx index 85429a50152e..69830001bc99 100644 --- a/emfio/source/reader/mtftools.cxx +++ b/emfio/source/reader/mtftools.cxx @@ -911,7 +911,7 @@ namespace emfio Point aPoint( aPoly[ 0 ] ); aPoly.Insert( nCount, aPoint ); } - mpGDIMetaFile->AddAction( new MetaPolygonAction( aPoly ) ); + mpGDIMetaFile->AddAction( new MetaPolygonAction( std::move(aPoly) ) ); } } } diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 5f84a0df7273..7d5c094717d7 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -1342,8 +1342,7 @@ bool EscherPropertyContainer::CreateOLEGraphicProperties(const uno::Reference<dr const Graphic* pGraphic = pOle2Obj->GetGraphic(); if (pGraphic) { - Graphic aGraphic(*pGraphic); - GraphicObject aGraphicObject(aGraphic); + GraphicObject aGraphicObject(*pGraphic); bRetValue = CreateGraphicProperties(rXShape, aGraphicObject); } } @@ -1418,10 +1417,10 @@ void EscherPropertyContainer::CreateEmbeddedBitmapProperties( uno::Reference<graphic::XGraphic> xGraphic(rxBitmap, uno::UNO_QUERY); if (!xGraphic.is()) return; - const Graphic aGraphic(xGraphic); + Graphic aGraphic(xGraphic); if (aGraphic.IsNone()) return; - const GraphicObject aGraphicObject(aGraphic); + GraphicObject aGraphicObject(std::move(aGraphic)); if (aGraphicObject.GetType() == GraphicType::NONE) return; if (ImplCreateEmbeddedBmp(aGraphicObject)) @@ -1467,7 +1466,7 @@ void EscherPropertyContainer::CreateEmbeddedHatchProperties(const drawing::Hatch { const tools::Rectangle aRect(pShapeBoundRect ? *pShapeBoundRect : tools::Rectangle(Point(0,0), Size(28000, 21000))); Graphic aGraphic(lclDrawHatch(rHatch, rBackColor, bFillBackground, aRect)); - GraphicObject aGraphicObject(aGraphic); + GraphicObject aGraphicObject(std::move(aGraphic)); if (ImplCreateEmbeddedBmp(aGraphicObject)) AddOpt( ESCHER_Prop_fillType, ESCHER_FillTexture ); diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 2eec8fe9fa2a..b77f3f77a77b 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -617,7 +617,6 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep }; FontList aFontList(Application::GetDefaultDevice()); XColorListRef pColorList( XColorList::CreateStdColorList() ); - const Graphic aNullGraphic; const ::Color aNullLineCol(COL_DEFAULT_SHAPE_STROKE); // #i121448# Use defined default color const ::Color aNullFillCol(COL_DEFAULT_SHAPE_FILLING); // #i121448# Use defined default color const XGradient aNullGrad(COL_BLACK, COL_WHITE); @@ -628,7 +627,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep new XFillColorItem("", aNullFillCol), new XFillGradientItem(aNullGrad), new XFillHatchItem(aNullHatch), - new XFillBitmapItem(aNullGraphic), + new XFillBitmapItem(Graphic()), new XFillTransparenceItem, new XGradientStepCountItem, new XFillBmpTileItem, diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index b53cfad7b87f..f84354a20ea0 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -2367,7 +2367,6 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ >); rtl::Reference<SfxItemPool> pPool( new SfxItemPool("ReportPageProperties", RPTUI_ID_LRSPACE, RPTUI_ID_METRIC, aItemInfos ) ); - const Graphic aNullGraphic; const ::Color aNullLineCol(COL_DEFAULT_SHAPE_STROKE); // #i121448# Use defined default color const ::Color aNullFillCol(COL_DEFAULT_SHAPE_FILLING); // #i121448# Use defined default color const XGradient aNullGrad(COL_BLACK, COL_WHITE); @@ -2387,7 +2386,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ new XFillColorItem("", aNullFillCol), new XFillGradientItem(aNullGrad), new XFillHatchItem(aNullHatch), - new XFillBitmapItem(aNullGraphic), + new XFillBitmapItem(Graphic()), new XFillTransparenceItem, new XGradientStepCountItem, new XFillBmpTileItem, diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index cc806168d1ed..2f99226a208f 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -2403,7 +2403,7 @@ formula::FormulaTokenRef ScColumn::ResolveStaticReference( SCROW nRow ) const EditTextObject* pText = sc::edittext_block::at(*it->data, aPos.second); OUString aStr = ScEditUtil::GetString(*pText, &GetDoc()); svl::SharedString aSS( GetDoc().GetSharedStringPool().intern(aStr)); - return formula::FormulaTokenRef(new formula::FormulaStringToken(aSS)); + return formula::FormulaTokenRef(new formula::FormulaStringToken(std::move(aSS))); } case sc::element_type_empty: default: diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 59f9e04ac8d3..1db10bc21de3 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -365,9 +365,9 @@ FormulaToken* ScRawToken::CreateToken(ScSheetLimits& rLimits) const { svl::SharedString aSS(sharedstring.mpData, sharedstring.mpDataIgnoreCase); if (eOp == ocPush) - return new FormulaStringToken(aSS); + return new FormulaStringToken(std::move(aSS)); else - return new FormulaStringOpToken(eOp, aSS); + return new FormulaStringOpToken(eOp, std::move(aSS)); } case svSingleRef : if (eOp == ocPush) diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index e9fea951e94e..578c9ff71265 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -605,7 +605,7 @@ void XclImpSupbookTab::LoadCachedValues( const ScExternalRefCache::TableTypeRef& case EXC_CACHEDVAL_STRING: { svl::SharedString aSS( rPool.intern( pCrn->GetString())); - ScExternalRefCache::TokenRef pToken(new formula::FormulaStringToken( aSS)); + ScExternalRefCache::TokenRef pToken(new formula::FormulaStringToken( std::move(aSS) )); pCacheTable->setCell(rAddr.mnCol, rAddr.mnRow, pToken, 0, false); } break; diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx index 7fcc4f5e259f..f47599fb3763 100644 --- a/sc/source/filter/oox/formulabuffer.cxx +++ b/sc/source/filter/oox/formulabuffer.cxx @@ -181,7 +181,7 @@ void applySharedFormulas( { // See applyCellFormulaValues svl::SharedString aSS = rStrPool.intern(rDesc.maCellValue); - pCell->SetResultToken(new formula::FormulaStringToken(aSS)); + pCell->SetResultToken(new formula::FormulaStringToken(std::move(aSS))); // If we don't reset dirty, then e.g. disabling macros makes all cells // that use macro functions to show #VALUE! pCell->ResetDirty(); @@ -310,7 +310,7 @@ void applyCellFormulaValues( if (bGeneratorKnownGood) { svl::SharedString aSS = rStrPool.intern(rValueStr); - pCell->SetResultToken(new formula::FormulaStringToken(aSS)); + pCell->SetResultToken(new formula::FormulaStringToken(std::move(aSS))); pCell->ResetDirty(); pCell->SetChanged(false); } diff --git a/sc/source/filter/xml/xmlexternaltabi.cxx b/sc/source/filter/xml/xmlexternaltabi.cxx index 91bb218bb330..7931440c12d0 100644 --- a/sc/source/filter/xml/xmlexternaltabi.cxx +++ b/sc/source/filter/xml/xmlexternaltabi.cxx @@ -337,7 +337,7 @@ void SAL_CALL ScXMLExternalRefCellContext::endFastElement( sal_Int32 /*nElement* { ScDocument& rDoc = mrScImport.GetDoc().getDoc(); svl::SharedString aSS = rDoc.GetSharedStringPool().intern(maCellString); - aToken.reset(new formula::FormulaStringToken(aSS)); + aToken.reset(new formula::FormulaStringToken(std::move(aSS))); } sal_uInt32 nNumFmt = mnNumberFormat >= 0 ? static_cast<sal_uInt32>(mnNumberFormat) : 0; diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 6c994b9a2a68..4fc7556c6daf 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -864,7 +864,7 @@ void ScExternalRefCache::setCellRangeData(sal_uInt16 nFileId, const ScRange& rRa }; ScMatrix::StringOpFunction aStringFunc = [=](size_t row, size_t col, svl::SharedString val) -> void { - pTabData->setCell(col + nCol1, row + nRow1, new formula::FormulaStringToken(val), 0, false); + pTabData->setCell(col + nCol1, row + nRow1, new formula::FormulaStringToken(std::move(val)), 0, false); }; ScMatrix::EmptyOpFunction aEmptyFunc = [](size_t /*row*/, size_t /*col*/) -> void { @@ -1515,7 +1515,7 @@ static FormulaToken* convertToToken( ScDocument& rHostDoc, const ScDocument& rSr { OUString aStr = rCell.getString(&rSrcDoc); svl::SharedString aSS = rHostDoc.GetSharedStringPool().intern(aStr); - return new formula::FormulaStringToken(aSS); + return new formula::FormulaStringToken(std::move(aSS)); } case CELLTYPE_VALUE: return new formula::FormulaDoubleToken(rCell.getDouble()); @@ -1533,7 +1533,7 @@ static FormulaToken* convertToToken( ScDocument& rHostDoc, const ScDocument& rSr else { svl::SharedString aSS = rHostDoc.GetSharedStringPool().intern( pFCell->GetString().getString()); - return new formula::FormulaStringToken(aSS); + return new formula::FormulaStringToken(std::move(aSS)); } } default: @@ -2940,7 +2940,7 @@ public: { OUString aStr = aCell.getString(&mpCurCol->GetDoc()); svl::SharedString aSS = mrStrPool.intern(aStr); - pTok.reset(new formula::FormulaStringToken(aSS)); + pTok.reset(new formula::FormulaStringToken(std::move(aSS))); } break; case CELLTYPE_VALUE: @@ -2958,7 +2958,7 @@ public: { // Re-intern the string to the host document pool. svl::SharedString aInterned = mrStrPool.intern(aRes.maString.getString()); - pTok.reset(new formula::FormulaStringToken(aInterned)); + pTok.reset(new formula::FormulaStringToken(std::move(aInterned))); } break; case sc::FormulaResultValue::Error: diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index c63468cdf61a..cbd043a65598 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -1404,7 +1404,7 @@ void SAL_CALL ScExternalSheetCacheObj::setCellValue(sal_Int32 nCol, sal_Int32 nR { svl::SharedStringPool& rPool = mpDocShell->GetDocument().GetSharedStringPool(); svl::SharedString aSS = rPool.intern(aVal); - pToken.reset(new FormulaStringToken(aSS)); + pToken.reset(new FormulaStringToken(std::move(aSS))); } else // unidentified value type. diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 5427e6b7dac3..098295758b40 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -349,7 +349,7 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, const SfxRequest& // MigrateItemSet makes sure the XFillBitmapItem will have a unique name SfxItemSetFixed<XATTR_FILLBITMAP, XATTR_FILLBITMAP> aMigrateSet( mpDoc->GetPool() ); - aMigrateSet.Put(XFillBitmapItem("background", aGraphic)); + aMigrateSet.Put(XFillBitmapItem("background", std::move(aGraphic))); SdrModel::MigrateItemSet( &aMigrateSet, &*pTempSet, mpDoc ); pTempSet->Put( XFillBmpStretchItem( true )); diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx index d896caa559ae..ab3065ac7138 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -63,7 +63,7 @@ std::unique_ptr<GraphicObject> importShapeGraphic(uno::Reference<beans::XPropert } Graphic aGraphic(xGraphic); - xRet.reset(new GraphicObject(aGraphic)); + xRet.reset(new GraphicObject(std::move(aGraphic))); if (GraphicType::Default == xRet->GetType() || GraphicType::NONE == xRet->GetType()) { diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx index bbd151c6b40b..d031026b1317 100644 --- a/svtools/source/graphic/renderer.cxx +++ b/svtools/source/graphic/renderer.cxx @@ -277,7 +277,7 @@ void SAL_CALL GraphicRendererVCL::render( const uno::Reference< graphic::XGraphi Graphic aGraphic(rxGraphic); if (!aGraphic.IsNone()) { - GraphicObject aGraphicObject(aGraphic); + GraphicObject aGraphicObject(std::move(aGraphic)); aGraphicObject.Draw(*mpOutDev, maDestRect.TopLeft(), maDestRect.GetSize()); } } diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index d92d22d62686..532174b7e10e 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -353,8 +353,7 @@ namespace svt { OUString sURL = m_rStorage.ReadUniOrByteString(m_rStorage.GetStreamCharSet()); sURL = m_xOfficeInstDirs->makeAbsoluteURL( sURL ); - INetURLObject aChildURL( sURL ); - rChildren.push_back( new TemplateContent( aChildURL ) ); + rChildren.push_back( new TemplateContent( INetURLObject( sURL ) ) ); } // their content @@ -568,7 +567,7 @@ namespace svt INetURLObject aSubContentURL( xContentAccess->queryContentIdentifierString() ); // a new content instance - ::rtl::Reference< TemplateContent > xChild = new TemplateContent( aSubContentURL ); + ::rtl::Reference< TemplateContent > xChild = new TemplateContent( std::move(aSubContentURL) ); // the modified date xChild->setModDate( xRow->getTimestamp( 2 ) ); // date modified diff --git a/svtools/source/uno/framestatuslistener.cxx b/svtools/source/uno/framestatuslistener.cxx index 0ad4271a1987..25152f2f3b4a 100644 --- a/svtools/source/uno/framestatuslistener.cxx +++ b/svtools/source/uno/framestatuslistener.cxx @@ -241,8 +241,7 @@ void FrameStatusListener::bindListener() } listener.second = xDispatch; - Listener aListener( aTargetURL, xDispatch ); - aDispatchVector.push_back( aListener ); + aDispatchVector.push_back( Listener( std::move(aTargetURL), xDispatch ) ); } } } diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx index 3e5d47c362c1..07d28ff7f0fd 100644 --- a/svtools/source/uno/popupmenucontrollerbase.cxx +++ b/svtools/source/uno/popupmenucontrollerbase.cxx @@ -141,7 +141,7 @@ void PopupMenuControllerBase::dispatchCommand( const OUString& sCommandURL, Reference< XDispatch > xDispatch( xDispatchProvider->queryDispatch( aURL, sTarget, 0 ), UNO_SET_THROW ); - Application::PostUserEvent( LINK(nullptr, PopupMenuControllerBase, ExecuteHdl_Impl), new PopupMenuControllerBaseDispatchInfo( xDispatch, aURL, rArgs ) ); + Application::PostUserEvent( LINK(nullptr, PopupMenuControllerBase, ExecuteHdl_Impl), new PopupMenuControllerBaseDispatchInfo( xDispatch, std::move(aURL), rArgs ) ); } catch( Exception& ) diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx index fae89f287b9e..69d360c9f73f 100644 --- a/svtools/source/uno/statusbarcontroller.cxx +++ b/svtools/source/uno/statusbarcontroller.cxx @@ -448,8 +448,7 @@ void StatusbarController::bindListener() } listener.second = xDispatch; - Listener aListener( aTargetURL, xDispatch ); - aDispatchVector.push_back( aListener ); + aDispatchVector.push_back( Listener( std::move(aTargetURL), xDispatch ) ); } } } diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index 21e186baf2df..df28e6f8f069 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -547,8 +547,7 @@ void ToolboxController::bindListener() listener.second = xDispatch; - Listener aListener( aTargetURL, xDispatch ); - aDispatchVector.push_back( aListener ); + aDispatchVector.push_back( Listener( aTargetURL, xDispatch ) ); } } } @@ -682,7 +681,7 @@ void ToolboxController::dispatchCommand( const OUString& sCommandURL, const Sequ Reference< XDispatch > xDispatch( xDispatchProvider->queryDispatch( aURL, sTarget, 0 ), UNO_SET_THROW ); - std::unique_ptr<DispatchInfo> pDispatchInfo(new DispatchInfo( xDispatch, aURL, rArgs )); + std::unique_ptr<DispatchInfo> pDispatchInfo(new DispatchInfo( xDispatch, std::move(aURL), rArgs )); if ( Application::PostUserEvent( LINK(nullptr, ToolboxController, ExecuteHdl_Impl), pDispatchInfo.get() ) ) pDispatchInfo.release(); diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 2be9a7c8d382..8a727909fb81 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -783,7 +783,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) if( bReplace ) { aFont.SetColor( aCol ); - pAct = new MetaFontAction( aFont ); + pAct = new MetaFontAction( std::move(aFont) ); } aMtf.AddAction( pAct ); @@ -801,7 +801,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) if( bReplace ) { aWall.SetColor( aCol ); - pAct = new MetaWallpaperAction( pAct->GetRect(), aWall ); + pAct = new MetaWallpaperAction( pAct->GetRect(), std::move(aWall) ); } aMtf.AddAction( pAct ); diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 3422f5e2919c..68cb1bc0c45d 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -391,7 +391,7 @@ void GalleryTransferable::InitData( bool bLazy ) Graphic aGraphic; if (mpTheme && mpTheme->GetGraphic(mnObjectPos, aGraphic)) - mpGraphicObject.reset(new GraphicObject( aGraphic )); + mpGraphicObject.reset(new GraphicObject( std::move(aGraphic) )); } if( !mxModelStream.is() ) @@ -428,7 +428,7 @@ void GalleryTransferable::InitData( bool bLazy ) Graphic aGraphic; if (mpTheme && mpTheme->GetGraphic(mnObjectPos, aGraphic)) - mpGraphicObject.reset(new GraphicObject( aGraphic )); + mpGraphicObject.reset(new GraphicObject( std::move(aGraphic) )); } } break; diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 56bb135237f8..c1105335ae84 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -639,7 +639,7 @@ std::unique_ptr<XPropertyEntry> SvxUnoXBitmapTable::createEntry(const OUString& if (aGraphic.IsNone()) return nullptr; - GraphicObject aGraphicObject(aGraphic); + GraphicObject aGraphicObject(std::move(aGraphic)); return std::make_unique<XBitmapEntry>(aGraphicObject, rName); } diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 03e85db36922..6c5c76bfce73 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -358,7 +358,7 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject() Graphic aGraphic(GetGraphic()); if (aGraphic.GetType() != GraphicType::NONE) { - mxGrfObj.reset(new GraphicObject(aGraphic)); + mxGrfObj.reset(new GraphicObject(std::move(aGraphic))); } return *mxGrfObj; } @@ -856,8 +856,7 @@ uno::Reference<io::XInputStream> SAL_CALL SvXMLGraphicHelper::createInputStream( { Reference<XInputStream> xInputStream; - Graphic aGraphic(rxGraphic); - GraphicObject aGraphicObject(aGraphic); + GraphicObject aGraphicObject((Graphic(rxGraphic))); if (SvXMLGraphicHelperMode::Write == meCreateMode) { diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx index b3e044e83696..65a096de3910 100644 --- a/svx/source/xoutdev/xpool.cxx +++ b/svx/source/xoutdev/xpool.cxx @@ -74,7 +74,6 @@ XOutdevItemPool::XOutdevItemPool(SfxItemPool* _pMaster) { // prepare some defaults const OUString aNullStr; - const Graphic aNullGraphic; const basegfx::B2DPolyPolygon aNullPol; const Color aNullLineCol(COL_DEFAULT_SHAPE_STROKE); // #i121448# Use defined default color const Color aNullFillCol(COL_DEFAULT_SHAPE_FILLING); // #i121448# Use defined default color @@ -111,7 +110,7 @@ XOutdevItemPool::XOutdevItemPool(SfxItemPool* _pMaster) rPoolDefaults[XATTR_FILLCOLOR -XATTR_START] = new XFillColorItem (aNullStr,aNullFillCol); rPoolDefaults[XATTR_FILLGRADIENT -XATTR_START] = new XFillGradientItem(XGradient(COL_BLACK, COL_WHITE)); rPoolDefaults[XATTR_FILLHATCH -XATTR_START] = new XFillHatchItem (aNullHatch); - rPoolDefaults[XATTR_FILLBITMAP -XATTR_START] = new XFillBitmapItem (aNullGraphic); + rPoolDefaults[XATTR_FILLBITMAP -XATTR_START] = new XFillBitmapItem (Graphic()); rPoolDefaults[XATTR_FILLTRANSPARENCE -XATTR_START] = new XFillTransparenceItem; rPoolDefaults[XATTR_GRADIENTSTEPCOUNT -XATTR_START] = new XGradientStepCountItem; rPoolDefaults[XATTR_FILLBMP_TILE -XATTR_START] = new XFillBmpTileItem; diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 9df8a8a180f1..8e30322644c6 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -434,8 +434,8 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI { if(pXFillBitmapItem) { - const Graphic aNullGraphic; - XFillBitmapItem aXFillBitmapItem(aNullGraphic); + Graphic aNullGraphic; + XFillBitmapItem aXFillBitmapItem(std::move(aNullGraphic)); aXFillBitmapItem.PutValue(*pXFillBitmapItem, MID_BITMAP); rToSet.Put(aXFillBitmapItem); @@ -1839,8 +1839,8 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const ::uno::Any& { case XATTR_FILLBITMAP: { - const Graphic aNullGraphic; - XFillBitmapItem aXFillBitmapItem(aNullGraphic); + Graphic aNullGraphic; + XFillBitmapItem aXFillBitmapItem(std::move(aNullGraphic)); aXFillBitmapItem.PutValue(aValue, nMemberId); aSet.Put(aXFillBitmapItem); diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 66832979b3df..c305279068e2 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -1646,9 +1646,9 @@ void SwXStyle::SetPropertyValue<sal_uInt16(XATTR_FILLGRADIENT)>(const SfxItemPro { if(sal_uInt16(XATTR_FILLBITMAP) == rEntry.nWID) { - const Graphic aNullGraphic; + Graphic aNullGraphic; SfxItemSet& rStyleSet = o_rStyleBase.GetItemSet(); - XFillBitmapItem aXFillBitmapItem(aNullGraphic); + XFillBitmapItem aXFillBitmapItem(std::move(aNullGraphic)); aXFillBitmapItem.PutValue(aValue, nMemberId); rStyleSet.Put(aXFillBitmapItem); } @@ -3694,8 +3694,8 @@ uno::Reference< style::XAutoStyle > SwXAutoStyleFamily::insertStyle( { if(XATTR_FILLBITMAP == pEntry->nWID) { - const Graphic aNullGraphic; - XFillBitmapItem aXFillBitmapItem(aNullGraphic); + Graphic aNullGraphic; + XFillBitmapItem aXFillBitmapItem(std::move(aNullGraphic)); aXFillBitmapItem.PutValue(aValue, nMemberId); aSet.Put(aXFillBitmapItem); diff --git a/sw/source/ui/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx index 40fc577440ea..6fd6e42f8634 100644 --- a/sw/source/ui/vba/vbaaddins.cxx +++ b/sw/source/ui/vba/vbaaddins.cxx @@ -51,7 +51,7 @@ static uno::Reference< container::XIndexAccess > lcl_getAddinCollection( const u // TODO: second get the customize addins in the org.openoffice.Office.Writer/GlobalTemplateList - uno::Reference< container::XIndexAccess > xAddinsAccess( new XNamedObjectCollectionHelper< word::XAddin >( aAddins ) ); + uno::Reference< container::XIndexAccess > xAddinsAccess( new XNamedObjectCollectionHelper< word::XAddin >( std::move(aAddins) ) ); return xAddinsAccess; } diff --git a/sw/source/ui/vba/vbavariables.cxx b/sw/source/ui/vba/vbavariables.cxx index 33bc3c0c4612..6505eb23e049 100644 --- a/sw/source/ui/vba/vbavariables.cxx +++ b/sw/source/ui/vba/vbavariables.cxx @@ -36,7 +36,7 @@ static uno::Reference< container::XIndexAccess > createVariablesAccess( const un [&xParent, &xContext, &xUserDefined](const beans::PropertyValue& rProp) -> uno::Reference< word::XVariable > { return uno::Reference< word::XVariable > ( new SwVbaVariable( xParent, xContext, xUserDefined, rProp.Name ) ); }); - uno::Reference< container::XIndexAccess > xVariables( new XNamedObjectCollectionHelper< word::XVariable >( aVariables ) ); + uno::Reference< container::XIndexAccess > xVariables( new XNamedObjectCollectionHelper< word::XVariable >( std::move(aVariables) ) ); return xVariables; } diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx index 5286c85b3830..4ef80f3b86ba 100644 --- a/sw/source/uibase/shells/drawsh.cxx +++ b/sw/source/uibase/shells/drawsh.cxx @@ -155,7 +155,7 @@ void SwDrawShell::InsertPictureFromFile(SdrObject& rObject) SfxItemSetFixed<XATTR_FILLSTYLE, XATTR_FILLBITMAP> aSet(pSdrView->GetModel()->GetItemPool()); aSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP)); - aSet.Put(XFillBitmapItem(OUString(), aGraphic)); + aSet.Put(XFillBitmapItem(OUString(), std::move(aGraphic))); rObject.SetMergedItemSetAndBroadcast(aSet); } diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx index faab903524c2..fead96292774 100644 --- a/vbahelper/source/vbahelper/vbashape.cxx +++ b/vbahelper/source/vbahelper/vbashape.cxx @@ -540,7 +540,7 @@ ScVbaShape::ShapeRange( const uno::Any& index ) XNamedObjectCollectionHelper< drawing::XShape >::XNamedVec aVec; aVec.push_back( m_xShape ); - uno::Reference< container::XIndexAccess > xIndexAccess( new XNamedObjectCollectionHelper< drawing::XShape >( aVec ) ); + uno::Reference< container::XIndexAccess > xIndexAccess( new XNamedObjectCollectionHelper< drawing::XShape >( std::move(aVec) ) ); uno::Reference< container::XChild > xChild( m_xShape, uno::UNO_QUERY_THROW ); // #FIXME for want of a better parent, setting this uno::Reference< msforms::XShapeRange > xShapeRange( new ScVbaShapeRange( mxParent, mxContext, xIndexAccess, uno::Reference< drawing::XDrawPage >( xChild->getParent(), uno::UNO_QUERY_THROW ), m_xModel ) ); diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx index d75a9874e448..02630a75c520 100644 --- a/vbahelper/source/vbahelper/vbashapes.cxx +++ b/vbahelper/source/vbahelper/vbashapes.cxx @@ -83,7 +83,7 @@ void ScVbaShapes::initBaseCollection() aShapes.reserve( nLen ); for ( sal_Int32 index=0; index<nLen; ++index ) aShapes.emplace_back( m_xIndexAccess->getByIndex( index ) , uno::UNO_QUERY ); - uno::Reference< container::XIndexAccess > xShapes( new XNamedObjectCollectionHelper< drawing::XShape >( aShapes ) ); + uno::Reference< container::XIndexAccess > xShapes( new XNamedObjectCollectionHelper< drawing::XShape >( std::move(aShapes) ) ); m_xIndexAccess = xShapes; m_xNameAccess.set( xShapes, uno::UNO_QUERY ); } @@ -167,7 +167,7 @@ ScVbaShapes::getShapesByArrayIndices( const uno::Any& Index ) if ( xShape.is() ) aShapes.push_back( xShape ); } - uno::Reference< container::XIndexAccess > xIndexAccess( new XNamedObjectCollectionHelper< drawing::XShape >( aShapes ) ); + uno::Reference< container::XIndexAccess > xIndexAccess( new XNamedObjectCollectionHelper< drawing::XShape >( std::move(aShapes) ) ); return xIndexAccess; } diff --git a/vcl/source/bitmap/impvect.cxx b/vcl/source/bitmap/impvect.cxx index f41c3f72c8ec..f3bdff4a9a4f 100644 --- a/vcl/source/bitmap/impvect.cxx +++ b/vcl/source/bitmap/impvect.cxx @@ -653,7 +653,6 @@ bool ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf, if( pRAcc ) { - tools::PolyPolygon aPolyPoly; double fPercent = 0.0; double fPercentStep_2 = 0.0; const tools::Long nWidth = pRAcc->Width(); @@ -702,7 +701,7 @@ bool ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf, if( oMap ) { - aPolyPoly.Clear(); + tools::PolyPolygon aPolyPoly; ImplCalculate( *oMap, aPolyPoly, cReduce ); oMap.reset(); @@ -716,7 +715,7 @@ bool ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf, { rMtf.AddAction( new MetaLineColorAction( aFindColor, true ) ); rMtf.AddAction( new MetaFillColorAction( aFindColor, true ) ); - rMtf.AddAction( new MetaPolyPolygonAction( aPolyPoly ) ); + rMtf.AddAction( new MetaPolyPolygonAction( std::move(aPolyPoly) ) ); } } } diff --git a/vcl/source/filter/ieps/ieps.cxx b/vcl/source/filter/ieps/ieps.cxx index 9c223d6cda90..cf6565abb030 100644 --- a/vcl/source/filter/ieps/ieps.cxx +++ b/vcl/source/filter/ieps/ieps.cxx @@ -805,7 +805,7 @@ bool ImportEpsGraphic( SvStream & rStream, Graphic & rGraphic) GfxLink aGfxLink( std::move(pBuf), nPSSize, GfxLinkType::EpsBuffer ) ; aMtf.AddAction( static_cast<MetaAction*>( new MetaEPSAction( Point(), Size( nWidth, nHeight ), - aGfxLink, aGraphic.GetGDIMetaFile() ) ) ); + std::move(aGfxLink), aGraphic.GetGDIMetaFile() ) ) ); CreateMtfReplacementAction( aMtf, rStream, nOrigPos, nPSSize, nPosWMF, nSizeWMF, nPosTIFF, nSizeTIFF ); aMtf.WindStart(); aMtf.SetPrefMapMode(MapMode(MapUnit::MapPoint)); diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 68c48bf6e01f..4d889f6d54d0 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -774,7 +774,7 @@ void GDIMetaFile::Clip( const tools::Rectangle& i_rClipRect ) vcl::Region aNewReg( aCurRect ); if( pOldAct->IsClipping() ) aNewReg.Intersect( pOldAct->GetRegion() ); - MetaClipRegionAction* pNewAct = new MetaClipRegionAction( aNewReg, true ); + MetaClipRegionAction* pNewAct = new MetaClipRegionAction( std::move(aNewReg), true ); m_aList[ m_nCurrentActionElement ] = pNewAct; } } @@ -1252,7 +1252,7 @@ void GDIMetaFile::Rotate( Degree10 nAngle10 ) vcl::Font aFont( pAct->GetFont() ); aFont.SetOrientation( aFont.GetOrientation() + nAngle10 ); - aMtf.AddAction( new MetaFontAction( aFont ) ); + aMtf.AddAction( new MetaFontAction( std::move(aFont) ) ); } break; @@ -1892,7 +1892,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol aFont.SetColor( pFncCol( aFont.GetColor(), pColParam ) ); aFont.SetFillColor( pFncCol( aFont.GetFillColor(), pColParam ) ); - aMtf.push_back( new MetaFontAction( aFont ) ); + aMtf.push_back( new MetaFontAction( std::move(aFont) ) ); } break; @@ -1916,7 +1916,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol aWall.SetGradient( aGradient ); } - aMtf.push_back( new MetaWallpaperAction( rRect, aWall ) ); + aMtf.push_back( new MetaWallpaperAction( rRect, std::move(aWall) ) ); } break; @@ -1993,7 +1993,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol aGradient.SetStartColor( pFncCol( aGradient.GetStartColor(), pColParam ) ); aGradient.SetEndColor( pFncCol( aGradient.GetEndColor(), pColParam ) ); - aMtf.push_back( new MetaGradientAction( pAct->GetRect(), aGradient ) ); + aMtf.push_back( new MetaGradientAction( pAct->GetRect(), std::move(aGradient) ) ); } break; @@ -2004,7 +2004,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol aGradient.SetStartColor( pFncCol( aGradient.GetStartColor(), pColParam ) ); aGradient.SetEndColor( pFncCol( aGradient.GetEndColor(), pColParam ) ); - aMtf.push_back( new MetaGradientExAction( pAct->GetPolyPolygon(), aGradient ) ); + aMtf.push_back( new MetaGradientExAction( pAct->GetPolyPolygon(), std::move(aGradient) ) ); } break; diff --git a/vcl/source/graphic/GraphicObject2.cxx b/vcl/source/graphic/GraphicObject2.cxx index 89af907e2b9d..f61cabf9c5ed 100644 --- a/vcl/source/graphic/GraphicObject2.cxx +++ b/vcl/source/graphic/GraphicObject2.cxx @@ -141,7 +141,7 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent // extract generated tile -> see comment on the first loop below BitmapEx aTileBitmap( rVDev.GetBitmap( aTileInfo.aTileTopLeft, aTileInfo.aTileSizePixel ) ); - xTmpGraphic.reset(new GraphicObject(aTileBitmap)); + xTmpGraphic.reset(new GraphicObject(std::move(aTileBitmap))); pTileGraphic = xTmpGraphic.get(); // fill stripes left over from upstream levels: diff --git a/vcl/source/outdev/gradient.cxx b/vcl/source/outdev/gradient.cxx index eb2fd4645323..fd8ee9e60a7d 100644 --- a/vcl/source/outdev/gradient.cxx +++ b/vcl/source/outdev/gradient.cxx @@ -195,7 +195,7 @@ void OutputDevice::DrawGradientToMetafile ( const tools::PolyPolygon& rPolyPoly, if ( rPolyPoly.IsRect() ) { - mpMetaFile->AddAction( new MetaGradientAction( aBoundRect, aGradient ) ); + mpMetaFile->AddAction( new MetaGradientAction( aBoundRect, std::move(aGradient) ) ); } else { diff --git a/vcl/source/outdev/polyline.cxx b/vcl/source/outdev/polyline.cxx index f699147c2edf..04b39c60415d 100644 --- a/vcl/source/outdev/polyline.cxx +++ b/vcl/source/outdev/polyline.cxx @@ -163,8 +163,8 @@ void OutputDevice::DrawPolyLine( const basegfx::B2DPolygon& rB2DPolygon, aLineInfo.SetLineJoin(eLineJoin); aLineInfo.SetLineCap(eLineCap); - const tools::Polygon aToolsPolygon( rB2DPolygon ); - mpMetaFile->AddAction( new MetaPolyLineAction( aToolsPolygon, aLineInfo ) ); + tools::Polygon aToolsPolygon( rB2DPolygon ); + mpMetaFile->AddAction( new MetaPolyLineAction( std::move(aToolsPolygon), std::move(aLineInfo) ) ); } // Do not paint empty PolyPolygons @@ -330,8 +330,8 @@ bool OutputDevice::DrawPolyLineDirect( aLineInfo.SetLineJoin(eLineJoin); aLineInfo.SetLineCap(eLineCap); // MiterMinimumAngle does not exist yet in LineInfo - const tools::Polygon aToolsPolygon( rB2DPolygon ); - mpMetaFile->AddAction( new MetaPolyLineAction( aToolsPolygon, aLineInfo ) ); + tools::Polygon aToolsPolygon( rB2DPolygon ); + mpMetaFile->AddAction( new MetaPolyLineAction( std::move(aToolsPolygon), std::move(aLineInfo) ) ); } return true; }
