diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-24 08:30:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-24 09:04:45 +0100 |
| commit | 6b4fe3e44b4daa89fef6a3385919b00472eaed60 (patch) | |
| tree | db2d11ae4e08d0782e1eb240513abfbe8ff33113 /drawinglayer/source/processor3d | |
| parent | e975ab34daf72a2b708a46095994d0df3c23dec0 (diff) | |
loplugin:makeshared in drawinglayer..fpicker
Change-Id: Ib20fec3a7b6bfe2f94c6f5f2f9fa0be6f7c21e97
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87320
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'drawinglayer/source/processor3d')
| -rw-r--r-- | drawinglayer/source/processor3d/defaultprocessor3d.cxx | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/drawinglayer/source/processor3d/defaultprocessor3d.cxx b/drawinglayer/source/processor3d/defaultprocessor3d.cxx index 36862b0db230..6415fb00a2ed 100644 --- a/drawinglayer/source/processor3d/defaultprocessor3d.cxx +++ b/drawinglayer/source/processor3d/defaultprocessor3d.cxx @@ -87,47 +87,45 @@ namespace drawinglayer::processor3d { case attribute::GradientStyle::Linear: { - pNewTex.reset( - new texture::GeoTexSvxGradientLinear( + pNewTex = std::make_shared<texture::GeoTexSvxGradientLinear>( aOutlineRange, aOutlineRange, aStart, aEnd, nSteps, rFillGradient.getBorder(), - rFillGradient.getAngle())); + rFillGradient.getAngle()); break; } case attribute::GradientStyle::Axial: { - pNewTex.reset( - new texture::GeoTexSvxGradientAxial( + pNewTex = std::make_shared<texture::GeoTexSvxGradientAxial>( aOutlineRange, aOutlineRange, aStart, aEnd, nSteps, rFillGradient.getBorder(), - rFillGradient.getAngle())); + rFillGradient.getAngle()); break; } case attribute::GradientStyle::Radial: { - pNewTex.reset( - new texture::GeoTexSvxGradientRadial( + pNewTex = + std::make_shared<texture::GeoTexSvxGradientRadial>( aOutlineRange, aStart, aEnd, nSteps, rFillGradient.getBorder(), rFillGradient.getOffsetX(), - rFillGradient.getOffsetY())); + rFillGradient.getOffsetY()); break; } case attribute::GradientStyle::Elliptical: { - pNewTex.reset( - new texture::GeoTexSvxGradientElliptical( + pNewTex = + std::make_shared<texture::GeoTexSvxGradientElliptical>( aOutlineRange, aStart, aEnd, @@ -135,13 +133,13 @@ namespace drawinglayer::processor3d rFillGradient.getBorder(), rFillGradient.getOffsetX(), rFillGradient.getOffsetY(), - rFillGradient.getAngle())); + rFillGradient.getAngle()); break; } case attribute::GradientStyle::Square: { - pNewTex.reset( - new texture::GeoTexSvxGradientSquare( + pNewTex = + std::make_shared<texture::GeoTexSvxGradientSquare>( aOutlineRange, aStart, aEnd, @@ -149,13 +147,13 @@ namespace drawinglayer::processor3d rFillGradient.getBorder(), rFillGradient.getOffsetX(), rFillGradient.getOffsetY(), - rFillGradient.getAngle())); + rFillGradient.getAngle()); break; } case attribute::GradientStyle::Rect: { - pNewTex.reset( - new texture::GeoTexSvxGradientRect( + pNewTex = + std::make_shared<texture::GeoTexSvxGradientRect>( aOutlineRange, aStart, aEnd, @@ -163,7 +161,7 @@ namespace drawinglayer::processor3d rFillGradient.getBorder(), rFillGradient.getOffsetX(), rFillGradient.getOffsetY(), - rFillGradient.getAngle())); + rFillGradient.getAngle()); break; } } @@ -173,7 +171,7 @@ namespace drawinglayer::processor3d else { // no color distance -> same color, use simple texture - pNewTex.reset(new texture::GeoTexSvxMono(aStart, 1.0 - aStart.luminance())); + pNewTex = std::make_shared<texture::GeoTexSvxMono>(aStart, 1.0 - aStart.luminance()); mbSimpleTextureActive = true; } @@ -235,7 +233,7 @@ namespace drawinglayer::processor3d const double fLogicTexSize(std::max(fLogicTexSizeX, fLogicTexSizeY)); // create texture and set - mpGeoTexSvx.reset(new texture::GeoTexSvxMultiHatch(rPrimitive, fLogicTexSize)); + mpGeoTexSvx = std::make_shared<texture::GeoTexSvxMultiHatch>(rPrimitive, fLogicTexSize); // process sub-list process(rSubSequence); @@ -273,19 +271,19 @@ namespace drawinglayer::processor3d if(rFillGraphicAttribute.getTiling()) { - mpGeoTexSvx.reset( - new texture::GeoTexSvxBitmapExTiled( + mpGeoTexSvx = + std::make_shared<texture::GeoTexSvxBitmapExTiled>( aBitmapEx, aGraphicRange, rFillGraphicAttribute.getOffsetX(), - rFillGraphicAttribute.getOffsetY())); + rFillGraphicAttribute.getOffsetY()); } else { - mpGeoTexSvx.reset( - new texture::GeoTexSvxBitmapEx( + mpGeoTexSvx = + std::make_shared<texture::GeoTexSvxBitmapEx>( aBitmapEx, - aGraphicRange)); + aGraphicRange); } // process sub-list |