these casts are no longer necessary

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

47 files changed, 177 insertions, 222 deletions

diff --git a/drawinglayer/qa/unit/vclmetafileprocessor2d.cxx b/drawinglayer/qa/unit/vclmetafileprocessor2d.cxx
index f34ef8a1bb6f..e5b5ed3cfc8a 100644
--- a/drawinglayer/qa/unit/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/qa/unit/vclmetafileprocessor2d.cxx
@@ -93,7 +93,7 @@ public:
         rtl::Reference<primitive2d::PolygonStrokePrimitive2D> strokePrimitive(
             new primitive2d::PolygonStrokePrimitive2D(polygon, lineAttributes, strokeAttributes));
         primitive2d::Primitive2DContainer primitives;
-        primitives.push_back(primitive2d::Primitive2DReference(strokePrimitive));
+        primitives.push_back(strokePrimitive);
         processor->process(primitives);
         metafile.Stop();
         metafile.WindStart();
diff --git a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
index 67349a83425a..87f524180fbe 100644
--- a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
@@ -76,8 +76,7 @@ namespace drawinglayer::primitive2d
                 nIndex = nLen - 1;
             }
 
-            const Primitive2DReference xRef(getChildren()[nIndex], uno::UNO_SET_THROW);
-            rVisitor.visit(xRef);
+            rVisitor.visit(getChildren()[nIndex]);
         }
 
         // provide unique ID
diff --git a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx
index 5fbb5dd06e2a..c3759be5b918 100644
--- a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx
@@ -49,10 +49,10 @@ namespace drawinglayer::primitive2d
             {
                 // if used, embed decompose geometry to unified transparency
                 Primitive2DContainer aContent { aDecompose };
-                aDecompose = Primitive2DReference(
+                aDecompose =
                     new UnifiedTransparencePrimitive2D(
                         std::move(aContent),
-                        getTransparency()));
+                        getTransparency());
             }
 
             rContainer.push_back(aDecompose);
diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index f54b71417735..68eed1864828 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -405,12 +405,12 @@ namespace drawinglayer::primitive2d
                 }
             }
 
-            return Primitive2DReference(
+            return
                 new BorderLinePrimitive2D(
                     pCandidateA->getStart(),
                     pCandidateB->getEnd(),
                     std::move(aMergedBorderLines),
-                    pCandidateA->getStrokeAttribute()));
+                    pCandidateA->getStrokeAttribute());
         }
 
 } // end of namespace
diff --git a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
index 89c4335bb0b3..dfeade98e8c7 100644
--- a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
@@ -170,84 +170,84 @@ namespace drawinglayer::primitive2d
             xRetval.resize(8);
 
             // TopLeft
-            xRetval[0] = Primitive2DReference(
+            xRetval[0] =
                 new BitmapPrimitive2D(
                     getDiscreteShadow().getTopLeft(),
                     basegfx::utils::createScaleTranslateB2DHomMatrix(
                         fBigLenX,
                         fBigLenY,
                         -fBorderX,
-                        -fBorderY)));
+                        -fBorderY));
 
             // Top
-            xRetval[1] = Primitive2DReference(
+            xRetval[1] =
                 new BitmapPrimitive2D(
                     getDiscreteShadow().getTop(),
                     basegfx::utils::createScaleTranslateB2DHomMatrix(
                         1.0 - (2.0 * (fBorderX + fSingleX)) + fSingleX,
                         fBorderY,
                         fBorderX + fSingleX,
-                        -fBorderY)));
+                        -fBorderY));
 
             // TopRight
-            xRetval[2] = Primitive2DReference(
+            xRetval[2] =
                 new BitmapPrimitive2D(
                     getDiscreteShadow().getTopRight(),
                     basegfx::utils::createScaleTranslateB2DHomMatrix(
                         fBigLenX,
                         fBigLenY,
                         1.0 - fBorderX,
-                        -fBorderY)));
+                        -fBorderY));
 
             // Right
-            xRetval[3] = Primitive2DReference(
+            xRetval[3] =
                 new BitmapPrimitive2D(
                     getDiscreteShadow().getRight(),
                     basegfx::utils::createScaleTranslateB2DHomMatrix(
                         fBorderX,
                         1.0 - (2.0 * (fBorderY + fSingleY)) + fSingleY,
                         1.0 + fSingleX,
-                        fBorderY + fSingleY)));
+                        fBorderY + fSingleY));
 
             // BottomRight
-            xRetval[4] = Primitive2DReference(
+            xRetval[4] =
                 new BitmapPrimitive2D(
                     getDiscreteShadow().getBottomRight(),
                     basegfx::utils::createScaleTranslateB2DHomMatrix(
                         fBigLenX,
                         fBigLenY,
                         1.0 - (fBorderX + fSingleX) + fSingleX,
-                        1.0 - (fBorderY + fSingleY) + fSingleY)));
+                        1.0 - (fBorderY + fSingleY) + fSingleY));
 
             // Bottom
-            xRetval[5] = Primitive2DReference(
+            xRetval[5] =
                 new BitmapPrimitive2D(
                     getDiscreteShadow().getBottom(),
                     basegfx::utils::createScaleTranslateB2DHomMatrix(
                         1.0 - (2.0 * (fBorderX + fSingleX)) + fSingleX,
                         fBorderY,
                         fBorderX + fSingleX,
-                        1.0 + fSingleY)));
+                        1.0 + fSingleY));
 
             // BottomLeft
-            xRetval[6] = Primitive2DReference(
+            xRetval[6] =
                 new BitmapPrimitive2D(
                     getDiscreteShadow().getBottomLeft(),
                     basegfx::utils::createScaleTranslateB2DHomMatrix(
                         fBigLenX,
                         fBigLenY,
                         -fBorderX,
-                        1.0 - fBorderY)));
+                        1.0 - fBorderY));
 
             // Left
-            xRetval[7] = Primitive2DReference(
+            xRetval[7] =
                 new BitmapPrimitive2D(
                     getDiscreteShadow().getLeft(),
                     basegfx::utils::createScaleTranslateB2DHomMatrix(
                         fBorderX,
                         1.0 - (2.0 * (fBorderY + fSingleY)) + fSingleY,
                         -fBorderX,
-                        fBorderY + fSingleY)));
+                        fBorderY + fSingleY));
 
             // put all in object transformation to get to target positions
             rContainer.push_back(
diff --git a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
index c26c76f43b55..bcccf3ad9d00 100644
--- a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
@@ -139,8 +139,8 @@ void GraphicPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer,
 
         if (!basegfx::fTools::equalZero(fTransparency))
         {
-            aRetval = Primitive2DContainer{ Primitive2DReference(
-                new UnifiedTransparencePrimitive2D(std::move(aRetval), fTransparency)) };
+            aRetval = Primitive2DContainer{ new UnifiedTransparencePrimitive2D(std::move(aRetval),
+                                                                               fTransparency) };
         }
     }
 
@@ -156,12 +156,12 @@ void GraphicPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer,
             getGraphicAttr().GetBottomCrop()));
 
         // embed content in cropPrimitive
-        aRetval = Primitive2DContainer{ Primitive2DReference(
-            new CropPrimitive2D(std::move(aRetval), aTransform,
-                                getGraphicAttr().GetLeftCrop() * aCropScaleFactor.getX(),
-                                getGraphicAttr().GetTopCrop() * aCropScaleFactor.getY(),
-                                getGraphicAttr().GetRightCrop() * aCropScaleFactor.getX(),
-                                getGraphicAttr().GetBottomCrop() * aCropScaleFactor.getY())) };
+        aRetval = Primitive2DContainer{ new CropPrimitive2D(
+            std::move(aRetval), aTransform,
+            getGraphicAttr().GetLeftCrop() * aCropScaleFactor.getX(),
+            getGraphicAttr().GetTopCrop() * aCropScaleFactor.getY(),
+            getGraphicAttr().GetRightCrop() * aCropScaleFactor.getX(),
+            getGraphicAttr().GetBottomCrop() * aCropScaleFactor.getY()) };
     }
 
     rContainer.append(std::move(aRetval));
diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index 4fcf7357882e..018c74450717 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -191,10 +191,7 @@ namespace drawinglayer::primitive2d
                     bitmap = BitmapEx(aMainBitmap, aMaskBitmap);
                 }
 
-                return Primitive2DReference(
-                    new BitmapPrimitive2D(
-                        bitmap,
-                        getTransform()));
+                return new BitmapPrimitive2D(bitmap, getTransform());
             }
 
             void checkSafeToBuffer(sal_uInt32 nIndex)
@@ -587,9 +584,9 @@ namespace drawinglayer::primitive2d
                         aMaskPolygon.transform(rTransform);
 
                         aRetval = Primitive2DContainer {
-                            Primitive2DReference(new MaskPrimitive2D(
+                            new MaskPrimitive2D(
                                 basegfx::B2DPolyPolygon(aMaskPolygon),
-                                std::move(aRetval)))
+                                std::move(aRetval))
                         };
                     }
                     break;
diff --git a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
index a41e3d4a4437..c9a1ef6e1645 100644
--- a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
@@ -84,7 +84,7 @@ namespace drawinglayer::primitive2d
 
                     // add transform primitive
                     xRetval = Primitive2DContainer {
-                        Primitive2DReference(new TransformPrimitive2D(aTransform, std::move(xRetval))) // Scaled
+                        new TransformPrimitive2D(aTransform, std::move(xRetval)) // Scaled
                     };
                 }
             }
diff --git a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
index 84ff2f39a142..627de80eec16 100644
--- a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
@@ -127,10 +127,9 @@ namespace drawinglayer::primitive2d
             {
                 const geometry::ViewInformation2D aViewInformation2D;
                 primitive2d::Primitive2DContainer xEmbedSeq {
-                    primitive2d::Primitive2DReference(
                         new primitive2d::TransformPrimitive2D(
                             basegfx::utils::createScaleB2DHomMatrix(mnDiscreteWidth, mnDiscreteHeight),
-                            Primitive2DContainer(getChildren())))
+                            Primitive2DContainer(getChildren()))
                 };
 
                 const BitmapEx aBitmapEx(
@@ -246,10 +245,9 @@ namespace drawinglayer::primitive2d
                         aMaskRange.getMinimum()));
 
                 aRetval = Primitive2DContainer {
-                    Primitive2DReference(
                         new TransformPrimitive2D(
                             aMaskTransform,
-                            std::move(aRetval)))
+                            std::move(aRetval))
                 };
             }
 
diff --git a/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx b/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx
index 65770945ebbf..7768c1f6af2b 100644
--- a/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx
+++ b/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx
@@ -97,8 +97,7 @@ namespace drawinglayer::primitive2d
             }
 
             // create HiddenGeometryPrimitive2D
-            return Primitive2DReference(
-                new HiddenGeometryPrimitive2D(Primitive2DContainer { xReference }));
+            return new HiddenGeometryPrimitive2D(Primitive2DContainer { xReference });
         }
 
 } // end of namespace
diff --git a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
index 25ee2fd543a0..6670ba22b5c3 100644
--- a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
@@ -84,10 +84,10 @@ namespace drawinglayer::primitive2d
                     {
                         Primitive2DContainer aContent { xRef };
 
-                        xRef = Primitive2DReference(
+                        xRef =
                             new UnifiedTransparencePrimitive2D(
                                 std::move(aContent),
-                                1.0 - fOpacity));
+                                1.0 - fOpacity);
                     }
 
                     rContainer.push_back(xRef);
diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
index 0e564eb8bc72..5498b2124bc9 100644
--- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
@@ -40,7 +40,7 @@ namespace drawinglayer::primitive2d
             const attribute::FontAttribute& rFontAttribute) const
         {
             // create the SimpleTextPrimitive needed in any case
-            rTarget.push_back(Primitive2DReference(
+            rTarget.push_back(
                 new TextSimplePortionPrimitive2D(
                     rDecTrans.getB2DHomMatrix(),
                     rText,
@@ -50,7 +50,7 @@ namespace drawinglayer::primitive2d
                     std::vector(rKashidaArray),
                     rFontAttribute,
                     getLocale(),
-                    getFontColor())));
+                    getFontColor()));
 
             CreateDecorationGeometryContent(rTarget, rDecTrans, rText,
                                             nTextPosition, nTextLength,
@@ -107,27 +107,27 @@ namespace drawinglayer::primitive2d
             if(bOverlineUsed)
             {
                 // create primitive geometry for overline
-                rTarget.push_back(Primitive2DReference(
+                rTarget.push_back(
                     new TextLinePrimitive2D(
                         rDecTrans.getB2DHomMatrix(),
                         fTextWidth,
                         aTextLayouter.getOverlineOffset(),
                         aTextLayouter.getOverlineHeight(),
                         getFontOverline(),
-                        getOverlineColor())));
+                        getOverlineColor()));
             }
 
             if(bUnderlineUsed)
             {
                 // create primitive geometry for underline
-                rTarget.push_back(Primitive2DReference(
+                rTarget.push_back(
                     new TextLinePrimitive2D(
                         rDecTrans.getB2DHomMatrix(),
                         fTextWidth,
                         aTextLayouter.getUnderlineOffset(),
                         aTextLayouter.getUnderlineHeight(),
                         getFontUnderline(),
-                        getTextlineColor())));
+                        getTextlineColor()));
             }
 
             if(!bStrikeoutUsed)
@@ -139,26 +139,26 @@ namespace drawinglayer::primitive2d
                 // strikeout with character
                 const sal_Unicode aStrikeoutChar(TEXT_STRIKEOUT_SLASH == getTextStrikeout() ? '/' : 'X');
 
-                rTarget.push_back(Primitive2DReference(
+                rTarget.push_back(
                     new TextCharacterStrikeoutPrimitive2D(
                         rDecTrans.getB2DHomMatrix(),
                         fTextWidth,
                         getFontColor(),
                         aStrikeoutChar,
                         getFontAttribute(),
-                        getLocale())));
+                        getLocale()));
             }
             else
             {
                 // strikeout with geometry
-                rTarget.push_back(Primitive2DReference(
+                rTarget.push_back(
                     new TextGeometryStrikeoutPrimitive2D(
                         rDecTrans.getB2DHomMatrix(),
                         fTextWidth,
                         getFontColor(),
                         aTextLayouter.getUnderlineHeight(),
                         aTextLayouter.getStrikeoutOffset(),
-                        getTextStrikeout())));
+                        getTextStrikeout()));
             }
 
             // TODO: Handle Font Emphasis Above/Below
@@ -272,11 +272,11 @@ namespace drawinglayer::primitive2d
                         }
 
                         aRetval = Primitive2DContainer {
-                            Primitive2DReference(new TextEffectPrimitive2D(
+                            new TextEffectPrimitive2D(
                                 std::move(aRetval),
                                 aDecTrans.getTranslate(),
                                 aDecTrans.getRotate(),
-                                aTextEffectStyle2D))
+                                aTextEffectStyle2D)
                          };
                     }
                     else if(bHasOutline)
@@ -284,11 +284,11 @@ namespace drawinglayer::primitive2d
                         // create outline using an own helper primitive since this will
                         // be view-dependent
                         aRetval = Primitive2DContainer {
-                            Primitive2DReference(new TextEffectPrimitive2D(
+                            new TextEffectPrimitive2D(
                                 std::move(aRetval),
                                 aDecTrans.getTranslate(),
                                 aDecTrans.getRotate(),
-                                TextEffectStyle2D::Outline))
+                                TextEffectStyle2D::Outline)
                          };
                     }
 
diff --git a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx
index 2c7978772a27..988e6a33345d 100644
--- a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx
@@ -208,11 +208,11 @@ namespace drawinglayer::primitive2d
                     fWaveWidth *= 2.0;
                 }
 
-                aNewPrimitive = Primitive2DReference(new PolygonWavePrimitive2D(aLine, aLineAttribute, aStrokeAttribute, fWaveWidth, fWaveWidth * 0.5));
+                aNewPrimitive = new PolygonWavePrimitive2D(aLine, aLineAttribute, aStrokeAttribute, fWaveWidth, fWaveWidth * 0.5);
             }
             else
             {
-                aNewPrimitive = Primitive2DReference(new PolygonStrokePrimitive2D(std::move(aLine), aLineAttribute, std::move(aStrokeAttribute)));
+                aNewPrimitive = new PolygonStrokePrimitive2D(std::move(aLine), aLineAttribute, std::move(aStrokeAttribute));
             }
 
             // add primitive
diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx
index ee6144df7dd2..b466446cc5db 100644
--- a/drawinglayer/source/primitive2d/textprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx
@@ -191,8 +191,8 @@ void TextSimplePortionPrimitive2D::create2DDecomposition(
         aPolygonTransform.decompose(aScale, aTranslate, fRotate, fShearX);
 
         // create outline text effect with current content and replace
-        aRetval = Primitive2DContainer{ Primitive2DReference(new TextEffectPrimitive2D(
-            std::move(aRetval), aTranslate, fRotate, TextEffectStyle2D::Outline)) };
+        aRetval = Primitive2DContainer{ new TextEffectPrimitive2D(
+            std::move(aRetval), aTranslate, fRotate, TextEffectStyle2D::Outline) };
     }
 
     rContainer.append(std::move(aRetval));
diff --git a/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx b/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx
index c09401995dd1..4a8383a5a354 100644
--- a/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx
@@ -89,8 +89,8 @@ namespace drawinglayer::primitive2d
                 const basegfx::BColor aGray(getTransparence(), getTransparence(), getTransparence());
                 Primitive2DContainer aTransparenceContent(2);
 
-                aTransparenceContent[0] = Primitive2DReference(new PolyPolygonColorPrimitive2D(basegfx::B2DPolyPolygon(aPolygon), aGray));
-                aTransparenceContent[1] = Primitive2DReference(new PolygonHairlinePrimitive2D(std::move(aPolygon), aGray));
+                aTransparenceContent[0] = new PolyPolygonColorPrimitive2D(basegfx::B2DPolyPolygon(aPolygon), aGray);
+                aTransparenceContent[1] = new PolygonHairlinePrimitive2D(std::move(aPolygon), aGray);
 
                 // create sub-transparence group with a gray-colored rectangular fill polygon
                 rVisitor.visit(new TransparencePrimitive2D(Primitive2DContainer(getChildren()), std::move(aTransparenceContent)));
diff --git a/drawinglayer/source/processor2d/hittestprocessor2d.cxx b/drawinglayer/source/processor2d/hittestprocessor2d.cxx
index b760b24f845a..cf6d3eec9447 100644
--- a/drawinglayer/source/processor2d/hittestprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/hittestprocessor2d.cxx
@@ -539,7 +539,7 @@ namespace drawinglayer::processor2d
             {
                 /// push candidate to HitStack to create it. This only happens when a hit is found and
                 /// creating the HitStack was requested (see collectHitStack)
-                maHitStack.append(primitive2d::Primitive2DReference(const_cast< primitive2d::BasePrimitive2D* >(&rCandidate)));
+                maHitStack.append(const_cast< primitive2d::BasePrimitive2D* >(&rCandidate));
             }
         }
 
diff --git a/drawinglayer/source/tools/emfphelperdata.cxx b/drawinglayer/source/tools/emfphelperdata.cxx
index 26b7563fec80..664902f9bc2d 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -632,17 +632,17 @@ namespace emfplushelper
         {
             drawinglayer::primitive2d::Primitive2DContainer aContainer;
             if (aStart.isDefault() && aEnd.isDefault())
-                aContainer.append(drawinglayer::primitive2d::Primitive2DReference(
+                aContainer.append(
                     new drawinglayer::primitive2d::PolyPolygonStrokePrimitive2D(
-                        polygon, lineAttribute, pen->GetStrokeAttribute(mdExtractedXScale))));
+                        polygon, lineAttribute, pen->GetStrokeAttribute(mdExtractedXScale)));
             else
             {
                 aContainer.resize(polygon.count());
                 for (sal_uInt32 i = 0; i < polygon.count(); i++)
-                    aContainer[i] = drawinglayer::primitive2d::Primitive2DReference(
+                    aContainer[i] =
                         new drawinglayer::primitive2d::PolygonStrokeArrowPrimitive2D(
                             polygon.getB2DPolygon(i), lineAttribute,
-                            pen->GetStrokeAttribute(mdExtractedXScale), aStart, aEnd));
+                            pen->GetStrokeAttribute(mdExtractedXScale), aStart, aEnd);
             }
             mrTargetHolders.Current().append(
                 new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D(
diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx
index 03a3c4a150f2..775df12733fe 100644
--- a/drawinglayer/source/tools/wmfemfhelper.cxx
+++ b/drawinglayer/source/tools/wmfemfhelper.cxx
@@ -343,10 +343,9 @@ namespace wmfemfhelper
             if (rClipPolyPolygon.count())
             {
                 xRetval = drawinglayer::primitive2d::Primitive2DContainer{
-                    drawinglayer::primitive2d::Primitive2DReference(
                         new drawinglayer::primitive2d::MaskPrimitive2D(
                             rClipPolyPolygon,
-                            std::move(xRetval)))
+                            std::move(xRetval))
                 };
             }
         }
diff --git a/sfx2/source/control/templateviewitem.cxx b/sfx2/source/control/templateviewitem.cxx
index d28ad50f74cd..3a77dac11a64 100644
--- a/sfx2/source/control/templateviewitem.cxx
+++ b/sfx2/source/control/templateviewitem.cxx
@@ -69,12 +69,12 @@ void TemplateViewItem::Paint(drawinglayer::processor2d::BaseProcessor2D *pProces
             fTransparence = pAttrs->fHighlightTransparence;
     }
 
-    aSeq[0] = drawinglayer::primitive2d::Primitive2DReference(
+    aSeq[0] =
             new PolyPolygonSelectionPrimitive2D( B2DPolyPolygon(::tools::Polygon(maDrawArea,5,5).getB2DPolygon()),
                                                  aFillColor,
                                                  fTransparence,
                                                  0.0,
-                                                 true));
+                                                 true);
 
     // Draw thumbnail
     Size aImageSize = maPreview1.GetSizePixel();
@@ -91,27 +91,27 @@ void TemplateViewItem::Paint(drawinglayer::processor2d::BaseProcessor2D *pProces
     aBounds.append(B2DPoint(fPosX,fPosY+fHeight));
     aBounds.setClosed(true);
 
-    aSeq[1] = drawinglayer::primitive2d::Primitive2DReference( new PolyPolygonColorPrimitive2D(
-                                        B2DPolyPolygon(aBounds), COL_WHITE.getBColor()));
+    aSeq[1] = new PolyPolygonColorPrimitive2D(
+                    B2DPolyPolygon(aBounds), COL_WHITE.getBColor());
 
-    aSeq[2] = drawinglayer::primitive2d::Primitive2DReference( new FillGraphicPrimitive2D(
-                                        createTranslateB2DHomMatrix(maPrev1Pos.X(),maPrev1Pos.Y()),
-                                        FillGraphicAttribute(Graphic(maPreview1),
-                                                            B2DRange(
-                                                                B2DPoint(0,0),
-                                                                B2DPoint(aImageSize.Width(),aImageSize.Height())),
-                                                            false)
-                                        ));
+    aSeq[2] = new FillGraphicPrimitive2D(
+                    createTranslateB2DHomMatrix(maPrev1Pos.X(),maPrev1Pos.Y()),
+                    FillGraphicAttribute(Graphic(maPreview1),
+                                        B2DRange(
+                                            B2DPoint(0,0),
+                                            B2DPoint(aImageSize.Width(),aImageSize.Height())),
+                                        false)
+                    );
 
     // draw thumbnail borders
-    aSeq[3] = drawinglayer::primitive2d::Primitive2DReference(createBorderLine(aBounds));
+    aSeq[3] = createBorderLine(aBounds);
 
     if(mbIsDefaultTemplate)
     {
         Point aIconPos(getDefaultIconArea().TopLeft());
 
-        aSeq[4] = drawinglayer::primitive2d::Primitive2DReference(new DiscreteBitmapPrimitive2D( maDefaultBitmap,
-                    B2DPoint(aIconPos.X(), aIconPos.Y())));
+        aSeq[4] = new DiscreteBitmapPrimitive2D( maDefaultBitmap,
+                    B2DPoint(aIconPos.X(), aIconPos.Y()));
     }
 
     addTextPrimitives(maTitle, pAttrs, maTextPos, aSeq);
diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx
index 56cfee35f199..ae874408b8af 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -164,25 +164,25 @@ void ThumbnailViewItem::Paint (drawinglayer::processor2d::BaseProcessor2D *pProc
     }
 
     sal_uInt32 nPrimitive = 0;
-    aSeq[nPrimitive++] = drawinglayer::primitive2d::Primitive2DReference(
+    aSeq[nPrimitive++] =
             new PolyPolygonSelectionPrimitive2D( B2DPolyPolygon(::tools::Polygon(maDrawArea, THUMBNAILVIEW_ITEM_CORNER, THUMBNAILVIEW_ITEM_CORNER).getB2DPolygon()),
                                                  aFillColor,
                                                  fTransparence,
                                                  0.0,
-                                                 true));
+                                                 true);
 
     // Draw thumbnail
     Point aPos = maPrev1Pos;
     Size aImageSize = maPreview1.GetSizePixel();
 
-    aSeq[nPrimitive++] = drawinglayer::primitive2d::Primitive2DReference( new FillGraphicPrimitive2D(
+    aSeq[nPrimitive++] = new FillGraphicPrimitive2D(
                                         createTranslateB2DHomMatrix(aPos.X(),aPos.Y()),
                                         FillGraphicAttribute(Graphic(maPreview1),
                                                             B2DRange(
                                                                 B2DPoint(0,0),
                                                                 B2DPoint(aImageSize.Width(),aImageSize.Height())),
                                                             false)
-                                        ));
+                                        );
 
     if (mbBorder)
     {
@@ -199,7 +199,7 @@ void ThumbnailViewItem::Paint (drawinglayer::processor2d::BaseProcessor2D *pProc
         aBounds.append(B2DPoint(fPosX,fPosY+fHeight));
         aBounds.setClosed(true);
 
-        aSeq[nPrimitive++] = drawinglayer::primitive2d::Primitive2DReference(createBorderLine(aBounds));
+        aSeq[nPrimitive++] = createBorderLine(aBounds);
     }
 
     // Draw text below thumbnail
@@ -271,14 +271,14 @@ void ThumbnailViewItem::addTextPrimitives (const OUString& rText, const Thumbnai
             aTextColor = pAttrs->aHighlightTextColor;
         }
 
-        rSeq[nPrimitives++] = drawinglayer::primitive2d::Primitive2DReference(
+        rSeq[nPrimitives++] =
                     new TextSimplePortionPrimitive2D(aTextMatrix,
                                                      aText, nLineStart, nLineLength,
                                                      std::vector<double>(),
                                                      {},
                                                      pAttrs->aFontAttr,
                                                      css::lang::Locale(),
-                                                     aTextColor));
+                                                     aTextColor);
 
         if (nMnemonicPos != -1 && nMnemonicPos >= nLineStart && nMnemonicPos < nLineStart + nLineLength)
         {
@@ -301,8 +301,8 @@ void ThumbnailViewItem::addTextPrimitives (const OUString& rText, const Thumbnai
 
             drawinglayer::attribute::LineAttribute aLineAttribute(Color(aTextColor).getBColor(), fMnemonicHeight);
 
-            rSeq[nPrimitives++] = drawinglayer::primitive2d::Primitive2DReference(
-                        new PolygonStrokePrimitive2D(std::move(aLine), aLineAttribute));
+            rSeq[nPrimitives++] =
+                        new PolygonStrokePrimitive2D(std::move(aLine), aLineAttribute);
         }
 
         nLineStart += nLineLength;
diff --git a/svgio/source/svgreader/svgclippathnode.cxx b/svgio/source/svgreader/svgclippathnode.cxx
index f09fce5daf4a..954ce19a78b8 100644
--- a/svgio/source/svgreader/svgclippathnode.cxx
+++ b/svgio/source/svgreader/svgclippathnode.cxx
@@ -233,10 +233,9 @@ namespace svgio::svgreader
                     // SvgStyleAttributes the clip definition is without fill, stroke,
                     // and strokeWidth and forced to black
                     rContent = drawinglayer::primitive2d::Primitive2DContainer {
-                        drawinglayer::primitive2d::Primitive2DReference(
                             new drawinglayer::primitive2d::MaskPrimitive2D(
                                 std::move(aClipPolyPolygon),
-                                std::move(rContent)))
+                                std::move(rContent))
                     };
                 }
                 else
diff --git a/svgio/source/svgreader/svgfedropshadownode.cxx b/svgio/source/svgreader/svgfedropshadownode.cxx
index c968f51f5c1a..2abe6c71c560 100644
--- a/svgio/source/svgreader/svgfedropshadownode.cxx
+++ b/svgio/source/svgreader/svgfedropshadownode.cxx
@@ -121,18 +121,16 @@ void SvgFeDropShadowNode::apply(drawinglayer::primitive2d::Primitive2DContainer&
     drawinglayer::primitive2d::Primitive2DContainer aTempTarget;
 
     // Create the shadow
-    aTempTarget.append(drawinglayer::primitive2d::Primitive2DReference(
-        new drawinglayer::primitive2d::ShadowPrimitive2D(
-            aTransform, maFloodColor.getBColor(), maStdDeviation.getNumber(),
-            drawinglayer::primitive2d::Primitive2DContainer(rTarget))));
+    aTempTarget.append(new drawinglayer::primitive2d::ShadowPrimitive2D(
+        aTransform, maFloodColor.getBColor(), maStdDeviation.getNumber(),
+        drawinglayer::primitive2d::Primitive2DContainer(rTarget)));
 
     const double fOpacity(maFloodOpacity.solve(*this));
     if (basegfx::fTools::less(fOpacity, 1.0))
     {
         // Apply transparence to the shadow
-        aTempTarget.append(drawinglayer::primitive2d::Primitive2DReference(
-            new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D(std::move(aTempTarget),
-                                                                          1.0 - fOpacity)));
+        aTempTarget.append(new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D(
+            std::move(aTempTarget), 1.0 - fOpacity));
     }
 
     // Append the original target
diff --git a/svgio/source/svgreader/svgmasknode.cxx b/svgio/source/svgreader/svgmasknode.cxx
index d4942bc0b192..26e082bd2577 100644
--- a/svgio/source/svgreader/svgmasknode.cxx
+++ b/svgio/source/svgreader/svgmasknode.cxx
@@ -176,10 +176,9 @@ namespace svgio::svgreader
             {
                 // create embedding group element with transformation
                 aNewTarget = drawinglayer::primitive2d::Primitive2DContainer {
-                    drawinglayer::primitive2d::Primitive2DReference(
                         new drawinglayer::primitive2d::TransformPrimitive2D(
                             *getTransform(),
-                            std::move(aNewTarget)))
+                            std::move(aNewTarget))
                 };
             }
 
@@ -243,12 +242,11 @@ namespace svgio::svgreader
                     {
                         // mask is object-relative, embed in content transformation
                         aMaskTarget = drawinglayer::primitive2d::Primitive2DContainer {
-                            drawinglayer::primitive2d::Primitive2DReference(
                                 new drawinglayer::primitive2d::TransformPrimitive2D(
                                     basegfx::utils::createScaleTranslateB2DHomMatrix(
                                         aContentRange.getRange(),
                                         aContentRange.getMinimum()),
-                                    std::move(aMaskTarget)))
+                                    std::move(aMaskTarget))
                         };
                     }
                     else // userSpaceOnUse
@@ -257,10 +255,9 @@ namespace svgio::svgreader
                         if(pTransform)
                         {
                             aMaskTarget = drawinglayer::primitive2d::Primitive2DContainer {
-                                drawinglayer::primitive2d::Primitive2DReference(
                                     new drawinglayer::primitive2d::TransformPrimitive2D(
                                         *pTransform,
-                                        std::move(aMaskTarget)))
+                                        std::move(aMaskTarget))
                             };
                         }
                     }
@@ -269,10 +266,9 @@ namespace svgio::svgreader
                     // how content is used as alpha is special for Svg
                     {
                         aMaskTarget = drawinglayer::primitive2d::Primitive2DContainer {
-                            drawinglayer::primitive2d::Primitive2DReference(
                                 new drawinglayer::primitive2d::ModifiedColorPrimitive2D(
                                     std::move(aMaskTarget),
-                                    std::make_shared<basegfx::BColorModifier_luminance_to_alpha>()))
+                                    std::make_shared<basegfx::BColorModifier_luminance_to_alpha>())
                         };
                     }
 
diff --git a/svgio/source/svgreader/svgnode.cxx b/svgio/source/svgreader/svgnode.cxx
index fa7795ab43fa..c372184b1e37 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -662,12 +662,11 @@ namespace {
 
                         rTarget = drawinglayer::primitive2d::Primitive2DContainer {
                             // pack in ObjectInfoPrimitive2D group
-                            drawinglayer::primitive2d::Primitive2DReference(
                                 new drawinglayer::primitive2d::ObjectInfoPrimitive2D(
                                     std::move(rTarget),
                                     aObjectName,
                                     rTitle,
-                                    rDesc))
+                                    rDesc)
                         };
                     }
                 }
diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx
index 5e05d4c93c58..cada4ee2f882 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -1652,10 +1652,9 @@ drawinglayer::primitive2d::Primitive2DContainer Array::CreateB2DPrimitiveRange(
     if(!aData.empty())
     {
         aSequence.append(
-            drawinglayer::primitive2d::Primitive2DReference(
                 new drawinglayer::primitive2d::SdrFrameBorderPrimitive2D(
                     std::move(aData),
-                    true)));    // force visualization to minimal one discrete unit (pixel)
+                    true));    // force visualization to minimal one discrete unit (pixel)
     }
 
 #ifdef OPTICAL_CHECK_CLIPRANGE_FOR_MERGED_CELL
@@ -1663,10 +1662,9 @@ drawinglayer::primitive2d::Primitive2DContainer Array::CreateB2DPrimitiveRange(
     {
         // draw ClipRange in yellow to allow simple interactive optical control in office
         aSequence.append(
-            drawinglayer::primitive2d::Primitive2DReference(
                 new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(
                     basegfx::utils::createPolygonFromRect(rClipRange),
-                    basegfx::BColor(1.0, 1.0, 0.0))));
+                    basegfx::BColor(1.0, 1.0, 0.0)));
     }
 #endif
 
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index f248b7a60874..f41fc47a8ad2 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -166,14 +166,14 @@ void Impl3DMirrorConstructOverlay::SetMirrorAxis(Point aMirrorAxisA, Point aMirr
                     {
                         // embed in transformation group
                         aContent = drawinglayer::primitive2d::Primitive2DContainer {
-                            drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::TransformPrimitive2D(aMatrixTransform, std::move(aContent)))
+                            new drawinglayer::primitive2d::TransformPrimitive2D(aMatrixTransform, std::move(aContent))
                         };
                     }
 
                     // if we have full overlay from selected objects, embed with 50% transparence, the
                     // transformation is added to the OverlayPrimitive2DSequenceObject
                     aContent = drawinglayer::primitive2d::Primitive2DContainer {
-                        drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D(std::move(aContent), 0.5))
+                        new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D(std::move(aContent), 0.5)
                     };
 
                     std::unique_ptr<sdr::overlay::OverlayPrimitive2DSequenceObject> pNew(new sdr::overlay::OverlayPrimitive2DSequenceObject(std::move(aContent)));
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index 77e5b82df4bd..eee994c583cc 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -159,10 +159,9 @@ namespace sdr::contact
                 aOutline.transform(rObjectMatrix);
 
                 xRetval.push_back(
-                    drawinglayer::primitive2d::Primitive2DReference(
                         new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(
                             std::move(aOutline),
-                            aBColor)));
+                            aBColor));
             }
 
             // decompose object matrix to get single values
@@ -209,10 +208,9 @@ namespace sdr::contact
                         fWidth, fHeight, fShearX, fRotate, aTranslate.getX(), aTranslate.getY()));
 
                     xRetval.push_back(
-                        drawinglayer::primitive2d::Primitive2DReference(
                             new drawinglayer::primitive2d::BitmapPrimitive2D(
                                 aDraftBitmap,
-                                aBitmapMatrix)));
+                                aBitmapMatrix));
 
                     // consume bitmap size in X
                     aScale.setX(std::max(0.0, aScale.getX() - (fWidth + fDistance)));
diff --git a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
index 6899bb5407e2..e6386e7c0a92 100644
--- a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
@@ -138,10 +138,9 @@ void ViewContactOfSdrOle2Obj::createPrimitive2DSequenceWithParameters(drawinglay
         || !GetOle2Obj().GetDescription().isEmpty())
     {
         xContent = drawinglayer::primitive2d::Primitive2DContainer{
-            drawinglayer::primitive2d::Primitive2DReference(
                 new drawinglayer::primitive2d::ObjectInfoPrimitive2D(
                     std::move(xContent), GetOle2Obj().GetName(), GetOle2Obj().GetTitle(),
-                    GetOle2Obj().GetDescription()))
+                    GetOle2Obj().GetDescription())
         };
     }
 
@@ -171,11 +170,10 @@ basegfx::B2DRange ViewContactOfSdrOle2Obj::getRange( const drawinglayer::geometr
     const drawinglayer::primitive2d::Primitive2DReference xReference(
         new drawinglayer::primitive2d::SdrOle2Primitive2D(
             drawinglayer::primitive2d::Primitive2DContainer {
-                drawinglayer::primitive2d::Primitive2DReference(
                     new drawinglayer::primitive2d::SdrOleContentPrimitive2D(
                         GetOle2Obj(),
                         aObjectMatrix,
-                        GetOle2Obj().getEmbeddedObjectRef().getGraphicVersion()))
+                        GetOle2Obj().getEmbeddedObjectRef().getGraphicVersion())
             },
             aObjectMatrix,
             aAttribute));
diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
index 43ca1fd5c06f..05b045ec473a 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
@@ -253,7 +253,7 @@ void ViewContactOfPageFill::createViewIndependentPrimitive2DSequence(drawinglaye
 
     // create and add primitive
     const basegfx::BColor aRGBColor(aPageFillColor.getBColor());
-    rVisitor.visit(drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(basegfx::B2DPolyPolygon(aPageFillPolygon), aRGBColor)));
+    rVisitor.visit(new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(basegfx::B2DPolyPolygon(aPageFillPolygon), aRGBColor));
 }
 
 ViewContactOfPageFill::ViewContactOfPageFill(ViewContactOfSdrPage& rParentViewContactOfSdrPage)
@@ -302,13 +302,13 @@ void ViewContactOfOuterPageBorder::createViewIndependentPrimitive2DSequence(draw
         aRight.append(basegfx::B2DPoint(aPageBorderRange.getMaxX(), aPageBorderRange.getMinY()));
         aRight.append(basegfx::B2DPoint(aPageBorderRange.getMaxX(), aPageBorderRange.getMaxY()));
 
-        rVisitor.visit(drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(std::move(aLeft), aRGBBorderColor)));
-        rVisitor.visit(drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(std::move(aRight), aRGBBorderColor)));
+        rVisitor.visit(new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(std::move(aLeft), aRGBBorderColor));
+        rVisitor.visit(new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(std::move(aRight), aRGBBorderColor));
     }
     else
     {
         basegfx::B2DPolygon aPageBorderPolygon(basegfx::utils::createPolygonFromRect(aPageBorderRange));
-        rVisitor.visit(drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(std::move(aPageBorderPolygon), aRGBBorderColor)));
+        rVisitor.visit(new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(std::move(aPageBorderPolygon), aRGBBorderColor));
     }
 }
 
@@ -355,7 +355,7 @@ void ViewContactOfInnerPageBorder::createViewIndependentPrimitive2DSequence(draw
 
     // create page outer border primitive
     const basegfx::BColor aRGBBorderColor(aBorderColor.getBColor());
-    rVisitor.visit(drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(std::move(aPageBorderPolygon), aRGBBorderColor)));
+    rVisitor.visit(new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(std::move(aPageBorderPolygon), aRGBBorderColor));
 }
 
 ViewContactOfInnerPageBorder::ViewContactOfInnerPageBorder(ViewContactOfSdrPage& rParentViewContactOfSdrPage)
diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx
index dfc31cc372e0..2e3ebfd8d3f9 100644
--- a/svx/source/sdr/contact/viewobjectcontact.cxx
+++ b/svx/source/sdr/contact/viewobjectcontact.cxx
@@ -334,10 +334,9 @@ void ViewObjectContact::createPrimitive2DSequence(const DisplayInfo& rDisplayInf
                     aRGBWhite,
                     0.5);
             xRetval = drawinglayer::primitive2d::Primitive2DContainer{
-                drawinglayer::primitive2d::Primitive2DReference(
                     new drawinglayer::primitive2d::ModifiedColorPrimitive2D(
                         std::move(xRetval),
-                        aBColorModifier))
+                        aBColorModifier)
             };
         }
     }
@@ -417,7 +416,6 @@ void ViewObjectContact::createStructureTag(drawinglayer::primitive2d::Primitive2
                     }
 
                     rNewPrimitiveSequence = drawinglayer::primitive2d::Primitive2DContainer {
-                        drawinglayer::primitive2d::Primitive2DReference(
                             new drawinglayer::primitive2d::StructureTagPrimitive2D(
                                 eElement,
                                 bBackground,
@@ -425,7 +423,7 @@ void ViewObjectContact::createStructureTag(drawinglayer::primitive2d::Primitive2
                                 false, // Decorative
                                 std::move(rNewPrimitiveSequence),
                                 pAnchorKey,
-                                &annotIds))
+                                &annotIds)
                     };
                 }
             }
@@ -483,10 +481,9 @@ drawinglayer::primitive2d::Primitive2DContainer const & ViewObjectContact::getPr
                 basegfx::utils::createTranslateB2DHomMatrix(
                     rGridOffset));
             xNewPrimitiveSequence = drawinglayer::primitive2d::Primitive2DContainer {
-                drawinglayer::primitive2d::Primitive2DReference(
                     new drawinglayer::primitive2d::TransformPrimitive2D(
                         aTranslateGridOffset,
-                        std::move(xNewPrimitiveSequence)))
+                        std::move(xNewPrimitiveSequence))
             };
         }
     }
diff --git a/svx/source/sdr/overlay/overlaybitmapex.cxx b/svx/source/sdr/overlay/overlaybitmapex.cxx
index 54ccf788b2e3..3ffba9e05747 100644
--- a/svx/source/sdr/overlay/overlaybitmapex.cxx
+++ b/svx/source/sdr/overlay/overlaybitmapex.cxx
@@ -38,8 +38,7 @@ namespace sdr::overlay
             if(basegfx::fTools::more(mfAlpha, 0.0))
             {
                 drawinglayer::primitive2d::Primitive2DContainer aNewTransPrimitiveVector { aReference };
-                aReference = drawinglayer::primitive2d::Primitive2DReference(
-                                new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D(std::move(aNewTransPrimitiveVector), mfAlpha));
+                aReference = new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D(std::move(aNewTransPrimitiveVector), mfAlpha);
             }
 
             return drawinglayer::primitive2d::Primitive2DContainer { aReference };
diff --git a/svx/source/sdr/overlay/overlayobject.cxx b/svx/source/sdr/overlay/overlayobject.cxx
index 2c83a32d6cd1..7c54928ecb47 100644
--- a/svx/source/sdr/overlay/overlayobject.cxx
+++ b/svx/source/sdr/overlay/overlayobject.cxx
@@ -115,10 +115,9 @@ namespace sdr::overlay
                             getOffset()));
                     const_cast< OverlayObject* >(this)->maPrimitive2DSequence =
                         drawinglayer::primitive2d::Primitive2DContainer {
-                            drawinglayer::primitive2d::Primitive2DReference(
                                 new drawinglayer::primitive2d::TransformPrimitive2D(
                                     aTranslateGridOffset,
-                                    std::move(const_cast<drawinglayer::primitive2d::Primitive2DContainer&>(maPrimitive2DSequence))))
+                                    std::move(const_cast<drawinglayer::primitive2d::Primitive2DContainer&>(maPrimitive2DSequence)))
                         };
                 }
             }
diff --git a/svx/source/sdr/overlay/overlayobjectcell.cxx b/svx/source/sdr/overlay/overlayobjectcell.cxx
index 8dcf71edd8ec..dd04e8a535f2 100644
--- a/svx/source/sdr/overlay/overlayobjectcell.cxx
+++ b/svx/source/sdr/overlay/overlayobjectcell.cxx
@@ -57,19 +57,18 @@ namespace sdr::overlay
                     const basegfx::B2DRange& rRange(maRectangles[a]);
                     const basegfx::B2DPolygon aPolygon(basegfx::utils::createPolygonFromRect(rRange));
 
-                    aRetval[a] = drawinglayer::primitive2d::Primitive2DReference(
+                    aRetval[a] =
                         new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(
                             basegfx::B2DPolyPolygon(aPolygon),
-                            aRGBColor));
+                            aRGBColor);
                 }
 
 
                 aRetval = drawinglayer::primitive2d::Primitive2DContainer {
                     // embed in 50% transparent paint
-                    drawinglayer::primitive2d::Primitive2DReference(
                         new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D(
                             std::move(aRetval),
-                            0.5))
+                            0.5)
                 };
             }
 
diff --git a/svx/source/sdr/overlay/overlaypolypolygon.cxx b/svx/source/sdr/overlay/overlaypolypolygon.cxx
index a3b3d10affc8..ff820682fc08 100644
--- a/svx/source/sdr/overlay/overlaypolypolygon.cxx
+++ b/svx/source/sdr/overlay/overlaypolypolygon.cxx
@@ -64,8 +64,7 @@ namespace sdr::overlay
                 if (nTransparency > 0)
                 {
                     aReturnContainer = drawinglayer::primitive2d::Primitive2DContainer{
-                        drawinglayer::primitive2d::Primitive2DReference(
-                            new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D(std::move(aReturnContainer), nTransparency / 255.0))
+                            new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D(std::move(aReturnContainer), nTransparency / 255.0)
                      };
                 }
             }
diff --git a/svx/source/sdr/overlay/overlayselection.cxx b/svx/source/sdr/overlay/overlayselection.cxx
index 8c082ab639d0..89ef1202e125 100644
--- a/svx/source/sdr/overlay/overlayselection.cxx
+++ b/svx/source/sdr/overlay/overlayselection.cxx
@@ -110,19 +110,18 @@ namespace sdr::overlay
                 for(sal_uInt32 a(0);a < nCount; a++)
                 {
                     const basegfx::B2DPolygon aPolygon(basegfx::utils::createPolygonFromRect(maRanges[a]));
-                    aRetval[a] = drawinglayer::primitive2d::Primitive2DReference(
+                    aRetval[a] =
                         new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(
                             basegfx::B2DPolyPolygon(aPolygon),
-                            aRGBColor));
+                            aRGBColor);
                 }
 
                 if(bInvert)
                 {
                     // embed all in invert primitive
                     aRetval = drawinglayer::primitive2d::Primitive2DContainer {
-                        drawinglayer::primitive2d::Primitive2DReference(
                             new drawinglayer::primitive2d::InvertPrimitive2D(
-                                std::move(aRetval)))
+                                std::move(aRetval))
                     };
                 }
                 else if(OverlayType::Transparent == maLastOverlayType)
diff --git a/svx/source/sdr/overlay/overlaytools.cxx b/svx/source/sdr/overlay/overlaytools.cxx
index 89b8d422c5b3..9f986979d185 100644
--- a/svx/source/sdr/overlay/overlaytools.cxx
+++ b/svx/source/sdr/overlay/overlaytools.cxx
@@ -341,10 +341,9 @@ sal_uInt32 OverlayStaticRectanglePrimitive::getPrimitive2DID() const
                     if(getTransparence() > 0.0)
                     {
                         aRetval = Primitive2DContainer {
-                            Primitive2DReference(
                                 new UnifiedTransparencePrimitive2D(
                                     std::move(aRetval),
-                                    getTransparence()))
+                                    getTransparence())
                         };
                     }
                 }
diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
index ccb927649ebe..ba5d7e69a78b 100644
--- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
+++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
@@ -442,7 +442,7 @@ sal_uInt32 SlideBackgroundFillPrimitive2D::getPrimitive2DID() const
             {
                 // create simpleTransparencePrimitive, add created fill primitive
                 Primitive2DContainer aContent { pNewFillPrimitive };
-                return Primitive2DReference(new UnifiedTransparencePrimitive2D(std::move(aContent), rFill.getTransparence()));
+                return new UnifiedTransparencePrimitive2D(std::move(aContent), rFill.getTransparence());
             }
             else if(!rFillGradient.isDefault())
             {
@@ -452,15 +452,14 @@ sal_uInt32 SlideBackgroundFillPrimitive2D::getPrimitive2DID() const
                 // create FillGradientPrimitive2D for transparence and add to new sequence
                 // fillGradientPrimitive is enough here (compared to PolyPolygonGradientPrimitive2D) since float transparence will be masked anyways
                 Primitive2DContainer aAlpha {
-                    Primitive2DReference(
-                        new FillGradientPrimitive2D(
-                            basegfx::utils::getRange(rPolyPolygon),
-                            rDefinitionRange,
-                            rFillGradient))
+                    new FillGradientPrimitive2D(
+                        basegfx::utils::getRange(rPolyPolygon),
+                        rDefinitionRange,
+                        rFillGradient)
                 };
 
                 // create TransparencePrimitive2D using alpha and content
-                return Primitive2DReference(new TransparencePrimitive2D(std::move(aContent), std::move(aAlpha)));
+                return new TransparencePrimitive2D(std::move(aContent), std::move(aAlpha));
             }
             else
             {
@@ -497,7 +496,7 @@ sal_uInt32 SlideBackgroundFillPrimitive2D::getPrimitive2DID() const
             {
                 // create simpleTransparencePrimitive, add created fill primitive
                 Primitive2DContainer aContent { pNewLinePrimitive };
-                return Primitive2DReference(new UnifiedTransparencePrimitive2D(std::move(aContent), rLine.getTransparence()));
+                return new UnifiedTransparencePrimitive2D(std::move(aContent), rLine.getTransparence());
             }
             else
             {
@@ -660,15 +659,15 @@ sal_uInt32 SlideBackgroundFillPrimitive2D::getPrimitive2DID() const
                 if(0.0 != aAnimationList.getDuration())
                 {
                     // create content sequence
-                    Primitive2DContainer aContent { Primitive2DReference(pNew) };
+                    Primitive2DContainer aContent { pNew };
 
                     // create and add animated switch primitive
-                    return Primitive2DReference(new AnimatedBlinkPrimitive2D(aAnimationList, std::move(aContent)));
+                    return new AnimatedBlinkPrimitive2D(aAnimationList, std::move(aContent));
                 }
                 else
                 {
                     // add to decomposition
-                    return Primitive2DReference(pNew);
+                    return pNew;
                 }
             }
 
@@ -752,19 +751,19 @@ sal_uInt32 SlideBackgroundFillPrimitive2D::getPrimitive2DID() const
 
                         // create a new animatedInterpolatePrimitive and add it
                         Primitive2DContainer aContent {
-                            Primitive2DReference(new AnimatedInterpolatePrimitive2D({ aLeft, aRight }, aAnimationList, std::move(aAnimSequence)))
+                            new AnimatedInterpolatePrimitive2D({ aLeft, aRight }, aAnimationList, std::move(aAnimSequence))
                         };
 
                         // scrolling needs an encapsulating clipping primitive
                         const basegfx::B2DRange aClipRange(aClipTopLeft, aClipBottomRight);
                         basegfx::B2DPolygon aClipPolygon(basegfx::utils::createPolygonFromRect(aClipRange));
                         aClipPolygon.transform(aSRT);
-                        return Primitive2DReference(new MaskPrimitive2D(basegfx::B2DPolyPolygon(aClipPolygon), std::move(aContent)));
+                        return new MaskPrimitive2D(basegfx::B2DPolyPolygon(aClipPolygon), std::move(aContent));
                     }
                     else
                     {
                         // add to decomposition
-                        return Primitive2DReference(pNew);
+                        return pNew;
                     }
                 }
             }
@@ -774,10 +773,10 @@ sal_uInt32 SlideBackgroundFillPrimitive2D::getPrimitive2DID() const
                 // #i97628#
                 // encapsulate with TextHierarchyEditPrimitive2D to allow renderers
                 // to suppress actively edited content if needed
-                Primitive2DContainer aContent { Primitive2DReference(pNew) };
+                Primitive2DContainer aContent { pNew };
 
                 // create and add TextHierarchyEditPrimitive2D primitive
-                return Primitive2DReference(new TextHierarchyEditPrimitive2D(std::move(aContent)));
+                return new TextHierarchyEditPrimitive2D(std::move(aContent));
             }
             else
             {
@@ -825,25 +824,25 @@ sal_uInt32 SlideBackgroundFillPrimitive2D::getPrimitive2DID() const
             if (nContentWithTransparence == 0)
             {
                 Primitive2DContainer aRetval(2);
-                aRetval[0] = Primitive2DReference(
+                aRetval[0] =
                     new ShadowPrimitive2D(
                         aShadowOffset,
                         rShadow.getColor(),
                         rShadow.getBlur(),
-                        Primitive2DContainer(pContentForShadow ? *pContentForShadow : rContent)));
+                        Primitive2DContainer(pContentForShadow ? *pContentForShadow : rContent));
 
                 if (0.0 != rShadow.getTransparence())
                 {
                     // create SimpleTransparencePrimitive2D
                     Primitive2DContainer aTempContent{ aRetval[0] };
 
-                    aRetval[0] = Primitive2DReference(
+                    aRetval[0] =
                         new UnifiedTransparencePrimitive2D(
                             std::move(aTempContent),
-                            rShadow.getTransparence()));
+                            rShadow.getTransparence());
                 }
 
-                aRetval[1] = Primitive2DReference(new GroupPrimitive2D(std::move(rContent)));
+                aRetval[1] = new GroupPrimitive2D(std::move(rContent));
                 return aRetval;
             }
 
@@ -856,13 +855,12 @@ sal_uInt32 SlideBackgroundFillPrimitive2D::getPrimitive2DID() const
                 if (rShadow.getTransparence() != 0.0)
                 {
                     Primitive2DContainer aTempContent{ aRetval.back() };
-                    aRetval.back() = Primitive2DReference(new UnifiedTransparencePrimitive2D(
-                            std::move(aTempContent), rShadow.getTransparence()));
+                    aRetval.back() = new UnifiedTransparencePrimitive2D(
+                            std::move(aTempContent), rShadow.getTransparence());
                 }
             }
 
-            aRetval.push_back(
-                    Primitive2DReference(new GroupPrimitive2D(std::move(rContent))));
+            aRetval.push_back(new GroupPrimitive2D(std::move(rContent)));
             return aRetval;
         }
 
@@ -873,9 +871,8 @@ sal_uInt32 SlideBackgroundFillPrimitive2D::getPrimitive2DID() const
             if(rContent.empty())
                 return std::move(rContent);
             Primitive2DContainer aRetval(2);
-            aRetval[0] = Primitive2DReference(
-                new GlowPrimitive2D(rGlow.getColor(), rGlow.getRadius(), Primitive2DContainer(rContent)));
-            aRetval[1] = Primitive2DReference(new GroupPrimitive2D(Primitive2DContainer(rContent)));
+            aRetval[0] = new GlowPrimitive2D(rGlow.getColor(), rGlow.getRadius(), Primitive2DContainer(rContent));
+            aRetval[1] = new GroupPrimitive2D(Primitive2DContainer(rContent));
             return aRetval;
         }
 
@@ -885,7 +882,7 @@ sal_uInt32 SlideBackgroundFillPrimitive2D::getPrimitive2DID() const
             if (aContent.empty() || !nRadius)
                 return std::move(aContent);
             Primitive2DContainer aRetval(1);
-            aRetval[0] = Primitive2DReference(new SoftEdgePrimitive2D(nRadius, std::move(aContent)));
+            aRetval[0] = new SoftEdgePrimitive2D(nRadius, std::move(aContent));
             return aRetval;
         }
 
diff --git a/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx
index 02a1373aa004..ea673d1b2563 100644
--- a/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx
@@ -602,12 +602,11 @@ namespace
         const basegfx::B2DPoint aStart(rOrigin + (aPerpendX * aCombination.getRefModeOffset()));
 
         rTarget.append(
-            drawinglayer::primitive2d::Primitive2DReference(
                 new drawinglayer::primitive2d::BorderLinePrimitive2D(
                     aStart,
                     aStart + rX,
                     std::move(aBorderlines),
-                    std::move(aStrokeAttribute))));
+                    std::move(aStrokeAttribute)));
     }
 
     double getMinimalNonZeroValue(double fCurrent, double fNew)
diff --git a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
index 3e9dff78bb24..0e1a1b9c2d97 100644
--- a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
@@ -392,7 +392,7 @@ namespace drawinglayer::primitive2d
             {
                 // embed line geometry to invisible (100% transparent) line group for HitTest
                 aRetval = Primitive2DContainer {
-                    Primitive2DReference(new HiddenGeometryPrimitive2D(std::move(aRetval)))
+                    new HiddenGeometryPrimitive2D(std::move(aRetval))
                 };
             }
 
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 101e4369d40e..4bd3c138a7d0 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -197,10 +197,9 @@ SdrDragEntryPrimitive2DSequence::~SdrDragEntryPrimitive2DSequence()
 drawinglayer::primitive2d::Primitive2DContainer SdrDragEntryPrimitive2DSequence::createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod)
 {
     return drawinglayer::primitive2d::Primitive2DContainer {
-        drawinglayer::primitive2d::Primitive2DReference(
             new drawinglayer::primitive2d::TransformPrimitive2D(
                 rDragMethod.getCurrentTransformation(),
-                drawinglayer::primitive2d::Primitive2DContainer(maPrimitive2DSequence)))
+                drawinglayer::primitive2d::Primitive2DContainer(maPrimitive2DSequence))
     };
 }
 
@@ -253,17 +252,15 @@ drawinglayer::primitive2d::Primitive2DContainer SdrDragEntryPointGlueDrag::creat
             }
 
             aRetval = drawinglayer::primitive2d::Primitive2DContainer {
-                drawinglayer::primitive2d::Primitive2DReference(
                     new drawinglayer::primitive2d::MarkerArrayPrimitive2D(std::move(aTransformedPositions),
-                        drawinglayer::primitive2d::createDefaultCross_3x3(aColor)))
+                        drawinglayer::primitive2d::createDefaultCross_3x3(aColor))
             };
         }
         else
         {
             aRetval = drawinglayer::primitive2d::Primitive2DContainer {
-                drawinglayer::primitive2d::Primitive2DReference(
                     new drawinglayer::primitive2d::MarkerArrayPrimitive2D(std::move(aTransformedPositions),
-                                                                          SdrHdl::createGluePointBitmap()))
+                                                                          SdrHdl::createGluePointBitmap())
              };
         }
     }
@@ -794,7 +791,7 @@ void SdrDragMethod::CreateOverlayGeometry(
         if(!aResultTransparent.empty())
         {
             aResultTransparent = drawinglayer::primitive2d::Primitive2DContainer {
-                drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D(std::move(aResultTransparent), 0.5))
+                new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D(std::move(aResultTransparent), 0.5)
             };
 
             std::unique_ptr<sdr::overlay::OverlayObject> pNewOverlayObject(
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index b4b98dde2e15..f2ea7c9ddeeb 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -520,14 +520,13 @@ TextEditHighContrastOverlaySelection::createOverlayObjectPrimitive2DSequence()
         // This is used in high contrast mode, we will render the selection
         // with the bg forced to the selection Highlight color and the fg color
         // forced to the HighlightText color
-        aRetval.append(drawinglayer::primitive2d::Primitive2DReference(
-            new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(
-                basegfx::B2DPolyPolygon(
-                    basegfx::utils::createPolygonFromRect(aClipPolyPolygon.getB2DRange())),
-                aRGBColor)));
+        aRetval.append(new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(
+            basegfx::B2DPolyPolygon(
+                basegfx::utils::createPolygonFromRect(aClipPolyPolygon.getB2DRange())),
+            aRGBColor));
         aRetval.append(mrTextEditOverlayObject.getTextPrimitives());
-        aRetval.append(drawinglayer::primitive2d::Primitive2DReference(
-            new drawinglayer::primitive2d::MaskPrimitive2D(aClipPolyPolygon, std::move(aRetval))));
+        aRetval.append(
+            new drawinglayer::primitive2d::MaskPrimitive2D(aClipPolyPolygon, std::move(aRetval)));
     }
 
     return aRetval;
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 703b3e664638..12bd86564261 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -678,10 +678,9 @@ uno::Any SvxShape::GetBitmap( bool bMetaFile /* = false */ ) const
 
                     // Embed primitives to get them in 100th mm
                     xPrimitives = drawinglayer::primitive2d::Primitive2DContainer {
-                        drawinglayer::primitive2d::Primitive2DReference(
                             new drawinglayer::primitive2d::TransformPrimitive2D(
                                 aMapTransform,
-                                std::move(xPrimitives)))
+                                std::move(xPrimitives))
                     };
 
                     // Update basegfx::B2DRange aRange, too. Here we have the
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index fd81d18d427e..67af9dc54b5e 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -2263,7 +2263,7 @@ namespace sdr::contact
             {
                 // create transform primitive
                 xRetval = drawinglayer::primitive2d::Primitive2DContainer {
-                    drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::TransformPrimitive2D(aOffsetMatrix, std::move(xRetval)))
+                    new drawinglayer::primitive2d::TransformPrimitive2D(aOffsetMatrix, std::move(xRetval))
                 };
             }
 
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index e36c11cad17e..0f9f401bbf54 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2680,10 +2680,9 @@ void SwTabFramePainter::PaintLines(OutputDevice& rDev, const SwRect& rRect) cons
     {
         drawinglayer::primitive2d::Primitive2DContainer aSequence;
         aSequence.append(
-            drawinglayer::primitive2d::Primitive2DReference(
                 new drawinglayer::primitive2d::SdrFrameBorderPrimitive2D(
                     std::move(aData),
-                    true)));    // force visualization to minimal one discrete unit (pixel)
+                    true));    // force visualization to minimal one discrete unit (pixel)
         // paint
         mrTabFrame.ProcessPrimitives(aSequence);
     }
@@ -5167,10 +5166,9 @@ namespace drawinglayer::primitive2d
             if(!aData.empty())
             {
                 rContainer.append(
-                    drawinglayer::primitive2d::Primitive2DReference(
                         new drawinglayer::primitive2d::SdrFrameBorderPrimitive2D(
                             std::move(aData),
-                            true)));    // force visualization to minimal one discrete unit (pixel)
+                            true));    // force visualization to minimal one discrete unit (pixel)
             }
         }
 
@@ -5297,13 +5295,12 @@ void PaintCharacterBorder(
     drawinglayer::primitive2d::Primitive2DContainer aBorderLineTarget;
 
     aBorderLineTarget.append(
-        drawinglayer::primitive2d::Primitive2DReference(
             new drawinglayer::primitive2d::SwBorderRectanglePrimitive2D(
                 aBorderTransform,
                 aStyleTop,
                 aStyleRight,
                 aStyleBottom,
-                aStyleLeft)));
+                aStyleLeft));
     gProp.pBLines->AddBorderLines(std::move(aBorderLineTarget));
 }
 
diff --git a/sw/source/uibase/docvw/OverlayRanges.cxx b/sw/source/uibase/docvw/OverlayRanges.cxx
index 2b30f9543ebe..3201848bad18 100644
--- a/sw/source/uibase/docvw/OverlayRanges.cxx
+++ b/sw/source/uibase/docvw/OverlayRanges.cxx
@@ -68,10 +68,10 @@ namespace sw::overlay
             {
                 const basegfx::BColor aRGBColor(getBaseColor().getBColor());
                 const basegfx::B2DPolygon aPolygon(basegfx::utils::createPolygonFromRect(maRanges[a]));
-                aRetval[a] = drawinglayer::primitive2d::Primitive2DReference(
+                aRetval[a] =
                     new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(
                     basegfx::B2DPolyPolygon(aPolygon),
-                    aRGBColor));
+                    aRGBColor);
             }
             // embed all rectangles in transparent paint
             const sal_uInt16 nTransparence( SvtOptionsDrawinglayer::GetTransparentSelectionPercent() );
diff --git a/sw/source/uibase/docvw/UnfloatTableButton.cxx b/sw/source/uibase/docvw/UnfloatTableButton.cxx
index 4e8449383ecd..c9169102f14e 100644
--- a/sw/source/uibase/docvw/UnfloatTableButton.cxx
+++ b/sw/source/uibase/docvw/UnfloatTableButton.cxx
@@ -214,10 +214,9 @@ void UnfloatTableButton::PaintButton()
         aFontSize.getX(), aFontSize.getY(), static_cast<double>(aTextPos.X()),
         static_cast<double>(aTextPos.Y())));
 
-    aSeq.push_back(drawinglayer::primitive2d::Primitive2DReference(
-        new drawinglayer::primitive2d::TextSimplePortionPrimitive2D(
-            aTextMatrix, m_sLabel, 0, m_sLabel.getLength(), std::vector<double>(), {},
-            std::move(aFontAttr), css::lang::Locale(), aLineColor)));
+    aSeq.push_back(new drawinglayer::primitive2d::TextSimplePortionPrimitive2D(
+        aTextMatrix, m_sLabel, 0, m_sLabel.getLength(), std::vector<double>(), {},
+        std::move(aFontAttr), css::lang::Locale(), aLineColor));
 
     // Create the processor and process the primitives
     const drawinglayer::geometry::ViewInformation2D aNewViewInfos;
diff --git a/sw/source/uibase/docvw/contentcontrolaliasbutton.cxx b/sw/source/uibase/docvw/contentcontrolaliasbutton.cxx
index 0d11b5c60641..a22deda2d4ee 100644
--- a/sw/source/uibase/docvw/contentcontrolaliasbutton.cxx
+++ b/sw/source/uibase/docvw/contentcontrolaliasbutton.cxx
@@ -118,10 +118,9 @@ void SwContentControlAliasButton::PaintButton()
         aFontSize.getX(), aFontSize.getY(), static_cast<double>(aTextPos.X()),
         static_cast<double>(aTextPos.Y()));
 
-    aSeq.push_back(drawinglayer::primitive2d::Primitive2DReference(
-        new drawinglayer::primitive2d::TextSimplePortionPrimitive2D(
-            aTextMatrix, m_sLabel, 0, m_sLabel.getLength(), std::vector<double>(), {},
-            std::move(aFontAttr), css::lang::Locale(), aLineColor)));
+    aSeq.push_back(new drawinglayer::primitive2d::TextSimplePortionPrimitive2D(
+        aTextMatrix, m_sLabel, 0, m_sLabel.getLength(), std::vector<double>(), {},
+        std::move(aFontAttr), css::lang::Locale(), aLineColor));
 
     // Create the processor and process the primitives
     drawinglayer::geometry::ViewInformation2D aViewInfo;