diff options
author | Jesse <jspears@umd.edu> | 2011-12-14 14:43:58 -0500 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2011-12-15 16:38:50 +0000 |
commit | 6a8f6c4b1324e28c598a065683103ac2ef8ea3fc (patch) | |
tree | d59cda7401565170e32c7d06af9755f3110651fd /sw | |
parent | 63a817d2fb00f248053566c8b8364667432fa8b3 (diff) |
Removed extra semicolons
Diffstat (limited to 'sw')
23 files changed, 30 insertions, 30 deletions
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx index 729d7d3c3da8..511df2ae9b33 100644 --- a/sw/source/core/text/txthyph.cxx +++ b/sw/source/core/text/txthyph.cxx @@ -79,7 +79,7 @@ sal_Bool SwTxtFrm::Hyphenate( SwInterHyphInfo &rHyphInf ) OSL_ENSURE( ! IsVertical() || ! IsSwapped(),"swapped frame at SwTxtFrm::Hyphenate" ); if( !pBreakIt->GetBreakIter().is() ) - return sal_False;; + return sal_False; // Wir machen den Laden erstmal dicht: OSL_ENSURE( !IsLocked(), "SwTxtFrm::Hyphenate: this is locked" ); // 4935: Der frame::Frame muss eine gueltige SSize haben! diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 86e4b69940af..e8335ee79654 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -428,7 +428,7 @@ void SwTxtNode::RstAttr(const SwIndex &rIdx, xub_StrLen nLen, sal_uInt16 nWhich, } // Default behavior is to process all attributes: - bool bSkipAttr = false;; + bool bSkipAttr = false; boost::shared_ptr<SfxItemSet> pStyleHandle; // 1. case: We want to reset only the attributes listed in pSet: diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx index e2767a164c2d..027e95ef003e 100644 --- a/sw/source/core/undo/rolbck.cxx +++ b/sw/source/core/undo/rolbck.cxx @@ -288,7 +288,7 @@ SwHistorySetTxtFld::SwHistorySetTxtFld( SwTxtFld* pTxtFld, sal_uLong nNodePos ) String SwHistorySetTxtFld::GetDescription() const { - return m_pFld->GetFld()->GetDescription();; + return m_pFld->GetFld()->GetDescription(); } SwHistorySetTxtFld::~SwHistorySetTxtFld() diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx index 2f1ee286e145..00c7b58e748a 100644 --- a/sw/source/core/undo/unins.cxx +++ b/sw/source/core/undo/unins.cxx @@ -378,7 +378,7 @@ void SwUndoInsert::RepeatImpl(::sw::RepeatContext & rContext) SwDoc & rDoc = rContext.GetDoc(); SwNodeIndex aNd( rDoc.GetNodes(), nNode ); - SwCntntNode* pCNd = aNd.GetNode().GetCntntNode();; + SwCntntNode* pCNd = aNd.GetNode().GetCntntNode(); if( !bIsAppend && 1 == nLen ) // >1 dann immer nur Text, ansonsten Grafik/OLE/Text/... { diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index 4c77cae0fc44..a44c14639e5f 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -543,7 +543,7 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry } eNewState = aCharStyles.getLength() ? - PropertyState_DIRECT_VALUE : PropertyState_DEFAULT_VALUE;; + PropertyState_DIRECT_VALUE : PropertyState_DEFAULT_VALUE; if(pAny) (*pAny) <<= aCharStyles; } @@ -615,7 +615,7 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam) SwCharFmt* pCharFmt = 0; for(sal_uInt16 nCharFmt = 0; nCharFmt < nChCount; nCharFmt++) { - SwCharFmt& rChFmt = *((*(pDoc->GetCharFmts()))[nCharFmt]);; + SwCharFmt& rChFmt = *((*(pDoc->GetCharFmts()))[nCharFmt]); if(rChFmt.GetName() == pNewCharStyles[i]) { pCharFmt = &rChFmt; diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index dc5c8a7d9ab6..3999f4707903 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -879,7 +879,7 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const String* pRealFileName ) if ( pDoc && !pOutDoc->getPrinter( false ) ) { const SwPageDesc& rPgDsc = const_cast<const SwDoc *>(pOutDoc)->GetPageDesc( 0 ); - //const SwPageDesc& rPgDsc = *pOutDoc->GetPageDescFromPool( RES_POOLPAGE_STANDARD );; + //const SwPageDesc& rPgDsc = *pOutDoc->GetPageDescFromPool( RES_POOLPAGE_STANDARD ); const SwFmtFrmSize& rSz = rPgDsc.GetMaster().GetFrmSize(); // Clipboard-Dokument wird immer ohne Drucker angelegt, so ist // der Std.PageDesc immer aug LONG_MAX !! Mappe dann auf DIN A4 diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index f98542757322..d5c2d5fc161b 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -584,7 +584,7 @@ void SwHTMLParser::NewObject() // Objects that are declared only are not evaluated. Moreover, only // Java applets are supported. - sal_Bool bIsApplet = sal_False;; + sal_Bool bIsApplet = sal_False; if( !bDeclare && aClassID.Len() == 42 && aClassID.EqualsAscii( "clsid:", 0, 6 ) ) diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx index ab13dfbe9171..feb6c1851718 100644 --- a/sw/source/filter/html/parcss1.cxx +++ b/sw/source/filter/html/parcss1.cxx @@ -201,7 +201,7 @@ CSS1Token CSS1Parser::GetNextToken() { case '{': if( !cQuoteCh && !bOldEscape ) - nBlockLvl++;; + nBlockLvl++; break; case ';': if( !cQuoteCh && !bOldEscape ) diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index f9bb431670f0..6f3905105b8b 100755 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -766,7 +766,7 @@ int SwTransferable::PrepareForCopy( sal_Bool bIsCut ) { int nRet = 1; if(!pWrtShell) - return 0;; + return 0; String sGrfNm; const int nSelection = pWrtShell->GetSelectionType(); diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index 413080a6cf4f..5db57e0d4932 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -256,7 +256,7 @@ IMPL_LINK( SwChangeDBDlg, ButtonHdl, Button *, EMPTYARG ) sal_Bool bIsTable = sal_False; aData.sDataSource = aAvailDBTLB.GetDBName(sTableName, sColumnName, &bIsTable); aData.sCommand = sTableName; - aData.nCommandType = bIsTable ? 0 : 1;; + aData.nCommandType = bIsTable ? 0 : 1; pSh->ChgDBData(aData); ShowDBName(pSh->GetDBData()); EndDialog(RET_OK); diff --git a/sw/source/ui/inc/swcont.hxx b/sw/source/ui/inc/swcont.hxx index 9ae0856ea8d5..099ce7e6a6e9 100644 --- a/sw/source/ui/inc/swcont.hxx +++ b/sw/source/ui/inc/swcont.hxx @@ -102,7 +102,7 @@ public: // at first sort by position and then by name return nYPosition != rCont.nYPosition ? nYPosition < rCont.nYPosition : - sContentName < rCont.sContentName;; + sContentName < rCont.sContentName; } long GetYPos() const {return nYPosition;} diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 247c6f3b8709..3e07f62ba048 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -2505,7 +2505,7 @@ IMPL_LINK(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox) // #i21237# SwFormTokens aPattern = m_pCurrentForm->GetPattern(nLevel + 1); - SwFormTokens::iterator aIt = aPattern.begin();; + SwFormTokens::iterator aIt = aPattern.begin(); while(aIt != aPattern.end()) { diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 7088f5530f3d..661344c960a3 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -160,7 +160,7 @@ SwFootNotePage::SwFootNotePage(Window *pParent, const SfxItemSet &rSet) : SetMetric( aLineDistEdit, aMetric ); MeasurementSystem eSys = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum(); long nHeightValue = MEASURE_METRIC != eSys ? 1440 : 1134; - aMaxHeightEdit.SetValue(aMaxHeightEdit.Normalize(nHeightValue),FUNIT_TWIP);; + aMaxHeightEdit.SetValue(aMaxHeightEdit.Normalize(nHeightValue),FUNIT_TWIP); aMaxHeightEdit.SetAccessibleRelationLabeledBy(&aMaxHeightBtn); } diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx index 7839ed03313d..be020a989bb2 100644 --- a/sw/source/ui/shells/drwtxtex.cxx +++ b/sw/source/ui/shells/drwtxtex.cxx @@ -554,7 +554,7 @@ void SwDrawTextShell::GetState(SfxItemSet& rSet) { case SID_LANGUAGE_STATUS://20412: { - nSlotId = SwLangHelper::GetLanguageStatus(pOLV,rSet);; + nSlotId = SwLangHelper::GetLanguageStatus(pOLV,rSet); break; } diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx index 023bf043e39f..d75a26e47e82 100644 --- a/sw/source/ui/uiview/srcview.cxx +++ b/sw/source/ui/uiview/srcview.cxx @@ -505,7 +505,7 @@ void SwSrcView::GetState(SfxItemSet& rSet) nCount = rMgr.GetUndoActionCount(); if(nCount) { - String aStr(SvtResId( STR_UNDO));; + String aStr(SvtResId( STR_UNDO)); aStr += rMgr.GetUndoActionComment(--nCount); rSet.Put(SfxStringItem(nWhich, aStr)); } @@ -517,7 +517,7 @@ void SwSrcView::GetState(SfxItemSet& rSet) nCount = rMgr.GetRedoActionCount(); if(nCount) { - String aStr(SvtResId( STR_REDO));; + String aStr(SvtResId( STR_REDO)); aStr += rMgr.GetRedoActionComment(--nCount); rSet.Put(SfxStringItem(nWhich,aStr)); } diff --git a/sw/source/ui/uiview/uivwimp.cxx b/sw/source/ui/uiview/uivwimp.cxx index 5f730ffa991c..e8787b2cb1c9 100644 --- a/sw/source/ui/uiview/uivwimp.cxx +++ b/sw/source/ui/uiview/uivwimp.cxx @@ -234,7 +234,7 @@ void SwView_Impl::Invalidate() void SwView_Impl::AddTransferable(SwTransferable& rTransferable) { //prevent removing of the non-referenced SwTransferable - rTransferable.m_refCount++;; + rTransferable.m_refCount++; { xTransferable = Reference<XUnoTunnel> (&rTransferable); } diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx index 0da7e0f42030..10273953522b 100644 --- a/sw/source/ui/uiview/viewling.cxx +++ b/sw/source/ui/uiview/viewling.cxx @@ -193,7 +193,7 @@ void SwView::ExecLingu(SfxRequest &rReq) const SwPosition *pPoint = pWrtShell->GetCrsr()->GetPoint(); sal_Bool bRestoreCursor = pPoint->nNode.GetNode().IsTxtNode(); const SwNodeIndex aPointNodeIndex( pPoint->nNode ); - xub_StrLen nPointIndex = pPoint->nContent.GetIndex();; + xub_StrLen nPointIndex = pPoint->nContent.GetIndex(); // since this conversion is not interactive the whole converted // document should be undone in a single undo step. diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx index 0ea40aac01c9..84162bdb9ab0 100644 --- a/sw/source/ui/uiview/viewprt.cxx +++ b/sw/source/ui/uiview/viewprt.cxx @@ -236,7 +236,7 @@ void SwView::ExecutePrint(SfxRequest& rReq) { short nBtn = SvxPrtQryBox(&GetEditWin()).Execute(); if( RET_CANCEL == nBtn ) - return;; + return; if( RET_OK == nBtn ) bPrintSelection = true; diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx index 9aafcd308c92..dba39b10636c 100644 --- a/sw/source/ui/uno/unoatxt.cxx +++ b/sw/source/ui/uno/unoatxt.cxx @@ -75,7 +75,7 @@ uno::Reference< uno::XInterface > SAL_CALL SwXAutoTextContainer_createInstance( //the module may not be loaded SolarMutexGuard aGuard; SwGlobals::ensure(); - static uno::Reference< uno::XInterface > xAText = (cppu::OWeakObject*)new SwXAutoTextContainer();; + static uno::Reference< uno::XInterface > xAText = (cppu::OWeakObject*)new SwXAutoTextContainer(); return xAText; } diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx index 299b17a3fa98..ac9ea9b173fa 100644 --- a/sw/source/ui/uno/unomod.cxx +++ b/sw/source/ui/uno/unomod.cxx @@ -208,7 +208,7 @@ static ChainablePropertySetInfo * lcl_createPrintSettingsInfo() Reference< uno::XInterface > SAL_CALL SwXModule_createInstance( const Reference< XMultiServiceFactory > & /*rSMgr*/) throw( Exception ) { - static Reference< uno::XInterface > xModule = (cppu::OWeakObject*)new SwXModule();; + static Reference< uno::XInterface > xModule = (cppu::OWeakObject*)new SwXModule(); return xModule; } diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index 6ac980825173..f0e3502c84b1 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -753,7 +753,7 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor > else if(pSearch->bStyles) { SwTxtFmtColl *pSearchColl = lcl_GetParaStyle(pSearch->sSearchText, pUnoCrsr->GetDoc()); - SwTxtFmtColl *pReplaceColl = lcl_GetParaStyle(pSearch->sReplaceText, pUnoCrsr->GetDoc());; + SwTxtFmtColl *pReplaceColl = lcl_GetParaStyle(pSearch->sReplaceText, pUnoCrsr->GetDoc()); sal_Bool bCancel; nResult = pUnoCrsr->Find( *pSearchColl, @@ -3113,7 +3113,7 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages( for (sal_uInt16 i = 0; i < pColls->Count(); ++i) { const SwAttrSet &rAttrSet = (*pColls)[i]->GetAttrSet(); - LanguageType nLang = LANGUAGE_DONTKNOW;; + LanguageType nLang = LANGUAGE_DONTKNOW; if (bLatin) { nLang = rAttrSet.GetLanguage( sal_False ).GetLanguage(); diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx index 3635eb417c6b..b0b37db7f369 100644 --- a/sw/source/ui/uno/unotxvw.cxx +++ b/sw/source/ui/uno/unotxvw.cxx @@ -336,7 +336,7 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArg } } - uno::Reference< text::XTextTable > xTbl(xInterface, uno::UNO_QUERY);; + uno::Reference< text::XTextTable > xTbl(xInterface, uno::UNO_QUERY); if(xTbl.is() && xIfcTunnel.is()) { @@ -385,7 +385,7 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArg return sal_True; } } - uno::Reference< text::XTextContent > xBkm(xInterface, uno::UNO_QUERY);; + uno::Reference< text::XTextContent > xBkm(xInterface, uno::UNO_QUERY); if(xBkm.is() && xIfcTunnel.is()) { @@ -522,7 +522,7 @@ uno::Any SwXTextView::getSelection(void) throw( uno::RuntimeException ) OSL_ENSURE(rSh.GetTableFmt(), "kein Tabellenformat?"); uno::Reference< text::XTextTableCursor > xCrsr = new SwXTextTableCursor(*rSh.GetTableFmt(), rSh.GetTableCrsr()); - aRef = uno::Reference< uno::XInterface > (xCrsr, uno::UNO_QUERY);; + aRef = uno::Reference< uno::XInterface > (xCrsr, uno::UNO_QUERY); break; } @@ -591,7 +591,7 @@ uno::Any SwXTextView::getSelection(void) throw( uno::RuntimeException ) { SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); uno::Reference< uno::XInterface > xInt = pSvxDrawPage->GetInterface( pObj ); - uno::Reference< drawing::XShape > xShape(xInt, uno::UNO_QUERY);; + uno::Reference< drawing::XShape > xShape(xInt, uno::UNO_QUERY); xShCol->add(xShape); } aRef = uno::Reference< uno::XInterface >(xShCol, uno::UNO_QUERY); @@ -1941,7 +1941,7 @@ sal_Int64 SAL_CALL SwXTextViewCursor::getSomething( { return sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( this )); } - return OTextCursorHelper::getSomething(rId);; + return OTextCursorHelper::getSomething(rId); } IMPLEMENT_FORWARD_XINTERFACE2(SwXTextViewCursor,SwXTextViewCursor_Base,OTextCursorHelper) diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index c0f12b3c7a96..1606d102f9e8 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -349,7 +349,7 @@ rtl::OUString SwVbaCustomDocumentProperty::getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException) { // #FIXME we need to store the link content somewhere - return rtl::OUString();; + return rtl::OUString(); } void |