diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-27 15:28:13 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-28 07:43:56 +0200 |
commit | a12523644802f715ca57774b75f84e327dc221f7 (patch) | |
tree | 6f79ff40710f3a799370e805e963e2b0059bd019 /cppcanvas | |
parent | 05ff3d67d0e2e436406786c949eb7cfca107ba33 (diff) |
clang-tidy:readability-redundant-member-init
Change-Id: I48e6fb31df732805423b89ed91b6e4363a69b668
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121150
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cppcanvas')
-rw-r--r-- | cppcanvas/source/mtfrenderer/bitmapaction.cxx | 6 | ||||
-rw-r--r-- | cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx | 2 | ||||
-rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 4 | ||||
-rw-r--r-- | cppcanvas/source/mtfrenderer/lineaction.cxx | 3 | ||||
-rw-r--r-- | cppcanvas/source/mtfrenderer/pointaction.cxx | 6 | ||||
-rw-r--r-- | cppcanvas/source/mtfrenderer/polypolyaction.cxx | 10 | ||||
-rw-r--r-- | cppcanvas/source/mtfrenderer/textaction.cxx | 26 | ||||
-rw-r--r-- | cppcanvas/source/mtfrenderer/transparencygroupaction.cxx | 5 | ||||
-rw-r--r-- | cppcanvas/source/tools/canvasgraphichelper.cxx | 1 | ||||
-rw-r--r-- | cppcanvas/source/wrapper/implbitmap.cxx | 3 | ||||
-rw-r--r-- | cppcanvas/source/wrapper/implcanvas.cxx | 2 | ||||
-rw-r--r-- | cppcanvas/source/wrapper/implcustomsprite.cxx | 1 | ||||
-rw-r--r-- | cppcanvas/source/wrapper/implpolypolygon.cxx | 2 | ||||
-rw-r--r-- | cppcanvas/source/wrapper/implsprite.cxx | 1 |
14 files changed, 12 insertions, 60 deletions
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx index 8040c9a018c0..24e1f46faeb8 100644 --- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx +++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx @@ -82,8 +82,7 @@ namespace cppcanvas::internal const OutDevState& rState ) : CachedPrimitiveBase( rCanvas, true ), mxBitmap( vcl::unotools::xBitmapFromBitmapEx( rBmpEx ) ), - mpCanvas( rCanvas ), - maState() + mpCanvas( rCanvas ) { tools::initRenderState(maState,rState); @@ -109,8 +108,7 @@ namespace cppcanvas::internal const OutDevState& rState ) : CachedPrimitiveBase( rCanvas, true ), mxBitmap( vcl::unotools::xBitmapFromBitmapEx( rBmpEx ) ), - mpCanvas( rCanvas ), - maState() + mpCanvas( rCanvas ) { tools::initRenderState(maState,rState); diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx index 8d63d30a335a..8001ae8733f5 100644 --- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx +++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx @@ -34,8 +34,6 @@ namespace cppcanvas::internal CachedPrimitiveBase::CachedPrimitiveBase( const CanvasSharedPtr& rCanvas, bool bOnlyRedrawWithSameTransform ) : mpCanvas( rCanvas ), - mxCachedPrimitive(), - maLastTransformation(), mbOnlyRedrawWithSameTransform( bOnlyRedrawWithSameTransform ) { // TODO(F2): also store last view transform, and refuse to diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 215bd45124b0..667e78546588 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -2654,8 +2654,7 @@ namespace cppcanvas::internal { public: explicit AreaQuery( const ::basegfx::B2DHomMatrix& rTransformation ) : - maTransformation( rTransformation ), - maBounds() + maTransformation( rTransformation ) { } @@ -2841,7 +2840,6 @@ namespace cppcanvas::internal const GDIMetaFile& rMtf, const Parameters& rParams ) : CanvasGraphicHelper(rCanvas) - , maActions() , nFrameLeft(0) , nFrameTop(0) , nFrameRight(0) diff --git a/cppcanvas/source/mtfrenderer/lineaction.cxx b/cppcanvas/source/mtfrenderer/lineaction.cxx index 066a2e0052f1..9c8734fdf450 100644 --- a/cppcanvas/source/mtfrenderer/lineaction.cxx +++ b/cppcanvas/source/mtfrenderer/lineaction.cxx @@ -74,8 +74,7 @@ namespace cppcanvas::internal const OutDevState& rState ) : maStartPoint( rStartPoint ), maEndPoint( rEndPoint ), - mpCanvas( rCanvas ), - maState() + mpCanvas( rCanvas ) { tools::initRenderState(maState,rState); maState.DeviceColor = rState.lineColor; diff --git a/cppcanvas/source/mtfrenderer/pointaction.cxx b/cppcanvas/source/mtfrenderer/pointaction.cxx index 0f2340d9ae74..72550db5480b 100644 --- a/cppcanvas/source/mtfrenderer/pointaction.cxx +++ b/cppcanvas/source/mtfrenderer/pointaction.cxx @@ -75,8 +75,7 @@ namespace cppcanvas::internal const CanvasSharedPtr& rCanvas, const OutDevState& rState ) : maPoint( rPoint ), - mpCanvas( rCanvas ), - maState() + mpCanvas( rCanvas ) { tools::initRenderState(maState,rState); maState.DeviceColor = rState.lineColor; @@ -87,8 +86,7 @@ namespace cppcanvas::internal const OutDevState& rState, const ::Color& rAltColor ) : maPoint( rPoint ), - mpCanvas( rCanvas ), - maState() + mpCanvas( rCanvas ) { tools::initRenderState(maState,rState); maState.DeviceColor = vcl::unotools::colorToDoubleSequence( diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx b/cppcanvas/source/mtfrenderer/polypolyaction.cxx index cc9fec338ca0..b69f14de774b 100644 --- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx +++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx @@ -89,9 +89,7 @@ namespace cppcanvas::internal CachedPrimitiveBase( rCanvas, false ), mxPolyPoly( ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( rCanvas->getUNOCanvas()->getDevice(), rPolyPoly) ), maBounds( ::basegfx::utils::getRange(rPolyPoly) ), - mpCanvas( rCanvas ), - maState(), - maFillColor() + mpCanvas( rCanvas ) { tools::initRenderState(maState,rState); @@ -111,9 +109,7 @@ namespace cppcanvas::internal CachedPrimitiveBase( rCanvas, false ), mxPolyPoly( ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( rCanvas->getUNOCanvas()->getDevice(), rPolyPoly) ), maBounds( ::basegfx::utils::getRange(rPolyPoly) ), - mpCanvas( rCanvas ), - maState(), - maFillColor() + mpCanvas( rCanvas ) { tools::initRenderState(maState,rState); @@ -263,7 +259,6 @@ namespace cppcanvas::internal mxPolyPoly( ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( rCanvas->getUNOCanvas()->getDevice(), rPolyPoly) ), maBounds( ::basegfx::utils::getRange(rPolyPoly) ), mpCanvas( rCanvas ), - maState(), maTexture( rTexture ) { tools::initRenderState(maState,rState); @@ -373,7 +368,6 @@ namespace cppcanvas::internal mxPolyPoly( ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( rCanvas->getUNOCanvas()->getDevice(), rPolyPoly) ), maBounds( ::basegfx::utils::getRange(rPolyPoly) ), mpCanvas( rCanvas ), - maState(), maStrokeAttributes( rStrokeAttributes ) { tools::initRenderState(maState,rState); diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx index c908d7a37b8a..0ffe14e3c04b 100644 --- a/cppcanvas/source/mtfrenderer/textaction.cxx +++ b/cppcanvas/source/mtfrenderer/textaction.cxx @@ -643,7 +643,6 @@ namespace cppcanvas::internal mxFont( rState.xFont ), maStringContext( rString, nStartPos, nLen ), mpCanvas( rCanvas ), - maState(), maTextDirection( rState.textDirection ) { init( maState, mxFont, @@ -664,7 +663,6 @@ namespace cppcanvas::internal mxFont( rState.xFont ), maStringContext( rString, nStartPos, nLen ), mpCanvas( rCanvas ), - maState(), maTextDirection( rState.textDirection ) { init( maState, mxFont, @@ -831,10 +829,7 @@ namespace cppcanvas::internal mxFont( rState.xFont ), maStringContext( rText, nStartPos, nLen ), mpCanvas( rCanvas ), - maState(), maTextLineInfo( tools::createTextLineInfo( rVDev, rState ) ), - maLinesOverallSize(), - mxTextLines(), maReliefOffset( rReliefOffset ), maReliefColor( rReliefColor ), maShadowOffset( rShadowOffset ), @@ -873,10 +868,7 @@ namespace cppcanvas::internal mxFont( rState.xFont ), maStringContext( rText, nStartPos, nLen ), mpCanvas( rCanvas ), - maState(), maTextLineInfo( tools::createTextLineInfo( rVDev, rState ) ), - maLinesOverallSize(), - mxTextLines(), maReliefOffset( rReliefOffset ), maReliefColor( rReliefColor ), maShadowOffset( rShadowOffset ), @@ -1071,9 +1063,7 @@ namespace cppcanvas::internal const uno::Sequence< double >& rOffsets, const CanvasSharedPtr& rCanvas, const OutDevState& rState ) : - mxTextLayout(), - mpCanvas( rCanvas ), - maState() + mpCanvas( rCanvas ) { initLayoutWidth(mnLayoutWidth, rOffsets); @@ -1096,9 +1086,7 @@ namespace cppcanvas::internal const CanvasSharedPtr& rCanvas, const OutDevState& rState, const ::basegfx::B2DHomMatrix& rTextTransform ) : - mxTextLayout(), - mpCanvas( rCanvas ), - maState() + mpCanvas( rCanvas ) { initLayoutWidth(mnLayoutWidth, rOffsets); @@ -1288,9 +1276,7 @@ namespace cppcanvas::internal VirtualDevice const & rVDev, const CanvasSharedPtr& rCanvas, const OutDevState& rState ) : - mxTextLayout(), mpCanvas( rCanvas ), - maState(), maTextLineInfo( tools::createTextLineInfo( rVDev, rState ) ), maTextLinesHelper(mpCanvas, rState), maReliefOffset( rReliefOffset ), @@ -1328,9 +1314,7 @@ namespace cppcanvas::internal const CanvasSharedPtr& rCanvas, const OutDevState& rState, const ::basegfx::B2DHomMatrix& rTextTransform ) : - mxTextLayout(), mpCanvas( rCanvas ), - maState(), maTextLineInfo( tools::createTextLineInfo( rVDev, rState ) ), maTextLinesHelper(mpCanvas, rState), maReliefOffset( rReliefOffset ), @@ -1677,16 +1661,13 @@ namespace cppcanvas::internal mxTextPoly( rTextPoly ), maOffsets( rOffsets ), mpCanvas( rCanvas ), - maState(), mnOutlineWidth( calcOutlineWidth(rState,rVDev) ), maFillColor( vcl::unotools::colorToDoubleSequence( COL_WHITE, rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() )), maTextLineInfo( tools::createTextLineInfo( rVDev, rState ) ), - maLinesOverallSize(), maOutlineBounds( rOutlineBounds ), - mxTextLines(), maReliefOffset( rReliefOffset ), maReliefColor( rReliefColor ), maShadowOffset( rShadowOffset ), @@ -1723,16 +1704,13 @@ namespace cppcanvas::internal mxTextPoly( rTextPoly ), maOffsets( rOffsets ), mpCanvas( rCanvas ), - maState(), mnOutlineWidth( calcOutlineWidth(rState,rVDev) ), maFillColor( vcl::unotools::colorToDoubleSequence( COL_WHITE, rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() )), maTextLineInfo( tools::createTextLineInfo( rVDev, rState ) ), - maLinesOverallSize(), maOutlineBounds( rOutlineBounds ), - mxTextLines(), maReliefOffset( rReliefOffset ), maReliefColor( rReliefColor ), maShadowOffset( rShadowOffset ), diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx index 55cc47a97732..e0562361e3ce 100644 --- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx +++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx @@ -144,10 +144,7 @@ namespace cppcanvas::internal mpGroupMtf( std::move(rGroupMtf) ), mpAlphaGradient( std::move(rAlphaGradient) ), maDstSize( rDstSize ), - mxBufferBitmap(), - maLastTransformation(), - mpCanvas( rCanvas ), - maState() + mpCanvas( rCanvas ) { tools::initRenderState(maState,rState); implSetupTransform( maState, rDstPoint ); diff --git a/cppcanvas/source/tools/canvasgraphichelper.cxx b/cppcanvas/source/tools/canvasgraphichelper.cxx index f7a91d38d361..632294834cce 100644 --- a/cppcanvas/source/tools/canvasgraphichelper.cxx +++ b/cppcanvas/source/tools/canvasgraphichelper.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star; namespace cppcanvas::internal { CanvasGraphicHelper::CanvasGraphicHelper( const CanvasSharedPtr& rParentCanvas ) : - maClipPolyPolygon(), mpCanvas( rParentCanvas ) { OSL_ENSURE( mpCanvas && mpCanvas->getUNOCanvas().is(), diff --git a/cppcanvas/source/wrapper/implbitmap.cxx b/cppcanvas/source/wrapper/implbitmap.cxx index 176fcd1cd849..4b46ecb657b3 100644 --- a/cppcanvas/source/wrapper/implbitmap.cxx +++ b/cppcanvas/source/wrapper/implbitmap.cxx @@ -32,8 +32,7 @@ namespace cppcanvas::internal ImplBitmap::ImplBitmap( const CanvasSharedPtr& rParentCanvas, const uno::Reference< rendering::XBitmap >& rBitmap ) : CanvasGraphicHelper( rParentCanvas ), - mxBitmap( rBitmap ), - mpBitmapCanvas() + mxBitmap( rBitmap ) { OSL_ENSURE( mxBitmap.is(), "ImplBitmap::ImplBitmap: no valid bitmap" ); diff --git a/cppcanvas/source/wrapper/implcanvas.cxx b/cppcanvas/source/wrapper/implcanvas.cxx index 3a186404ce2e..2760311d5ef7 100644 --- a/cppcanvas/source/wrapper/implcanvas.cxx +++ b/cppcanvas/source/wrapper/implcanvas.cxx @@ -35,8 +35,6 @@ namespace cppcanvas::internal { ImplCanvas::ImplCanvas( const uno::Reference< rendering::XCanvas >& xCanvas ) : - maViewState(), - maClipPolyPolygon(), mxCanvas( xCanvas ) { OSL_ENSURE( mxCanvas.is(), "Canvas::Canvas() invalid XCanvas" ); diff --git a/cppcanvas/source/wrapper/implcustomsprite.cxx b/cppcanvas/source/wrapper/implcustomsprite.cxx index 71fe28a6682a..f6af05cf9e67 100644 --- a/cppcanvas/source/wrapper/implcustomsprite.cxx +++ b/cppcanvas/source/wrapper/implcustomsprite.cxx @@ -33,7 +33,6 @@ namespace cppcanvas::internal ImplSprite( rParentCanvas, rSprite, rTransformArbiter ), - mpLastCanvas(), mxCustomSprite( rSprite ) { OSL_ENSURE( rParentCanvas.is(), "ImplCustomSprite::ImplCustomSprite(): Invalid canvas" ); diff --git a/cppcanvas/source/wrapper/implpolypolygon.cxx b/cppcanvas/source/wrapper/implpolypolygon.cxx index 308d3dace114..182bf6b47f42 100644 --- a/cppcanvas/source/wrapper/implpolypolygon.cxx +++ b/cppcanvas/source/wrapper/implpolypolygon.cxx @@ -45,8 +45,6 @@ namespace cppcanvas::internal rendering::PathCapType::ROUND, rendering::PathCapType::ROUND, rendering::PathJoinType::ROUND ), - maFillColor(), - maStrokeColor(), mbFillColorSet( false ), mbStrokeColorSet( false ) { diff --git a/cppcanvas/source/wrapper/implsprite.cxx b/cppcanvas/source/wrapper/implsprite.cxx index f7cd4eb77c97..c0450880d75d 100644 --- a/cppcanvas/source/wrapper/implsprite.cxx +++ b/cppcanvas/source/wrapper/implsprite.cxx @@ -33,7 +33,6 @@ namespace cppcanvas::internal ImplSprite::ImplSprite( const uno::Reference< rendering::XSpriteCanvas >& rParentCanvas, const uno::Reference< rendering::XSprite >& rSprite, const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ) : - mxGraphicDevice(), mxSprite( rSprite ), mpTransformArbiter( rTransformArbiter ) { |