tdf#144052 reduce Primitive2D copying

when creating charts, by using a
Primitive2DContainer&&
parameter in the GroupPrimitive2D constructor, which forces the call
sites to pass a temporary, and at most call sites, we can std::move in
an existing local variable.

Change-Id: I531970918800c6832ab606b5a4ff5fd2d47ccf5b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121844
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

36 files changed, 157 insertions, 145 deletions

diff --git a/drawinglayer/source/primitive2d/PolyPolygonGradientPrimitive2D.cxx b/drawinglayer/source/primitive2d/PolyPolygonGradientPrimitive2D.cxx
index 115acc0adde6..3e88b6c0ddb0 100644
--- a/drawinglayer/source/primitive2d/PolyPolygonGradientPrimitive2D.cxx
+++ b/drawinglayer/source/primitive2d/PolyPolygonGradientPrimitive2D.cxx
@@ -37,10 +37,10 @@ void PolyPolygonGradientPrimitive2D::create2DDecomposition(
         const basegfx::B2DRange aPolyPolygonRange(getB2DPolyPolygon().getB2DRange());
         rtl::Reference<FillGradientPrimitive2D> pNewGradient = new FillGradientPrimitive2D(
             aPolyPolygonRange, getDefinitionRange(), getFillGradient());
-        const Primitive2DContainer aSubSequence{ pNewGradient };
+        Primitive2DContainer aSubSequence{ pNewGradient };
 
         // create mask primitive
-        rContainer.push_back(new MaskPrimitive2D(getB2DPolyPolygon(), aSubSequence));
+        rContainer.push_back(new MaskPrimitive2D(getB2DPolyPolygon(), std::move(aSubSequence)));
     }
 }
 
diff --git a/drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D.cxx b/drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D.cxx
index a868ce5b71c1..7fc0502c8f43 100644
--- a/drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D.cxx
+++ b/drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D.cxx
@@ -37,10 +37,10 @@ void PolyPolygonHatchPrimitive2D::create2DDecomposition(
         const basegfx::B2DRange aPolyPolygonRange(getB2DPolyPolygon().getB2DRange());
         rtl::Reference<FillHatchPrimitive2D> pNewHatch = new FillHatchPrimitive2D(
             aPolyPolygonRange, getDefinitionRange(), getBackgroundColor(), getFillHatch());
-        const Primitive2DContainer aSubSequence{ pNewHatch };
+        Primitive2DContainer aSubSequence{ pNewHatch };
 
         // create mask primitive
-        rContainer.push_back(new MaskPrimitive2D(getB2DPolyPolygon(), aSubSequence));
+        rContainer.push_back(new MaskPrimitive2D(getB2DPolyPolygon(), std::move(aSubSequence)));
     }
 }
 
diff --git a/drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D.cxx b/drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D.cxx
index 821cc2da9772..3ad4840bd5bd 100644
--- a/drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D.cxx
+++ b/drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D.cxx
@@ -61,7 +61,7 @@ void PolyPolygonSelectionPrimitive2D::create2DDecomposition(
     if (!aRetval.empty() && getTransparence() > 0.0)
     {
         const Primitive2DReference aTrans(
-            new UnifiedTransparencePrimitive2D(aRetval, getTransparence()));
+            new UnifiedTransparencePrimitive2D(std::move(aRetval), getTransparence()));
 
         aRetval = Primitive2DContainer{ aTrans };
     }
diff --git a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
index 2b5c3c4c7c9f..adb66dddb36c 100644
--- a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
@@ -37,9 +37,9 @@ namespace drawinglayer::primitive2d
 
         AnimatedSwitchPrimitive2D::AnimatedSwitchPrimitive2D(
             const animation::AnimationEntry& rAnimationEntry,
-            const Primitive2DContainer& rChildren,
+            Primitive2DContainer&& aChildren,
             bool bIsTextAnimation)
-        :   GroupPrimitive2D(rChildren),
+        :   GroupPrimitive2D(std::move(aChildren)),
             mbIsTextAnimation(bIsTextAnimation)
         {
             // clone given animation description
@@ -93,8 +93,8 @@ namespace drawinglayer::primitive2d
 {
         AnimatedBlinkPrimitive2D::AnimatedBlinkPrimitive2D(
             const animation::AnimationEntry& rAnimationEntry,
-            const Primitive2DContainer& rChildren)
-        :   AnimatedSwitchPrimitive2D(rAnimationEntry, rChildren, true/*bIsTextAnimation*/)
+            Primitive2DContainer&& aChildren)
+        :   AnimatedSwitchPrimitive2D(rAnimationEntry, std::move(aChildren), true/*bIsTextAnimation*/)
         {
         }
 
@@ -125,8 +125,8 @@ namespace drawinglayer::primitive2d
         AnimatedInterpolatePrimitive2D::AnimatedInterpolatePrimitive2D(
             const std::vector< basegfx::B2DHomMatrix >& rmMatrixStack,
             const animation::AnimationEntry& rAnimationEntry,
-            const Primitive2DContainer& rChildren)
-        :   AnimatedSwitchPrimitive2D(rAnimationEntry, rChildren, true/*bIsTextAnimation*/)
+            Primitive2DContainer&& aChildren)
+        :   AnimatedSwitchPrimitive2D(rAnimationEntry, std::move(aChildren), true/*bIsTextAnimation*/)
         {
             // copy matrices to locally pre-decomposed matrix stack
             const sal_uInt32 nCount(rmMatrixStack.size());
@@ -184,7 +184,7 @@ namespace drawinglayer::primitive2d
                 }
 
                 // create new transform primitive reference, return new sequence
-                const Primitive2DReference xRef(new TransformPrimitive2D(aTargetTransform, getChildren()));
+                Primitive2DReference xRef(new TransformPrimitive2D(aTargetTransform, Primitive2DContainer(getChildren())));
                 rVisitor.append(xRef);
             }
             else
diff --git a/drawinglayer/source/primitive2d/cropprimitive2d.cxx b/drawinglayer/source/primitive2d/cropprimitive2d.cxx
index ff460a59fd11..06a7e2726f04 100644
--- a/drawinglayer/source/primitive2d/cropprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/cropprimitive2d.cxx
@@ -32,13 +32,13 @@ using namespace com::sun::star;
 namespace drawinglayer::primitive2d
 {
         CropPrimitive2D::CropPrimitive2D(
-            const Primitive2DContainer& rChildren,
+            Primitive2DContainer&& aChildren,
             const basegfx::B2DHomMatrix& rTransformation,
             double fCropLeft,
             double fCropTop,
             double fCropRight,
             double fCropBottom)
-        :   GroupPrimitive2D(rChildren),
+        :   GroupPrimitive2D(std::move(aChildren)),
             maTransformation(rTransformation),
             mfCropLeft(fCropLeft),
             mfCropTop(fCropTop),
@@ -120,7 +120,7 @@ namespace drawinglayer::primitive2d
             const Primitive2DReference xTransformPrimitive(
                 new TransformPrimitive2D(
                     aNewTransform,
-                    getChildren()));
+                    Primitive2DContainer(getChildren())));
 
             if(aUnitRange.isInside(aNewRange))
             {
diff --git a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
index 36ba083dfdc4..5c562471a786 100644
--- a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
@@ -251,7 +251,7 @@ namespace drawinglayer::primitive2d
             rContainer.push_back(
                 new TransformPrimitive2D(
                     getTransform(),
-                    xRetval));
+                    std::move(xRetval)));
         }
 
         DiscreteShadowPrimitive2D::DiscreteShadowPrimitive2D(
diff --git a/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx
index b710657f404d..958d3bf17960 100644
--- a/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx
@@ -73,7 +73,7 @@ namespace drawinglayer::primitive2d
                 {
                     rContainer.push_back(new TransformPrimitive2D(
                         getTransformation() * aMatrices[a],
-                        xSeq));
+                        std::move(xSeq)));
                 }
             }
             else
diff --git a/drawinglayer/source/primitive2d/glowprimitive2d.cxx b/drawinglayer/source/primitive2d/glowprimitive2d.cxx
index e6adcb4b66d8..6fe14c2222c1 100644
--- a/drawinglayer/source/primitive2d/glowprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/glowprimitive2d.cxx
@@ -25,8 +25,8 @@ using namespace com::sun::star;
 namespace drawinglayer::primitive2d
 {
 GlowPrimitive2D::GlowPrimitive2D(const Color& rGlowColor, double fRadius,
-                                 const Primitive2DContainer& rChildren)
-    : GroupPrimitive2D(rChildren)
+                                 Primitive2DContainer&& rChildren)
+    : GroupPrimitive2D(std::move(rChildren))
     , maGlowColor(rGlowColor)
     , mfGlowRadius(fRadius)
 {
diff --git a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
index 4a1121366092..ac1ba3d5657e 100644
--- a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
@@ -138,8 +138,8 @@ void GraphicPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer,
 
         if (!basegfx::fTools::equalZero(fTransparency))
         {
-            const Primitive2DReference aUnifiedTransparence(
-                new UnifiedTransparencePrimitive2D(aRetval, fTransparency));
+            Primitive2DReference aUnifiedTransparence(
+                new UnifiedTransparencePrimitive2D(std::move(aRetval), fTransparency));
 
             aRetval = Primitive2DContainer{ aUnifiedTransparence };
         }
@@ -157,11 +157,12 @@ void GraphicPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer,
             getGraphicAttr().GetBottomCrop()));
 
         // embed content in cropPrimitive
-        Primitive2DReference xPrimitive(new CropPrimitive2D(
-            aRetval, aTransform, getGraphicAttr().GetLeftCrop() * aCropScaleFactor.getX(),
-            getGraphicAttr().GetTopCrop() * aCropScaleFactor.getY(),
-            getGraphicAttr().GetRightCrop() * aCropScaleFactor.getX(),
-            getGraphicAttr().GetBottomCrop() * aCropScaleFactor.getY()));
+        Primitive2DReference xPrimitive(
+            new CropPrimitive2D(std::move(aRetval), aTransform,
+                                getGraphicAttr().GetLeftCrop() * aCropScaleFactor.getX(),
+                                getGraphicAttr().GetTopCrop() * aCropScaleFactor.getY(),
+                                getGraphicAttr().GetRightCrop() * aCropScaleFactor.getX(),
+                                getGraphicAttr().GetBottomCrop() * aCropScaleFactor.getY()));
 
         aRetval = Primitive2DContainer{ xPrimitive };
     }
diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index 3896108a660c..37539685a8cd 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -559,8 +559,8 @@ namespace drawinglayer::primitive2d
 
                         Primitive2DReference mask = new MaskPrimitive2D(
                             basegfx::B2DPolyPolygon(aMaskPolygon),
-                            aRetval);
-                        aRetval[0] = mask;
+                            std::move(aRetval));
+                        aRetval = Primitive2DContainer { mask };
                     }
                     break;
                 }
@@ -618,7 +618,7 @@ namespace drawinglayer::primitive2d
                     // convert to grey
                     const Primitive2DReference aPrimitiveGrey(
                         new ModifiedColorPrimitive2D(
-                            aRetval,
+                            std::move(aRetval),
                             std::make_shared<basegfx::BColorModifier_gray>()));
 
                     aRetval = Primitive2DContainer { aPrimitiveGrey };
@@ -629,7 +629,7 @@ namespace drawinglayer::primitive2d
                     // convert to mono (black/white with threshold 0.5)
                     const Primitive2DReference aPrimitiveBlackAndWhite(
                         new ModifiedColorPrimitive2D(
-                            aRetval,
+                            std::move(aRetval),
                             std::make_shared<basegfx::BColorModifier_black_and_white>(0.5)));
 
                     aRetval = Primitive2DContainer { aPrimitiveBlackAndWhite };
@@ -655,7 +655,7 @@ namespace drawinglayer::primitive2d
             {
                 const Primitive2DReference aPrimitiveRGBLuminannceContrast(
                     new ModifiedColorPrimitive2D(
-                        aRetval,
+                        std::move(aRetval),
                         std::make_shared<basegfx::BColorModifier_RGBLuminanceContrast>(
                                 fRed,
                                 fGreen,
@@ -671,7 +671,7 @@ namespace drawinglayer::primitive2d
             {
                 const Primitive2DReference aPrimitiveGamma(
                     new ModifiedColorPrimitive2D(
-                        aRetval,
+                        std::move(aRetval),
                         std::make_shared<basegfx::BColorModifier_gamma>(
                                 fGamma)));
 
@@ -683,7 +683,7 @@ namespace drawinglayer::primitive2d
             {
                 const Primitive2DReference aPrimitiveInvert(
                     new ModifiedColorPrimitive2D(
-                        aRetval,
+                        std::move(aRetval),
                         std::make_shared<basegfx::BColorModifier_invert>()));
 
                 aRetval = Primitive2DContainer { aPrimitiveInvert };
diff --git a/drawinglayer/source/primitive2d/groupprimitive2d.cxx b/drawinglayer/source/primitive2d/groupprimitive2d.cxx
index 95870c0de6de..8c16d848fdff 100644
--- a/drawinglayer/source/primitive2d/groupprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/groupprimitive2d.cxx
@@ -26,8 +26,8 @@ using namespace com::sun::star;
 
 namespace drawinglayer::primitive2d
 {
-        GroupPrimitive2D::GroupPrimitive2D( const Primitive2DContainer& rChildren )
-        :   maChildren(rChildren)
+        GroupPrimitive2D::GroupPrimitive2D( Primitive2DContainer&& aChildren )
+        :   maChildren(std::move(aChildren))
         {
         }
 
diff --git a/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx b/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx
index c1298cd9589b..c1a5442b25af 100644
--- a/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx
@@ -27,8 +27,8 @@ using namespace com::sun::star;
 namespace drawinglayer::primitive2d
 {
         HiddenGeometryPrimitive2D::HiddenGeometryPrimitive2D(
-            const Primitive2DContainer& rChildren)
-        :   GroupPrimitive2D(rChildren)
+            Primitive2DContainer&& aChildren)
+        :   GroupPrimitive2D(std::move(aChildren))
         {
         }
 
diff --git a/drawinglayer/source/primitive2d/invertprimitive2d.cxx b/drawinglayer/source/primitive2d/invertprimitive2d.cxx
index 0066b73d21dd..e2d01381e1a9 100644
--- a/drawinglayer/source/primitive2d/invertprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/invertprimitive2d.cxx
@@ -27,8 +27,8 @@ using namespace com::sun::star;
 namespace drawinglayer::primitive2d
 {
         InvertPrimitive2D::InvertPrimitive2D(
-            const Primitive2DContainer& rChildren)
-        :   GroupPrimitive2D(rChildren)
+            Primitive2DContainer&& aChildren)
+        :   GroupPrimitive2D(std::move(aChildren))
         {
         }
 
diff --git a/drawinglayer/source/primitive2d/maskprimitive2d.cxx b/drawinglayer/source/primitive2d/maskprimitive2d.cxx
index 8a71d97008b9..842085168827 100644
--- a/drawinglayer/source/primitive2d/maskprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/maskprimitive2d.cxx
@@ -28,8 +28,8 @@ namespace drawinglayer::primitive2d
 {
         MaskPrimitive2D::MaskPrimitive2D(
             const basegfx::B2DPolyPolygon& rMask,
-            const Primitive2DContainer& rChildren)
-        :   GroupPrimitive2D(rChildren),
+            Primitive2DContainer&& aChildren)
+        :   GroupPrimitive2D(std::move(aChildren)),
             maMask(rMask)
         {
         }
diff --git a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
index 665622527e87..108f53bf1431 100644
--- a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
@@ -69,7 +69,7 @@ namespace drawinglayer::primitive2d
                 {
                     // shrunk primitive has no content (zero size in X or Y), nothing to display. Still create
                     // invisible content for HitTest and BoundRect
-                    const Primitive2DReference xHiddenLines(new HiddenGeometryPrimitive2D(xRetval));
+                    const Primitive2DReference xHiddenLines(new HiddenGeometryPrimitive2D(std::move(xRetval)));
 
                     xRetval = Primitive2DContainer { xHiddenLines, };
                 }
@@ -82,7 +82,7 @@ namespace drawinglayer::primitive2d
                     aTransform.translate(aDestRange.getMinX(), aDestRange.getMinY());
 
                     // add transform primitive
-                    const Primitive2DReference aScaled(new TransformPrimitive2D(aTransform, xRetval));
+                    Primitive2DReference aScaled(new TransformPrimitive2D(aTransform, std::move(xRetval)));
                     xRetval = Primitive2DContainer { aScaled };
                 }
             }
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 2c880122b928..eddb02375d0a 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -58,7 +58,7 @@ namespace drawinglayer::primitive2d
                                 basegfx::B2DPolyPolygon(
                                     basegfx::utils::createPolygonFromRect(
                                         aMtfRange)),
-                                xRetval));
+                                std::move(xRetval)));
 
                         xRetval = drawinglayer::primitive2d::Primitive2DContainer{ xMask };
                     }
@@ -77,7 +77,7 @@ namespace drawinglayer::primitive2d
                 const Primitive2DReference aEmbeddedTransform(
                     new TransformPrimitive2D(
                         aAdaptedTransform,
-                        xRetval));
+                        std::move(xRetval)));
 
                 xRetval = Primitive2DContainer { aEmbeddedTransform };
             }
diff --git a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx
index 06d322cada70..2d0f572dad39 100644
--- a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx
@@ -27,9 +27,9 @@ using namespace com::sun::star;
 namespace drawinglayer::primitive2d
 {
         ModifiedColorPrimitive2D::ModifiedColorPrimitive2D(
-            const Primitive2DContainer& rChildren,
+            Primitive2DContainer&& aChildren,
             const basegfx::BColorModifierSharedPtr& rColorModifier)
-        :   GroupPrimitive2D(rChildren),
+        :   GroupPrimitive2D(std::move(aChildren)),
             maColorModifier(rColorModifier)
         {
         }
diff --git a/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx b/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx
index 8ea05672812d..577f3171a3dd 100644
--- a/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx
@@ -24,11 +24,11 @@ using namespace com::sun::star;
 namespace drawinglayer::primitive2d
 {
         ObjectInfoPrimitive2D::ObjectInfoPrimitive2D(
-            const Primitive2DContainer& rChildren,
+            Primitive2DContainer&& aChildren,
             const OUString& rName,
             const OUString& rTitle,
             const OUString& rDesc)
-        :   GroupPrimitive2D(rChildren),
+        :   GroupPrimitive2D(std::move(aChildren)),
             maName(rName),
             maTitle(rTitle),
             maDesc(rDesc)
diff --git a/drawinglayer/source/primitive2d/pagehierarchyprimitive2d.cxx b/drawinglayer/source/primitive2d/pagehierarchyprimitive2d.cxx
index f176e3b8301e..8ffd7735abd8 100644
--- a/drawinglayer/source/primitive2d/pagehierarchyprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/pagehierarchyprimitive2d.cxx
@@ -24,8 +24,8 @@ using namespace com::sun::star;
 
 namespace drawinglayer::primitive2d
 {
-        PageHierarchyPrimitive2D::PageHierarchyPrimitive2D(const Primitive2DContainer& rChildren)
-        :   GroupPrimitive2D(rChildren)
+        PageHierarchyPrimitive2D::PageHierarchyPrimitive2D(Primitive2DContainer&& aChildren)
+        :   GroupPrimitive2D(std::move(aChildren))
         {
         }
 
diff --git a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
index d8fc5af94995..83468b36d46e 100644
--- a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
@@ -58,7 +58,7 @@ namespace drawinglayer::primitive2d
                 const Primitive2DReference xReferenceA(
                     new MaskPrimitive2D(
                         basegfx::B2DPolyPolygon(
-                            basegfx::utils::createPolygonFromRect(aAllowedContentRange)), aContent));
+                            basegfx::utils::createPolygonFromRect(aAllowedContentRange)), std::move(aContent)));
                 aContent = Primitive2DContainer { xReferenceA };
             }
 
@@ -97,7 +97,7 @@ namespace drawinglayer::primitive2d
             aPageTrans = aCombined * aPageTrans;
 
             // embed in necessary transformation to map from SdrPage to SdrPageObject
-            rContainer.push_back(new TransformPrimitive2D(aPageTrans, aContent));
+            rContainer.push_back(new TransformPrimitive2D(aPageTrans, std::move(aContent)));
         }
 
         PagePreviewPrimitive2D::PagePreviewPrimitive2D(
diff --git a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
index ded9fb15eb3b..8add9d587c6d 100644
--- a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
@@ -125,11 +125,11 @@ namespace drawinglayer::primitive2d
             if(0 != mnDiscreteWidth && 0 != mnDiscreteHeight)
             {
                 const geometry::ViewInformation2D aViewInformation2D;
-                const primitive2d::Primitive2DReference xEmbedRef(
+                primitive2d::Primitive2DReference xEmbedRef(
                     new primitive2d::TransformPrimitive2D(
                         basegfx::utils::createScaleB2DHomMatrix(mnDiscreteWidth, mnDiscreteHeight),
-                        getChildren()));
-                const primitive2d::Primitive2DContainer xEmbedSeq { xEmbedRef };
+                        Primitive2DContainer(getChildren())));
+                primitive2d::Primitive2DContainer xEmbedSeq { xEmbedRef };
 
                 const BitmapEx aBitmapEx(
                     convertToBitmapEx(
@@ -173,7 +173,7 @@ namespace drawinglayer::primitive2d
                     const Primitive2DReference xRef(
                         new MaskPrimitive2D(
                             basegfx::B2DPolyPolygon(basegfx::utils::createPolygonFromRect(aUnitRange)),
-                            aContent));
+                            std::move(aContent)));
 
                     aContent = Primitive2DContainer { xRef };
                 }
@@ -186,11 +186,11 @@ namespace drawinglayer::primitive2d
         BitmapEx PatternFillPrimitive2D::createTileImage(sal_uInt32 nWidth, sal_uInt32 nHeight) const
         {
             const geometry::ViewInformation2D aViewInformation2D;
-            const Primitive2DContainer aContent(createContent(aViewInformation2D));
+            Primitive2DContainer aContent(createContent(aViewInformation2D));
             const primitive2d::Primitive2DReference xEmbedRef(
                     new primitive2d::TransformPrimitive2D(
                         basegfx::utils::createScaleB2DHomMatrix(nWidth, nHeight),
-                        aContent));
+                        std::move(aContent)));
             const primitive2d::Primitive2DContainer xEmbedSeq { xEmbedRef };
 
             return convertToBitmapEx(
@@ -223,7 +223,7 @@ namespace drawinglayer::primitive2d
             aTiling.appendTransformations(aMatrices);
 
             // create content
-            const Primitive2DContainer aContent(createContent(rViewInformation));
+            Primitive2DContainer aContent(createContent(rViewInformation));
 
             // resize result
             aRetval.resize(aMatrices.size());
@@ -233,7 +233,7 @@ namespace drawinglayer::primitive2d
             {
                 aRetval[a] = new TransformPrimitive2D(
                     aMatrices[a],
-                    aContent);
+                    Primitive2DContainer(aContent));
             }
 
             // transform result which is in unit coordinates to mask's object coordinates
@@ -243,10 +243,10 @@ namespace drawinglayer::primitive2d
                         aMaskRange.getRange(),
                         aMaskRange.getMinimum()));
 
-                const Primitive2DReference xRef(
+                Primitive2DReference xRef(
                     new TransformPrimitive2D(
                         aMaskTransform,
-                        aRetval));
+                        std::move(aRetval)));
 
                 aRetval = Primitive2DContainer { xRef };
             }
@@ -256,7 +256,7 @@ namespace drawinglayer::primitive2d
                 rContainer.push_back(
                     new MaskPrimitive2D(
                         getMask(),
-                        aRetval));
+                        std::move(aRetval)));
             }
         }
 
diff --git a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
index 5ede8b68c9c3..6ea066b35754 100644
--- a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
@@ -34,8 +34,8 @@ namespace drawinglayer::primitive2d
             const basegfx::B2DHomMatrix& rShadowTransform,
             const basegfx::BColor& rShadowColor,
             double fShadowBlur,
-            const Primitive2DContainer& rChildren)
-        :   GroupPrimitive2D(rChildren),
+            Primitive2DContainer&& aChildren)
+        :   GroupPrimitive2D(std::move(aChildren)),
             maShadowTransform(rShadowTransform),
             maShadowColor(rShadowColor),
             mfShadowBlur(fShadowBlur)
@@ -75,12 +75,12 @@ namespace drawinglayer::primitive2d
                     getShadowColor());
             const Primitive2DReference xRefA(
                 new ModifiedColorPrimitive2D(
-                    getChildren(),
+                    Primitive2DContainer(getChildren()),
                     aBColorModifier));
-            const Primitive2DContainer aSequenceB { xRefA };
+            Primitive2DContainer aSequenceB { xRefA };
 
             // build transformed primitiveVector with shadow offset and add to target
-            rVisitor.append(new TransformPrimitive2D(getShadowTransform(), aSequenceB));
+            rVisitor.append(new TransformPrimitive2D(getShadowTransform(), std::move(aSequenceB)));
         }
 
         // provide unique ID
diff --git a/drawinglayer/source/primitive2d/softedgeprimitive2d.cxx b/drawinglayer/source/primitive2d/softedgeprimitive2d.cxx
index 03b8ee61c950..98a3bea752eb 100644
--- a/drawinglayer/source/primitive2d/softedgeprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/softedgeprimitive2d.cxx
@@ -23,8 +23,8 @@
 
 namespace drawinglayer::primitive2d
 {
-SoftEdgePrimitive2D::SoftEdgePrimitive2D(double fRadius, const Primitive2DContainer& rChildren)
-    : GroupPrimitive2D(rChildren)
+SoftEdgePrimitive2D::SoftEdgePrimitive2D(double fRadius, Primitive2DContainer&& aChildren)
+    : GroupPrimitive2D(std::move(aChildren))
     , mfRadius(fRadius)
 {
 }
@@ -58,7 +58,8 @@ void SoftEdgePrimitive2D::get2DDecomposition(
     basegfx::BColorModifierSharedPtr aBColorModifier
         = std::make_shared<basegfx::BColorModifier_replace>(basegfx::BColor());
 
-    const Primitive2DReference xRef(new ModifiedColorPrimitive2D(getChildren(), aBColorModifier));
+    const Primitive2DReference xRef(
+        new ModifiedColorPrimitive2D(Primitive2DContainer(getChildren()), aBColorModifier));
     rVisitor.append(xRef);
 }
 
diff --git a/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx b/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx
index e2465078d33c..c82b0088e29d 100644
--- a/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx
@@ -30,8 +30,8 @@ namespace drawinglayer::primitive2d
             const vcl::PDFWriter::StructElement& rStructureElement,
             bool bBackground,
             bool bIsImage,
-            const Primitive2DContainer& rChildren)
-        :   GroupPrimitive2D(rChildren),
+            Primitive2DContainer&& aChildren)
+        :   GroupPrimitive2D(std::move(aChildren)),
             maStructureElement(rStructureElement),
             mbBackground(bBackground),
             mbIsImage(bIsImage)
diff --git a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
index 203a38cae222..f723979e74be 100644
--- a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
@@ -80,11 +80,11 @@ namespace drawinglayer::primitive2d
 
                     if(fOpacity < 1.0)
                     {
-                        const Primitive2DContainer aContent { xRef };
+                        Primitive2DContainer aContent { xRef };
 
                         xRef = Primitive2DReference(
                             new UnifiedTransparencePrimitive2D(
-                                aContent,
+                                std::move(aContent),
                                 1.0 - fOpacity));
                     }
 
@@ -310,8 +310,8 @@ namespace drawinglayer::primitive2d
             const basegfx::B2DHomMatrix& rUnitGradientToObject,
             bool bInvert) const
         {
-            const Primitive2DContainer aTargetColorEntries(rTargetColor.maybeInvert(bInvert));
-            const Primitive2DContainer aTargetOpacityEntries(rTargetOpacity.maybeInvert(bInvert));
+            Primitive2DContainer aTargetColorEntries(rTargetColor.maybeInvert(bInvert));
+            Primitive2DContainer aTargetOpacityEntries(rTargetOpacity.maybeInvert(bInvert));
 
             if(aTargetColorEntries.empty())
                 return;
@@ -321,8 +321,8 @@ namespace drawinglayer::primitive2d
             if(!aTargetOpacityEntries.empty())
             {
                 const Primitive2DReference xRefOpacity = new TransparencePrimitive2D(
-                    aTargetColorEntries,
-                    aTargetOpacityEntries);
+                    std::move(aTargetColorEntries),
+                    std::move(aTargetOpacityEntries));
 
                 xRefContent = new TransformPrimitive2D(
                     rUnitGradientToObject,
@@ -332,7 +332,7 @@ namespace drawinglayer::primitive2d
             {
                 xRefContent = new TransformPrimitive2D(
                     rUnitGradientToObject,
-                    aTargetColorEntries);
+                    std::move(aTargetColorEntries));
             }
 
             rContainer.push_back(new MaskPrimitive2D(
diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
index 34dbf72b94ea..05417f55c505 100644
--- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
@@ -236,7 +236,7 @@ namespace drawinglayer::primitive2d
                             aShadowTransform,
                             aShadowColor,
                             0,          // fShadowBlur = 0, there's no blur for text shadow yet.
-                            aRetval);
+                            Primitive2DContainer(aRetval));
                     }
 
                     if(bHasTextRelief)
diff --git a/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx b/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx
index 79872474b69d..e68be6b28391 100644
--- a/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx
@@ -81,8 +81,8 @@ void TextEffectPrimitive2D::create2DDecomposition(
                 // emboss/engrave in black, original forced to white
                 const basegfx::BColorModifierSharedPtr aBColorModifierToGray
                     = std::make_shared<basegfx::BColorModifier_replace>(basegfx::BColor(0.0));
-                const Primitive2DReference xModifiedColor(
-                    new ModifiedColorPrimitive2D(getTextContent(), aBColorModifierToGray));
+                const Primitive2DReference xModifiedColor(new ModifiedColorPrimitive2D(
+                    Primitive2DContainer(getTextContent()), aBColorModifierToGray));
 
                 rContainer.push_back(
                     new TransformPrimitive2D(aTransform, Primitive2DContainer{ xModifiedColor }));
@@ -91,8 +91,8 @@ void TextEffectPrimitive2D::create2DDecomposition(
                 const basegfx::BColorModifierSharedPtr aBColorModifierToWhite
                     = std::make_shared<basegfx::BColorModifier_replace>(basegfx::BColor(1.0));
 
-                rContainer.push_back(
-                    new ModifiedColorPrimitive2D(getTextContent(), aBColorModifierToWhite));
+                rContainer.push_back(new ModifiedColorPrimitive2D(
+                    Primitive2DContainer(getTextContent()), aBColorModifierToWhite));
             }
             else
             {
@@ -100,14 +100,14 @@ void TextEffectPrimitive2D::create2DDecomposition(
                 const basegfx::BColorModifierSharedPtr aBColorModifierToGray
                     = std::make_shared<basegfx::BColorModifier_replace>(
                         basegfx::BColor(0.75)); // 192
-                const Primitive2DReference xModifiedColor(
-                    new ModifiedColorPrimitive2D(getTextContent(), aBColorModifierToGray));
+                const Primitive2DReference xModifiedColor(new ModifiedColorPrimitive2D(
+                    Primitive2DContainer(getTextContent()), aBColorModifierToGray));
 
                 rContainer.push_back(
                     new TransformPrimitive2D(aTransform, Primitive2DContainer{ xModifiedColor }));
 
                 // add original, too
-                rContainer.push_back(new GroupPrimitive2D(getTextContent()));
+                rContainer.push_back(new GroupPrimitive2D(Primitive2DContainer(getTextContent())));
             }
 
             break;
@@ -119,41 +119,49 @@ void TextEffectPrimitive2D::create2DDecomposition(
 
             aTransform.set(0, 2, aDistance.getX());
             aTransform.set(1, 2, 0.0);
-            rContainer.push_back(new TransformPrimitive2D(aTransform, getTextContent()));
+            rContainer.push_back(
+                new TransformPrimitive2D(aTransform, Primitive2DContainer(getTextContent())));
 
             aTransform.set(0, 2, aDiagonalDistance.getX());
             aTransform.set(1, 2, aDiagonalDistance.getY());
-            rContainer.push_back(new TransformPrimitive2D(aTransform, getTextContent()));
+            rContainer.push_back(
+                new TransformPrimitive2D(aTransform, Primitive2DContainer(getTextContent())));
 
             aTransform.set(0, 2, 0.0);
             aTransform.set(1, 2, aDistance.getY());
-            rContainer.push_back(new TransformPrimitive2D(aTransform, getTextContent()));
+            rContainer.push_back(
+                new TransformPrimitive2D(aTransform, Primitive2DContainer(getTextContent())));
 
             aTransform.set(0, 2, -aDiagonalDistance.getX());
             aTransform.set(1, 2, aDiagonalDistance.getY());
-            rContainer.push_back(new TransformPrimitive2D(aTransform, getTextContent()));
+            rContainer.push_back(
+                new TransformPrimitive2D(aTransform, Primitive2DContainer(getTextContent())));
 
             aTransform.set(0, 2, -aDistance.getX());
             aTransform.set(1, 2, 0.0);
-            rContainer.push_back(new TransformPrimitive2D(aTransform, getTextContent()));
+            rContainer.push_back(
+                new TransformPrimitive2D(aTransform, Primitive2DContainer(getTextContent())));
 
             aTransform.set(0, 2, -aDiagonalDistance.getX());
             aTransform.set(1, 2, -aDiagonalDistance.getY());
-            rContainer.push_back(new TransformPrimitive2D(aTransform, getTextContent()));
+            rContainer.push_back(
+                new TransformPrimitive2D(aTransform, Primitive2DContainer(getTextContent())));
 
             aTransform.set(0, 2, 0.0);
             aTransform.set(1, 2, -aDistance.getY());
-            rContainer.push_back(new TransformPrimitive2D(aTransform, getTextContent()));
+            rContainer.push_back(
+                new TransformPrimitive2D(aTransform, Primitive2DContainer(getTextContent())));
 
             aTransform.set(0, 2, aDiagonalDistance.getX());
             aTransform.set(1, 2, -aDiagonalDistance.getY());
-            rContainer.push_back(new TransformPrimitive2D(aTransform, getTextContent()));
+            rContainer.push_back(
+                new TransformPrimitive2D(aTransform, Primitive2DContainer(getTextContent())));
 
             // at last, place original over it, but force to white
             const basegfx::BColorModifierSharedPtr aBColorModifierToWhite
                 = std::make_shared<basegfx::BColorModifier_replace>(basegfx::BColor(1.0, 1.0, 1.0));
-            rContainer.push_back(
-                new ModifiedColorPrimitive2D(getTextContent(), aBColorModifierToWhite));
+            rContainer.push_back(new ModifiedColorPrimitive2D(
+                Primitive2DContainer(getTextContent()), aBColorModifierToWhite));
 
             break;
         }
diff --git a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
index b7d4218f04fd..c7af9562adc1 100644
--- a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
@@ -26,8 +26,8 @@ using namespace com::sun::star;
 
 namespace drawinglayer::primitive2d
 {
-        TextHierarchyLinePrimitive2D::TextHierarchyLinePrimitive2D(const Primitive2DContainer& rChildren)
-        :   GroupPrimitive2D(rChildren)
+        TextHierarchyLinePrimitive2D::TextHierarchyLinePrimitive2D(Primitive2DContainer&& aChildren)
+        :   GroupPrimitive2D(std::move(aChildren))
         {
         }
 
@@ -39,9 +39,9 @@ namespace drawinglayer::primitive2d
 
 
         TextHierarchyParagraphPrimitive2D::TextHierarchyParagraphPrimitive2D(
-            const Primitive2DContainer& rChildren,
+            Primitive2DContainer&& aChildren,
             sal_Int16 nOutlineLevel)
-        :   GroupPrimitive2D(rChildren),
+        :   GroupPrimitive2D(std::move(aChildren)),
             mnOutlineLevel(nOutlineLevel)
         {
         }
@@ -66,8 +66,8 @@ namespace drawinglayer::primitive2d
 
 
 
-        TextHierarchyBulletPrimitive2D::TextHierarchyBulletPrimitive2D(const Primitive2DContainer& rChildren)
-        :   GroupPrimitive2D(rChildren)
+        TextHierarchyBulletPrimitive2D::TextHierarchyBulletPrimitive2D(Primitive2DContainer&& aChildren)
+        :   GroupPrimitive2D(std::move(aChildren))
         {
         }
 
@@ -78,8 +78,8 @@ namespace drawinglayer::primitive2d
         }
 
 
-        TextHierarchyBlockPrimitive2D::TextHierarchyBlockPrimitive2D(const Primitive2DContainer& rChildren)
-        :   GroupPrimitive2D(rChildren)
+        TextHierarchyBlockPrimitive2D::TextHierarchyBlockPrimitive2D(Primitive2DContainer&& aChildren)
+        :   GroupPrimitive2D(std::move(aChildren))
         {
         }
 
@@ -91,10 +91,10 @@ namespace drawinglayer::primitive2d
 
 
         TextHierarchyFieldPrimitive2D::TextHierarchyFieldPrimitive2D(
-            const Primitive2DContainer& rChildren,
+            Primitive2DContainer&& aChildren,
             const FieldType& rFieldType,
             const std::vector< std::pair< OUString, OUString>>* pNameValue)
-        :   GroupPrimitive2D(rChildren),
+        :   GroupPrimitive2D(std::move(aChildren)),
             meType(rFieldType)
         {
             if (nullptr != pNameValue)
@@ -136,8 +136,8 @@ namespace drawinglayer::primitive2d
         }
 
 
-        TextHierarchyEditPrimitive2D::TextHierarchyEditPrimitive2D(const Primitive2DContainer& rChildren)
-        :   GroupPrimitive2D(rChildren)
+        TextHierarchyEditPrimitive2D::TextHierarchyEditPrimitive2D(Primitive2DContainer&& aChildren)
+        :   GroupPrimitive2D(std::move(aChildren))
         {
         }
 
diff --git a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx
index 32ab7982015a..f791d9e63598 100644
--- a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx
@@ -242,8 +242,8 @@ namespace drawinglayer::primitive2d
             aTransform.translate(aTranslate.getX(), aTranslate.getY());
 
             // add transform primitive
-            const Primitive2DContainer aContent { aNewPrimitive };
-            rContainer.push_back( new TransformPrimitive2D(aTransform, aContent) );
+            Primitive2DContainer aContent { aNewPrimitive };
+            rContainer.push_back( new TransformPrimitive2D(aTransform, std::move(aContent)) );
         }
 
         TextLinePrimitive2D::TextLinePrimitive2D(
diff --git a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
index 0ddbedae0c16..afcb3f1abeae 100644
--- a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
@@ -213,7 +213,7 @@ namespace drawinglayer::primitive2d
                 xRetval.push_back(
                         new TransformPrimitive2D(
                             aTransform,
-                            xRetval));
+                            Primitive2DContainer(xRetval)));
             }
 
             rContainer.insert(rContainer.end(), xRetval.begin(), xRetval.end());
diff --git a/drawinglayer/source/primitive2d/transformprimitive2d.cxx b/drawinglayer/source/primitive2d/transformprimitive2d.cxx
index b44b7d271459..ddd1594e270e 100644
--- a/drawinglayer/source/primitive2d/transformprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/transformprimitive2d.cxx
@@ -28,8 +28,8 @@ namespace drawinglayer::primitive2d
 {
         TransformPrimitive2D::TransformPrimitive2D(
             const basegfx::B2DHomMatrix& rTransformation,
-            const Primitive2DContainer& rChildren)
-        :   GroupPrimitive2D(rChildren),
+            Primitive2DContainer&& aChildren)
+        :   GroupPrimitive2D(std::move(aChildren)),
             maTransformation(rTransformation)
         {
         }
diff --git a/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx b/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx
index c36d9f76ef7f..8a86b1b295f4 100644
--- a/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx
@@ -27,10 +27,10 @@ using namespace com::sun::star;
 namespace drawinglayer::primitive2d
 {
         TransparencePrimitive2D::TransparencePrimitive2D(
-            const Primitive2DContainer& rChildren,
-            const Primitive2DContainer& rTransparence)
-        :   GroupPrimitive2D(rChildren),
-            maTransparence(rTransparence)
+            Primitive2DContainer&& aChildren,
+            Primitive2DContainer&& aTransparence)
+        :   GroupPrimitive2D(std::move(aChildren)),
+            maTransparence(std::move(aTransparence))
         {
         }
 
diff --git a/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx b/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx
index 88ecf44571cf..c50fcb008435 100644
--- a/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx
@@ -33,9 +33,9 @@ using namespace com::sun::star;
 namespace drawinglayer::primitive2d
 {
         UnifiedTransparencePrimitive2D::UnifiedTransparencePrimitive2D(
-            const Primitive2DContainer& rChildren,
+            Primitive2DContainer&& aChildren,
             double fTransparence)
-        :   GroupPrimitive2D(rChildren),
+        :   GroupPrimitive2D(std::move(aChildren)),
             mfTransparence(fTransparence)
         {
         }
@@ -93,7 +93,7 @@ namespace drawinglayer::primitive2d
                 aTransparenceContent[1] = Primitive2DReference(new PolygonHairlinePrimitive2D(aPolygon, aGray));
 
                 // create sub-transparence group with a gray-colored rectangular fill polygon
-                rVisitor.append(new TransparencePrimitive2D(getChildren(), aTransparenceContent));
+                rVisitor.append(new TransparencePrimitive2D(Primitive2DContainer(getChildren()), std::move(aTransparenceContent)));
             }
             else
             {
diff --git a/drawinglayer/source/processor3d/shadow3dextractor.cxx b/drawinglayer/source/processor3d/shadow3dextractor.cxx
index 2fad74959cd1..bed08b9688fb 100644
--- a/drawinglayer/source/processor3d/shadow3dextractor.cxx
+++ b/drawinglayer/source/processor3d/shadow3dextractor.cxx
@@ -76,15 +76,15 @@ namespace drawinglayer::processor3d
                         rPrimitive.getShadowTransform(),
                         rPrimitive.getShadowColor(),
                         0,  // shadow3d doesn't have rPrimitive.getShadowBlur() yet.
-                        aNewSubList);
+                        std::move(aNewSubList));
 
                     if(basegfx::fTools::more(rPrimitive.getShadowTransparence(), 0.0))
                     {
                         // create simpleTransparencePrimitive, add created primitives
-                        const primitive2d::Primitive2DContainer aNewTransPrimitiveVector { pNew };
+                        primitive2d::Primitive2DContainer aNewTransPrimitiveVector { pNew };
 
                         pNew = new primitive2d::UnifiedTransparencePrimitive2D(
-                            aNewTransPrimitiveVector,
+                            std::move(aNewTransPrimitiveVector),
                             rPrimitive.getShadowTransparence());
                     }
 
diff --git a/drawinglayer/source/tools/converters.cxx b/drawinglayer/source/tools/converters.cxx
index d8fe291bf803..1f51384480cd 100644
--- a/drawinglayer/source/tools/converters.cxx
+++ b/drawinglayer/source/tools/converters.cxx
@@ -49,7 +49,7 @@ namespace drawinglayer
             // get destination size in pixels
             const MapMode aMapModePixel(MapUnit::MapPixel);
             const sal_uInt32 nViewVisibleArea(nDiscreteWidth * nDiscreteHeight);
-            drawinglayer::primitive2d::Primitive2DContainer aSequence(rSeq);
+            drawinglayer::primitive2d::Primitive2DContainer aSequence;
 
             if(nViewVisibleArea > nMaxSquarePixels)
             {
@@ -61,10 +61,12 @@ namespace drawinglayer
                 const drawinglayer::primitive2d::Primitive2DReference aEmbed(
                     new drawinglayer::primitive2d::TransformPrimitive2D(
                         basegfx::utils::createScaleB2DHomMatrix(fReduceFactor, fReduceFactor),
-                        rSeq));
+                        primitive2d::Primitive2DContainer(rSeq)));
 
                 aSequence = drawinglayer::primitive2d::Primitive2DContainer { aEmbed };
             }
+            else
+                aSequence = rSeq;
 
             const Point aEmptyPoint;
             const Size aSizePixel(nDiscreteWidth, nDiscreteHeight);
@@ -119,7 +121,7 @@ namespace drawinglayer
             // embed primitives to paint them black
             const primitive2d::Primitive2DReference xRef(
                 new primitive2d::ModifiedColorPrimitive2D(
-                    aSequence,
+                    std::move(aSequence),
                     std::make_shared<basegfx::BColorModifier_replace>(
                             basegfx::BColor(0.0, 0.0, 0.0))));
             const primitive2d::Primitive2DContainer xSeq { xRef };
diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx
index 90a6920b2bb3..a7beae35ed83 100644
--- a/drawinglayer/source/tools/wmfemfhelper.cxx
+++ b/drawinglayer/source/tools/wmfemfhelper.cxx
@@ -348,10 +348,10 @@ namespace wmfemfhelper
 
             if (rClipPolyPolygon.count())
             {
-                const drawinglayer::primitive2d::Primitive2DReference xMask(
+                drawinglayer::primitive2d::Primitive2DReference xMask(
                     new drawinglayer::primitive2d::MaskPrimitive2D(
                         rClipPolyPolygon,
-                        xRetval));
+                        std::move(xRetval)));
 
                 xRetval = drawinglayer::primitive2d::Primitive2DContainer{ xMask };
             }
@@ -845,7 +845,7 @@ namespace wmfemfhelper
             {
                 rTargetHolders.Current().append(
                     new drawinglayer::primitive2d::GroupPrimitive2D(
-                        aSubContent));
+                        std::move(aSubContent)));
             }
         }
 
@@ -892,7 +892,7 @@ namespace wmfemfhelper
                     // force content to black
                     rTargetHolders.Current().append(
                         new drawinglayer::primitive2d::ModifiedColorPrimitive2D(
-                            aSubContent,
+                            std::move(aSubContent),
                             std::make_shared<basegfx::BColorModifier_replace>(
                                     basegfx::BColor(0.0, 0.0, 0.0))));
                 }
@@ -901,7 +901,7 @@ namespace wmfemfhelper
                     // invert content
                     rTargetHolders.Current().append(
                         new drawinglayer::primitive2d::InvertPrimitive2D(
-                            aSubContent));
+                            std::move(aSubContent)));
                 }
             }
         }
@@ -959,11 +959,11 @@ namespace wmfemfhelper
             if(!rPropertyHolder.getTransformation().isIdentity())
             {
                 const drawinglayer::primitive2d::Primitive2DReference xPrim(pRetval);
-                const drawinglayer::primitive2d::Primitive2DContainer xSeq { xPrim };
+                drawinglayer::primitive2d::Primitive2DContainer xSeq { xPrim };
 
                 pRetval = new drawinglayer::primitive2d::TransformPrimitive2D(
                     rPropertyHolder.getTransformation(),
-                    xSeq);
+                    std::move(xSeq));
             }
 
             return pRetval;
@@ -1270,7 +1270,7 @@ namespace wmfemfhelper
                         rProperty.getTextFillColor()));
 
                 // set as group at pResult
-                pResult = new drawinglayer::primitive2d::GroupPrimitive2D(aSequence);
+                pResult = new drawinglayer::primitive2d::GroupPrimitive2D(std::move(aSequence));
             }
         }
 
@@ -1420,7 +1420,7 @@ namespace wmfemfhelper
             rTarget.append(
                 new drawinglayer::primitive2d::TransformPrimitive2D(
                     rProperty.getTransformation(),
-                    xTargets));
+                    std::move(xTargets)));
         }
     }
 
@@ -1970,7 +1970,7 @@ namespace wmfemfhelper
                                 rTargetHolders.Current().append(
                                     new drawinglayer::primitive2d::TransformPrimitive2D(
                                         rPropertyHolders.Current().getTransformation(),
-                                        xSubContent));
+                                        std::move(xSubContent)));
                             }
                         }
                     }
@@ -2158,7 +2158,7 @@ namespace wmfemfhelper
                                 rTargetHolders.Current().append(
                                     new drawinglayer::primitive2d::MaskPrimitive2D(
                                         aOutline,
-                                        xGradient));
+                                        std::move(xGradient)));
                             }
                         }
                     }
@@ -2670,7 +2670,7 @@ namespace wmfemfhelper
 
                             // create primitives there and get them
                             createHairlineAndFillPrimitive(aOutline, rTargetHolders.Current(), rPropertyHolders.Current());
-                            const drawinglayer::primitive2d::Primitive2DContainer aSubContent(
+                            drawinglayer::primitive2d::Primitive2DContainer aSubContent(
                                 rTargetHolders.Current().getPrimitive2DSequence(rPropertyHolders.Current()));
 
                             // back to old target
@@ -2680,7 +2680,7 @@ namespace wmfemfhelper
                             {
                                 rTargetHolders.Current().append(
                                     new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D(
-                                        aSubContent,
+                                        std::move(aSubContent),
                                         nTransparence * 0.01));
                             }
                         }
@@ -2820,7 +2820,7 @@ namespace wmfemfhelper
                                     const drawinglayer::primitive2d::Primitive2DReference aEmbeddedTransform(
                                         new drawinglayer::primitive2d::TransformPrimitive2D(
                                             aSubTransform,
-                                            xSubContent));
+                                            std::move(xSubContent)));
 
                                     xSubContent = drawinglayer::primitive2d::Primitive2DContainer { aEmbeddedTransform };
                                 }
@@ -2834,7 +2834,7 @@ namespace wmfemfhelper
                                     // not really a gradient; create UnifiedTransparencePrimitive2D
                                     rTargetHolders.Current().append(
                                         new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D(
-                                            xSubContent,
+                                            std::move(xSubContent),
                                             aAttribute.getStartColor().luminance()));
                                 }
                                 else
@@ -2852,7 +2852,7 @@ namespace wmfemfhelper
                                     // create transparence primitive
                                     rTargetHolders.Current().append(
                                         new drawinglayer::primitive2d::TransparencePrimitive2D(
-                                            xSubContent,
+                                            std::move(xSubContent),
                                             drawinglayer::primitive2d::Primitive2DContainer { xTransparence }));
                                 }
                             }