new loplugin: commaoperator

Change-Id: I03f24e61f696b7619855e3c7010aa0d874e5a4ff

7 files changed, 41 insertions, 14 deletions

diff --git a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
index 66521432973e..214725cd80c7 100644
--- a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
+++ b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
@@ -56,7 +56,7 @@ AccessibleShapeTreeInfo& AccessibleShapeTreeInfo::operator= (const AccessibleSha
         mxDocumentWindow = rInfo.mxDocumentWindow;
         mxModelBroadcaster = rInfo.mxModelBroadcaster;
         mpView = rInfo.mpView;
-        mxController = rInfo.mxController,
+        mxController = rInfo.mxController;
         mpWindow = rInfo.mpWindow;
         mpViewForwarder = rInfo.mpViewForwarder;
     }
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index cd54857f9b21..47b5dab49fa7 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -621,7 +621,8 @@ GalleryTheme* Gallery::ImplGetCachedTheme(const GalleryThemeEntry* pThemeEntry)
 
                         if( pIStm->GetError() )
                         {
-                            delete pTheme, pTheme = nullptr;
+                            delete pTheme;
+                            pTheme = nullptr;
                         }
                     }
                     catch (const css::ucb::ContentCreationException&)
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 29258839a2dd..025b1019f5c5 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -454,7 +454,10 @@ void GalleryTransferable::InitData( bool bLazy )
                 mpURL = new INetURLObject;
 
                 if( !mpTheme->GetURL( mnObjectPos, *mpURL ) )
-                    delete mpURL, mpURL = nullptr;
+                {
+                    delete mpURL;
+                    mpURL = nullptr;
+                }
             }
 
             if( ( SGA_OBJ_SOUND != meObjectKind ) && !mpGraphicObject )
@@ -570,9 +573,12 @@ void GalleryTransferable::DragFinished( sal_Int8 nDropAction )
 void GalleryTransferable::ObjectReleased()
 {
     mxModelStream.Clear();
-    delete mpGraphicObject, mpGraphicObject = nullptr;
-    delete mpImageMap, mpImageMap = nullptr;
-    delete mpURL, mpURL = nullptr;
+    delete mpGraphicObject;
+    mpGraphicObject = nullptr;
+    delete mpImageMap;
+    mpImageMap = nullptr;
+    delete mpURL;
+    mpURL = nullptr;
 }
 
 void GalleryTransferable::CopyToClipboard( vcl::Window* pWindow )
diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx
index b033f8fe8bbb..e4cfffc41166 100644
--- a/svx/source/items/grfitem.cxx
+++ b/svx/source/items/grfitem.cxx
@@ -56,7 +56,12 @@ SfxPoolItem* SvxGrfCrop::Create( SvStream& rStrm, sal_uInt16 nVersion ) const
     rStrm.ReadInt32( top ).ReadInt32( left ).ReadInt32( right ).ReadInt32( bottom );
 
     if( GRFCROP_VERSION_SWDEFAULT == nVersion )
-        top = -top, bottom = -bottom, left = -left, right = -right;
+    {
+        top = -top;
+        bottom = -bottom;
+        left = -left;
+        right = -right;
+    }
 
     SvxGrfCrop* pNew = static_cast<SvxGrfCrop*>(Clone());
     pNew->SetLeft( left );
@@ -72,7 +77,12 @@ SvStream& SvxGrfCrop::Store( SvStream& rStrm, sal_uInt16 nVersion ) const
     sal_Int32 left = GetLeft(), right = GetRight(),
             top = GetTop(), bottom = GetBottom();
     if( GRFCROP_VERSION_SWDEFAULT == nVersion )
-        top = -top, bottom = -bottom, left = -left, right = -right;
+    {
+        top = -top;
+        bottom = -bottom;
+        left = -left;
+        right = -right;
+    }
 
     rStrm.WriteInt32( top ).WriteInt32( left ).WriteInt32( right ).WriteInt32( bottom );
 
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index b5ac4d8917f6..26165e854741 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -109,7 +109,8 @@ ImplGrafMetricField::ImplGrafMetricField( vcl::Window* pParent, const OUString&
 {
     Size aSize( GetTextWidth( "-100 %" ), GetTextHeight() );
 
-    aSize.Width() += 20, aSize.Height() += 6;
+    aSize.Width() += 20;
+    aSize.Height() += 6;
     SetSizePixel( aSize );
 
     if ( maCommand == ".uno:GrafGamma" )
@@ -274,9 +275,15 @@ ImplGrafControl::ImplGrafControl(
     SetBackground( Wallpaper( COL_TRANSPARENT ) );
 
     if( aImgSize.Height() > aFldSize.Height() )
-        nImgY = 0, nFldY = ( aImgSize.Height() - aFldSize.Height() ) >> 1;
+    {
+        nImgY = 0;
+        nFldY = ( aImgSize.Height() - aFldSize.Height() ) >> 1;
+    }
     else
-        nFldY = 0, nImgY = ( aFldSize.Height() - aImgSize.Height() ) >> 1;
+    {
+        nFldY = 0;
+        nImgY = ( aFldSize.Height() - aImgSize.Height() ) >> 1;
+    }
 
     long nOffset = SYMBOL_TO_FIELD_OFFSET / 2;
     maImage->SetPosPixel( Point( nOffset, nImgY ) );
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index f341bf45a666..88782dbebeee 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -235,7 +235,8 @@ SvxShape::~SvxShape() throw()
         SdrObject::Free( pObject );
     }
 
-    delete mpImpl, mpImpl = nullptr;
+    delete mpImpl;
+    mpImpl = nullptr;
 
     EndListeningAll(); // call explictily within SolarMutexGuard
 }
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 58cd9b4c7bd5..9a5ee24952f7 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -336,8 +336,10 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject()
         maGrfObj = aGraphic;
         if( maGrfObj.GetType() != GRAPHIC_NONE )
         {
-            delete mpOStm, mpOStm = nullptr;
-            delete mpTmp, mpTmp = nullptr;
+            delete mpOStm;
+            mpOStm = nullptr;
+            delete mpTmp;
+            mpTmp = nullptr;
         }
     }