diff options
| author | Noel <noel.grandin@collabora.co.uk> | 2021-02-19 15:53:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-02-20 11:38:55 +0100 |
| commit | d8ed3bda462b351d2b98ec57cfdb879e0eec0010 (patch) | |
| tree | 10d3696813b853e6b90cf045d89b9203206004b9 /svx/source/sdr | |
| parent | a87fa0206bbcbcf9aa13ee17f6f41d34e176775e (diff) | |
loplugin:refcounting in svx
Change-Id: I79afd219a29ad176ce72020579d2b29a0b3ec09d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111220
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/sdr')
| -rw-r--r-- | svx/source/sdr/overlay/overlaypolypolygon.cxx | 7 | ||||
| -rw-r--r-- | svx/source/sdr/primitive2d/sdrdecompositiontools.cxx | 13 |
2 files changed, 8 insertions, 12 deletions
diff --git a/svx/source/sdr/overlay/overlaypolypolygon.cxx b/svx/source/sdr/overlay/overlaypolypolygon.cxx index 5be533074a50..f71b664b7a06 100644 --- a/svx/source/sdr/overlay/overlaypolypolygon.cxx +++ b/svx/source/sdr/overlay/overlaypolypolygon.cxx @@ -50,13 +50,12 @@ namespace sdr::overlay { const drawinglayer::attribute::LineAttribute aLineAttribute(getBaseColor().getBColor(), mfLineWidth); - auto aLine(new drawinglayer::primitive2d::PolyPolygonStrokePrimitive2D(maLinePolyPolygon, aLineAttribute)); + aReturnContainer = drawinglayer::primitive2d::Primitive2DContainer { + new drawinglayer::primitive2d::PolyPolygonStrokePrimitive2D(maLinePolyPolygon, aLineAttribute) }; - aReturnContainer = drawinglayer::primitive2d::Primitive2DContainer { aLine }; if (maFillColor.GetAlpha() != 0) { - auto aFill(new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(maLinePolyPolygon, maFillColor.getBColor())); - aReturnContainer.push_back(aFill); + aReturnContainer.push_back(new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(maLinePolyPolygon, maFillColor.getBColor())); } sal_uInt8 nTransparency = 255 - getBaseColor().GetAlpha(); diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx index e1bd4d2a026a..35e410b8fbfd 100644 --- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx +++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx @@ -87,7 +87,7 @@ namespace drawinglayer::primitive2d } // prepare fully scaled polygon - BasePrimitive2D* pNewFillPrimitive = nullptr; + rtl::Reference<BasePrimitive2D> pNewFillPrimitive; if(!rFill.getGradient().isDefault()) { @@ -121,15 +121,13 @@ namespace drawinglayer::primitive2d if(0.0 != rFill.getTransparence()) { // create simpleTransparencePrimitive, add created fill primitive - const Primitive2DReference xRefA(pNewFillPrimitive); - const Primitive2DContainer aContent { xRefA }; + const Primitive2DContainer aContent { pNewFillPrimitive }; return Primitive2DReference(new UnifiedTransparencePrimitive2D(aContent, rFill.getTransparence())); } else if(!rFillGradient.isDefault()) { // create sequence with created fill primitive - const Primitive2DReference xRefA(pNewFillPrimitive); - const Primitive2DContainer aContent { xRefA }; + const Primitive2DContainer aContent { pNewFillPrimitive }; // create FillGradientPrimitive2D for transparence and add to new sequence // fillGradientPrimitive is enough here (compared to PolyPolygonGradientPrimitive2D) since float transparence will be masked anyways @@ -159,7 +157,7 @@ namespace drawinglayer::primitive2d // create line and stroke attribute const attribute::LineAttribute aLineAttribute(rLine.getColor(), rLine.getWidth(), rLine.getJoin(), rLine.getCap()); const attribute::StrokeAttribute aStrokeAttribute(rLine.getDotDashArray(), rLine.getFullDotDashLen()); - BasePrimitive2D* pNewLinePrimitive = nullptr; + rtl::Reference<BasePrimitive2D> pNewLinePrimitive; if(!rPolygon.isClosed() && !rStroke.isDefault()) { @@ -178,8 +176,7 @@ namespace drawinglayer::primitive2d if(0.0 != rLine.getTransparence()) { // create simpleTransparencePrimitive, add created fill primitive - const Primitive2DReference xRefA(pNewLinePrimitive); - const Primitive2DContainer aContent { xRefA }; + const Primitive2DContainer aContent { pNewLinePrimitive }; return Primitive2DReference(new UnifiedTransparencePrimitive2D(aContent, rLine.getTransparence())); } else |