From 8104d771b10a5c8b15eae4b67aa112ae2ef77b5b Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu, 9 Sep 2021 13:00:23 +0200
Subject: 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>
---
 drawinglayer/source/tools/wmfemfhelper.cxx | 32 +++++++++++++++---------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'drawinglayer/source/tools/wmfemfhelper.cxx')

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 }));
                                 }
                             }
-- 
cgit