diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2022-05-29 21:20:02 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-05-30 10:07:47 +0200 |
commit | 4fc1f038a687e1db4319bb08367fbdbad96fcbdd (patch) | |
tree | 276457335153ced7aaf54d9fe888d9c280008312 /drawinglayer | |
parent | 0ce1e13d2d530c891cad0d8b456adfa2c0d55df6 (diff) |
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 <noel.grandin@collabora.co.uk>
Diffstat (limited to 'drawinglayer')
9 files changed, 9 insertions, 9 deletions
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( |