diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-12-16 12:29:34 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-12-16 20:26:16 +0100 |
| commit | 8c3a651a3f939bbc346ced5547326fe110958cdb (patch) | |
| tree | 07090b5ae8dd9dcd75fe78533423f9946f48c615 /drawinglayer/source | |
| parent | 0da294bb8297f309eca9504de1b043571e2c4d31 (diff) | |
cid#1546456 COPY_INSTEAD_OF_MOVE
and
cid#1546450 COPY_INSTEAD_OF_MOVE
cid#1546430 COPY_INSTEAD_OF_MOVE
cid#1546401 COPY_INSTEAD_OF_MOVE
cid#1546313 COPY_INSTEAD_OF_MOVE
cid#1546302 COPY_INSTEAD_OF_MOVE
cid#1546301 COPY_INSTEAD_OF_MOVE
cid#1546299 COPY_INSTEAD_OF_MOVE
cid#1546280 COPY_INSTEAD_OF_MOVE
cid#1546233 COPY_INSTEAD_OF_MOVE
cid#1546217 COPY_INSTEAD_OF_MOVE
cid#1546215 COPY_INSTEAD_OF_MOVE
cid#1546204 COPY_INSTEAD_OF_MOVE
Change-Id: Iaab419509ad4a0bea9cae3665723af0e99c60ee4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160849
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'drawinglayer/source')
| -rw-r--r-- | drawinglayer/source/primitive2d/polygonprimitive2d.cxx | 9 | ||||
| -rw-r--r-- | drawinglayer/source/primitive2d/textprimitive2d.cxx | 6 |
2 files changed, 6 insertions, 9 deletions
diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx index fb6a8ed369d2..435408cd5846 100644 --- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx @@ -142,16 +142,15 @@ void SingleLinePrimitive2D::get2DDecomposition( if (getStart() == getEnd()) { // single point - std::vector<basegfx::B2DPoint> aPoints = { getStart() }; - Primitive2DContainer aSequence - = { new PointArrayPrimitive2D(std::move(aPoints), getBColor()) }; + Primitive2DContainer aSequence = { new PointArrayPrimitive2D( + std::vector<basegfx::B2DPoint>{ getStart() }, getBColor()) }; rVisitor.visit(aSequence); } else { // line - basegfx::B2DPolygon aPolygon{ getStart(), getEnd() }; - Primitive2DContainer aSequence = { new PolygonHairlinePrimitive2D(aPolygon, getBColor()) }; + Primitive2DContainer aSequence = { new PolygonHairlinePrimitive2D( + basegfx::B2DPolygon{ getStart(), getEnd() }, getBColor()) }; rVisitor.visit(aSequence); } } diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx index f60f73b21045..ee6144df7dd2 100644 --- a/drawinglayer/source/primitive2d/textprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx @@ -191,10 +191,8 @@ void TextSimplePortionPrimitive2D::create2DDecomposition( aPolygonTransform.decompose(aScale, aTranslate, fRotate, fShearX); // create outline text effect with current content and replace - Primitive2DReference aNewTextEffect(new TextEffectPrimitive2D( - std::move(aRetval), aTranslate, fRotate, TextEffectStyle2D::Outline)); - - aRetval = Primitive2DContainer{ aNewTextEffect }; + aRetval = Primitive2DContainer{ Primitive2DReference(new TextEffectPrimitive2D( + std::move(aRetval), aTranslate, fRotate, TextEffectStyle2D::Outline)) }; } rContainer.append(std::move(aRetval)); |