drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx | 2 - svgio/source/svgreader/svgclippathnode.cxx | 2 - svx/source/sdr/contact/viewobjectcontact.cxx | 4 +- svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx | 4 +- svx/source/svdraw/svddrgmt.cxx | 4 +- sw/source/core/doc/notxtfrm.cxx | 22 ++++++--------- sw/source/core/draw/dcontact.cxx | 2 - 7 files changed, 19 insertions(+), 21 deletions(-)
New commits: commit 4ae68d59dcb27532d1b0643a37e65f679f0af0f8 Author: Noel Grandin <[email protected]> AuthorDate: Wed Feb 7 08:56:48 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Feb 7 10:33:20 2024 +0100 can std::move these Primitive2DContainer values Change-Id: Id40fdc3915107575eec734de704a52c5fb3715f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163069 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx index 633a525f3628..67919e3c5a2a 100644 --- a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx @@ -211,7 +211,7 @@ namespace drawinglayer::primitive2d } if (aRetval.is()) - rContainer.push_back(aRetval); + rContainer.push_back(std::move(aRetval)); } WallpaperBitmapPrimitive2D::WallpaperBitmapPrimitive2D( diff --git a/svgio/source/svgreader/svgclippathnode.cxx b/svgio/source/svgreader/svgclippathnode.cxx index af7ea5cacb05..f09fce5daf4a 100644 --- a/svgio/source/svgreader/svgclippathnode.cxx +++ b/svgio/source/svgreader/svgclippathnode.cxx @@ -118,7 +118,7 @@ namespace svgio::svgreader else { // append to current target - rTarget.append(aNewTarget); + rTarget.append(std::move(aNewTarget)); } } diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx index c962e77eb33c..dfc31cc372e0 100644 --- a/svx/source/sdr/contact/viewobjectcontact.cxx +++ b/svx/source/sdr/contact/viewobjectcontact.cxx @@ -317,11 +317,11 @@ void ViewObjectContact::createPrimitive2DSequence(const DisplayInfo& rDisplayInf // handle GluePoint if(!GetObjectContact().isOutputToPrinter() && GetObjectContact().AreGluePointsVisible()) { - const drawinglayer::primitive2d::Primitive2DContainer xGlue(GetViewContact().createGluePointPrimitive2DSequence()); + drawinglayer::primitive2d::Primitive2DContainer xGlue(GetViewContact().createGluePointPrimitive2DSequence()); if(!xGlue.empty()) { - xRetval.append(xGlue); + xRetval.append(std::move(xGlue)); } } diff --git a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx index ac7ad90f13bf..9b5adea9f15c 100644 --- a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx @@ -87,11 +87,11 @@ namespace sdr::contact // handle GluePoint if(!GetObjectContact().isOutputToPrinter() && GetObjectContact().AreGluePointsVisible()) { - const drawinglayer::primitive2d::Primitive2DContainer xGlue(GetViewContact().createGluePointPrimitive2DSequence()); + drawinglayer::primitive2d::Primitive2DContainer xGlue(GetViewContact().createGluePointPrimitive2DSequence()); if(!xGlue.empty()) { - xRetval.append(xGlue); + xRetval.append(std::move(xGlue)); } } diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 1a8609c6b865..101e4369d40e 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -770,12 +770,12 @@ void SdrDragMethod::CreateOverlayGeometry( if(DoAddConnectorOverlays()) { - const drawinglayer::primitive2d::Primitive2DContainer aConnectorOverlays(AddConnectorOverlays()); + drawinglayer::primitive2d::Primitive2DContainer aConnectorOverlays(AddConnectorOverlays()); if(!aConnectorOverlays.empty()) { // add connector overlays to transparent part - aResultTransparent.append(aConnectorOverlays); + aResultTransparent.append(std::move(aConnectorOverlays)); } } diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 362054bd592a..0255ff8b358c 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -928,11 +928,11 @@ void paintGraphicUsingPrimitivesHelper( // -> the primitive handles all crop and mirror stuff // -> the primitive renderer will create the needed pdf export data // -> if bitmap content, it will be cached system-dependent - drawinglayer::primitive2d::Primitive2DContainer aContent(1); - aContent[0] = new drawinglayer::primitive2d::GraphicPrimitive2D( - rGraphicTransform, - rGrfObj, - rGraphicAttr); + drawinglayer::primitive2d::Primitive2DContainer aContent { + new drawinglayer::primitive2d::GraphicPrimitive2D( + rGraphicTransform, + rGrfObj, + rGraphicAttr) }; // MM02 use primitive-based version for visualization paintGraphicUsingPrimitivesHelper( @@ -969,11 +969,10 @@ void paintGraphicUsingPrimitivesHelper( if(0 != aClip.count()) { - rContent.resize(1); - rContent[0] = + rContent = drawinglayer::primitive2d::Primitive2DContainer { new drawinglayer::primitive2d::MaskPrimitive2D( std::move(aClip), - drawinglayer::primitive2d::Primitive2DContainer(rContent)); + std::move(rContent)) }; } } @@ -981,13 +980,12 @@ void paintGraphicUsingPrimitivesHelper( { // Embed to ObjectInfoPrimitive2D when we have Name/Title/Description // information available - rContent.resize(1); - rContent[0] = + rContent = drawinglayer::primitive2d::Primitive2DContainer { new drawinglayer::primitive2d::ObjectInfoPrimitive2D( - drawinglayer::primitive2d::Primitive2DContainer(rContent), + std::move(rContent), rName, rTitle, - rDescription); + rDescription) }; } basegfx::B2DRange aTargetRange(0.0, 0.0, 1.0, 1.0); diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 49f2b7396e96..fd81d18d427e 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -2211,7 +2211,7 @@ namespace sdr::contact if(!aNewSequence.empty()) { - rxTarget.append(aNewSequence); + rxTarget.append(std::move(aNewSequence)); } } }
