From c45d3badc96481db093560b94d8bf51ead6bd17c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 17 Feb 2016 13:14:50 +0200 Subject: new loplugin: commaoperator Change-Id: I03f24e61f696b7619855e3c7010aa0d874e5a4ff --- svtools/source/brwbox/brwbox2.cxx | 10 ++++++++-- svtools/source/contnr/imivctl2.cxx | 6 ++++-- svtools/source/filter/exportdialog.cxx | 6 ++++-- svtools/source/graphic/grfcache.cxx | 24 ++++++++++++++++++------ svtools/source/graphic/grfmgr.cxx | 26 ++++++++++++++++++++------ svtools/source/graphic/grfmgr2.cxx | 30 ++++++++++++++++++++---------- svtools/source/misc/embedhlp.cxx | 12 ++++++++++-- svtools/source/misc/transfer.cxx | 15 ++++++++++----- svtools/source/svhtml/parhtml.cxx | 29 ++++++++++++++++++++++------- 9 files changed, 116 insertions(+), 42 deletions(-) (limited to 'svtools') diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 2cbf05481044..1a3cfad27e11 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -1902,9 +1902,15 @@ void BrowseBox::Dispatch( sal_uInt16 nId ) sal_uInt16 nNewPos = GetColumnPos(nColId); bool bMoveAllowed = false; if ( BROWSER_MOVECOLUMNLEFT == nId && nNewPos > 1 ) - --nNewPos,bMoveAllowed = true; + { + --nNewPos; + bMoveAllowed = true; + } else if ( BROWSER_MOVECOLUMNRIGHT == nId && nNewPos < (ColCount()-1) ) - ++nNewPos,bMoveAllowed = true; + { + ++nNewPos; + bMoveAllowed = true; + } if ( bMoveAllowed ) { diff --git a/svtools/source/contnr/imivctl2.cxx b/svtools/source/contnr/imivctl2.cxx index e001b3f3068c..549020906d57 100644 --- a/svtools/source/contnr/imivctl2.cxx +++ b/svtools/source/contnr/imivctl2.cxx @@ -538,7 +538,8 @@ IcnGridMap_Impl::IcnGridMap_Impl(SvxIconChoiceCtrl_Impl* pView) IcnGridMap_Impl::~IcnGridMap_Impl() { - delete[] _pGridMap, _pGridMap=nullptr; + delete[] _pGridMap; + _pGridMap = nullptr; } void IcnGridMap_Impl::Expand() @@ -719,7 +720,8 @@ void IcnGridMap_Impl::Clear() { if( _pGridMap ) { - delete[] _pGridMap, _pGridMap=nullptr; + delete[] _pGridMap; + _pGridMap = nullptr; _nGridRows = 0; _nGridCols = 0; _aLastOccupiedGrid.SetEmpty(); diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index 4f46e0c03faa..5c06d6a8f53a 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -391,7 +391,8 @@ void ExportDialog::GetGraphicStream() { if ( !IsTempExportAvailable() ) { - delete mpTempStream, mpTempStream = new SvMemoryStream(); + delete mpTempStream; + mpTempStream = new SvMemoryStream(); maBitmap = Bitmap(); return; } @@ -409,7 +410,8 @@ void ExportDialog::GetGraphicStream() { if ( bRecreateOutputStream ) { - delete mpTempStream, mpTempStream = new SvMemoryStream(); + delete mpTempStream; + mpTempStream = new SvMemoryStream(); maBitmap = Bitmap(); uno::Reference < io::XStream > xStream( new utl::OStreamWrapper( *mpTempStream ) ); 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(); - 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 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(); diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index af105c1836bc..4efd3d8de961 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -664,8 +664,16 @@ void EmbeddedObjectRef::DrawPaintReplacement( const Rectangle &rRect, const OUSt aPt.Y() = (rRect.GetHeight() - pOut->GetTextHeight()) / 2; bool bTiny = false; - if( aPt.X() < 0 ) bTiny = true, aPt.X() = 0; - if( aPt.Y() < 0 ) bTiny = true, aPt.Y() = 0; + if( aPt.X() < 0 ) + { + bTiny = true; + aPt.X() = 0; + } + if( aPt.Y() < 0 ) + { + bTiny = true; + aPt.Y() = 0; + } if( bTiny ) { // decrease for small images diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index dc79ac671c7b..d4761afd9672 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -1181,8 +1181,10 @@ TransferableDataHelper& TransferableDataHelper::operator=( const TransferableDat StopClipboardListening(); mxTransfer = rDataHelper.mxTransfer; - delete mpFormats, mpFormats = new DataFlavorExVector( *rDataHelper.mpFormats ); - delete mpObjDesc, mpObjDesc = new TransferableObjectDescriptor( *rDataHelper.mpObjDesc ); + delete mpFormats; + mpFormats = new DataFlavorExVector( *rDataHelper.mpFormats ); + delete mpObjDesc; + mpObjDesc = new TransferableObjectDescriptor( *rDataHelper.mpObjDesc ); mxClipboard = rDataHelper.mxClipboard; if ( bWasClipboardListening ) @@ -1198,8 +1200,10 @@ TransferableDataHelper::~TransferableDataHelper() StopClipboardListening( ); { ::osl::MutexGuard aGuard( mpImpl->maMutex ); - delete mpFormats, mpFormats = nullptr; - delete mpObjDesc, mpObjDesc = nullptr; + delete mpFormats; + mpFormats = nullptr; + delete mpObjDesc; + mpObjDesc = nullptr; } } @@ -1303,7 +1307,8 @@ void TransferableDataHelper::InitFormats() ::osl::MutexGuard aGuard( mpImpl->maMutex ); mpFormats->clear(); - delete mpObjDesc, mpObjDesc = new TransferableObjectDescriptor; + delete mpObjDesc; + mpObjDesc = new TransferableObjectDescriptor; if( mxTransfer.is() ) { diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index d1a081bbabf8..0ac318cdb337 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -1502,12 +1502,16 @@ const HTMLOptions& HTMLParser::GetOptions( sal_uInt16 *pNoConvertToken ) if( bStripCRLF ) aToken = aToken.replaceAt( nPos, 1, "" ); else - nPos++, nLen++; + { + nPos++; + nLen++; + } break; case '\\': if( bOldEscape ) { - nPos++, nLen++; + nPos++; + nLen++; } else { @@ -1519,10 +1523,14 @@ const HTMLOptions& HTMLParser::GetOptions( sal_uInt16 *pNoConvertToken ) case '\'': bDone = !bOldEscape && cChar==cEnd; if( !bDone ) - nPos++, nLen++; + { + nPos++; + nLen++; + } break; default: - nPos++, nLen++; + nPos++; + nLen++; break; } } @@ -1544,7 +1552,10 @@ const HTMLOptions& HTMLParser::GetOptions( sal_uInt16 *pNoConvertToken ) case ' ': bDone = !bOldEscape; if( !bDone ) - nPos++, nLen++; + { + nPos++; + nLen++; + } break; case '\t': @@ -1556,7 +1567,8 @@ const HTMLOptions& HTMLParser::GetOptions( sal_uInt16 *pNoConvertToken ) case '\\': if( bOldEscape ) { - nPos++, nLen++; + nPos++; + nLen++; } else { @@ -1567,7 +1579,10 @@ const HTMLOptions& HTMLParser::GetOptions( sal_uInt16 *pNoConvertToken ) default: if( HTML_ISPRINTABLE( c ) ) - nPos++, nLen++; + { + nPos++; + nLen++; + } else bDone = true; break; -- cgit