From 3b24dcc8a8138c1e1495c3dba5ffe5748cb183c2 Mon Sep 17 00:00:00 2001 From: Peter Senna Tschudin Date: Mon, 26 May 2014 19:41:16 +0200 Subject: Remove unnecessary semicolons A simplified version of the semantic match that finds this problem is follows: (http://coccinelle.lip6.fr/) // @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 // Change-Id: Ib9708d37fbb4c6060f88d5dae3814a2d37b2091e Reviewed-on: https://gerrit.libreoffice.org/9493 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- rsc/source/parser/erscerr.cxx | 4 ++-- rsc/source/parser/rscdb.cxx | 12 +++++------ rsc/source/parser/rsckey.cxx | 8 ++++---- rsc/source/parser/rsclex.cxx | 18 ++++++++-------- rsc/source/parser/rscpar.cxx | 6 +++--- rsc/source/prj/start.cxx | 4 ++-- rsc/source/res/rscclass.cxx | 44 +++++++++++++++++++-------------------- rsc/source/res/rscclobj.cxx | 6 +++--- rsc/source/res/rscconst.cxx | 4 ++-- rsc/source/res/rsccont.cxx | 48 +++++++++++++++++++++---------------------- rsc/source/res/rscflag.cxx | 18 ++++++++-------- rsc/source/res/rscmgr.cxx | 8 ++++---- rsc/source/res/rscrange.cxx | 4 ++-- rsc/source/res/rscstr.cxx | 6 +++--- rsc/source/rsc/rsc.cxx | 14 ++++++------- rsc/source/tools/rscdef.cxx | 10 ++++----- rsc/source/tools/rsctools.cxx | 4 ++-- rsc/source/tools/rsctree.cxx | 2 +- 18 files changed, 110 insertions(+), 110 deletions(-) (limited to 'rsc') diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx index 57ff61fc2001..f11425d84da2 100644 --- a/rsc/source/parser/erscerr.cxx +++ b/rsc/source/parser/erscerr.cxx @@ -133,7 +133,7 @@ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage ) sprintf( buf, "%d.%d\n\n", RSCVERSION_ID / 100, RSCVERSION_ID % 100 ); StdLstOut( buf ); - }; + } StdLstOut( "Command line: rsc [Switches] \n" ); StdLstOut( "Command line: rsc @\n" ); @@ -382,7 +382,7 @@ void RscError::Error( const ERRTYPE& rError, RscTop * pClass, ErrorFormat( rError, pClass, aId ); WriteError( rError, pMessage ); StdLstErr( "\n" ); - }; + } } void RscError::FatalError( const ERRTYPE& rError, const RscId &aId, diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx index 007f33b8bff4..8d4589824696 100644 --- a/rsc/source/parser/rscdb.cxx +++ b/rsc/source/parser/rscdb.cxx @@ -137,7 +137,7 @@ void DestroyNode( RscTop * pRscTop, ObjNode * pObjNode ) rtl_freeMemory( pObjNode->GetRscObj() ); } delete pObjNode; - }; + } } void DestroySubTrees( RscTop * pRscTop ) @@ -147,7 +147,7 @@ void DestroySubTrees( RscTop * pRscTop ) DestroySubTrees( (RscTop*)pRscTop->Left() ); DestroyNode( pRscTop, pRscTop->GetObjNode() ); DestroySubTrees( (RscTop*)pRscTop->Right() ); - }; + } } void DestroyTree( RscTop * pRscTop ) @@ -158,7 +158,7 @@ void DestroyTree( RscTop * pRscTop ) DestroyTree( (RscTop*)pRscTop->Right() ); delete pRscTop; - }; + } } void Pre_dtorTree( RscTop * pRscTop ) @@ -169,7 +169,7 @@ void Pre_dtorTree( RscTop * pRscTop ) Pre_dtorTree( (RscTop*)pRscTop->Right() ); pRscTop->Pre_dtor(); - }; + } } RscTypCont :: ~RscTypCont() @@ -625,7 +625,7 @@ bool IsInstConsistent( ObjNode * pObjNode, RscTop * pRscTop ) if( ! IsInstConsistent( (ObjNode*)pObjNode->Right(), pRscTop ) ) bRet = false; - }; + } return bRet; } @@ -653,7 +653,7 @@ bool MakeConsistent( RscTop * pRscTop ) if( ! ::MakeConsistent( (RscTop*)pRscTop->Right() ) ) bRet = false; - }; + } return bRet; } diff --git a/rsc/source/parser/rsckey.cxx b/rsc/source/parser/rsckey.cxx index 432e1073e580..cd779e3a7928 100644 --- a/rsc/source/parser/rsckey.cxx +++ b/rsc/source/parser/rsckey.cxx @@ -66,7 +66,7 @@ void RscNameTable::SetSort( bool bSorted ) // Schluesselwort Feld sortieren qsort( (void *)pTable, nEntries, sizeof( KEY_STRUCT ), KeyCompare ); - }; + } }; Atom RscNameTable::Put( Atom nName, sal_uInt32 nTyp, long nValue ) @@ -134,15 +134,15 @@ bool RscNameTable::Get( Atom nName, KEY_STRUCT * pEle ) if( pTable[ i ].nName == nName ) pKey = &pTable[ i ]; i++; - }; - }; + } + } if( pKey ) { // Schluesselwort gefunden *pEle = *pKey; return true; - }; + } return false; }; diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx index cfc85a289c04..bcfb796ff18c 100644 --- a/rsc/source/parser/rsclex.cxx +++ b/rsc/source/parser/rsclex.cxx @@ -77,7 +77,7 @@ sal_uInt32 GetNumber() nLog = 16; c = pFI->GetFastChar(); } - }; + } if( nLog == 16 ) { @@ -147,7 +147,7 @@ int MakeToken( YYSTYPE * pTokenVal ) } else break; - }; + } // FIXME: wtf is this supposed to do? if( (c != 0) == pFI->IsEof() ) @@ -166,11 +166,11 @@ int MakeToken( YYSTYPE * pTokenVal ) { aBuf.append( sal_Char(c) ); c = pFI->GetFastChar(); - }; + } c = pFI->GetFastChar(); pTokenVal->string = const_cast(pStringContainer->putString( aBuf.getStr() )); return( INCLUDE_STRING ); - }; + } } if( c == '"' ) @@ -256,7 +256,7 @@ int MakeToken( YYSTYPE * pTokenVal ) bLastInclude = true; default: pTokenVal->value = aKey.yylval; - }; + } return aKey.nTyp; } @@ -393,11 +393,11 @@ void IncludeParser( RscFileInst * pFileInst ) lKey = pTypCon->aFileTab.NewIncFile( aYYSType.string, OString() ); pFName->InsertDependFile( lKey, ULONG_MAX ); - }; - }; - }; + } + } + } nToken = MakeToken( &aYYSType ); - }; + } EndParser(); } diff --git a/rsc/source/parser/rscpar.cxx b/rsc/source/parser/rscpar.cxx index 2d0f496219fd..8f56023d93b0 100644 --- a/rsc/source/parser/rscpar.cxx +++ b/rsc/source/parser/rscpar.cxx @@ -133,8 +133,8 @@ void RscFileInst::GetNewLine() } } } - }; - }; + } + } // Abbruch ueber EOF pLine[ nLen ] = '\0'; @@ -158,7 +158,7 @@ void RscFileInst::SetError( ERRTYPE aError ) aFirstError = aError; nErrorLine = GetLineNo(); nErrorPos = GetScanPos() -1; - }; + } }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx index 061398227bb4..46c62a7a1f2f 100644 --- a/rsc/source/prj/start.cxx +++ b/rsc/source/prj/start.cxx @@ -179,7 +179,7 @@ static bool CallRsc2( RscStrList * pInputList, { aNewCmdL.Append( rsc_strdup( (char *)pCmdLine->GetEntry( i ) ) ); } - }; + } aNewCmdL.Append( rsc_strdup( rSrsName.getStr() ) ); @@ -187,7 +187,7 @@ static bool CallRsc2( RscStrList * pInputList, { pString = (*pInputList)[ i ]; aNewCmdL.Append( rsc_strdup( pString->getStr() ) ); - }; + } if ( eVerbosity >= RscVerbosityVerbose ) { 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; } diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index 06d8429079d3..0fac4102cb09 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.cxx @@ -330,13 +330,13 @@ ERRTYPE RscCompiler::Start() aError = IncludeParser( aIndex ); // Currentzeiger richtig setzen aIndex = pTC->aFileTab.GetIndexOf( pFName ); - }; + } aIndex = pTC->aFileTab.NextIndex( aIndex ); - }; + } pTC->pEH->SetListFile( fListing ); } - }; + } if ( pTC->pEH->GetVerbosity() >= RscVerbosityVerbose ) { @@ -348,7 +348,7 @@ ERRTYPE RscCompiler::Start() pTC->pEH->StdOut( pFName->aFileName.getStr() ); pTC->pEH->StdOut( " " ); aIndex = pTC->aFileTab.NextIndex( aIndex ); - }; + } pTC->pEH->StdOut( "\n" ); } @@ -393,11 +393,11 @@ void RscCompiler::EndCompile() pTC->WriteSrc( foutput, NOFILE_INDEX, false ); break; // ?T 281091MM nur eine Src-Datei } - }; + } fclose( foutput ); - }; - }; + } + } } } diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx index 7ecbe58c45fb..26fb2080dc10 100644 --- a/rsc/source/tools/rscdef.cxx +++ b/rsc/source/tools/rscdef.cxx @@ -243,7 +243,7 @@ void RscDefineList::WriteAll( FILE * fOutput ) pDefEle->GetName().getStr(), pDefEle->GetMacro().getStr() ); - }; + } } bool RscExpType::Evaluate( sal_Int32 * plValue ) const @@ -326,7 +326,7 @@ bool RscExpression::Evaluate( sal_Int32 * plValue ) if( 0L == lRight ) return false; *plValue = lLeft / lRight; - }; + } return true; } return false; @@ -485,7 +485,7 @@ bool RscDefTree::Evaluate( RscDefine * pDef ) return false; if( !Evaluate( (RscDefine *)pDef->Right() ) ) return false; - }; + } return true; } @@ -538,9 +538,9 @@ bool RscFileTab::Depend( sal_uLong lDepend, sal_uLong lFree ) { if( !pFile->Depend( lDepend, lFree ) ) return false; - }; + } aIndex = NextIndex(aIndex); - }; + } return true; } diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx index a6796991e96a..01c6f79665fa 100644 --- a/rsc/source/tools/rsctools.cxx +++ b/rsc/source/tools/rsctools.cxx @@ -179,13 +179,13 @@ char * ResponseFile( RscPtrPtr * ppCmd, char ** ppArgv, sal_uInt32 nArgc ) ppCmd->Append( rsc_strdup( szBuffer ) ); } nItems = fread( &szBuffer[ 0 ], 1, sizeof( char ), fFile ); - }; + } fclose( fFile ); } else ppCmd->Append( rsc_strdup( *(ppArgv +i) ) ); - }; + } ppCmd->Append( (void *)0 ); return NULL; } diff --git a/rsc/source/tools/rsctree.cxx b/rsc/source/tools/rsctree.cxx index 25a645062123..9fcf90638f03 100644 --- a/rsc/source/tools/rsctree.cxx +++ b/rsc/source/tools/rsctree.cxx @@ -187,7 +187,7 @@ NameNode* NameNode::SearchParent( const NameNode * pSearch ) const if( ((NameNode *)Left())->Compare( pSearch ) == EQUAL ) return (NameNode *)this; return ((NameNode *)Left())->SearchParent( pSearch ); - }; + } } else if( nCmp == LESS ) { -- cgit v1.2.3