loplugin:commaoperator in vcl/

Change-Id: Ia5bbce27d9e9526122ce1e27389c7845e6709f27

5 files changed, 32 insertions, 12 deletions

diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 85b28dc78889..0c8026d0ff6a 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1119,7 +1119,8 @@ GraphicFilter::~GraphicFilter()
         }
         if( pFilterHdlList->empty() )
         {
-            delete pFilterHdlList, pFilterHdlList = nullptr;
+            delete pFilterHdlList;
+            pFilterHdlList = nullptr;
             delete pConfig;
         }
     }
diff --git a/vcl/source/filter/ixbm/xbmread.cxx b/vcl/source/filter/ixbm/xbmread.cxx
index b12aea3b973c..d34076fde8c6 100644
--- a/vcl/source/filter/ixbm/xbmread.cxx
+++ b/vcl/source/filter/ixbm/xbmread.cxx
@@ -233,7 +233,10 @@ bool XBMReader::ParseData( SvStream* pInStm, const OString& aLastLine, XBMFormat
                         pAcc1->SetPixel( nRow, nCol++, ( nValue & ( 1 << nBit++ ) ) ? aBlack : aWhite );
 
                     if( nCol == nWidth )
-                        nCol = 0, nRow++;
+                    {
+                        nCol = 0;
+                        nRow++;
+                    }
                 }
             }
         }
@@ -319,7 +322,8 @@ ReadState XBMReader::ReadXBM( Graphic& rGraphic )
         {
             Bitmap aBlackBmp( Size( pAcc1->Width(), pAcc1->Height() ), 1 );
 
-            Bitmap::ReleaseAccess( pAcc1 ), pAcc1 = nullptr;
+            Bitmap::ReleaseAccess( pAcc1 );
+            pAcc1 = nullptr;
             aBlackBmp.Erase( Color( COL_BLACK ) );
             rGraphic = BitmapEx( aBlackBmp, aBmp1 );
             eReadState = XBMREAD_OK;
diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx
index c456d4ed1877..2622bf0d467b 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -181,21 +181,32 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic )
         {
             if ( mpMaskAcc )
             {
-                Bitmap::ReleaseAccess ( mpMaskAcc), mpMaskAcc = nullptr;
-                Bitmap::ReleaseAccess( mpAcc ), mpAcc = nullptr;
+                Bitmap::ReleaseAccess ( mpMaskAcc);
+                mpMaskAcc = nullptr;
+                Bitmap::ReleaseAccess( mpAcc );
+                mpAcc = nullptr;
                 rGraphic = Graphic( BitmapEx( maBmp, maMaskBmp ) );
             }
             else
             {
-                Bitmap::ReleaseAccess( mpAcc ), mpAcc = nullptr;
+                Bitmap::ReleaseAccess( mpAcc );
+                mpAcc = nullptr;
                 rGraphic = maBmp;
             }
             eReadState = XPMREAD_OK;
         }
         else
         {
-            if ( mpMaskAcc ) Bitmap::ReleaseAccess ( mpMaskAcc), mpMaskAcc = nullptr;
-            if ( mpAcc ) Bitmap::ReleaseAccess( mpAcc ), mpAcc = nullptr;
+            if ( mpMaskAcc )
+            {
+                Bitmap::ReleaseAccess ( mpMaskAcc);
+                mpMaskAcc = nullptr;
+            }
+            if ( mpAcc )
+            {
+                Bitmap::ReleaseAccess( mpAcc );
+                mpAcc = nullptr;
+            }
             eReadState = XPMREAD_ERROR;
         }
     }
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index eb7864d47e31..7f33702e1838 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -1237,10 +1237,12 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
                 if( fScaleX != 1.0 || fScaleY != 1.0 )
                 {
                     aTmpMtf.Scale( fScaleX, fScaleY );
-                    aSrcPt.X() = FRound( aSrcPt.X() * fScaleX ), aSrcPt.Y() = FRound( aSrcPt.Y() * fScaleY );
+                    aSrcPt.X() = FRound( aSrcPt.X() * fScaleX );
+                    aSrcPt.Y() = FRound( aSrcPt.Y() * fScaleY );
                 }
 
-                nMoveX = aDestPt.X() - aSrcPt.X(), nMoveY = aDestPt.Y() - aSrcPt.Y();
+                nMoveX = aDestPt.X() - aSrcPt.X();
+                nMoveY = aDestPt.Y() - aSrcPt.Y();
 
                 if( nMoveX || nMoveY )
                     aTmpMtf.Move( nMoveX, nMoveY );
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index 79f56f0fa09d..46464ac7c7e1 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -1581,10 +1581,12 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
                     if( fScaleX != 1.0 || fScaleY != 1.0 )
                     {
                         aTmpMtf.Scale( fScaleX, fScaleY );
-                        aSrcPt.X() = FRound( aSrcPt.X() * fScaleX ), aSrcPt.Y() = FRound( aSrcPt.Y() * fScaleY );
+                        aSrcPt.X() = FRound( aSrcPt.X() * fScaleX );
+                        aSrcPt.Y() = FRound( aSrcPt.Y() * fScaleY );
                     }
 
-                    nMoveX = aDestPt.X() - aSrcPt.X(), nMoveY = aDestPt.Y() - aSrcPt.Y();
+                    nMoveX = aDestPt.X() - aSrcPt.X();
+                    nMoveY = aDestPt.Y() - aSrcPt.Y();
 
                     if( nMoveX || nMoveY )
                         aTmpMtf.Move( nMoveX, nMoveY );