diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-16 10:41:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-21 12:44:55 +0100 |
| commit | 2dbd02b576f28224204ac962f6ce20fde6687093 (patch) | |
| tree | 28b3f8807d5909e7bcc3c5a629dadd6f475ad9d3 /drawinglayer/source | |
| parent | 48314f25241e014a634dd5371543b90137ffd2bc (diff) | |
loplugin:redundantfcast improvements
check for calls to constructors, and extend the list of types we check
for unnecessary temporary creation
Change-Id: Ia2c1f202b41ed6866779fff5343c821128033eec
Reviewed-on: https://gerrit.libreoffice.org/63472
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'drawinglayer/source')
| -rw-r--r-- | drawinglayer/source/primitive2d/controlprimitive2d.cxx | 2 | ||||
| -rw-r--r-- | drawinglayer/source/tools/emfphelperdata.cxx | 6 | ||||
| -rw-r--r-- | drawinglayer/source/tools/emfpregion.cxx | 3 | ||||
| -rw-r--r-- | drawinglayer/source/tools/wmfemfhelper.cxx | 11 |
4 files changed, 9 insertions, 13 deletions
diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx b/drawinglayer/source/primitive2d/controlprimitive2d.cxx index 4de6279cb60d..921c9837a8c0 100644 --- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx @@ -207,7 +207,7 @@ namespace drawinglayer aBitmapSizeLogic.getX(), aBitmapSizeLogic.getY(), aTranslate.getX(), aTranslate.getY())); // create primitive - xRetval = new BitmapPrimitive2D(BitmapEx(aContent), aBitmapTransform); + xRetval = new BitmapPrimitive2D(aContent, aBitmapTransform); } catch( const uno::Exception& ) { diff --git a/drawinglayer/source/tools/emfphelperdata.cxx b/drawinglayer/source/tools/emfphelperdata.cxx index 06a2d0a814b2..d75db28a1902 100644 --- a/drawinglayer/source/tools/emfphelperdata.cxx +++ b/drawinglayer/source/tools/emfphelperdata.cxx @@ -1056,8 +1056,7 @@ namespace emfplushelper ::basegfx::B2DPoint mappedCenter(Map(dx + dw / 2, dy + dh / 2)); ::basegfx::B2DSize mappedSize(MapSize(dw / 2, dh / 2)); ::basegfx::B2DPolyPolygon polyPolygon( - ::basegfx::B2DPolygon( - ::basegfx::utils::createPolygonFromEllipse(mappedCenter, mappedSize.getX(), mappedSize.getY()))); + ::basegfx::utils::createPolygonFromEllipse(mappedCenter, mappedSize.getX(), mappedSize.getY())); if (type == EmfPlusRecordTypeFillEllipse) EMFPPlusFillPolygon(polyPolygon, flags & 0x8000, brushIndexOrColor); @@ -1663,13 +1662,12 @@ namespace emfplushelper ::basegfx::B2DSize mappedSize(MapSize(dw, dh)); ::basegfx::B2DPolyPolygon polyPolygon( - ::basegfx::B2DPolygon( ::basegfx::utils::createPolygonFromRect( ::basegfx::B2DRectangle( mappedPoint.getX(), mappedPoint.getY(), mappedPoint.getX() + mappedSize.getX(), - mappedPoint.getY() + mappedSize.getY())))); + mappedPoint.getY() + mappedSize.getY()))); HandleNewClipRegion(combineClip(mrPropertyHolders.Current().getClipPolyPolygon(), combineMode, polyPolygon), mrTargetHolders, mrPropertyHolders); break; diff --git a/drawinglayer/source/tools/emfpregion.cxx b/drawinglayer/source/tools/emfpregion.cxx index ba78503c2826..559e77db6e08 100644 --- a/drawinglayer/source/tools/emfpregion.cxx +++ b/drawinglayer/source/tools/emfpregion.cxx @@ -74,13 +74,12 @@ namespace emfplushelper ::basegfx::B2DSize mappedSize(rR.MapSize(dw, dh)); ::basegfx::B2DPolyPolygon polyPolygon( - ::basegfx::B2DPolygon( ::basegfx::utils::createPolygonFromRect( ::basegfx::B2DRectangle( mappedPoint.getX(), mappedPoint.getY(), mappedPoint.getX() + mappedSize.getX(), - mappedPoint.getY() + mappedSize.getY())))); + mappedPoint.getY() + mappedSize.getY()))); polygon = polyPolygon; break; } diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx index 5081fbf9f236..3b5128f99255 100644 --- a/drawinglayer/source/tools/wmfemfhelper.cxx +++ b/drawinglayer/source/tools/wmfemfhelper.cxx @@ -1063,12 +1063,11 @@ namespace wmfemfhelper const vcl::Font& rFont = rProperty.getFont(); basegfx::B2DVector aFontScaling; - rFontAttribute = drawinglayer::attribute::FontAttribute( - drawinglayer::primitive2d::getFontAttributeFromVclFont( - aFontScaling, - rFont, - bool(rProperty.getLayoutMode() & ComplexTextLayoutFlags::BiDiRtl), - bool(rProperty.getLayoutMode() & ComplexTextLayoutFlags::BiDiStrong))); + rFontAttribute = drawinglayer::primitive2d::getFontAttributeFromVclFont( + aFontScaling, + rFont, + bool(rProperty.getLayoutMode() & ComplexTextLayoutFlags::BiDiRtl), + bool(rProperty.getLayoutMode() & ComplexTextLayoutFlags::BiDiStrong)); // add FontScaling rTextTransform.scale(aFontScaling.getX(), aFontScaling.getY()); |