new loplugin: commaoperator

Change-Id: I03f24e61f696b7619855e3c7010aa0d874e5a4ff

5 files changed, 25 insertions, 13 deletions

diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 3addfbfc5194..39a8ebf8dd1f 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -3318,7 +3318,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                         if ( pOut )
                         {
                             pClientTextBox->Write( pOut->GetData(), pOut->Tell() );
-                            delete pOut, aTextRule.pOut = nullptr;
+                            delete pOut;
+                            aTextRule.pOut = nullptr;
                         }
                         if ( aExtBu.Tell() )
                         {
@@ -3381,7 +3382,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                        .WriteUInt32( pClientData->Tell() );
 
                 mpStrm->Write( pClientData->GetData(), pClientData->Tell() );
-                delete pClientData, pClientData = nullptr;
+                delete pClientData;
+                pClientData = nullptr;
             }
             if ( pClientTextBox )
             {
@@ -3389,7 +3391,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                        .WriteUInt32( pClientTextBox->Tell() );
 
                 mpStrm->Write( pClientTextBox->GetData(), pClientTextBox->Tell() );
-                delete pClientTextBox, pClientTextBox = nullptr;
+                delete pClientTextBox;
+                pClientTextBox = nullptr;
             }
             mpPptEscherEx->CloseContainer();      // ESCHER_SpContainer
         }
@@ -3454,7 +3457,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                    .WriteUInt32( pClientTextBox->Tell() );
 
             mpStrm->Write( pClientTextBox->GetData(), pClientTextBox->Tell() );
-            delete pClientTextBox, pClientTextBox = nullptr;
+            delete pClientTextBox;
+            pClientTextBox = nullptr;
 
             mpPptEscherEx->CloseContainer();  // ESCHER_SpContainer
 
@@ -3701,7 +3705,8 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
                                .WriteUInt32( pClientData->Tell() );
 
                             mpStrm->Write( pClientData->GetData(), pClientData->Tell() );
-                            delete pClientData, pClientData = nullptr;
+                            delete pClientData;
+                            pClientData = nullptr;
                         }
 
                         aPropOptSp.Commit( *mpStrm );
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 844ae34c0b43..fc5c89b68dd5 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2696,7 +2696,8 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
                                                 maAnimations[pMediaObj] = pAnimation;
                                             }
 
-                                            SdrObject::Free( pObj ), pObj = pMediaObj;  // SJ: hoping that pObj is not inserted in any list
+                                            SdrObject::Free( pObj );
+                                            pObj = pMediaObj;  // SJ: hoping that pObj is not inserted in any list
                                             pMediaObj->setURL( aMediaURL, ""/*TODO?*/ );
                                         }
                                     }
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index bb253c0ea7c2..71d548d097e3 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -1715,7 +1715,7 @@ void AnimationImporter::importAnimateSetContainer( const Atom* pAtom, const Refe
                 sal_Int32 nU1, nU2;
                 mrStCtrl.ReadInt32( nU1 ).ReadInt32( nU2 );
 
-                dump( " set_1=\"%ld\"", nU1 ),
+                dump( " set_1=\"%ld\"", nU1 );
                 dump( " set_2=\"%ld\"", nU2 );
             }
             break;
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index ce537a53c4de..add56e7f777b 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -126,8 +126,10 @@ void SdModule::Notify( SfxBroadcaster&, const SfxHint& rHint )
     const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
     if( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DEINITIALIZING )
     {
-        delete pImpressOptions, pImpressOptions = nullptr;
-        delete pDrawOptions, pDrawOptions = nullptr;
+        delete pImpressOptions;
+        pImpressOptions = nullptr;
+        delete pDrawOptions;
+        pDrawOptions = nullptr;
     }
 }
 
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 3103f72cba86..aea5e11ca475 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -152,10 +152,14 @@ void SdTransferable::CreateObjectReplacement( SdrObject* pObj )
 {
     if( pObj )
     {
-        delete mpOLEDataHelper, mpOLEDataHelper = nullptr;
-        delete mpGraphic, mpGraphic = nullptr;
-        delete mpBookmark, mpBookmark = nullptr;
-        delete mpImageMap, mpImageMap = nullptr;
+        delete mpOLEDataHelper;
+        mpOLEDataHelper = nullptr;
+        delete mpGraphic;
+        mpGraphic = nullptr;
+        delete mpBookmark;
+        mpBookmark = nullptr;
+        delete mpImageMap;
+        mpImageMap = nullptr;
 
         if( nullptr!= dynamic_cast< const SdrOle2Obj* >( pObj ) )
         {