cid#1545970 COPY_INSTEAD_OF_MOVE

and

cid#1545957 COPY_INSTEAD_OF_MOVE
cid#1545944 COPY_INSTEAD_OF_MOVE
cid#1545939 COPY_INSTEAD_OF_MOVE
cid#1545931 COPY_INSTEAD_OF_MOVE
cid#1545926 COPY_INSTEAD_OF_MOVE
cid#1545909 COPY_INSTEAD_OF_MOVE
cid#1545899 COPY_INSTEAD_OF_MOVE
cid#1545896 COPY_INSTEAD_OF_MOVE
cid#1545894 COPY_INSTEAD_OF_MOVE
cid#1545858 COPY_INSTEAD_OF_MOVE
cid#1545823 COPY_INSTEAD_OF_MOVE
cid#1545820 COPY_INSTEAD_OF_MOVE
cid#1545819 COPY_INSTEAD_OF_MOVE
cid#1545772 COPY_INSTEAD_OF_MOVE
cid#1545749 COPY_INSTEAD_OF_MOVE
cid#1545743 COPY_INSTEAD_OF_MOVE
cid#1545739 COPY_INSTEAD_OF_MOVE
cid#1545635 COPY_INSTEAD_OF_MOVE
cid#1545603 COPY_INSTEAD_OF_MOVE
cid#1545602 COPY_INSTEAD_OF_MOVE
cid#1545592 COPY_INSTEAD_OF_MOVE
cid#1545544 COPY_INSTEAD_OF_MOVE
cid#1545532 COPY_INSTEAD_OF_MOVE
cid#1545520 COPY_INSTEAD_OF_MOVE
cid#1545512 COPY_INSTEAD_OF_MOVE
cid#1545490 COPY_INSTEAD_OF_MOVE
cid#1545483 COPY_INSTEAD_OF_MOVE
cid#1545467 COPY_INSTEAD_OF_MOVE
cid#1545461 COPY_INSTEAD_OF_MOVE
cid#1545458 COPY_INSTEAD_OF_MOVE
cid#1545428 COPY_INSTEAD_OF_MOVE
cid#1545394 COPY_INSTEAD_OF_MOVE
cid#1545385 COPY_INSTEAD_OF_MOVE
cid#1545383 COPY_INSTEAD_OF_MOVE
cid#1545366 COPY_INSTEAD_OF_MOVE
cid#1545357 COPY_INSTEAD_OF_MOVE

Change-Id: I76224326977b4067b94ca3176cad1ca6de17930a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160847
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>

5 files changed, 26 insertions, 25 deletions

diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index eac781290624..f248b7a60874 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -165,8 +165,9 @@ void Impl3DMirrorConstructOverlay::SetMirrorAxis(Point aMirrorAxisA, Point aMirr
                     if(!aMatrixTransform.isIdentity())
                     {
                         // embed in transformation group
-                        drawinglayer::primitive2d::Primitive2DReference aTransformPrimitive2D(new drawinglayer::primitive2d::TransformPrimitive2D(aMatrixTransform, std::move(aContent)));
-                        aContent = drawinglayer::primitive2d::Primitive2DContainer { aTransformPrimitive2D };
+                        aContent = drawinglayer::primitive2d::Primitive2DContainer {
+                            drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::TransformPrimitive2D(aMatrixTransform, std::move(aContent)))
+                        };
                     }
 
                     // if we have full overlay from selected objects, embed with 50% transparence, the
diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx
index 5d01880d2ef4..09593f129f4b 100644
--- a/svx/source/sdr/contact/viewobjectcontact.cxx
+++ b/svx/source/sdr/contact/viewobjectcontact.cxx
@@ -333,12 +333,12 @@ void ViewObjectContact::createPrimitive2DSequence(const DisplayInfo& rDisplayInf
                 std::make_shared<basegfx::BColorModifier_interpolate>(
                     aRGBWhite,
                     0.5);
-            drawinglayer::primitive2d::Primitive2DReference xReference(
-                new drawinglayer::primitive2d::ModifiedColorPrimitive2D(
-                    std::move(xRetval),
-                    aBColorModifier));
-
-            xRetval = drawinglayer::primitive2d::Primitive2DContainer { xReference };
+            xRetval = drawinglayer::primitive2d::Primitive2DContainer{
+                drawinglayer::primitive2d::Primitive2DReference(
+                    new drawinglayer::primitive2d::ModifiedColorPrimitive2D(
+                        std::move(xRetval),
+                        aBColorModifier))
+            };
         }
     }
 
diff --git a/svx/source/sdr/overlay/overlayselection.cxx b/svx/source/sdr/overlay/overlayselection.cxx
index 8319a259bc4b..6eb3d912fd42 100644
--- a/svx/source/sdr/overlay/overlayselection.cxx
+++ b/svx/source/sdr/overlay/overlayselection.cxx
@@ -118,10 +118,11 @@ namespace sdr::overlay
                 if(bInvert)
                 {
                     // embed all in invert primitive
-                    drawinglayer::primitive2d::Primitive2DReference aInvert(
-                        new drawinglayer::primitive2d::InvertPrimitive2D(
-                            std::move(aRetval)));
-                    aRetval = drawinglayer::primitive2d::Primitive2DContainer { aInvert };
+                    aRetval = drawinglayer::primitive2d::Primitive2DContainer {
+                        drawinglayer::primitive2d::Primitive2DReference(
+                            new drawinglayer::primitive2d::InvertPrimitive2D(
+                                std::move(aRetval)))
+                    };
                 }
                 else if(OverlayType::Transparent == maLastOverlayType)
                 {
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 31271af9aef4..1a8609c6b865 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -196,15 +196,14 @@ SdrDragEntryPrimitive2DSequence::~SdrDragEntryPrimitive2DSequence()
 
 drawinglayer::primitive2d::Primitive2DContainer SdrDragEntryPrimitive2DSequence::createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod)
 {
-    drawinglayer::primitive2d::Primitive2DReference aTransformPrimitive2D(
-        new drawinglayer::primitive2d::TransformPrimitive2D(
-            rDragMethod.getCurrentTransformation(),
-            drawinglayer::primitive2d::Primitive2DContainer(maPrimitive2DSequence)));
-
-    return drawinglayer::primitive2d::Primitive2DContainer { aTransformPrimitive2D };
+    return drawinglayer::primitive2d::Primitive2DContainer {
+        drawinglayer::primitive2d::Primitive2DReference(
+            new drawinglayer::primitive2d::TransformPrimitive2D(
+                rDragMethod.getCurrentTransformation(),
+                drawinglayer::primitive2d::Primitive2DContainer(maPrimitive2DSequence)))
+    };
 }
 
-
 SdrDragEntryPointGlueDrag::SdrDragEntryPointGlueDrag(std::vector< basegfx::B2DPoint >&& rPositions, bool bIsPointDrag)
 :   maPositions(std::move(rPositions)),
     mbIsPointDrag(bIsPointDrag)
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index b6ef17b86616..c5aeded2a21f 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -679,12 +679,12 @@ uno::Any SvxShape::GetBitmap( bool bMetaFile /* = false */ ) const
                             MapMode(MapUnit::Map100thMM)));
 
                     // Embed primitives to get them in 100th mm
-                    drawinglayer::primitive2d::Primitive2DReference xEmbedRef(
-                        new drawinglayer::primitive2d::TransformPrimitive2D(
-                            aMapTransform,
-                            std::move(xPrimitives)));
-
-                    xPrimitives = drawinglayer::primitive2d::Primitive2DContainer { xEmbedRef };
+                    xPrimitives = drawinglayer::primitive2d::Primitive2DContainer {
+                        drawinglayer::primitive2d::Primitive2DReference(
+                            new drawinglayer::primitive2d::TransformPrimitive2D(
+                                aMapTransform,
+                                std::move(xPrimitives)))
+                    };
 
                     // Update basegfx::B2DRange aRange, too. Here we have the
                     // choice of transforming the existing value or get newly by