1 files changed, 16 insertions, 15 deletions
diff --git a/drawinglayer/source/primitive2d/PolyPolygonStrokePrimitive2D.cxx b/drawinglayer/source/primitive2d/PolyPolygonStrokePrimitive2D.cxx
index 91093f37278d..9c32d8853d8d 100644
--- a/drawinglayer/source/primitive2d/PolyPolygonStrokePrimitive2D.cxx
+++ b/drawinglayer/source/primitive2d/PolyPolygonStrokePrimitive2D.cxx
@@ -21,40 +21,41 @@
 
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
-#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
+#include <drawinglayer/primitive2d/PolygonStrokePrimitive2D.hxx>
+#include <drawinglayer/primitive2d/groupprimitive2d.hxx>
+#include <utility>
 
 using namespace com::sun::star;
 
 namespace drawinglayer::primitive2d
 {
-void PolyPolygonStrokePrimitive2D::create2DDecomposition(
-    Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
+Primitive2DReference PolyPolygonStrokePrimitive2D::create2DDecomposition(
+    const geometry::ViewInformation2D& /*rViewInformation*/) const
 {
     const basegfx::B2DPolyPolygon aPolyPolygon(getB2DPolyPolygon());
     const sal_uInt32 nCount(aPolyPolygon.count());
 
-    if (nCount)
+    Primitive2DContainer aContainer;
+    for (sal_uInt32 a(0); a < nCount; a++)
     {
-        for (sal_uInt32 a(0); a < nCount; a++)
-        {
-            rContainer.push_back(new PolygonStrokePrimitive2D(
-                aPolyPolygon.getB2DPolygon(a), getLineAttribute(), getStrokeAttribute()));
-        }
+        aContainer.push_back(new PolygonStrokePrimitive2D(
+            aPolyPolygon.getB2DPolygon(a), getLineAttribute(), getStrokeAttribute()));
     }
+    return new GroupPrimitive2D(std::move(aContainer));
 }
 
 PolyPolygonStrokePrimitive2D::PolyPolygonStrokePrimitive2D(
-    const basegfx::B2DPolyPolygon& rPolyPolygon, const attribute::LineAttribute& rLineAttribute,
-    const attribute::StrokeAttribute& rStrokeAttribute)
-    : maPolyPolygon(rPolyPolygon)
+    basegfx::B2DPolyPolygon aPolyPolygon, const attribute::LineAttribute& rLineAttribute,
+    attribute::StrokeAttribute aStrokeAttribute)
+    : maPolyPolygon(std::move(aPolyPolygon))
     , maLineAttribute(rLineAttribute)
-    , maStrokeAttribute(rStrokeAttribute)
+    , maStrokeAttribute(std::move(aStrokeAttribute))
 {
 }
 
 PolyPolygonStrokePrimitive2D::PolyPolygonStrokePrimitive2D(
-    const basegfx::B2DPolyPolygon& rPolyPolygon, const attribute::LineAttribute& rLineAttribute)
-    : maPolyPolygon(rPolyPolygon)
+    basegfx::B2DPolyPolygon aPolyPolygon, const attribute::LineAttribute& rLineAttribute)
+    : maPolyPolygon(std::move(aPolyPolygon))
     , maLineAttribute(rLineAttribute)
 {
 }