diff options
author | Noel Grandin <noel@peralex.com> | 2016-02-17 13:14:50 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-02-23 08:08:56 +0200 |
commit | c45d3badc96481db093560b94d8bf51ead6bd17c (patch) | |
tree | 4bb6c9220678a12b327e46ca2acd01e77fc8e2c4 /svtools/source/graphic | |
parent | 003d0ccf902d2449320dd24119564565a384f365 (diff) |
new loplugin: commaoperator
Change-Id: I03f24e61f696b7619855e3c7010aa0d874e5a4ff
Diffstat (limited to 'svtools/source/graphic')
-rw-r--r-- | svtools/source/graphic/grfcache.cxx | 24 | ||||
-rw-r--r-- | svtools/source/graphic/grfmgr.cxx | 26 | ||||
-rw-r--r-- | svtools/source/graphic/grfmgr2.cxx | 30 |
3 files changed, 58 insertions, 22 deletions
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx index e8fdfe1f1341..623e7b14d296 100644 --- a/svtools/source/graphic/grfcache.cxx +++ b/svtools/source/graphic/grfcache.cxx @@ -208,13 +208,22 @@ bool GraphicCacheEntry::ImplInit( const GraphicObject& rObj ) const Graphic& rGraphic = rObj.GetGraphic(); if( mpBmpEx ) - delete mpBmpEx, mpBmpEx = nullptr; + { + delete mpBmpEx; + mpBmpEx = nullptr; + } if( mpMtf ) - delete mpMtf, mpMtf = nullptr; + { + delete mpMtf; + mpMtf = nullptr; + } if( mpAnimation ) - delete mpAnimation, mpAnimation = nullptr; + { + delete mpAnimation; + mpAnimation = nullptr; + } switch( rGraphic.GetType() ) { @@ -361,9 +370,12 @@ void GraphicCacheEntry::GraphicObjectWasSwappedOut( const GraphicObject& /*rObj* if( mbSwappedAll ) { - delete mpBmpEx, mpBmpEx = nullptr; - delete mpMtf, mpMtf = nullptr; - delete mpAnimation, mpAnimation = nullptr; + delete mpBmpEx; + mpBmpEx = nullptr; + delete mpMtf; + mpMtf = nullptr; + delete mpAnimation; + mpAnimation = nullptr; // #119176# also reset SvgData maSvgData.reset(); diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 74346e9aa064..95182e1faa47 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -126,7 +126,10 @@ GraphicObject::~GraphicObject() mpMgr->ImplUnregisterObj( *this ); if( ( mpMgr == mpGlobalMgr ) && !mpGlobalMgr->ImplHasObjects() ) - delete mpGlobalMgr, mpGlobalMgr = nullptr; + { + delete mpGlobalMgr; + mpGlobalMgr = nullptr; + } } delete mpSwapOutTimer; @@ -177,7 +180,10 @@ void GraphicObject::ImplSetGraphicManager( const GraphicManager* pMgr, const OSt mpMgr->ImplUnregisterObj( *this ); if( ( mpMgr == mpGlobalMgr ) && !mpGlobalMgr->ImplHasObjects() ) - delete mpGlobalMgr, mpGlobalMgr = nullptr; + { + delete mpGlobalMgr; + mpGlobalMgr = nullptr; + } } if( !pMgr ) @@ -350,7 +356,8 @@ GraphicObject& GraphicObject::operator=( const GraphicObject& rGraphicObj ) mpMgr->ImplUnregisterObj( *this ); maSwapStreamHdl = Link<const GraphicObject*, SvStream*>(); - delete mpSimpleCache, mpSimpleCache = nullptr; + delete mpSimpleCache; + mpSimpleCache = nullptr; maGraphic = rGraphicObj.GetGraphic(); maAttr = rGraphicObj.maAttr; @@ -400,7 +407,10 @@ void GraphicObject::SetAttr( const GraphicAttr& rAttr ) maAttr = rAttr; if( mpSimpleCache && ( mpSimpleCache->maAttr != rAttr ) ) - delete mpSimpleCache, mpSimpleCache = nullptr; + { + delete mpSimpleCache; + mpSimpleCache = nullptr; + } } void GraphicObject::SetLink() @@ -454,7 +464,10 @@ void GraphicObject::SetSwapStreamHdl(const Link<const GraphicObject*, SvStream*> mpSwapOutTimer->Start(); } else - delete mpSwapOutTimer, mpSwapOutTimer = nullptr; + { + delete mpSwapOutTimer; + mpSwapOutTimer = nullptr; + } } void GraphicObject::FireSwapInRequest() @@ -684,7 +697,8 @@ void GraphicObject::SetGraphic( const Graphic& rGraphic, const GraphicObject* pC mbAutoSwapped = false; ImplAssignGraphicData(); maLink.clear(); - delete mpSimpleCache, mpSimpleCache = nullptr; + delete mpSimpleCache; + mpSimpleCache = nullptr; mpMgr->ImplRegisterObj( *this, maGraphic, nullptr, pCopyObj); diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 7ffb4676773d..fc9d81945042 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -478,8 +478,10 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib if( ( nUnRotX >= 0L ) && ( nUnRotX < aUnrotatedWidth ) && ( nUnRotY >= 0L ) && ( nUnRotY < aUnrotatedHeight ) ) { - nTmpX = pMapIX[ nUnRotX ]; nTmpFX = pMapFX[ nUnRotX ]; - nTmpY = pMapIY[ nUnRotY ], nTmpFY = pMapFY[ nUnRotY ]; + nTmpX = pMapIX[ nUnRotX ]; + nTmpFX = pMapFX[ nUnRotX ]; + nTmpY = pMapIY[ nUnRotY ]; + nTmpFY = pMapFY[ nUnRotY ]; const BitmapColor& rCol0 = pReadAccess->GetPaletteColor( pReadAccess->GetPixelIndex( nTmpY, nTmpX ) ); const BitmapColor& rCol1 = pReadAccess->GetPaletteColor( pReadAccess->GetPixelIndex( nTmpY, ++nTmpX ) ); @@ -518,8 +520,10 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib if( ( nUnRotX >= 0L ) && ( nUnRotX < aUnrotatedWidth ) && ( nUnRotY >= 0L ) && ( nUnRotY < aUnrotatedHeight ) ) { - nTmpX = pMapIX[ nUnRotX ]; nTmpFX = pMapFX[ nUnRotX ]; - nTmpY = pMapIY[ nUnRotY ], nTmpFY = pMapFY[ nUnRotY ]; + nTmpX = pMapIX[ nUnRotX ]; + nTmpFX = pMapFX[ nUnRotX ]; + nTmpY = pMapIY[ nUnRotY ]; + nTmpFY = pMapFY[ nUnRotY ]; aCol0 = pReadAccess->GetPixel( nTmpY, nTmpX ); aCol1 = pReadAccess->GetPixel( nTmpY, ++nTmpX ); @@ -643,7 +647,8 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib for( long nY = 0; nY < aTargetHeight; nY++ ) { - nSinY = pSinY[ nY ], nCosY = pCosY[ nY ]; + nSinY = pSinY[ nY ]; + nCosY = pCosY[ nY ]; pLineW = pWriteAccess->GetScanline( nY ); for( long nX = 0; nX < aTargetWidth; nX++ ) @@ -654,8 +659,10 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib if( ( nUnRotX >= 0L ) && ( nUnRotX < aUnrotatedWidth ) && ( nUnRotY >= 0L ) && ( nUnRotY < aUnrotatedHeight ) ) { - nTmpX = pMapIX[ nUnRotX ], nTmpFX = pMapFX[ nUnRotX ]; - nTmpY = pMapIY[ nUnRotY ], nTmpFY = pMapFY[ nUnRotY ]; + nTmpX = pMapIX[ nUnRotX ]; + nTmpFX = pMapFX[ nUnRotX ]; + nTmpY = pMapIY[ nUnRotY ]; + nTmpFY = pMapFY[ nUnRotY ]; pLine0 = pReadAccess->GetScanline( nTmpY++ ); pLine1 = pReadAccess->GetScanline( nTmpY ); @@ -740,7 +747,8 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib for( long nY = 0; nY < aTargetHeight; nY++ ) { - nSinY = pSinY[ nY ], nCosY = pCosY[ nY ]; + nSinY = pSinY[ nY ]; + nCosY = pCosY[ nY ]; for( long nX = 0; nX < aTargetWidth; nX++ ) { @@ -750,8 +758,10 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib if( ( nUnRotX >= 0L ) && ( nUnRotX < aUnrotatedWidth ) && ( nUnRotY >= 0L ) && ( nUnRotY < aUnrotatedHeight ) ) { - nTmpX = pMapIX[ nUnRotX ]; nTmpFX = pMapFX[ nUnRotX ]; - nTmpY = pMapIY[ nUnRotY ], nTmpFY = pMapFY[ nUnRotY ]; + nTmpX = pMapIX[ nUnRotX ]; + nTmpFX = pMapFX[ nUnRotX ]; + nTmpY = pMapIY[ nUnRotY ]; + nTmpFY = pMapFY[ nUnRotY ]; const long nAlpha0 = pReadAccess->GetPixel( nTmpY, nTmpX ).GetIndex(); const long nAlpha1 = pReadAccess->GetPixel( nTmpY, ++nTmpX ).GetIndex(); |