[Libreoffice-commits] .: 4 commits - binfilter/bf_sd binfilter/bf_sfx2 binfilter/bf_svx binfilter/bf_sw binfilter/binfilterdetect binfilter/inc lotuswordpro/source writerfilter/source
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Dec 22 07:03:52 PST 2010
binfilter/bf_sd/source/core/sd_stlpool.cxx | 46 +++++-------
binfilter/bf_sfx2/source/view/sfx2_printer.cxx | 2
binfilter/bf_svx/source/svdraw/svx_svdograf.cxx | 2
binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx | 24 +++---
binfilter/bf_sw/source/core/bastyp/sw_calc.cxx | 71 +++++++++----------
binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx | 2
binfilter/bf_sw/source/core/fields/sw_expfld.cxx | 25 ++----
binfilter/bf_sw/source/core/fields/sw_tblcalc.cxx | 8 +-
binfilter/bf_sw/source/core/inc/tblrwcl.hxx | 20 ++++-
binfilter/bf_sw/source/core/unocore/sw_unotext.cxx | 18 ++--
binfilter/binfilterdetect/source/bindetect.cxx | 11 +-
binfilter/binfilterdetect/source/makefile.mk | 2
binfilter/inc/bf_svx/svdpagv.hxx | 6 -
binfilter/inc/bf_sw/cellfml.hxx | 2
binfilter/inc/bf_sw/dbmgr.hxx | 6 -
binfilter/inc/bf_sw/unocoll.hxx | 7 +
binfilter/inc/bf_sw/unotbl.hxx | 4 -
lotuswordpro/source/filter/xfilter/xffontfactory.cxx | 4 -
writerfilter/source/doctok/WW8DocumentImpl.cxx | 10 +-
19 files changed, 133 insertions(+), 137 deletions(-)
New commits:
commit ac076aa67821f76e71547068693107faa05983ba
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Dec 22 14:44:10 2010 +0000
drop a few warnings
diff --git a/binfilter/bf_sd/source/core/sd_stlpool.cxx b/binfilter/bf_sd/source/core/sd_stlpool.cxx
index 72cf09c..165e0f2 100644
--- a/binfilter/bf_sd/source/core/sd_stlpool.cxx
+++ b/binfilter/bf_sd/source/core/sd_stlpool.cxx
@@ -80,8 +80,8 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ SdStyleSheetPool::SdStyleSheetPool(SfxItemPool& rPool, SdDrawDocument* pDocument) :
-/*N*/ SfxStyleSheetPool(rPool),
+/*N*/ SdStyleSheetPool::SdStyleSheetPool(SfxItemPool& rPoolIn, SdDrawDocument* pDocument) :
+/*N*/ SfxStyleSheetPool(rPoolIn),
/*N*/ pActualStyleSheet(NULL),
/*N*/ pDoc(pDocument)
/*N*/ {
@@ -105,9 +105,9 @@ namespace binfilter {
/*N*/ SfxStyleSheetBase* SdStyleSheetPool::Create(const String& rName,
/*N*/ SfxStyleFamily eFamily,
-/*N*/ USHORT nMask )
+/*N*/ USHORT nMaskIn )
/*N*/ {
-/*N*/ return new SdStyleSheet(rName, *this, eFamily, nMask);
+/*N*/ return new SdStyleSheet(rName, *this, eFamily, nMaskIn);
/*N*/ }
@@ -170,7 +170,7 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bool bCheck /*=sal_False*/ )
+/*N*/ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bool /*bCheck*/ )
/*N*/ {
/*N*/ sal_Bool bCreated = sal_False;
/*N*/
@@ -249,8 +249,8 @@ namespace binfilter {
/*N*/
/*N*/ if( nLevel == 1 )
/*N*/ {
-/*N*/ Font aBulletFont( GetBulletFont() );
-/*N*/ PutNumBulletItem( pSheet, aBulletFont );
+/*N*/ Font aLclBulletFont( GetBulletFont() );
+/*N*/ PutNumBulletItem( pSheet, aLclBulletFont );
/*N*/ }
/*N*/ }
/*N*/
@@ -432,9 +432,9 @@ namespace binfilter {
/*N*/ rSubtitleSet.Put( SfxUInt16Item(EE_PARA_BULLETSTATE, 0) );
/*N*/ aSvxLRSpaceItem.SetTxtLeft(0);
/*N*/ rSubtitleSet.Put(aSvxLRSpaceItem);
-/*N*/ Font aBulletFont( GetBulletFont() );
-/*N*/ aBulletFont.SetSize(Size(0, 1129)); // 32 pt
-/*N*/ PutNumBulletItem( pSheet, aBulletFont );
+/*N*/ Font aLclBulletFont( GetBulletFont() );
+/*N*/ aLclBulletFont.SetSize(Size(0, 1129)); // 32 pt
+/*N*/ PutNumBulletItem( pSheet, aLclBulletFont );
/*N*/ }
/*N*/
/**************************************************************************
@@ -522,7 +522,6 @@ namespace binfilter {
/*N*/ rBackgroundSet.Put(XFillStyleItem(XFILL_NONE));
/*N*/ }
/*N*/
-/*N*/ DBG_ASSERT( !bCheck || !bCreated, "missing layout style sheets detected!" );
/*N*/ }
/*************************************************************************
@@ -587,13 +586,12 @@ namespace binfilter {
/*N*/ SfxStyleSheetBase* pSheet = NULL;
/*N*/ SfxStyleSheetBase* pParent = NULL;
/*N*/
-/*N*/ //USHORT nMask = SFXSTYLEBIT_ALL & ~SFXSTYLEBIT_USERDEF;
-/*N*/ USHORT nMask = SFXSTYLEBIT_USED;
+/*N*/ USHORT nLclMask = SFXSTYLEBIT_USED;
/*N*/
/*N*/ aName = String(SdResId(STR_PSEUDOSHEET_TITLE));
/*N*/ if (!(pSheet = Find(aName, SFX_STYLE_FAMILY_PSEUDO)))
/*N*/ {
-/*N*/ pSheet = &Make(aName, SFX_STYLE_FAMILY_PSEUDO, nMask);
+/*N*/ pSheet = &Make(aName, SFX_STYLE_FAMILY_PSEUDO, nLclMask);
/*N*/ pSheet->SetParent( String() );
/*N*/ ((SfxStyleSheet*)pSheet)->StartListening(*this);
/*N*/ }
@@ -602,7 +600,7 @@ namespace binfilter {
/*N*/ aName = String(SdResId(STR_PSEUDOSHEET_SUBTITLE));
/*N*/ if (!(pSheet = Find(aName, SFX_STYLE_FAMILY_PSEUDO)))
/*N*/ {
-/*N*/ pSheet = &Make(aName, SFX_STYLE_FAMILY_PSEUDO, nMask);
+/*N*/ pSheet = &Make(aName, SFX_STYLE_FAMILY_PSEUDO, nLclMask);
/*N*/ pSheet->SetParent(String());
/*N*/ ((SfxStyleSheet*)pSheet)->StartListening(*this);
/*N*/ }
@@ -611,7 +609,7 @@ namespace binfilter {
/*N*/ aName = String(SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS));
/*N*/ if (!(pSheet = Find(aName, SFX_STYLE_FAMILY_PSEUDO)))
/*N*/ {
-/*N*/ pSheet = &Make(aName, SFX_STYLE_FAMILY_PSEUDO, nMask);
+/*N*/ pSheet = &Make(aName, SFX_STYLE_FAMILY_PSEUDO, nLclMask);
/*N*/ pSheet->SetParent( String() );
/*N*/ ((SfxStyleSheet*)pSheet)->StartListening(*this);
/*N*/ }
@@ -620,7 +618,7 @@ namespace binfilter {
/*N*/ aName = String(SdResId(STR_PSEUDOSHEET_BACKGROUND));
/*N*/ if (!(pSheet = Find(aName, SFX_STYLE_FAMILY_PSEUDO)))
/*N*/ {
-/*N*/ pSheet = &Make(aName, SFX_STYLE_FAMILY_PSEUDO, nMask);
+/*N*/ pSheet = &Make(aName, SFX_STYLE_FAMILY_PSEUDO, nLclMask);
/*N*/ pSheet->SetParent( String() );
/*N*/ ((SfxStyleSheet*)pSheet)->StartListening(*this);
/*N*/ }
@@ -629,7 +627,7 @@ namespace binfilter {
/*N*/ aName = String(SdResId(STR_PSEUDOSHEET_NOTES));
/*N*/ if (!(pSheet = Find(aName, SFX_STYLE_FAMILY_PSEUDO)))
/*N*/ {
-/*N*/ pSheet = &Make(aName, SFX_STYLE_FAMILY_PSEUDO, nMask);
+/*N*/ pSheet = &Make(aName, SFX_STYLE_FAMILY_PSEUDO, nLclMask);
/*N*/ pSheet->SetParent( String() );
/*N*/ ((SfxStyleSheet*)pSheet)->StartListening(*this);
/*N*/ }
@@ -646,7 +644,7 @@ namespace binfilter {
/*N*/
/*N*/ if (!(pSheet = Find(aLevelName, SFX_STYLE_FAMILY_PSEUDO)))
/*N*/ {
-/*N*/ pSheet = &Make(aLevelName, SFX_STYLE_FAMILY_PSEUDO, nMask);
+/*N*/ pSheet = &Make(aLevelName, SFX_STYLE_FAMILY_PSEUDO, nLclMask);
/*N*/
/*N*/ if (pSheet)
/*N*/ {
@@ -830,7 +828,6 @@ namespace binfilter {
/*N*/ String aStr( SdResId( STR_PSEUDOSHEET_OUTLINE ) );
/*N*/ aStr.Append( sal_Unicode( ' ' ));
/*N*/ String aStr2( RTL_CONSTASCII_USTRINGPARAM( "Gliederung " ));
-/*N*/ sal_Int32 nNumber = 0;
/*N*/
/*N*/ if( aOldName == String( SdResId( STR_PSEUDOSHEET_TITLE ) ) ||
/*N*/ aOldName.EqualsAscii( "Titel", 0, RTL_CONSTASCII_LENGTH( "Titel" )))
@@ -915,7 +912,6 @@ namespace binfilter {
/*N*/ void SdStyleSheetPool::AdjustLRSpaceItems()
/*N*/ {
-/*N*/ String aHelpFile;
/*N*/ ULONG nCount = aStyles.Count();
/*N*/
/*N*/ // #63254# Aenderungen nicht mehr broadcasten,statt dessen nach
@@ -1046,13 +1042,13 @@ namespace binfilter {
/*N*/ aName.Search(aSubtitleName) != STRING_NOTFOUND )
/*N*/ {
/*N*/ // Titel- oder Untertitel-Vorlage
-/*N*/ SfxItemSet& rSet = pSheet->GetItemSet();
+/*N*/ SfxItemSet& rLclSet = pSheet->GetItemSet();
/*N*/
-/*N*/ if (rSet.GetItemState(EE_PARA_BULLETSTATE) != SFX_ITEM_ON ||
-/*N*/ ((const SfxUInt16Item&) rSet.Get(EE_PARA_BULLETSTATE)).GetValue() == 1)
+/*N*/ if (rLclSet.GetItemState(EE_PARA_BULLETSTATE) != SFX_ITEM_ON ||
+/*N*/ ((const SfxUInt16Item&) rLclSet.Get(EE_PARA_BULLETSTATE)).GetValue() == 1)
/*N*/ {
/*N*/ SfxUInt16Item aBulletStateItem(EE_PARA_BULLETSTATE, 0); // Bullets nicht sichtbar
-/*N*/ rSet.Put(aBulletStateItem);
+/*N*/ rLclSet.Put(aBulletStateItem);
/*N*/ }
/*N*/
/*N*/ if( nHelpId == HID_PSEUDOSHEET_TITLE ||
diff --git a/binfilter/bf_sfx2/source/view/sfx2_printer.cxx b/binfilter/bf_sfx2/source/view/sfx2_printer.cxx
index eeaf6ac..1a5d7e8 100644
--- a/binfilter/bf_sfx2/source/view/sfx2_printer.cxx
+++ b/binfilter/bf_sfx2/source/view/sfx2_printer.cxx
@@ -188,7 +188,7 @@ namespace binfilter {
//--------------------------------------------------------------------
-/*?*/ const SfxFont* SfxPrinter::GetFontByName( const String &rFontName )
+/*?*/ const SfxFont* SfxPrinter::GetFontByName( const String & )
/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001
/*?*/ }
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx
index 45b7245..e48de58 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx
@@ -72,7 +72,7 @@ using namespace ::com::sun::star;
-/*N*/ IMPL_LINK(FrameAnimator,Hdl,AutoTimer*,pTim)
+/*N*/ IMPL_LINK(FrameAnimator,Hdl,AutoTimer*,EMPTYARG)
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ return 0;
/*N*/ }
@@ -382,7 +382,7 @@ using namespace ::com::sun::star;
////////////////////////////////////////////////////////////////////////////////////////////////////
-/*N*/ void SdrPaintView::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType)
+/*N*/ void SdrPaintView::SFX_NOTIFY(SfxBroadcaster& /*rBC*/, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType)
/*N*/ {
/*N*/ BOOL bObjChg=!bSomeObjChgdFlag; // TRUE= auswerten fuer ComeBack-Timer
/*N*/ BOOL bMaster=pMasterBmp!=NULL; // TRUE= auswerten fuer MasterPagePaintCache
@@ -432,7 +432,7 @@ using namespace ::com::sun::star;
////////////////////////////////////////////////////////////////////////////////////////////////////
-/*N*/ IMPL_LINK_INLINE_START(SdrPaintView,ImpComeBackHdl,Timer*,pTimer)
+/*N*/ IMPL_LINK_INLINE_START(SdrPaintView,ImpComeBackHdl,Timer*,EMPTYARG)
/*N*/ {
/*N*/ if (bSomeObjChgdFlag) {
/*N*/ bSomeObjChgdFlag=FALSE;
@@ -447,11 +447,11 @@ using namespace ::com::sun::star;
-/*?*/ void SdrPaintView::ImpAsyncPaintDone( const SdrObject* pObj )
+/*?*/ void SdrPaintView::ImpAsyncPaintDone( const SdrObject* /*pObj*/ )
/*?*/ {{DBG_BF_ASSERT(0, "STRIP");}//STRIP001
/*?*/ }
-/*N*/ IMPL_LINK(SdrPaintView,ImpAfterPaintHdl,Timer*,pTimer)
+/*N*/ IMPL_LINK(SdrPaintView,ImpAfterPaintHdl,Timer*,EMPTYARG)
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ return 0;
/*N*/ }
@@ -486,12 +486,12 @@ using namespace ::com::sun::star;
////////////////////////////////////////////////////////////////////////////////////////////////////
-/*N*/ IMPL_LINK_INLINE_START(SdrPaintView,ImpUserMarkerAnimatorHdl,AutoTimer*,pTimer)
+/*N*/ IMPL_LINK_INLINE_START(SdrPaintView,ImpUserMarkerAnimatorHdl,AutoTimer*,EMPTYARG)
/*N*/ {
/*N*/ USHORT nAnz=ImpGetUserMarkerCount();
/*N*/ for (USHORT nNum=0; nNum<nAnz; nNum++) {
/*N*/ SdrViewUserMarker* pUM=ImpGetUserMarker(nNum);
-/*N*/ if (pUM->IsAnimate() && pUM->IsVisible()) {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pUM->DoAnimateOneStep();
+/*N*/ if (pUM->IsAnimate() && pUM->IsVisible()) {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ }
/*N*/ return 0;
/*N*/ }
@@ -538,14 +538,14 @@ using namespace ::com::sun::star;
/*N*/ }
-/*N*/ void SdrPaintView::ToggleShownXor(OutputDevice* pOut, const Region* pRegion) const
+/*N*/ void SdrPaintView::ToggleShownXor(OutputDevice* /*pOut*/, const Region* /*pRegion*/) const
/*N*/ {
/*N*/ if (IsEncirclement() && aDragStat.IsShown()) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ }
/*N*/ USHORT nAnz=ImpGetUserMarkerCount();
/*N*/ for (USHORT nNum=0; nNum<nAnz; nNum++) {
/*N*/ SdrViewUserMarker* pUM=ImpGetUserMarker(nNum);
-/*N*/ if (pUM->IsVisible()) {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pUM->Draw(pOut,FALSE,!bRestoreColors); // den 3. Parameter hier noch richtig setzen !!!!!
+/*N*/ if (pUM->IsVisible()) {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ }
/*N*/ }
@@ -738,13 +738,13 @@ using namespace ::com::sun::star;
/*N*/ #endif
/*N*/ }
-/*N*/ Rectangle SdrPaintView::GetVisibleArea( USHORT nNum )
+/*N*/ Rectangle SdrPaintView::GetVisibleArea( USHORT )
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return Rectangle();//STRIP001
/*N*/ }
////////////////////////////////////////////////////////////////////////////////////////////////////
-/*N*/ void SdrPaintView::InitRedraw(OutputDevice* pOut, const Region& rReg, USHORT nPaintMode)
+/*N*/ void SdrPaintView::InitRedraw(OutputDevice*, const Region&, USHORT)
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ }
@@ -900,7 +900,7 @@ using namespace ::com::sun::star;
////////////////////////////////////////////////////////////////////////////////////////////////////
-/*N*/ BOOL SdrPaintView::ReadRecord(const SdrIOHeader& rViewHead,
+/*N*/ BOOL SdrPaintView::ReadRecord(const SdrIOHeader& /*rViewHead*/,
/*N*/ const SdrNamedSubRecord& rSubHead,
/*N*/ SvStream& rIn)
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
index 07734ec..efbdc8f 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
@@ -112,34 +112,34 @@ struct _CalcOp
};
_CalcOp const aOpTable[] = {
-/* ACOS */ {sCalc_Acos, CALC_ACOS}, // Arcuscosinus
-/* ADD */ {sCalc_Add, CALC_PLUS}, // Addition
-/* AND */ {sCalc_And, CALC_AND}, // log. und
-/* ASIN */ {sCalc_Asin, CALC_ASIN}, // Arcussinus
-/* ATAN */ {sCalc_Atan, CALC_ATAN}, // Arcustangens
-/* COS */ {sCalc_Cos, CALC_COS}, // Cosinus
-/* DIV */ {sCalc_Div, CALC_DIV}, // Dividieren
-/* EQ */ {sCalc_Eq, CALC_EQ}, // gleich
-/* G */ {sCalc_G, CALC_GRE}, // groesser
-/* GEQ */ {sCalc_Geq, CALC_GEQ}, // groesser gleich
-/* L */ {sCalc_L, CALC_LES}, // kleiner
-/* LEQ */ {sCalc_Leq, CALC_LEQ}, // kleiner gleich
-/* MAX */ {sCalc_Max, CALC_MAX}, // Maximalwert
-/* MEAN */ {sCalc_Mean, CALC_MEAN}, // Mittelwert
-/* MIN */ {sCalc_Min, CALC_MIN}, // Minimalwert
-/* MUL */ {sCalc_Mul, CALC_MUL}, // Multiplizieren
-/* NEQ */ {sCalc_Neq, CALC_NEQ}, // nicht gleich
-/* NOT */ {sCalc_Not, CALC_NOT}, // log. nicht
-/* OR */ {sCalc_Or, CALC_OR}, // log. oder
-/* PHD */ {sCalc_Phd, CALC_PHD}, // Prozent
-/* POW */ {sCalc_Pow, CALC_POW}, // Potenzieren
-/* ROUND */ {sCalc_Round, CALC_ROUND}, // Runden
-/* SIN */ {sCalc_Sin, CALC_SIN}, // Sinus
-/* SQRT */ {sCalc_Sqrt, CALC_SQRT}, // Wurzel
-/* SUB */ {sCalc_Sub, CALC_MINUS}, // Subtraktion
-/* SUM */ {sCalc_Sum, CALC_SUM}, // Summe
-/* TAN */ {sCalc_Tan, CALC_TAN}, // Tangens
-/* XOR */ {sCalc_Xor, CALC_XOR} // log. xoder
+/* ACOS */ {{sCalc_Acos}, CALC_ACOS}, // Arcuscosinus
+/* ADD */ {{sCalc_Add}, CALC_PLUS}, // Addition
+/* AND */ {{sCalc_And}, CALC_AND}, // log. und
+/* ASIN */ {{sCalc_Asin}, CALC_ASIN}, // Arcussinus
+/* ATAN */ {{sCalc_Atan}, CALC_ATAN}, // Arcustangens
+/* COS */ {{sCalc_Cos}, CALC_COS}, // Cosinus
+/* DIV */ {{sCalc_Div}, CALC_DIV}, // Dividieren
+/* EQ */ {{sCalc_Eq}, CALC_EQ}, // gleich
+/* G */ {{sCalc_G}, CALC_GRE}, // groesser
+/* GEQ */ {{sCalc_Geq}, CALC_GEQ}, // groesser gleich
+/* L */ {{sCalc_L}, CALC_LES}, // kleiner
+/* LEQ */ {{sCalc_Leq}, CALC_LEQ}, // kleiner gleich
+/* MAX */ {{sCalc_Max}, CALC_MAX}, // Maximalwert
+/* MEAN */ {{sCalc_Mean}, CALC_MEAN}, // Mittelwert
+/* MIN */ {{sCalc_Min}, CALC_MIN}, // Minimalwert
+/* MUL */ {{sCalc_Mul}, CALC_MUL}, // Multiplizieren
+/* NEQ */ {{sCalc_Neq}, CALC_NEQ}, // nicht gleich
+/* NOT */ {{sCalc_Not}, CALC_NOT}, // log. nicht
+/* OR */ {{sCalc_Or}, CALC_OR}, // log. oder
+/* PHD */ {{sCalc_Phd}, CALC_PHD}, // Prozent
+/* POW */ {{sCalc_Pow}, CALC_POW}, // Potenzieren
+/* ROUND */ {{sCalc_Round}, CALC_ROUND}, // Runden
+/* SIN */ {{sCalc_Sin}, CALC_SIN}, // Sinus
+/* SQRT */ {{sCalc_Sqrt}, CALC_SQRT}, // Wurzel
+/* SUB */ {{sCalc_Sub}, CALC_MINUS}, // Subtraktion
+/* SUM */ {{sCalc_Sum}, CALC_SUM}, // Summe
+/* TAN */ {{sCalc_Tan}, CALC_TAN}, // Tangens
+/* XOR */ {{sCalc_Xor}, CALC_XOR} // log. xoder
};
double const nRoundVal[] = {
@@ -252,12 +252,12 @@ static int
|******************************************************************************/
/*N*/
/*N*/ SwCalc::SwCalc( SwDoc& rD )
-/*N*/ : rDoc( rD ),
-/*N*/ eError( CALC_NOERR ),
-/*N*/ nListPor( 0 ),
-/*N*/ aErrExpr( aEmptyStr, SwSbxValue(), 0 ),
+/*N*/ : aErrExpr( aEmptyStr, SwSbxValue(), 0 ),
+/*N*/ rDoc( rD ),
/*N*/ pLclData( &GetAppLocaleData() ),
-/*N*/ pCharClass( &GetAppCharClass() )
+/*N*/ pCharClass( &GetAppCharClass() ),
+/*N*/ nListPor( 0 ),
+/*N*/ eError( CALC_NOERR )
/*N*/ {
/*N*/ aErrExpr.aStr.AssignAscii( "~C_ERR~" );
/*N*/ memset( VarTable, 0, sizeof(VarTable) );
@@ -668,11 +668,8 @@ static int
|*
|******************************************************************************/
-/*N*/ void SwCalc::Pop( const VoidPtr pPtr )
+/*N*/ void SwCalc::Pop( const VoidPtr )
/*N*/ {
-/*N*/ ASSERT( aRekurStk.Count() && aRekurStk.GetPos( pPtr ) ==
-/*N*/ (aRekurStk.Count() - 1 ), "SwCalc: Pop auf ungueltigen Ptr" );
-/*N*/
/*N*/ aRekurStk.Remove( aRekurStk.Count() - 1 );
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
index 9c51563..6c13d82 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
@@ -394,7 +394,7 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
/*N*/ SwTableBoxes& rBoxes = pLine->GetTabBoxes();
/*N*/ for( USHORT i = 0; i < nCols; ++i )
/*N*/ {
-/*N*/ SwTableBoxFmt *pBoxF;
+/*N*/ SwTableBoxFmt *pBoxF(0);
/*N*/ if( pTAFmt )
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 BYTE nId = !n ? 0 : (( n+1 == nRows )
diff --git a/binfilter/bf_sw/source/core/fields/sw_expfld.cxx b/binfilter/bf_sw/source/core/fields/sw_expfld.cxx
index 7e13453..754e7a8 100644
--- a/binfilter/bf_sw/source/core/fields/sw_expfld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_expfld.cxx
@@ -112,7 +112,7 @@ using namespace ::rtl;
//-----------------------------------------------------------------------------
/*N*/ sal_Int32 lcl_APIToSubType(const uno::Any& rAny)
/*N*/ {
-/*N*/ sal_Int16 nVal;
+/*N*/ sal_Int16 nVal(0);
/*N*/ rAny >>= nVal;
/*N*/ sal_Int32 nSet = 0;
/*N*/ switch(nVal)
@@ -427,7 +427,7 @@ void SwGetExpField::SetPar2(const String& rStr)
BOOL SwGetExpField::PutValue( const uno::Any& rAny, BYTE nMId )
{
nMId &= ~CONVERT_TWIPS;
- sal_Int32 nTmp;
+ sal_Int32 nTmp(0);
String sTmp;
switch( nMId )
{
@@ -469,8 +469,8 @@ BOOL SwGetExpField::PutValue( const uno::Any& rAny, BYTE nMId )
Set-Expression-Type
--------------------------------------------------*/
-/*N*/ SwSetExpFieldType::SwSetExpFieldType( SwDoc* pDoc, const String& rName, USHORT nTyp )
-/*N*/ : SwValueFieldType( pDoc, RES_SETEXPFLD ),
+/*N*/ SwSetExpFieldType::SwSetExpFieldType( SwDoc* pInDoc, const String& rName, USHORT nTyp )
+/*N*/ : SwValueFieldType( pInDoc, RES_SETEXPFLD ),
/*N*/ sName( rName ),
/*N*/ nType(nTyp),
/*N*/ cDelim( '.' ), nLevel( UCHAR_MAX ),
@@ -602,7 +602,7 @@ void SwSetExpFieldType::Modify( SfxPoolItem*, SfxPoolItem* )
/*?*/ break;
/*N*/ case FIELD_PROP_SHORT1:
/*N*/ {
-/*N*/ sal_Int8 nLvl;
+/*N*/ sal_Int8 nLvl(0);
/*N*/ rAny >>= nLvl;
/*N*/ if(nLvl < 0 || nLvl >= MAXLEVEL)
/*N*/ SetOutlineLvl(UCHAR_MAX);
@@ -995,8 +995,8 @@ void SwInputField::SetSubType(USHORT nSub)
/*N*/ //I18N - if the formula contains only "TypeName+1"
/*N*/ //and it's one of the initially created sequence fields
/*N*/ //then the localized names has to be replaced by a programmatic name
-/*N*/ OUString sFormula = SwXFieldMaster::LocalizeFormula(*this, GetFormula(), TRUE);
-/*N*/ rAny <<= OUString( sFormula );
+/*N*/ OUString sLclFormula = SwXFieldMaster::LocalizeFormula(*this, GetFormula(), TRUE);
+/*N*/ rAny <<= OUString( sLclFormula );
/*N*/ }
/*N*/ break;
/*N*/ case FIELD_PROP_DOUBLE:
@@ -1038,8 +1038,8 @@ void SwInputField::SetSubType(USHORT nSub)
/*N*/ BOOL SwSetExpField::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
-/*N*/ sal_Int32 nTmp32;
-/*N*/ sal_Int16 nTmp16;
+/*N*/ sal_Int32 nTmp32(0);
+/*N*/ sal_Int16 nTmp16(0);
/*N*/ String sTmp;
/*N*/ switch( nMId )
/*N*/ {
@@ -1058,9 +1058,6 @@ void SwInputField::SetSubType(USHORT nSub)
/*?*/ rAny >>= nTmp16;
/*?*/ if(nTmp16 <= SVX_NUMBER_NONE )
/*?*/ SetFormat(nTmp16);
-/*?*/ else
-/*?*/ //exception(wrong_value)
-/*?*/ ;
/*?*/ }
/*?*/ break;
/*?*/ case FIELD_PROP_USHORT1:
@@ -1078,8 +1075,8 @@ void SwInputField::SetSubType(USHORT nSub)
/*N*/ //I18N - if the formula contains only "TypeName+1"
/*N*/ //and it's one of the initially created sequence fields
/*N*/ //then the localized names has to be replaced by a programmatic name
-/*N*/ OUString sFormula = SwXFieldMaster::LocalizeFormula(*this, uTmp, FALSE);
-/*N*/ SetFormula( sFormula );
+/*N*/ OUString sLclFormula = SwXFieldMaster::LocalizeFormula(*this, uTmp, FALSE);
+/*N*/ SetFormula( sLclFormula );
/*N*/ }
/*N*/ break;
/*N*/ case FIELD_PROP_DOUBLE:
diff --git a/binfilter/bf_sw/source/core/fields/sw_tblcalc.cxx b/binfilter/bf_sw/source/core/fields/sw_tblcalc.cxx
index 4c3c1d2..9df4893 100644
--- a/binfilter/bf_sw/source/core/fields/sw_tblcalc.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_tblcalc.cxx
@@ -75,10 +75,10 @@ using namespace ::rtl;
-/*N*/ SwTblField::SwTblField( SwTblFieldType* pType, const String& rFormel,
+/*N*/ SwTblField::SwTblField( SwTblFieldType* pInType, const String& rFormel,
/*N*/ USHORT nType, ULONG nFmt )
-/*N*/ : SwValueField( pType, nFmt ), SwTableFormula( rFormel ),
-/*N*/ nSubType(nType), sExpand( '0' )
+/*N*/ : SwValueField( pInType, nFmt ), SwTableFormula( rFormel ),
+/*N*/ sExpand( '0' ), nSubType(nType)
/*N*/ {
/*N*/ }
@@ -254,7 +254,7 @@ BOOL SwTblField::PutValue( const uno::Any& rAny, BYTE nMId )
break;
case FIELD_PROP_FORMAT:
{
- sal_Int32 nTmp;
+ sal_Int32 nTmp(0);
rAny >>= nTmp;
SetFormat(nTmp);
}
diff --git a/binfilter/bf_sw/source/core/inc/tblrwcl.hxx b/binfilter/bf_sw/source/core/inc/tblrwcl.hxx
index d4f76c0..a1d39d1 100644
--- a/binfilter/bf_sw/source/core/inc/tblrwcl.hxx
+++ b/binfilter/bf_sw/source/core/inc/tblrwcl.hxx
@@ -98,9 +98,13 @@ void _DeleteBox( SwTable& rTbl, SwTableBox* pBox,
public:
SwCollectTblLineBoxes( BOOL bTop, USHORT nMd = 0, SwHistory* pHist=0 )
- : aPosArr( 16, 16 ), aBoxes( 16, 16 ),
- bGetFromTop( bTop ), bGetValues( TRUE ), nMode( nMd ),
- nWidth( 0 ), pHst( pHist )
+ : aPosArr( 16, 16 )
+ , aBoxes( 16, 16 )
+ , pHst( pHist )
+ , nMode( nMd )
+ , nWidth( 0 )
+ , bGetFromTop( bTop )
+ , bGetValues( TRUE )
{}
void AddBox( const SwTableBox& rBox );
@@ -137,10 +141,16 @@ struct _SwGCLineBorder
USHORT nLinePos;
_SwGCLineBorder( const SwTable& rTable )
- : pLines( &rTable.GetTabLines() ), nLinePos( 0 ), pShareFmts(0) {}
+ : pLines( &rTable.GetTabLines() )
+ , pShareFmts(0)
+ , nLinePos( 0 )
+ {}
_SwGCLineBorder( const SwTableBox& rBox )
- : pLines( &rBox.GetTabLines() ), nLinePos( 0 ), pShareFmts(0) {}
+ : pLines( &rBox.GetTabLines() )
+ , pShareFmts(0)
+ , nLinePos( 0 )
+ {}
BOOL IsLastLine() const { return nLinePos + 1 >= pLines->Count(); }
};
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unotext.cxx b/binfilter/bf_sw/source/core/unocore/sw_unotext.cxx
index ba07099..9d84fc2 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unotext.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unotext.cxx
@@ -217,8 +217,8 @@ void SwXText::insertString(const uno::Reference< XTextRange > & xTextRange,
OTextCursorHelper::getUnoTunnelId());
}
- if(pRange && pRange->GetDoc() == GetDoc() ||
- pCursor && pCursor->GetDoc() == GetDoc())
+ if( (pRange && pRange->GetDoc() == GetDoc()) ||
+ (pCursor && pCursor->GetDoc() == GetDoc()) )
{
const SwStartNode* pOwnStartNode = GetStartNode();
if(pCursor)
@@ -417,8 +417,8 @@ void SwXText::insertTextContent(const uno::Reference< XTextRange > & xRange,
case CURSOR_FOOTNOTE: eSearchNodeType = SwFootnoteStartNode; break;
case CURSOR_HEADER: eSearchNodeType = SwHeaderStartNode; break;
case CURSOR_FOOTER: eSearchNodeType = SwFooterStartNode; break;
- //case CURSOR_INVALID:
- //case CURSOR_BODY:
+ default:
+ break;
}
const SwNode* pSrcNode = 0;
@@ -983,8 +983,8 @@ sal_Bool SwXText::CheckForOwnMember(
case CURSOR_FOOTNOTE: eSearchNodeType = SwFootnoteStartNode; break;
case CURSOR_HEADER: eSearchNodeType = SwHeaderStartNode; break;
case CURSOR_FOOTER: eSearchNodeType = SwFooterStartNode; break;
- //case CURSOR_INVALID:
- //case CURSOR_BODY:
+ default:
+ break;
}
const SwNode* pSrcNode;
@@ -1021,7 +1021,7 @@ sal_Int16 SwXText::ComparePositions(
const Reference<XTextRange>& xPos2)
throw(IllegalArgumentException, RuntimeException)
{
- sal_Int16 nCompare;
+ sal_Int16 nCompare(0);
SwUnoInternalPaM aPam1(*GetDoc());
SwUnoInternalPaM aPam2(*GetDoc());
@@ -1276,8 +1276,8 @@ sal_Int64 SwXText::getSomething( const uno::Sequence< sal_Int8 >& rId )
/******************************************************************
* SwXBodyText
******************************************************************/
-SwXBodyText::SwXBodyText(SwDoc* pDoc) :
- SwXText(pDoc, CURSOR_BODY)
+SwXBodyText::SwXBodyText(SwDoc* pDocIn) :
+ SwXText(pDocIn, CURSOR_BODY)
{
}
diff --git a/binfilter/binfilterdetect/source/bindetect.cxx b/binfilter/binfilterdetect/source/bindetect.cxx
index c486dd4..edfe2cb 100644
--- a/binfilter/binfilterdetect/source/bindetect.cxx
+++ b/binfilter/binfilterdetect/source/bindetect.cxx
@@ -491,9 +491,8 @@ bool checkFormat( SvStream* pStream, ::rtl::OUString& rTypeName, ::rtl::OUString
}
}
//check for W4W at the end of the type name
- if( rURL.getLength() && (bCheckAll || aName.getLength() > 4 &&
- String(aName).Copy( xub_StrLen(aName.getLength()) - 4, 4 ).EqualsAscii( "_W4W" )))
-// aName.equalsAsciiL( aFileTypeList[5].Type, aFileTypeList[5].Length )) )
+ if( rURL.getLength() && (bCheckAll || (aName.getLength() > 4 &&
+ String(aName).Copy( xub_StrLen(aName.getLength()) - 4, 4 ).EqualsAscii( "_W4W" ))))
{
// W4W
::rtl::OUString sFileName = INetURLObject( rURL ).getFSysPath(INetURLObject::FSYS_DETECT);
@@ -746,12 +745,12 @@ UNOREFERENCE< UNOXINTERFACE > SAL_CALL BinFilterDetect::impl_createInstance( con
extern "C" {
void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvironmentTypeName ,
- uno_Environment** ppEnvironment )
+ uno_Environment** /*ppEnvironment*/ )
{
*ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
}
-sal_Bool SAL_CALL component_writeInfo( void* pServiceManager ,
+sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/ ,
void* pRegistryKey )
{
::com::sun::star::uno::Reference< XRegistryKey > xKey( reinterpret_cast< XRegistryKey* >( pRegistryKey ) ) ;
@@ -780,7 +779,7 @@ sal_Bool SAL_CALL component_writeInfo( void* pServiceManager ,
void* SAL_CALL component_getFactory( const sal_Char* pImplementationName ,
void* pServiceManager ,
- void* pRegistryKey )
+ void* /*pRegistryKey*/ )
{
// Set default return value for this operation - if it failed.
void* pReturn = NULL ;
diff --git a/binfilter/binfilterdetect/source/makefile.mk b/binfilter/binfilterdetect/source/makefile.mk
index f475bce..316ca51 100644
--- a/binfilter/binfilterdetect/source/makefile.mk
+++ b/binfilter/binfilterdetect/source/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..
BFPRJ=..
diff --git a/binfilter/inc/bf_svx/svdpagv.hxx b/binfilter/inc/bf_svx/svdpagv.hxx
index 334dc8a..f626d7f 100644
--- a/binfilter/inc/bf_svx/svdpagv.hxx
+++ b/binfilter/inc/bf_svx/svdpagv.hxx
@@ -244,8 +244,8 @@ public:
class SdrPageViewWinList {
Container aList;
private:
- SdrPageViewWinList(const SdrPageViewWinList& rSource): aList(1024,4,4) {}
- void operator=(const SdrPageViewWinList& rSource) {}
+ SdrPageViewWinList(const SdrPageViewWinList& /*rSource*/): aList(1024,4,4) {}
+ void operator=(const SdrPageViewWinList& /*rSource*/) {}
protected:
SdrPageViewWinRec* GetObject(USHORT i) const { return (SdrPageViewWinRec*)(aList.GetObject(i)); }
public:
@@ -352,7 +352,7 @@ public:
// rRect bezieht sich auf die Page
void InvalidateAllWin(const Rectangle& rRect, bool bPlus1Pix=FALSE);
// rReg bezieht sich auf's OutDev, nicht auf die Page
- void InitRedraw(OutputDevice* pOut, const Region& rReg, USHORT nPaintMode=0, const Link* pPaintProc=NULL){DBG_BF_ASSERT(0, "STRIP");}//STRIP001 void InitRedraw(OutputDevice* pOut, const Region& rReg, USHORT nPaintMode=0, const Link* pPaintProc=NULL);
+ void InitRedraw(OutputDevice*, const Region&, USHORT =0, const Link* =NULL){DBG_BF_ASSERT(0, "STRIP");}
// rReg bezieht sich auf's OutDev, nicht auf die Page
// Painten aller Objekte eines Layer der Page ohne MasterPage
// pOut==NULL -> alle OutputDevices
diff --git a/binfilter/inc/bf_sw/cellfml.hxx b/binfilter/inc/bf_sw/cellfml.hxx
index 8b909f0..c2a1344 100644
--- a/binfilter/inc/bf_sw/cellfml.hxx
+++ b/binfilter/inc/bf_sw/cellfml.hxx
@@ -73,7 +73,7 @@ typedef void (SwTableFormula:: *FnScanFormel)( const SwTable&, String&,
void _MakeFormel( const SwTable&, String&, String&, String* = 0,
void* pPara = 0 ) const;
void _SplitMergeBoxNm( const SwTable&, String&, String&, String* = 0,
- void* pPara = 0 ) const{DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void* pPara = 0 ) const;
+ void* = 0 ) const{DBG_BF_ASSERT(0, "STRIP");}
void GetBoxes( const SwTableBox& rStt, const SwTableBox& rEnd,
SwSelBoxes& rBoxes ) const;
diff --git a/binfilter/inc/bf_sw/dbmgr.hxx b/binfilter/inc/bf_sw/dbmgr.hxx
index e080eb4..12c0bf2 100644
--- a/binfilter/inc/bf_sw/dbmgr.hxx
+++ b/binfilter/inc/bf_sw/dbmgr.hxx
@@ -128,12 +128,12 @@ struct SwDSParam : public SwDBData
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& xResSet,
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rSelection) :
SwDBData(rData),
+ xResultSet(xResSet),
+ aSelection(rSelection),
bScrollable(TRUE),
bEndOfDB(FALSE),
bAfterSelection(FALSE),
- nSelectionIndex(0),
- xResultSet(xResSet),
- aSelection(rSelection)
+ nSelectionIndex(0)
{}
void CheckEndOfDB()
diff --git a/binfilter/inc/bf_sw/unocoll.hxx b/binfilter/inc/bf_sw/unocoll.hxx
index a80a30a..f410006 100644
--- a/binfilter/inc/bf_sw/unocoll.hxx
+++ b/binfilter/inc/bf_sw/unocoll.hxx
@@ -74,9 +74,10 @@ class SwUnoCollection
SwDoc* pDoc;
public:
- SwUnoCollection(SwDoc* p) :
- pDoc(p),
- bObjectValid(sal_True){}
+ SwUnoCollection(SwDoc* p)
+ : bObjectValid(sal_True)
+ , pDoc(p)
+ {}
virtual void Invalidate();
sal_Bool IsValid() const {return bObjectValid;}
diff --git a/binfilter/inc/bf_sw/unotbl.hxx b/binfilter/inc/bf_sw/unotbl.hxx
index b7653b8..cee6ee5 100644
--- a/binfilter/inc/bf_sw/unotbl.hxx
+++ b/binfilter/inc/bf_sw/unotbl.hxx
@@ -54,8 +54,8 @@ class SwTableCursor;
class SwChartEventListenerContainer : public SwEventListenerContainer
{
public:
- SwChartEventListenerContainer( ::com::sun::star::uno::XInterface* pxParent) :
- SwEventListenerContainer(pxParent){}
+ SwChartEventListenerContainer( ::com::sun::star::uno::XInterface* pxParentIn) :
+ SwEventListenerContainer(pxParentIn){}
void ChartDataChanged();
};
/* ---------------------------------------------------------------------------
commit 3ec77ed32e882c8419f639f68f598df89b273823
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Dec 22 13:47:37 2010 +0000
cppcheck: prefer prefix variants
diff --git a/lotuswordpro/source/filter/xfilter/xffontfactory.cxx b/lotuswordpro/source/filter/xfilter/xffontfactory.cxx
index 49a8f3b..8569649 100644
--- a/lotuswordpro/source/filter/xfilter/xffontfactory.cxx
+++ b/lotuswordpro/source/filter/xfilter/xffontfactory.cxx
@@ -75,7 +75,7 @@ XFFontFactory::~XFFontFactory()
void XFFontFactory::Reset()
{
std::vector<XFFont*>::iterator it;
- for( it = s_aFonts.begin(); it != s_aFonts.end(); it++ )
+ for( it = s_aFonts.begin(); it != s_aFonts.end(); ++it )
{
XFFont *pFont = (*it);
if( !pFont )
@@ -93,7 +93,7 @@ void XFFontFactory::AddFont(XFFont *pFont)
XFFont* XFFontFactory::FindSameFont(XFFont *pFont)
{
std::vector<XFFont*>::iterator it;
- for( it = s_aFonts.begin(); it != s_aFonts.end(); it++ )
+ for( it = s_aFonts.begin(); it != s_aFonts.end(); ++it )
{
if( *pFont == **it )
return *it;
commit c8c6811c2e065ee3e8f6d50f4d88a61452cb478c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Dec 22 13:38:54 2010 +0000
cppcheck: unused variables
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx b/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
index 9e7050f..1f44d18 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
@@ -699,7 +699,6 @@ namespace binfilter {
/*N*/
/*N*/ long nDrehWink = aGeo.nDrehWink, nShearWink = aGeo.nShearWink;
/*N*/ bool bRotate = ( nDrehWink != 0 && nDrehWink != 18000 );
-/*N*/ bool bShear = ( nShearWink != 0 );
/*N*/ bool bRota180 = nDrehWink == 18000;
/*N*/ USHORT nMirrorCase = ( bRota180 ? ( bMirrored ? 3 : 4 ) : ( bMirrored ? 2 : 1 ) ); // 4 | 3 H&V gespiegelt | nur Vertikal
/*N*/ bool bHMirr = ( ( 2 == nMirrorCase ) || ( 4 == nMirrorCase ) ); // ---+--- ---------------+-----------------
@@ -917,7 +916,6 @@ namespace binfilter {
/*N*/ void SdrGrafObj::NbcSetLogicRect( const Rectangle& rRect)
/*N*/ {
-/*N*/ bool bChg=rRect.GetSize()!=aRect.GetSize();
/*N*/ SdrRectObj::NbcSetLogicRect(rRect);
/*N*/ }
commit ee75fe6345fe720464f3a06bdb9cf1ced1bf5e4c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Dec 22 13:29:44 2010 +0000
cppcheck: prefer prefix variant
diff --git a/writerfilter/source/doctok/WW8DocumentImpl.cxx b/writerfilter/source/doctok/WW8DocumentImpl.cxx
index 084af25..20b85dd 100644
--- a/writerfilter/source/doctok/WW8DocumentImpl.cxx
+++ b/writerfilter/source/doctok/WW8DocumentImpl.cxx
@@ -783,7 +783,7 @@ CpAndFc WW8DocumentImpl::getNextCp(const CpAndFc & rCpAndFc) const
if (aIt != mCpAndFcs.end())
{
- aIt++;
+ ++aIt;
if (aIt != mCpAndFcs.end())
aResult = *aIt;
@@ -802,7 +802,7 @@ CpAndFc WW8DocumentImpl::getPrevCp(const CpAndFc & rCpAndFc) const
if (aIt != mCpAndFcs.end() && aIt != mCpAndFcs.begin())
{
- aIt--;
+ --aIt;
aResult = *aIt;
}
@@ -2283,7 +2283,7 @@ void FieldHelper::init()
{
Map_t::iterator aIt;
- for (aIt = mMap.begin(); aIt != mMap.end(); aIt++)
+ for (aIt = mMap.begin(); aIt != mMap.end(); ++aIt)
{
mpDoc->insertCpAndFc(aIt->first);
}
@@ -2319,7 +2319,7 @@ void ShapeHelper::init()
{
Map_t::iterator aIt;
- for (aIt = mMap.begin(); aIt != mMap.end(); aIt++)
+ for (aIt = mMap.begin(); aIt != mMap.end(); ++aIt)
{
mpDoc->insertCpAndFc(aIt->first);
aIt->second->setDocument(mpDoc);
@@ -2347,7 +2347,7 @@ void BreakHelper::init()
{
Map_t::iterator aIt;
- for (aIt = mMap.begin(); aIt != mMap.end(); aIt++)
+ for (aIt = mMap.begin(); aIt != mMap.end(); ++aIt)
{
mpDoc->insertCpAndFc(aIt->first);
}
More information about the Libreoffice-commits
mailing list