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 --- chart2/source/controller/main/SelectionHelper.cxx | 2 +- chart2/source/view/axes/VPolarAngleAxis.cxx | 2 +- chart2/source/view/main/LabelPositionHelper.cxx | 2 +- crashrep/source/unx/main.cxx | 4 +- crashrep/source/win32/soreport.cxx | 2 +- cui/source/dialogs/iconcdlg.cxx | 8 ++-- dbaccess/source/core/api/RowSet.cxx | 2 +- dbaccess/source/core/api/RowSetBase.cxx | 2 +- editeng/source/misc/splwrap.cxx | 2 +- extensions/source/bibliography/datman.cxx | 2 +- filter/source/graphicfilter/icgm/bitmap.cxx | 2 +- filter/source/msfilter/escherex.cxx | 2 +- filter/source/pdf/impdialog.cxx | 10 ++--- forms/source/component/EventThread.cxx | 2 +- forms/source/xforms/binding.cxx | 2 +- framework/source/jobs/joburl.cxx | 6 +-- hwpfilter/source/hwpeq.cxx | 2 +- i18npool/source/localedata/LocaleNode.cxx | 12 +++--- idl/source/cmptools/lex.cxx | 2 +- l10ntools/source/lngmerge.cxx | 2 +- lotuswordpro/source/filter/lwpfnlayout.cxx | 2 +- lotuswordpro/source/filter/lwpframelayout.cxx | 4 +- oox/source/ole/axcontrol.cxx | 2 +- registry/test/testregcpp.cxx | 2 +- 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 +- sal/textenc/convertisciidevangari.cxx | 2 +- sal/textenc/tencinfo.cxx | 2 +- sc/source/core/data/document.cxx | 8 ++-- sc/source/filter/dif/difimp.cxx | 2 +- sc/source/filter/excel/read.cxx | 2 +- sc/source/filter/oox/condformatbuffer.cxx | 2 +- sc/source/ui/docshell/externalrefmgr.cxx | 2 +- sc/source/ui/vba/vbarange.cxx | 4 +- sd/source/filter/eppt/eppt.cxx | 2 +- sd/source/filter/eppt/pptx-stylesheet.cxx | 2 +- sd/source/ui/func/fuconrec.cxx | 2 +- sdext/source/pdfimport/pdfparse/pdfentries.cxx | 2 +- sfx2/source/control/bindings.cxx | 2 +- soltools/mkdepend/collectdircontent.cxx | 6 +-- starmath/source/node.cxx | 2 +- svl/source/items/itemset.cxx | 2 +- svx/source/sidebar/nbdtmg.cxx | 8 ++-- svx/source/tbxctrls/extrusioncontrols.cxx | 2 +- svx/source/unodraw/unoshape.cxx | 2 +- sw/source/core/docnode/node2lay.cxx | 2 +- sw/source/core/docnode/nodedump.cxx | 2 +- sw/source/core/layout/findfrm.cxx | 2 +- sw/source/core/layout/frmtool.cxx | 2 +- sw/source/core/layout/wsfrm.cxx | 2 +- sw/source/core/table/swnewtable.cxx | 2 +- sw/source/core/table/swtable.cxx | 4 +- sw/source/core/text/pormulti.cxx | 2 +- sw/source/core/text/txtfrm.cxx | 2 +- sw/source/core/uibase/app/swmodul1.cxx | 2 +- sw/source/core/uibase/uiview/srcview.cxx | 2 +- sw/source/filter/html/swhtml.cxx | 2 +- sw/source/filter/ww8/docxattributeoutput.cxx | 4 +- sw/source/filter/ww8/wrtw8nds.cxx | 4 +- sw/source/filter/ww8/ww8par6.cxx | 2 +- test/source/sheet/xdatapilotdescriptor.cxx | 2 +- toolkit/source/awt/vclxwindows.cxx | 2 +- vcl/generic/print/genprnpsp.cxx | 2 +- vcl/osx/salprn.cxx | 2 +- vcl/source/opengl/OpenGLContext.cxx | 2 +- vcl/source/window/toolbox2.cxx | 2 +- vcl/win/source/gdi/salgdi3.cxx | 2 +- winaccessibility/source/UAccCOM/MAccessible.cxx | 2 +- xmloff/source/draw/ximpshap.cxx | 2 +- 85 files changed, 205 insertions(+), 205 deletions(-) diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx index 486f5a6d4ff4..9d0107168e02 100644 --- a/chart2/source/controller/main/SelectionHelper.cxx +++ b/chart2/source/controller/main/SelectionHelper.cxx @@ -345,7 +345,7 @@ bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject { SdrObjList* pObjList = pObj->GetObjList(); if( !pObjList ) - return false;; + return false; SdrObject* pOwner = pObjList->GetOwnerObj(); if( !pOwner ) return false; diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx index 9d24c5ceeec1..f0d172f9f478 100644 --- a/chart2/source/view/axes/VPolarAngleAxis.cxx +++ b/chart2/source/view/axes/VPolarAngleAxis.cxx @@ -185,7 +185,7 @@ void VPolarAngleAxis::createLabels() , fLogicRadius, fLogicZ ) ) { - }; + } //no staggering for polar angle axis } diff --git a/chart2/source/view/main/LabelPositionHelper.cxx b/chart2/source/view/main/LabelPositionHelper.cxx index cfa023f8d6f6..d1faa2e7dd2b 100644 --- a/chart2/source/view/main/LabelPositionHelper.cxx +++ b/chart2/source/view/main/LabelPositionHelper.cxx @@ -333,7 +333,7 @@ void lcl_correctRotation_Left_Bottom( double& rfXCorrection, double& rfYCorrecti { double beta = fAnglePi-F_PI/2.0; rfXCorrection = -aSize.Width*rtl::math::sin( beta ) - -aSize.Height*rtl::math::cos( beta );; + -aSize.Height*rtl::math::cos( beta ); rfYCorrection = aSize.Height*rtl::math::sin( beta ); } else if( fAnglePositiveDegree<= 270.0 ) diff --git a/crashrep/source/unx/main.cxx b/crashrep/source/unx/main.cxx index 07ee976258c0..a49ef7e7ff51 100644 --- a/crashrep/source/unx/main.cxx +++ b/crashrep/source/unx/main.cxx @@ -441,7 +441,7 @@ static void WriteSOAPRequest( FILE *fp ) fcopy( fp, fpin ); fprintf( fp, "]]>\n" ); fclose( fpin ); - }; + } fpin = fopen( g_szStackFile, "r" ); if ( fpin ) @@ -453,7 +453,7 @@ static void WriteSOAPRequest( FILE *fp ) fcopy( fp, fpin ); fprintf( fp, "]]>\n" ); fclose( fpin ); - }; + } fprintf( fp, "\n" diff --git a/crashrep/source/win32/soreport.cxx b/crashrep/source/win32/soreport.cxx index 0f7f760de0ec..4a4d2bf07bdc 100644 --- a/crashrep/source/win32/soreport.cxx +++ b/crashrep/source/win32/soreport.cxx @@ -2440,7 +2440,7 @@ static void WriteSOAPRequest( FILE *fp ) fcopy( fpin, fp ); fprintf( fp, "]]>\n" ); fclose( fpin ); - }; + } fpin = fopen( g_szDumpFileNameA, "rb" ); diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 388b4000bc4c..c0d4124b06f1 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -371,7 +371,7 @@ EIconChoicePos IconChoiceDialog::SetCtrlPos( const EIconChoicePos& rPos ) aWinBits &= ~WB_ALIGN_LEFT & ~WB_NOHSCROLL; aWinBits |= WB_ALIGN_TOP | WB_NOVSCROLL; break; - }; + } maIconCtrl.SetStyle ( aWinBits ); SetPosSizeCtrls(); @@ -487,7 +487,7 @@ void IconChoiceDialog::SetPosSizeCtrls ( bool bInit ) aNewIconCtrlSize = Size ( aOutSize.Width()-(2*aCtrlOffset.X()), nDefaultHeight ); break; - }; + } maIconCtrl.SetPosSizePixel ( aIconCtrlPos, aNewIconCtrlSize ); maIconCtrl.ArrangeIcons(); @@ -530,7 +530,7 @@ void IconChoiceDialog::SetPosSizeCtrls ( bool bInit ) aOutSize.Height() - aOKBtn.GetSizePixel().Height() - aNewIconCtrlSize.Height() - (4*aCtrlOffset.X()) ); break; - }; + } if ( pData->pPage ) pData->pPage->SetPosSizePixel ( aNewPagePos, aNewPageSize ); @@ -619,7 +619,7 @@ void IconChoiceDialog::SetPosSizePages ( sal_uInt16 nId ) aOutSize.Height() - aOKBtn.GetSizePixel().Height() - maIconCtrl.GetSizePixel().Height() - (4*aCtrlOffset.X()) ); break; - }; + } pData->pPage->SetPosSizePixel ( aNewPagePos, aNewPageSize ); } diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index f8ba99e50f4b..7bac101b5b9a 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -392,7 +392,7 @@ void SAL_CALL ORowSet::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const break; default: ORowSetBase::getFastPropertyValue(rValue,nHandle); - }; + } } else { diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index 5d9438e16fa7..0bcee0cfdbfc 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -147,7 +147,7 @@ void SAL_CALL ORowSetBase::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) c break; default: OPropertyStateContainer::getFastPropertyValue(rValue,nHandle); - }; + } } else OPropertyStateContainer::getFastPropertyValue(rValue,nHandle); diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index b633cacad5b9..9a76777b986e 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -389,7 +389,7 @@ void SvxSpellWrapper::SpellDocument( ) } bDialog = false; pWin = pOld; - }; + } } diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index ae784218a609..e4f7b28a3776 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -1308,7 +1308,7 @@ OUString BibDataManager::getControlName(sal_Int32 nFormatKey ) case DataType::TINYINT: case DataType::SMALLINT: case DataType::INTEGER: - aResStr="NumericField"; ; + aResStr="NumericField"; break; case DataType::REAL: case DataType::DOUBLE: diff --git a/filter/source/graphicfilter/icgm/bitmap.cxx b/filter/source/graphicfilter/icgm/bitmap.cxx index ee03b667b075..d6fd86ff0562 100644 --- a/filter/source/graphicfilter/icgm/bitmap.cxx +++ b/filter/source/graphicfilter/icgm/bitmap.cxx @@ -153,7 +153,7 @@ void CGMBitmap::ImplGetBitmap( CGMBitmapDescriptor& rDesc ) } } break; - }; + } double nX = rDesc.mnR.X - rDesc.mnQ.X; double nY = rDesc.mnR.Y - rDesc.mnQ.Y; diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index d7ce53b4d4e9..84d512b8a6cb 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -4176,7 +4176,7 @@ void EscherBlibEntry::WriteBlibEntry( SvStream& rSt, bool bWritePictureOffset, s break; default: rSt.WriteUChar( (sal_uInt8)meBlibType ); - }; + } rSt.Write( &mnIdentifier[ 0 ], 16 ); rSt.WriteUInt16( (sal_uInt16)0 ) diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 0825ea035d6c..6ee28e190c07 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -915,7 +915,7 @@ void ImpPDFTabOpnFtrPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent case 3: mpRbPgLyContinueFacing->Check(); break; - }; + } switch( paParent->mnInitialView ) { @@ -929,7 +929,7 @@ void ImpPDFTabOpnFtrPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent case 2: mpRbOpnThumbs->Check(); break; - }; + } switch( paParent->mnMagnification ) { @@ -954,7 +954,7 @@ void ImpPDFTabOpnFtrPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent mpRbMagnZoom->Check(); mpNumZoom->Enable( true ); break; - }; + } mpNumZoom->SetValue( paParent->mnZoom ); mpNumInitialPage->SetValue( paParent->mnInitialPage ); @@ -1163,7 +1163,7 @@ void ImpPDFTabSecurityPage::SetFilterConfigItem( const ImpPDFTabDialog* paParen case 2: mpRbPrintHighRes->Check(); break; - }; + } switch( paParent->mnChangesAllowed ) { @@ -1183,7 +1183,7 @@ void ImpPDFTabSecurityPage::SetFilterConfigItem( const ImpPDFTabDialog* paParen case 4: mpRbChangesAnyNoCopy->Check(); break; - }; + } mpCbEnableCopy->Check( paParent->mbCanCopyOrExtract ); mpCbEnableAccessibility->Check( paParent->mbCanExtractForAccessibility ); diff --git a/forms/source/component/EventThread.cxx b/forms/source/component/EventThread.cxx index 8901e8eb2def..a7a633b1a5d5 100644 --- a/forms/source/component/EventThread.cxx +++ b/forms/source/component/EventThread.cxx @@ -198,7 +198,7 @@ void OComponentEventThread::run() if( xComp.is() ) processEvent( pCompImpl, pEvt.get(), xControl, bFlag ); } - }; + } // After a Dispose, we do not know the Control anymore. // Thus, we must not wait either. diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index 72806b0593fb..677404f9841a 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.cxx @@ -771,7 +771,7 @@ void Binding::distributeMIP( const XNode_t & rxNode ) { target->dispatchEvent(xEvent); xNode = xNode->getNextSibling(); - }; + } } void Binding::bindingModified() diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx index fe487c9be41d..fae5556ec31f 100644 --- a/framework/source/jobs/joburl.cxx +++ b/framework/source/jobs/joburl.cxx @@ -376,7 +376,7 @@ void JobURL::impldbg_checkURL( /*IN*/ const sal_Char* pURL , (aURL.getEventArgs(sEventArgs) ) && (sEventArgs.equalsAscii(pExpectedEventArgs)) ); - }; + } } // check if URL has no event part @@ -412,7 +412,7 @@ void JobURL::impldbg_checkURL( /*IN*/ const sal_Char* pURL , (aURL.getAliasArgs(sAliasArgs) ) && (sAliasArgs.equalsAscii(pExpectedAliasArgs)) ); - }; + } } // check if URL has the no alias part @@ -448,7 +448,7 @@ void JobURL::impldbg_checkURL( /*IN*/ const sal_Char* pURL , (aURL.getServiceArgs(sServiceArgs) ) && (sServiceArgs.equalsAscii(pExpectedServiceArgs)) ); - }; + } } // check if URL has the no service part diff --git a/hwpfilter/source/hwpeq.cxx b/hwpfilter/source/hwpeq.cxx index 2ae2b55ad1ed..b1206c88ff9b 100644 --- a/hwpfilter/source/hwpeq.cxx +++ b/hwpfilter/source/hwpeq.cxx @@ -390,7 +390,7 @@ static const hwpeq *lookup_eqn(char *str) m = (l + r) / 2; k = strcmp(eq_tbl[m].key, str); if( k == 0 ) { - result = eq_tbl + m;; + result = eq_tbl + m; break; } else if( k < 0 ) diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx index 05762c6b0c3b..58bce7faf655 100644 --- a/i18npool/source/localedata/LocaleNode.cxx +++ b/i18npool/source/localedata/LocaleNode.cxx @@ -399,7 +399,7 @@ void LCCTYPENode::generateCode (const OFileWriter &of) const } OUString str = getAttr().getValueByName("unoid"); of.writeAsciiString("\n\n"); - of.writeParameter("LC_CTYPE_Unoid", str);; + of.writeParameter("LC_CTYPE_Unoid", str); aDateSep = writeParameterCheckLen( of, "DateSeparator", "dateSeparator", 1, 1); @@ -1808,7 +1808,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const for(i = 0; i < nbOfCalendars - 1; i++) { of.writeInt(nbOfDays[i]); of.writeAsciiString(", "); - }; + } of.writeInt(nbOfDays[i]); of.writeAsciiString("};\n"); @@ -1816,7 +1816,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const for(i = 0; i < nbOfCalendars - 1; i++) { of.writeInt(nbOfMonths[i]); of.writeAsciiString(", "); - }; + } of.writeInt(nbOfMonths[i]); of.writeAsciiString("};\n"); @@ -1824,7 +1824,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const for(i = 0; i < nbOfCalendars - 1; i++) { of.writeInt(nbOfGenitiveMonths[i]); of.writeAsciiString(", "); - }; + } of.writeInt(nbOfGenitiveMonths[i]); of.writeAsciiString("};\n"); @@ -1832,7 +1832,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const for(i = 0; i < nbOfCalendars - 1; i++) { of.writeInt(nbOfPartitiveMonths[i]); of.writeAsciiString(", "); - }; + } of.writeInt(nbOfPartitiveMonths[i]); of.writeAsciiString("};\n"); @@ -1840,7 +1840,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const for(i = 0; i < nbOfCalendars - 1; i++) { of.writeInt(nbOfEras[i]); of.writeAsciiString(", "); - }; + } of.writeInt(nbOfEras[i]); of.writeAsciiString("};\n"); diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx index e5fa39cb65dd..f770e9dcbd15 100644 --- a/idl/source/cmptools/lex.cxx +++ b/idl/source/cmptools/lex.cxx @@ -185,7 +185,7 @@ sal_uLong SvTokenStream::GetNumber() nLog = 16; c = GetFastNextChar(); } - }; + } if( nLog == 16 ) { diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx index 1ab50ac06f79..5465d556a023 100644 --- a/l10ntools/source/lngmerge.cxx +++ b/l10ntools/source/lngmerge.cxx @@ -106,7 +106,7 @@ bool LngParser::CreatePO( const OString &rPOFile ) ReadLine( sLine , Text ); sID = sGroup; sLine = *(*pLines)[ nPos++ ]; - }; + } if( bStart ) { bStart = false; sID = sGroup; diff --git a/lotuswordpro/source/filter/lwpfnlayout.cxx b/lotuswordpro/source/filter/lwpfnlayout.cxx index beb389d95610..0b10dc4ba277 100644 --- a/lotuswordpro/source/filter/lwpfnlayout.cxx +++ b/lotuswordpro/source/filter/lwpfnlayout.cxx @@ -241,7 +241,7 @@ void LwpEnSuperTableLayout::RegisterStyle() if (pTableLayout != NULL) { pTableLayout->SetFoundry(m_pFoundry); - pTableLayout->RegisterStyle();; + pTableLayout->RegisterStyle(); } } diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx b/lotuswordpro/source/filter/lwpframelayout.cxx index 2245d65fb22e..173bb7eca38c 100644 --- a/lotuswordpro/source/filter/lwpframelayout.cxx +++ b/lotuswordpro/source/filter/lwpframelayout.cxx @@ -1212,8 +1212,8 @@ void LwpRubyLayout::Read() { LwpFrameLayout::Read(); m_nPlacement = m_pObjStrm->QuickReaduInt8(); - m_nAlignment = m_pObjStrm->QuickReaduInt8();; - m_nStateFlag = m_pObjStrm->QuickReaduInt16();; + m_nAlignment = m_pObjStrm->QuickReaduInt8(); + m_nStateFlag = m_pObjStrm->QuickReaduInt16(); m_nXOffset = m_pObjStrm->QuickReadInt32(); m_nYOffset = m_pObjStrm->QuickReadInt32(); m_objRubyMarker.ReadIndexed(m_pObjStrm); diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index c384b8c8be13..f767fb340659 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -440,7 +440,7 @@ void ControlConverter::convertToAxBorder( PropertySet& rPropSet, case API_BORDER_NONE: default: break; - }; + } convertToMSColor( rPropSet, PROP_BorderColor, nBorderColor ); } diff --git a/registry/test/testregcpp.cxx b/registry/test/testregcpp.cxx index 0d9aa977f855..532501d73859 100644 --- a/registry/test/testregcpp.cxx +++ b/registry/test/testregcpp.cxx @@ -399,7 +399,7 @@ void test_registry_CppApi() // Link Test - REG_ENSURE(!rootKey.createKey(OUString("/myFourthKey/X"), key7), "test_registry_CppApi error 7c)");; + REG_ENSURE(!rootKey.createKey(OUString("/myFourthKey/X"), key7), "test_registry_CppApi error 7c)"); REG_ENSURE(!key6.createLink(OUString("myFirstLink"), OUString("/myFourthKey/X")), "test_registry_CppApi error 7d"); REG_ENSURE(!key6.createKey(OUString("mySixthSubKey"), key7), "test_registry_CppApi error 7e"); 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 ) { diff --git a/sal/textenc/convertisciidevangari.cxx b/sal/textenc/convertisciidevangari.cxx index 205e16d6abdf..27cc1ff91913 100644 --- a/sal/textenc/convertisciidevangari.cxx +++ b/sal/textenc/convertisciidevangari.cxx @@ -176,7 +176,7 @@ sal_Size IsciiDevanagariToUnicode::convert( bNormal = true; bDouble = false; break; - }; + } } if (bNormal) diff --git a/sal/textenc/tencinfo.cxx b/sal/textenc/tencinfo.cxx index 0aaa2ff0c446..381b2f0a21e7 100644 --- a/sal/textenc/tencinfo.cxx +++ b/sal/textenc/tencinfo.cxx @@ -190,7 +190,7 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromWindowsCharset( sal_uInt8 nWinC case 238: eTextEncoding = RTL_TEXTENCODING_MS_1250; break; /* EASTEUROPE_CHARSET */ case 255: eTextEncoding = RTL_TEXTENCODING_IBM_850; break; /* OEM_CHARSET */ default: eTextEncoding = RTL_TEXTENCODING_DONTKNOW; break; - }; + } return eTextEncoding; } diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 97c10cae4cf7..32b6ba4fc312 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -4207,7 +4207,7 @@ void ScDocument::SetColHidden(SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, bool b SCROW ScDocument::FirstVisibleRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab) const { if (!ValidTab(nTab) || nTab >= static_cast(maTabs.size()) || !maTabs[nTab]) - return ::std::numeric_limits::max();; + return ::std::numeric_limits::max(); return maTabs[nTab]->FirstVisibleRow(nStartRow, nEndRow); } @@ -4215,7 +4215,7 @@ SCROW ScDocument::FirstVisibleRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab) co SCROW ScDocument::LastVisibleRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab) const { if (!ValidTab(nTab) || nTab >= static_cast(maTabs.size()) || !maTabs[nTab]) - return ::std::numeric_limits::max();; + return ::std::numeric_limits::max(); return maTabs[nTab]->LastVisibleRow(nStartRow, nEndRow); } @@ -4264,7 +4264,7 @@ void ScDocument::SetRowFiltered(SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool SCROW ScDocument::FirstNonFilteredRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab) const { if (!ValidTab(nTab) || nTab >= static_cast(maTabs.size()) || !maTabs[nTab]) - return ::std::numeric_limits::max();; + return ::std::numeric_limits::max(); return maTabs[nTab]->FirstNonFilteredRow(nStartRow, nEndRow); } @@ -4272,7 +4272,7 @@ SCROW ScDocument::FirstNonFilteredRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab SCROW ScDocument::LastNonFilteredRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab) const { if (!ValidTab(nTab) || nTab >= static_cast(maTabs.size()) || !maTabs[nTab]) - return ::std::numeric_limits::max();; + return ::std::numeric_limits::max(); return maTabs[nTab]->LastNonFilteredRow(nStartRow, nEndRow); } diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx index 1ec7e809ed13..8039d5dbd88a 100644 --- a/sc/source/filter/dif/difimp.cxx +++ b/sc/source/filter/dif/difimp.cxx @@ -590,7 +590,7 @@ DATASET DifParser::GetNextDataset( void ) } } } - }; + } } } } diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx index 5c6e6f261004..7c4d7bd09d3b 100644 --- a/sc/source/filter/excel/read.cxx +++ b/sc/source/filter/excel/read.cxx @@ -124,7 +124,7 @@ FltError ImportExcel::Read( void ) Eof(); break; default:; - }; + } eAkt = Z_Ende; break; } diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index ca871857c53e..3c3b45eec2f2 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -1164,7 +1164,7 @@ void ExtCfRule::finalizeImport() case UNKNOWN: // nothing to do default: break; - }; + } } void ExtCfRule::importDataBar( const AttributeList& rAttribs ) diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 9c89c0054765..cce3e2fba694 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -2340,7 +2340,7 @@ SfxObjectShellRef ScExternalRefManager::loadSrcDocument(sal_uInt16 nFileId, OUSt if ( !pFileData->maFilterName.isEmpty() ) rFilter = pFileData->maFilterName; // don't overwrite stored filter with guessed filter else - ScDocumentLoader::GetFilterName(aFile, rFilter, aOptions, true, false);; + ScDocumentLoader::GetFilterName(aFile, rFilter, aOptions, true, false); ScDocumentLoader::GetFilterName(aFile, rFilter, aOptions, true, false); const SfxFilter* pFilter = ScDocShell::Factory().GetFilterContainer()->GetFilter4FilterName(rFilter); diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index e52ca43e2747..9af01d0de30c 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -2839,7 +2839,7 @@ getPasteFlags (sal_Int32 Paste) case excel::XlPasteType::xlPasteAllExceptBorders: default: nFlags = IDF_ALL;break; - }; + } return nFlags; } @@ -2861,7 +2861,7 @@ getPasteFormulaBits( sal_Int32 Operation) case excel::XlPasteSpecialOperation::xlPasteSpecialOperationNone: default: nFormulaBits = PASTE_NOFUNC; break; - }; + } return nFormulaBits; } diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index d3e91bf8a9e8..77db284787ac 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -486,7 +486,7 @@ bool PPTWriter::ImplCreateCurrentUserStream() for ( sal_uInt32 i = 0x15 + nLenOfUserName; i < nSizeOfRecord; i++ ) { mpCurUserStrm->WriteUChar( (sal_uInt8)0 ); // pad bytes - }; + } mpCurUserStrm->Seek( nEditPos ); return true; }; diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx b/sd/source/filter/eppt/pptx-stylesheet.cxx index cd1e8fd6570f..8cf5bcae9eb1 100644 --- a/sd/source/filter/eppt/pptx-stylesheet.cxx +++ b/sd/source/filter/eppt/pptx-stylesheet.cxx @@ -455,7 +455,7 @@ bool PPTExStyleSheet::IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLevel, case CharAttr_Escapement : return ( rChar.mnEscapement != nValue ); default: break; - }; + } if ( nFlag ) { if ( rChar.mnFlags & nFlag ) diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index d7c051a9c5d4..20b6a09973c8 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -694,7 +694,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj) rAttr.Put(XLineEndWidthItem(nWidth)); } break; - }; + } // and again, for the still missing ends switch (nSlotId) diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx index 8d54a9edcc81..7607058ddd9a 100644 --- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx @@ -758,7 +758,7 @@ static void unzipToBuffer( const char* pBegin, unsigned int nLen, if( err == Z_STREAM_END ) { if( aZStr.avail_out > 0 ) - *pOutLen -= aZStr.avail_out;; + *pOutLen -= aZStr.avail_out; } inflateEnd(&aZStr); if( err < Z_OK ) diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index f157ba54a849..b83ef08d9e44 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -1055,7 +1055,7 @@ const SfxPoolItem* SfxBindings::Execute_Impl( sal_uInt16 nId, const SfxPoolItem* if ( pBind->GetStateCache( nId ) ) return pBind->Execute_Impl( nId, ppItems, nModi, nCallMode, ppInternalArgs, bGlobalOnly ); pBind = pBind->pImp->pSubBindings; - }; + } } SfxDispatcher &rDispatcher = *pDispatcher; diff --git a/soltools/mkdepend/collectdircontent.cxx b/soltools/mkdepend/collectdircontent.cxx index 3ea2f0d9f09f..c061e691c254 100644 --- a/soltools/mkdepend/collectdircontent.cxx +++ b/soltools/mkdepend/collectdircontent.cxx @@ -26,7 +26,7 @@ void IncludesCollection::add_to_collection(const string& dirPath) { // Invalid File Handle - no need to try it anymore allIncludes.insert(EntriesPair(dirPath, DirContent())); return; - }; + } do { string winFileName(FindFileData.cFileName); transform(winFileName.begin(), winFileName.end(), winFileName.begin(), ::tolower); @@ -43,7 +43,7 @@ void IncludesCollection::add_to_collection(const string& dirPath) { } while ((pent = readdir(pdir))) { dirContent.insert(pent->d_name); - }; + } closedir(pdir); #endif // defined( WNT ) allIncludes.insert(EntriesPair(dirPath, dirContent)); @@ -60,7 +60,7 @@ bool IncludesCollection::exists(string filePath) { if (mapIter == allIncludes.end()) { add_to_collection(dirPath); mapIter = allIncludes.find(dirPath); - }; + } DirContent dirContent = (*mapIter).second; DirContent::iterator dirIter = dirContent.find(fileName); if (dirIter == dirContent.end()) { diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index 41a74b5105f9..50bfccd1af11 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -2944,7 +2944,7 @@ void SmSpecialNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell if (bItalic) Attributes() |= ATTR_ITALIC; else - Attributes() &= ~ATTR_ITALIC;; + Attributes() &= ~ATTR_ITALIC; } }; diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index 03905eaa6b2e..24fc38145b66 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -1499,7 +1499,7 @@ SvStream &SfxItemSet::Store _pPool->StoreItem( rStream, *pItem, bDirect ) ) // Item wurde in 'rStream' gestreamt ++nWrittenCount; - }; + } // weniger geschrieben als enthalten (z.B. altes Format) if ( nWrittenCount != _nCount ) diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index 567e3ea94975..5c321396422c 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -757,7 +757,7 @@ OUString GraphyicBulletsTypeMgr::GetDescription(sal_uInt16 nIndex, bool /*isDefa if ( pEntry ) { sRet = pEntry->sDescription; - }; + } } return sRet; } @@ -777,7 +777,7 @@ bool GraphyicBulletsTypeMgr::IsCustomized(sal_uInt16 nIndex) if ( pEntry ) { bRet = pEntry->bIsCustomized; - }; + } } return bRet; @@ -1901,7 +1901,7 @@ OUString OutlineTypeMgr::GetDescription(sal_uInt16 nIndex, bool isDefault) if ( pItemArr ) { sRet = pItemArr->sDescription; - }; + } } return sRet; } @@ -1921,7 +1921,7 @@ bool OutlineTypeMgr::IsCustomized(sal_uInt16 nIndex) if ( pItemArr ) { bRet = pItemArr->bIsCustomized; - }; + } } return bRet; diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 42dfaa55c440..30fd7b4b5aca 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -382,7 +382,7 @@ void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit ) { OUString aStr( SVX_RESSTR( nResource + i ) ); setEntryText( i, aStr ); - }; + } } diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 55afb1ff01a2..1557bba05d20 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -3952,7 +3952,7 @@ void SvxShape::updateShapeKind() } break; } - }; + } } /*********************************************************************** diff --git a/sw/source/core/docnode/node2lay.cxx b/sw/source/core/docnode/node2lay.cxx index 201e3bdcc7fb..6a04f88d83f2 100644 --- a/sw/source/core/docnode/node2lay.cxx +++ b/sw/source/core/docnode/node2lay.cxx @@ -330,7 +330,7 @@ SwLayoutFrm* SwNode2LayImpl::UpperFrm( SwFrm* &rpFrm, const SwNode &rNode ) return pUpper; } } - }; + } if( !bMaster ) rpFrm = rpFrm->GetNext(); return pUpper; diff --git a/sw/source/core/docnode/nodedump.cxx b/sw/source/core/docnode/nodedump.cxx index 5de57f28e39c..f0c544797c01 100644 --- a/sw/source/core/docnode/nodedump.cxx +++ b/sw/source/core/docnode/nodedump.cxx @@ -772,7 +772,7 @@ void SwRedlineTbl::dumpAsXml( xmlTextWriterPtr w ) default: sRedlineType = "UNKNOWN"; break; - }; + } writer.writeFormatAttribute( "id", "%s", BAD_CAST(aId.getStr()) ); writer.writeFormatAttribute( "author", "%s", BAD_CAST(aAuthor.getStr()) ); writer.writeFormatAttribute( "date", "%s", BAD_CAST(aDate.getStr()) ); diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index 78c065696e2b..8b4b1e4f6779 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -955,7 +955,7 @@ SwCntntFrm* SwFrm::_FindPrevCnt( const bool _bInSameFtn ) { // current content frame is the first content in the // footnote - no previous content exists. - pPrevCntntFrm = 0L;; + pPrevCntntFrm = 0L; } } } diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 3418f3d9dad6..0f9b78f09809 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -426,7 +426,7 @@ static void lcl_InvalidatePosOfLowers( SwLayoutFrm& _rLayoutFrm ) pLowerFrm->InvalidateObjs( true, false ); pLowerFrm = pLowerFrm->GetNext(); - }; + } } SwLayNotify::~SwLayNotify() diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index bbab6c3c3e88..7e765e379d0e 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -666,7 +666,7 @@ void SwFrm::InsertGroupBefore( SwFrm* pParent, SwFrm* pBehind, SwFrm* pSct ) { pLast->mpUpper = pBehind->GetUpper(); pLast = pLast->GetNext(); - }; + } } else { diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx index 90110110a00a..4bcf1284b48d 100644 --- a/sw/source/core/table/swnewtable.cxx +++ b/sw/source/core/table/swnewtable.cxx @@ -1078,7 +1078,7 @@ static void lcl_getAllMergedBoxes( const SwTable& rTable, SwSelBoxes& rBoxes, Sw pBox = lcl_LeftBorder2Box( nLeftBorder, rTable.GetTabLines()[nLine] ); if( pBox ) rBoxes.insert( pBox ); - }; + } } /** lcl_UnMerge(..) manipulates the row span attribute of a given master cell diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 5c3d3f620bd9..e3afa6c79c48 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -1278,7 +1278,7 @@ void SwTable::NewSetTabCols( Parm &rParm, const SwTabCols &rNew, rParm.nOldWish, nOldWidth, true ); lcl_AdjustWidthsInLine( rLines[j], aCopy, rParm, 0 ); bGoOn = !aRowSpanPos.empty() && j > 0; - }; + } aRowSpanPos.clear(); } if( nCurr+1 < (sal_uInt16)rLines.size() ) @@ -1302,7 +1302,7 @@ void SwTable::NewSetTabCols( Parm &rParm, const SwTabCols &rNew, rParm.nOldWish, nOldWidth, false ); lcl_AdjustWidthsInLine( rLines[j], aCopy, rParm, 0 ); bGoOn = !aRowSpanPos.empty() && j+1 < (sal_uInt16)rLines.size(); - }; + } } ::lcl_AdjustWidthsInLine( rLines[nCurr], aOldNew, rParm, COLFUZZY ); } diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx index 9671b54cb1fa..f9ccc77a16ed 100644 --- a/sw/source/core/text/pormulti.cxx +++ b/sw/source/core/text/pormulti.cxx @@ -520,7 +520,7 @@ bool SwDoubleLinePortion::ChgSpaceAdd( SwLineLayout* pCurr, // cancels the manipulation from SwDoubleLinePortion::ChangeSpaceAdd(..) void SwDoubleLinePortion::ResetSpaceAdd( SwLineLayout* pCurr ) { - pCurr->RemoveFirstLLSpaceAdd();; + pCurr->RemoveFirstLLSpaceAdd(); if( !pCurr->GetLLSpaceAddCount() ) pCurr->FinishSpaceAdd(); } diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index ab0d613c7f7d..d1b64864ba77 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -1378,7 +1378,7 @@ static bool lcl_ErgoVadis( SwTxtFrm* pFrm, sal_Int32 &rPos, const PrepareHint eP if( ePrep == PREP_ERGOSUM ) { if( rFtnInfo.aErgoSum.isEmpty() ) - return false;; + return false; rPos = pFrm->GetOfst(); } else diff --git a/sw/source/core/uibase/app/swmodul1.cxx b/sw/source/core/uibase/app/swmodul1.cxx index 4c3733a15966..dcdfc0101625 100644 --- a/sw/source/core/uibase/app/swmodul1.cxx +++ b/sw/source/core/uibase/app/swmodul1.cxx @@ -421,7 +421,7 @@ OUString SwModule::GetRedlineAuthor(sal_uInt16 nPos) while(!(nPos < pAuthorNames->size())) { InsertRedlineAuthor("nn"); - }; + } return (*pAuthorNames)[nPos]; } diff --git a/sw/source/core/uibase/uiview/srcview.cxx b/sw/source/core/uibase/uiview/srcview.cxx index b939c79f934c..c97da041ef3e 100644 --- a/sw/source/core/uibase/uiview/srcview.cxx +++ b/sw/source/core/uibase/uiview/srcview.cxx @@ -485,7 +485,7 @@ void SwSrcView::GetState(SfxItemSet& rSet) { if(!GetSearchItem()) rSet.DisableItem(nWhich); - }; + } break; case SID_UNDO: case SID_REDO: diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 6ea4a0fd9be3..c0e10c17a790 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -2593,7 +2593,7 @@ SwViewShell *SwHTMLParser::CallEndAction( bool bChkAction, bool bChkPtr ) const bool bOldLock = pActionViewShell->IsViewLocked(); pActionViewShell->LockView( true ); const bool bOldEndActionByVirDev = pActionViewShell->IsEndActionByVirDev(); - pActionViewShell->SetEndActionByVirDev( true );; + pActionViewShell->SetEndActionByVirDev( true ); ((SwEditShell*)pActionViewShell)->EndAction(); pActionViewShell->SetEndActionByVirDev( bOldEndActionByVirDev ); pActionViewShell->LockView( bOldLock ); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 2e2cb9d6c612..7fc9acb4bb88 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -3089,7 +3089,7 @@ void DocxAttributeOutput::TableRowRedline( ww8::WW8TableNodeInfoInner::Pointer_t FSEND ); } break; - }; + } } } } @@ -3135,7 +3135,7 @@ void DocxAttributeOutput::TableCellRedline( ww8::WW8TableNodeInfoInner::Pointer_ FSEND ); } break; - }; + } } } } diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index e17625969a2e..55c3fa2aab63 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -1321,7 +1321,7 @@ const SwRedlineData* SwWW8AttrIter::GetRunLevelRedline( sal_Int32 nPos ) break; default: break; - }; + } pCurRedline = 0; ++nCurRedlinePos; } @@ -1357,7 +1357,7 @@ const SwRedlineData* SwWW8AttrIter::GetRunLevelRedline( sal_Int32 nPos ) break; default: break; - }; + } } break; } diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 1ab57d53d25e..c55fd660debf 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -4178,7 +4178,7 @@ void SwWW8ImplReader::Read_UL( sal_uInt16 nId, const sal_uInt8* pData, short nLe break; default: return; - }; + } NewAttr( aUL ); } diff --git a/test/source/sheet/xdatapilotdescriptor.cxx b/test/source/sheet/xdatapilotdescriptor.cxx index be968e4d426d..ba5b89f60247 100644 --- a/test/source/sheet/xdatapilotdescriptor.cxx +++ b/test/source/sheet/xdatapilotdescriptor.cxx @@ -179,7 +179,7 @@ void XDataPilotDescriptor::testGetDataFields() void XDataPilotDescriptor::testGetHiddenFields() { std::cout << "testGetHiddenFields" < xDescr(init(),UNO_QUERY_THROW);; + uno::Reference< sheet::XDataPilotDescriptor > xDescr(init(),UNO_QUERY_THROW); testGetDataPilotFields_Impl( xDescr ); uno::Reference< container::XIndexAccess > xIndex(xDescr->getHiddenFields(), UNO_QUERY_THROW); diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 62ec58926e59..cea2913398d8 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -2727,7 +2727,7 @@ void VCLXMultiPage::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) default: VCLXContainer::ProcessWindowEvent( rVclWindowEvent ); break; - }; + } } diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index e80ec57b6b6c..9304ac757d7a 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -829,7 +829,7 @@ sal_uLong PspSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, sal return aData.m_nPDFDevice > 0 ? 1 : 0; } default: break; - }; + } return 0; } diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx index a973505bbf5b..93e52e778954 100644 --- a/vcl/osx/salprn.cxx +++ b/vcl/osx/salprn.cxx @@ -296,7 +296,7 @@ sal_uLong AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup*, sal_uInt16 i case PRINTER_CAPABILITIES_USEPULLMODEL: return 1; default: break; - }; + } return 0; } diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index 974f9130535f..6936f2b5dea7 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -661,7 +661,7 @@ bool OpenGLContext::initWindow() { Visual* pVisual = (Visual*)pChildSysData->pVisual; XVisualInfo aTemplate; - aTemplate.visualid = XVisualIDFromVisual( pVisual );; + aTemplate.visualid = XVisualIDFromVisual( pVisual ); int nVisuals = 0; XVisualInfo* pInfos = XGetVisualInfo( m_aGLWin.dpy, VisualIDMask, &aTemplate, &nVisuals ); if( nVisuals != 1 ) diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index ba4e866e2140..5b36f8c3cf61 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -1106,7 +1106,7 @@ Point ToolBox::ImplGetPopupPosition( const Rectangle& rRect, const Size& rSize ) break; default: break; - }; + } } return aPos; } diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index d2e13a9c634c..e21e7e9eb284 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -613,7 +613,7 @@ static rtl_TextEncoding ImplCharSetToSal( BYTE nCharSet ) default: eTextEncoding = rtl_getTextEncodingFromWindowsCodePage(nCP); break; - }; + } } else { diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx index 81e0d53507e1..b6979a38cf92 100644 --- a/winaccessibility/source/UAccCOM/MAccessible.cxx +++ b/winaccessibility/source/UAccCOM/MAccessible.cxx @@ -1011,7 +1011,7 @@ STDMETHODIMP CMAccessible::accNavigate(long navDir, VARIANT varStart, VARIANT *p break; default: break; - }; + } return ret; LEAVE_PROTECTED_BLOCK diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 77d87bad09ff..3e34f2ec41de 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -803,7 +803,7 @@ void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rL } else if( IsXMLToken( rLocalName, XML_ID ) ) { - if (!mbHaveXmlId) { maShapeId = rValue; }; + if (!mbHaveXmlId) { maShapeId = rValue; } } else if( IsXMLToken( rLocalName, XML_NAME ) ) { -- cgit