1 files changed, 9 insertions, 9 deletions
diff --git a/drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D.cxx b/drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D.cxx
index 7be684c2f71e..a5595a4bcaeb 100644
--- a/drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D.cxx
+++ b/drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D.cxx
@@ -25,16 +25,17 @@
 #include <drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx>
 #include <drawinglayer/primitive2d/PolyPolygonStrokePrimitive2D.hxx>
 #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
+#include <utility>
 
 using namespace com::sun::star;
 
 namespace drawinglayer::primitive2d
 {
-void PolyPolygonSelectionPrimitive2D::create2DDecomposition(
-    Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
+Primitive2DReference PolyPolygonSelectionPrimitive2D::create2DDecomposition(
+    const geometry::ViewInformation2D& /*rViewInformation*/) const
 {
     if (getTransparence() >= 1.0 || !getB2DPolyPolygon().count())
-        return;
+        return nullptr;
 
     Primitive2DContainer aRetval;
 
@@ -61,19 +62,18 @@ 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 };
     }
 
-    rContainer.insert(rContainer.end(), aRetval.begin(), aRetval.end());
+    return new GroupPrimitive2D(std::move(aRetval));
 }
 
 PolyPolygonSelectionPrimitive2D::PolyPolygonSelectionPrimitive2D(
-    const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::BColor& rColor,
-    double fTransparence, double fDiscreteGrow, bool bFill)
-    : DiscreteMetricDependentPrimitive2D()
-    , maPolyPolygon(rPolyPolygon)
+    basegfx::B2DPolyPolygon aPolyPolygon, const basegfx::BColor& rColor, double fTransparence,
+    double fDiscreteGrow, bool bFill)
+    : maPolyPolygon(std::move(aPolyPolygon))
     , maColor(rColor)
     , mfTransparence(fTransparence)
     , mfDiscreteGrow(fabs(fDiscreteGrow))