drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D.cxx | 2 +- drawinglayer/source/primitive2d/graphicprimitive2d.cxx | 2 +- drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx | 2 +- drawinglayer/source/primitive2d/mediaprimitive2d.cxx | 2 +- drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 2 +- drawinglayer/source/primitive2d/sceneprimitive2d.cxx | 2 +- drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx | 2 +- drawinglayer/source/primitive2d/textprimitive2d.cxx | 2 +- drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx | 2 +- svx/source/sdr/overlay/overlaytools.cxx | 4 ++-- svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx | 2 +- svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx | 2 +- svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx | 2 +- svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx | 4 ++-- svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx | 2 +- svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx | 2 +- svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx | 2 +- svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx | 2 +- svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx | 2 +- 19 files changed, 21 insertions(+), 21 deletions(-)
New commits: commit 4fc1f038a687e1db4319bb08367fbdbad96fcbdd Author: Noel Grandin <[email protected]> AuthorDate: Sun May 29 21:20:02 2022 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon May 30 10:07:47 2022 +0200 use more Primitive2DContainer::append and more std::move Change-Id: Ide40a08f70cbb30a4f18c496d986feb78e5dfa1c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135103 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D.cxx b/drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D.cxx index 3ad4840bd5bd..d5ed17980016 100644 --- a/drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D.cxx +++ b/drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D.cxx @@ -66,7 +66,7 @@ void PolyPolygonSelectionPrimitive2D::create2DDecomposition( aRetval = Primitive2DContainer{ aTrans }; } - rContainer.insert(rContainer.end(), aRetval.begin(), aRetval.end()); + rContainer.append(std::move(aRetval)); } PolyPolygonSelectionPrimitive2D::PolyPolygonSelectionPrimitive2D( diff --git a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx index 0d57512f2f86..4cd7a4963f9d 100644 --- a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx @@ -167,7 +167,7 @@ void GraphicPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, aRetval = Primitive2DContainer{ xPrimitive }; } - rContainer.insert(rContainer.end(), aRetval.begin(), aRetval.end()); + rContainer.append(std::move(aRetval)); } GraphicPrimitive2D::GraphicPrimitive2D(const basegfx::B2DHomMatrix& rTransform, diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx index 7f27fa782ff8..c79af14dd673 100644 --- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx +++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx @@ -572,7 +572,7 @@ namespace drawinglayer::primitive2d } } - rContainer.insert(rContainer.end(), aRetval.begin(), aRetval.end()); + rContainer.append(std::move(aRetval)); } Primitive2DContainer create2DColorModifierEmbeddingsAsNeeded( diff --git a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx index cd36291428ea..e097d2d98ae7 100644 --- a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx @@ -87,7 +87,7 @@ namespace drawinglayer::primitive2d } } - rContainer.insert(rContainer.end(), xRetval.begin(), xRetval.end()); + rContainer.append(std::move(xRetval)); } MediaPrimitive2D::MediaPrimitive2D( diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index eddb02375d0a..608be0bbc6b1 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -82,7 +82,7 @@ namespace drawinglayer::primitive2d xRetval = Primitive2DContainer { aEmbeddedTransform }; } - rContainer.insert(rContainer.end(), xRetval.begin(), xRetval.end()); + rContainer.append(std::move(xRetval)); } MetafilePrimitive2D::MetafilePrimitive2D( diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx index d371cdedcd5c..0bec2258d69f 100644 --- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx @@ -223,7 +223,7 @@ namespace drawinglayer::primitive2d if(aViewRange.isEmpty() || aShadow2DRange.overlaps(aViewRange)) { // add extracted 2d shadows (before 3d scene creations itself) - rContainer.insert(rContainer.end(), maShadowPrimitives.begin(), maShadowPrimitives.end()); + rContainer.append(maShadowPrimitives); } } diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx index 25c5fd7b4ffa..f92529fe50d7 100644 --- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx @@ -298,7 +298,7 @@ namespace drawinglayer::primitive2d } } - rContainer.insert(rContainer.end(), aRetval.begin(), aRetval.end()); + rContainer.append(std::move(aRetval)); } TextDecoratedPortionPrimitive2D::TextDecoratedPortionPrimitive2D( diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx index f27ad45ddbff..00135a3aa623 100644 --- a/drawinglayer/source/primitive2d/textprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx @@ -196,7 +196,7 @@ void TextSimplePortionPrimitive2D::create2DDecomposition( aRetval = Primitive2DContainer{ aNewTextEffect }; } - rContainer.insert(rContainer.end(), aRetval.begin(), aRetval.end()); + rContainer.append(std::move(aRetval)); } TextSimplePortionPrimitive2D::TextSimplePortionPrimitive2D( diff --git a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx index 8946b285fe43..ecd66b7a840e 100644 --- a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx @@ -217,7 +217,7 @@ namespace drawinglayer::primitive2d Primitive2DContainer(xRetval))); } - rContainer.insert(rContainer.end(), xRetval.begin(), xRetval.end()); + rContainer.append(std::move(xRetval)); } TextGeometryStrikeoutPrimitive2D::TextGeometryStrikeoutPrimitive2D( diff --git a/svx/source/sdr/overlay/overlaytools.cxx b/svx/source/sdr/overlay/overlaytools.cxx index bffddfe4343a..ceeb32b3f39a 100644 --- a/svx/source/sdr/overlay/overlaytools.cxx +++ b/svx/source/sdr/overlay/overlaytools.cxx @@ -99,7 +99,7 @@ void OverlayStaticRectanglePrimitive::create2DDecomposition(Primitive2DContainer } } - rContainer.insert(rContainer.end(), aPrimitive2DSequence.begin(), aPrimitive2DSequence.end()); + rContainer.append(std::move(aPrimitive2DSequence)); } bool OverlayStaticRectanglePrimitive::operator==(const BasePrimitive2D& rPrimitive) const @@ -377,7 +377,7 @@ sal_uInt32 OverlayStaticRectanglePrimitive::getPrimitive2DID() const } } - rContainer.insert(rContainer.end(), aRetval.begin(), aRetval.end()); + rContainer.append(std::move(aRetval)); } bool OverlayRectanglePrimitive::operator==( const BasePrimitive2D& rPrimitive ) const diff --git a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx index a371a75f6106..50787ed399f1 100644 --- a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx @@ -115,7 +115,7 @@ namespace drawinglayer::primitive2d aRetval = createEmbeddedShadowPrimitive(std::move(aRetval), getSdrLFSTAttribute().getShadow()); } - rContainer.insert(rContainer.end(), aRetval.begin(), aRetval.end()); + rContainer.append(std::move(aRetval)); } SdrCaptionPrimitive2D::SdrCaptionPrimitive2D( diff --git a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx index 21d48e9b1eab..aa663fb7aa7f 100644 --- a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx @@ -72,7 +72,7 @@ namespace drawinglayer::primitive2d getSdrLSTAttribute().getShadow()); } - rContainer.insert(rContainer.end(), aRetval.begin(), aRetval.end()); + rContainer.append(std::move(aRetval)); } SdrConnectorPrimitive2D::SdrConnectorPrimitive2D( diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx index 040ed2ccf482..dddb8aa3069a 100644 --- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx @@ -84,7 +84,7 @@ namespace drawinglayer::primitive2d } } - rContainer.insert(rContainer.end(), aRetval.begin(), aRetval.end()); + rContainer.append(std::move(aRetval)); } SdrCustomShapePrimitive2D::SdrCustomShapePrimitive2D( diff --git a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx index 809aec8569d8..89c348beb01b 100644 --- a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx @@ -105,7 +105,7 @@ namespace drawinglayer::primitive2d getSdrLFSTAttribute().getShadow()); } - rContainer.insert(rContainer.end(), aRetval.begin(), aRetval.end()); + rContainer.append(std::move(aRetval)); } SdrEllipsePrimitive2D::SdrEllipsePrimitive2D( @@ -219,7 +219,7 @@ namespace drawinglayer::primitive2d getSdrLFSTAttribute().getShadow()); } - rContainer.insert(rContainer.end(), aRetval.begin(), aRetval.end()); + rContainer.append(std::move(aRetval)); } SdrEllipseSegmentPrimitive2D::SdrEllipseSegmentPrimitive2D( diff --git a/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx index 448640591ce6..0610f43b06ba 100644 --- a/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx @@ -843,7 +843,7 @@ namespace drawinglayer::primitive2d } } - rContainer.insert(rContainer.end(), aRetval.begin(), aRetval.end()); + rContainer.append(std::move(aRetval)); } SdrFrameBorderPrimitive2D::SdrFrameBorderPrimitive2D( diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx index 1fc860920638..f5ac21cfc9c8 100644 --- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx @@ -120,7 +120,7 @@ void SdrGrafPrimitive2D::create2DDecomposition( getSdrLFSTAttribute().getShadow(), getTransform()); } - rContainer.insert(rContainer.end(), aRetval.begin(), aRetval.end()); + rContainer.append(std::move(aRetval)); } SdrGrafPrimitive2D::SdrGrafPrimitive2D( diff --git a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx index 25fbb0404c53..aada2aee0774 100644 --- a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx @@ -430,7 +430,7 @@ namespace drawinglayer::primitive2d getSdrLSTAttribute().getShadow()); } - rContainer.insert(rContainer.end(), aRetval.begin(), aRetval.end()); + rContainer.append(std::move(aRetval)); } SdrMeasurePrimitive2D::SdrMeasurePrimitive2D( diff --git a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx index 5df6d9c09e5d..829525e2bc36 100644 --- a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx @@ -115,7 +115,7 @@ namespace drawinglayer::primitive2d getSdrLFSTAttribute().getShadow()); } - rContainer.insert(rContainer.end(), aRetval.begin(), aRetval.end()); + rContainer.append(std::move(aRetval)); } SdrPathPrimitive2D::SdrPathPrimitive2D( diff --git a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx index a51e231beabb..f289ea6bcac2 100644 --- a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx @@ -108,7 +108,7 @@ namespace drawinglayer::primitive2d getSdrLFSTAttribute().getShadow()); } - rContainer.insert(rContainer.end(), aRetval.begin(), aRetval.end()); + rContainer.append(std::move(aRetval)); } SdrRectanglePrimitive2D::SdrRectanglePrimitive2D(
