Remove unnecessary semicolons

A simplified version of the semantic match that finds this problem is
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@r1@
statement S;
position p,p1;
@@
S@p1;@p

@script:python r2@
p << r1.p;
p1 << r1.p1;
@@
if p[0].line != p1[0].line_end:
cocci.include_match(False)
@@
position r1.p;
@@
-;@p
// </smpl>

Change-Id: Ib9708d37fbb4c6060f88d5dae3814a2d37b2091e
Reviewed-on: https://gerrit.libreoffice.org/9493
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

8 files changed, 69 insertions, 69 deletions

diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx
index a25f5a56ed8e..be6fd38aea5f 100644
--- a/rsc/source/res/rscclass.cxx
+++ b/rsc/source/res/rscclass.cxx
@@ -52,8 +52,8 @@ void RscClass::Pre_dtor()
                                   pVarTypeList[ i ].pDefault ) );
             rtl_freeMemory( pVarTypeList[ i ].pDefault );
             pVarTypeList[ i ].pDefault = NULL;
-        };
-    };
+        }
+    }
 }
 
 RscClass::~RscClass()
@@ -106,7 +106,7 @@ RSCINST RscClass::GetInstData
         }
         else
             aInst.pData = pData + pVarTypeList[ nEle ].nOffset;
-    };
+    }
     return aInst;
 }
 
@@ -186,13 +186,13 @@ RSCINST RscClass::Create( RSCINST * pInst,
             {
                 aMemInst = pVarTypeList[ i ].pClass->Create( NULL, aDfltI );
                 *ppData = aMemInst.pData;
-            };
+            }
         }
         else
         {
             aMemInst = GetInstData( aInst.pData, i, true );
             aMemInst = aMemInst.pClass->Create( &aMemInst, aDfltI );
-        };
+        }
     }
 
     return aInst;
@@ -219,10 +219,10 @@ void RscClass::Destroy( const RSCINST & rInst )
                 {
                     // Speicher freigeben
                     rtl_freeMemory( aTmpI.pData );
-                };
-            };
+                }
+            }
         }
-    };
+    }
 }
 
 ERRTYPE RscClass::SetVariable( Atom nVarName,
@@ -274,7 +274,7 @@ ERRTYPE RscClass::SetVariable( Atom nVarName,
     {
         // Bereich fuer Default zu klein
         RscExit( 16 );
-    };
+    }
     return ERR_OK;
 }
 
@@ -351,11 +351,11 @@ RSCINST RscClass::GetVariable( const RSCINST & rInst,
                     *ppData = aTmpI.pData;
                 }
             }
-        };
+        }
         // auf nicht Default setzen
         SetVarDflt( rInst.pData, i, false );
         return aTmpI;
-    };
+    }
 
     return RscTop::GetVariable( rInst, nVarName, rInitInst,
                                 bInitDflt, pCreateClass );
@@ -387,9 +387,9 @@ RSCINST RscClass::GetCopyVar( const RSCINST & rInst, Atom nVarName)
             else
                 aVarI = GetInstData( rInst.pData, i, true );
 
-        };
+        }
         return aVarI ;
-    };
+    }
 
     return RscTop::GetCopyVar( rInst, nVarName );
 }
@@ -412,7 +412,7 @@ bool RscClass::IsConsistent( const RSCINST & rInst )
                 if( ! aTmpI.pClass->IsConsistent( aTmpI ) )
                     bRet = false;
         }
-    };
+    }
 
     return bRet;
 }
@@ -453,7 +453,7 @@ bool RscClass::IsDefault( const RSCINST & rInst )
         if( !(VAR_NODATAINST & pVarTypeList[ i ].nVarType) )
             if( !IsDflt( rInst.pData, i ) )
                 return false;
-    };
+    }
 
     return RscTop::IsDefault( rInst );
 }
@@ -473,7 +473,7 @@ RSCINST RscClass::GetDefault( Atom nVarId )
         aTmpI.pClass = pVarTypeList[ i ].pClass;
         aTmpI.pData  = GetDfltData( i );
         return aTmpI;
-    };
+    }
 
     return RscTop::GetDefault( nVarId );
 }
@@ -632,9 +632,9 @@ void RscClass::WriteSrc( const RSCINST & rInst,
                               aTmpI, fOutput, pTC, nTab, RscId(), pName );
                     fprintf( fOutput, ";\n" );
                 }
-            };
-        };
-    };
+            }
+        }
+    }
 
     return;
 }
@@ -683,7 +683,7 @@ ERRTYPE RscClass::WriteInstRc( const RSCINST & rInst,
             rMem.Put( sal_uInt32(0) );
             break;
         }
-    };
+    }
 
     for( i = 0; i < nEntries && aError.IsOk(); i++ )
     {
@@ -862,8 +862,8 @@ void RscTupel::WriteSrc( const RSCINST & rInst, FILE * fOutput,
             else
                 fprintf( fOutput, "Default" );
             fprintf( fOutput, "; " );
-        };
-    };
+        }
+    }
     fprintf( fOutput, ">" );
 
     return;
diff --git a/rsc/source/res/rscclobj.cxx b/rsc/source/res/rscclobj.cxx
index 908030cd4b3c..4f5e5ace0490 100644
--- a/rsc/source/res/rscclobj.cxx
+++ b/rsc/source/res/rscclobj.cxx
@@ -119,7 +119,7 @@ bool ObjNode::IsConsistent()
             {
                 bRet = false;
             }
-        };
+        }
         if( Right() )
         {
             if( ((ObjNode *)Right())->aRscId <= aRscId )
@@ -130,8 +130,8 @@ bool ObjNode::IsConsistent()
             {
                 bRet = false;
             }
-        };
-    };
+        }
+    }
 
     return bRet;
 }
diff --git a/rsc/source/res/rscconst.cxx b/rsc/source/res/rscconst.cxx
index 6f714958f013..562a2ba64aaa 100644
--- a/rsc/source/res/rscconst.cxx
+++ b/rsc/source/res/rscconst.cxx
@@ -123,7 +123,7 @@ ERRTYPE RscEnum::SetConst( const RSCINST & rInst, Atom nConst, sal_Int32 /*nVal*
         ((RscEnumInst *)rInst.pData)->nValue = i;
         ((RscEnumInst *)rInst.pData)->bDflt = false;
         return ERR_OK;
-    };
+    }
 
     return ERR_RSCENUM;
 }
@@ -136,7 +136,7 @@ ERRTYPE RscEnum::SetNumber( const RSCINST & rInst, sal_Int32 lValue )
     {
         if( (sal_Int32)pVarArray[ i ].lValue == lValue )
             return SetConst( rInst, pVarArray[ i ].nId, lValue );
-    };
+    }
 
     return ERR_RSCENUM;
 }
diff --git a/rsc/source/res/rsccont.cxx b/rsc/source/res/rsccont.cxx
index b818e95663e6..926aa969f3b6 100644
--- a/rsc/source/res/rsccont.cxx
+++ b/rsc/source/res/rsccont.cxx
@@ -32,7 +32,7 @@ void ENTRY_STRUCT::Destroy()
     {
         aInst.pClass->Destroy( aInst );
         rtl_freeMemory( aInst.pData );
-    };
+    }
 }
 
 RscBaseCont::RscBaseCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper,
@@ -63,11 +63,11 @@ void RscBaseCont::DestroyElements( RscBaseContInst * pClassData )
         for (sal_uInt32 i = 0; i < pClassData->nEntries; i++ )
         {
             pClassData->pEntries[ i ].Destroy();
-        };
+        }
         rtl_freeMemory( pClassData->pEntries );
         pClassData->pEntries = NULL;
         pClassData->nEntries = 0;
-    };
+    }
 }
 
 RSCINST RscBaseCont::Create( RSCINST * pInst, const RSCINST & rDflt,
@@ -115,8 +115,8 @@ RSCINST RscBaseCont::Create( RSCINST * pInst, const RSCINST & rDflt,
                 aDfltI = pDfltClassData->pEntries[ i ].aInst;
                 pClassData->pEntries[ i ].aInst =
                                     aDfltI.pClass->Create( NULL, aDfltI );
-            };
-        };
+            }
+        }
     }
 
     return aInst;
@@ -149,9 +149,9 @@ RSCINST RscBaseCont::SearchElePos( const RSCINST & rInst, const RscId & rEleName
                 pClassData->pEntries[ i ].aInst.pClass == pClass )
             {
                 return( pClassData->pEntries[ i ].aInst );
-            };
-        };
-    };
+            }
+        }
+    }
     return RSCINST();
 }
 
@@ -188,8 +188,8 @@ ERRTYPE RscBaseCont::GetElement( const RSCINST & rInst, const RscId & rEleName,
             else
             {
                 return ERR_CONT_INVALIDTYPE;
-            };
-        };
+            }
+        }
     }
     else
         pCreateClass = pTypeClass;
@@ -206,7 +206,7 @@ ERRTYPE RscBaseCont::GetElement( const RSCINST & rInst, const RscId & rEleName,
         {
             aTmpI.pClass->Destroy( aTmpI );
             aTmpI.pClass->Create( &aTmpI, rCreateInst );
-        };
+        }
     }
     else
     {
@@ -221,7 +221,7 @@ ERRTYPE RscBaseCont::GetElement( const RSCINST & rInst, const RscId & rEleName,
             pClassData->pEntries =
                 (ENTRY_STRUCT *)rtl_allocateMemory( sizeof( ENTRY_STRUCT )
                                                 * (pClassData->nEntries +1) );
-        };
+        }
 
         pClassData->pEntries[ pClassData->nEntries ].Create();
         pClassData->pEntries[ pClassData->nEntries ].aName = rEleName;
@@ -236,7 +236,7 @@ ERRTYPE RscBaseCont::GetElement( const RSCINST & rInst, const RscId & rEleName,
         {
             pClassData->pEntries[ pClassData->nEntries ].aInst =
                 pCreateClass->Create( NULL, RSCINST() );
-        };
+        }
 
         pClassData->nEntries++;
         aTmpI = pClassData->pEntries[ pClassData->nEntries -1 ].aInst;
@@ -545,14 +545,14 @@ bool RscBaseCont::IsConsistent( const RSCINST & rInst )
                                    pClassData->pEntries[ i ].aInst.pClass, i +1 ).IsInst() )
             {
                  bRet = false;
-            };
+            }
         }
         if( ! pClassData->pEntries[ i ].aInst.pClass->
             IsConsistent( pClassData->pEntries[ i ].aInst ) )
         {
             bRet = false;
         }
-    };
+    }
 
     return bRet;
 }
@@ -568,7 +568,7 @@ void RscBaseCont::SetToDefault( const RSCINST & rInst )
     {
         pClassData->pEntries[ i ].aInst.pClass->
                   SetToDefault( pClassData->pEntries[ i ].aInst );
-    };
+    }
 
     RscTop::SetToDefault( rInst );
 }
@@ -589,8 +589,8 @@ bool RscBaseCont::IsDefault( const RSCINST & rInst )
             IsDefault( pClassData->pEntries[ i ].aInst ) )
         {
             return( false );
-        };
-    };
+        }
+    }
 
     return RscTop::IsDefault( rInst );
 }
@@ -628,9 +628,9 @@ void RscBaseCont::Delete( const RSCINST & rInst, RscTop * pClass,
             {
                 DeletePos( rInst, i );
                 return;
-            };
-        };
-    };
+            }
+        }
+    }
 
 }
 
@@ -652,8 +652,8 @@ void RscBaseCont::DeletePos( const RSCINST & rInst, sal_uInt32 nPos )
             for (sal_uInt32 i = nPos; i < pClassData->nEntries; i++ )
                 pClassData->pEntries[ i ] = pClassData->pEntries[ i + 1 ];
 
-        };
-    };
+        }
+    }
 }
 
 void RscBaseCont::ContWriteSrc( const RSCINST & rInst, FILE * fOutput,
@@ -675,7 +675,7 @@ void RscBaseCont::ContWriteSrc( const RSCINST & rInst, FILE * fOutput,
                                   fOutput, pTC, nTab,
                                   pClassData->pEntries[ i ].aName, pVarName );
         fprintf( fOutput, ";\n" );
-    };
+    }
 }
 
 ERRTYPE RscBaseCont::ContWriteRc( const RSCINST & rInst, RscWriteRc & rMem,
diff --git a/rsc/source/res/rscflag.cxx b/rsc/source/res/rscflag.cxx
index 0aa1efd75f1d..fa65c6ebc8f2 100644
--- a/rsc/source/res/rscflag.cxx
+++ b/rsc/source/res/rscflag.cxx
@@ -47,7 +47,7 @@ ERRTYPE RscFlag::SetNotConst( const RSCINST & rInst, Atom nConst )
         ((RscFlagInst *)rInst.pData)[ i ].nFlags     &= ~nFlag;
         ((RscFlagInst *)rInst.pData)[ i ].nDfltFlags &= ~nFlag;
         return ERR_OK;
-    };
+    }
 
     return ERR_RSCFLAG;
 }
@@ -64,7 +64,7 @@ ERRTYPE RscFlag::SetConst( const RSCINST & rInst, Atom nConst, sal_Int32 /*nVal*
         ((RscFlagInst *)rInst.pData)[ i ].nFlags     |= nFlag;
         ((RscFlagInst *)rInst.pData)[ i ].nDfltFlags &= ~nFlag;
         return ERR_OK;
-    };
+    }
 
     return ERR_RSCFLAG;
 }
@@ -100,7 +100,7 @@ RSCINST RscFlag::Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass
             ((RscFlagInst *)aInst.pData)[ i ].nFlags = 0;
             ((RscFlagInst *)aInst.pData)[ i ].nDfltFlags = 0xFFFFFFFF;
         }
-    };
+    }
 
     return aInst;
 }
@@ -168,7 +168,7 @@ bool RscFlag::IsDefault( const RSCINST & rInst, Atom nConstId )
             return true ;
         else
             return false;
-    };
+    }
     return true;
 }
 
@@ -190,7 +190,7 @@ bool RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef,
                 return true;
             }
         }
-    };
+    }
 
     return false;
 }
@@ -214,7 +214,7 @@ bool RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
             Flag <<= 1;
             if( !Flag )
                 Flag = 1;
-        };
+        }
     }
     else
         return false;
@@ -235,7 +235,7 @@ bool RscFlag::IsSet( const RSCINST & rInst, Atom nConstId )
             return true;
         else
             return false;
-    };
+    }
     return true;
 }
 
@@ -266,7 +266,7 @@ void RscFlag::WriteSrc( const RSCINST & rInst, FILE * fOutput,
         Flag <<= 1;
         if( !Flag )
             Flag = 1;
-    };
+    }
 }
 
 ERRTYPE RscFlag::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
@@ -286,7 +286,7 @@ ERRTYPE RscFlag::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
         Flag <<= 1;
         if( !Flag )
             Flag = 1;
-    };
+    }
 
     aMem.Put( (sal_Int32)lVal );
     return ERR_OK;
diff --git a/rsc/source/res/rscmgr.cxx b/rsc/source/res/rscmgr.cxx
index 41ff63a68401..99b849102c07 100644
--- a/rsc/source/res/rscmgr.cxx
+++ b/rsc/source/res/rscmgr.cxx
@@ -61,7 +61,7 @@ RSCINST RscMgr::Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass )
     {
         RscMgrInst * pDfltData = (RscMgrInst *)(rDflt.pData + RscClass::Size());
         *pClassData = *pDfltData;
-    };
+    }
 
     return aInst;
 }
@@ -222,7 +222,7 @@ ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem,
             {
                 // RscClass wird uebersprungen
                 aError = RscTop::WriteRc( rInst, rMem, pTC, nDeep, bExtra );
-            };
+            }
 
             /*
             // Definition der Struktur, aus denen die Resource aufgebaut ist
@@ -238,8 +238,8 @@ ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem,
             rMem.PutAt( nOldSize +4, (sal_uInt32)rInst.pClass->GetTypId() );
             rMem.PutAt( nOldSize +8, (sal_uInt32)(rMem.Size() - nOldSize) );
             rMem.PutAt( nOldSize +12, (sal_uInt32)(nLocalSize - nOldSize) );
-        };
-    };
+        }
+    }
 
     return aError;
 }
diff --git a/rsc/source/res/rscrange.cxx b/rsc/source/res/rscrange.cxx
index 031dc23d6963..b8d9efc5d607 100644
--- a/rsc/source/res/rscrange.cxx
+++ b/rsc/source/res/rscrange.cxx
@@ -47,7 +47,7 @@ ERRTYPE RscRange::SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum )
     {
         nMax = nMaximum;
         nMin = nMinimum;
-    };
+    }
 
     return ERR_OK;
 }
@@ -161,7 +161,7 @@ ERRTYPE RscLongRange::SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum )
     {
         nMax = nMaximum;
         nMin = nMinimum;
-    };
+    }
 
     return ERR_OK;
 }
diff --git a/rsc/source/res/rscstr.cxx b/rsc/source/res/rscstr.cxx
index e4aacca22b48..8319c33a3b62 100644
--- a/rsc/source/res/rscstr.cxx
+++ b/rsc/source/res/rscstr.cxx
@@ -61,7 +61,7 @@ ERRTYPE RscString::SetString( const RSCINST & rInst, const char * pStr )
             sal_uInt32  nLen = strlen( pStr ) +1;
             pTmp = (char *)rtl_allocateMemory( nLen );
             memcpy( pTmp, pStr, nLen );
-        };
+        }
 
         ((RscStringInst *)rInst.pData)->pStr = pTmp;
     }
@@ -291,8 +291,8 @@ ERRTYPE RscString::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
             }
             else
                 rMem.PutUTF8( ((RscStringInst *)rInst.pData)->pStr );
-        };
-    };
+        }
+    }
     return aError;
 }