regards
>From 29737dab0202b18c1326841e449e1640b9bd5561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= <pjacq...@alumni.ethz.ch> Date: Sun, 28 Nov 2010 19:40:04 +0100 Subject: [PATCH 2/5] trivial warning fixes in binfilter
--- binfilter/bf_sw/source/core/attr/sw_calbck.cxx | 2 +- binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx | 2 +- binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx | 6 ++-- binfilter/bf_sw/source/core/docnode/sw_nodes.cxx | 2 +- binfilter/bf_sw/source/core/docnode/sw_section.cxx | 7 +--- binfilter/bf_sw/source/core/graphic/sw_grfatr.cxx | 34 ++++++++++---------- binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx | 2 +- binfilter/bf_sw/source/core/view/sw_viewimp.cxx | 14 ++++---- binfilter/bf_sw/source/ui/app/sw_docsh2.cxx | 6 ++-- binfilter/bf_sw/source/ui/app/sw_docstyle.cxx | 8 ++-- binfilter/bf_sw/source/ui/app/sw_swmodul1.cxx | 4 +- binfilter/inc/bf_sw/fmthbsh.hxx | 6 ++-- 12 files changed, 45 insertions(+), 48 deletions(-) diff --git a/binfilter/bf_sw/source/core/attr/sw_calbck.cxx b/binfilter/bf_sw/source/core/attr/sw_calbck.cxx index 3c0377c..a948fab 100644 --- a/binfilter/bf_sw/source/core/attr/sw_calbck.cxx +++ b/binfilter/bf_sw/source/core/attr/sw_calbck.cxx @@ -72,7 +72,7 @@ static SwClientIter* pClientIters = 0; *************************************************************************/ -/*N*/ void SwClient::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ) +/*N*/ void SwClient::Modify( SfxPoolItem *pOld, SfxPoolItem * /*pNew*/ ) /*N*/ { /*N*/ if( (!pOld || pOld->Which() != RES_OBJECTDYING) ) /*N*/ return; diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx index 2dcdeb6..9612c0d 100644 --- a/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx +++ b/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx @@ -58,7 +58,7 @@ #include <comcore.hrc> namespace binfilter { -/*N*/ int lcl_IsInSameTblBox( SwNodes& rNds, const SwNode& rNd, +/*N*/ int lcl_IsInSameTblBox( SwNodes& /*rNds*/, const SwNode& rNd, /*N*/ const SwNodeIndex& rIdx2 ) /*N*/ { /*N*/ const SwTableNode* pTblNd = rNd.FindTableNode(); diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx index a4a40b5..62293df 100644 --- a/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx +++ b/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx @@ -533,8 +533,8 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which) // ---------- teilen / zusammenfassen von Boxen in der Tabelle -------- -/*N*/ BOOL SwDoc::SplitTbl( const SwSelBoxes& rBoxes, sal_Bool bVert, USHORT nCnt, -/*N*/ sal_Bool bSameHeight ) +/*N*/ BOOL SwDoc::SplitTbl( const SwSelBoxes& /*rBoxes*/, sal_Bool /*bVert*/, USHORT /*nCnt*/, +/*N*/ sal_Bool /*bSameHeight*/ ) /*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 /*N*/ } @@ -625,7 +625,7 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which) /*N*/ } -/*N*/ void SwTableNode::SetNewTable( SwTable* pNewTable, BOOL bNewFrames ) +/*N*/ void SwTableNode::SetNewTable( SwTable* /*pNewTable*/, BOOL /*bNewFrames*/ ) /*N*/ { DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DelFrms(); /*N*/ } diff --git a/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx b/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx index 3a28d68..28ba75f 100644 --- a/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx +++ b/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx @@ -560,7 +560,7 @@ namespace binfilter { |* *******************************************************************/ -/*N*/ void SwNodes::GoStartOfSection(SwNodeIndex *pIdx) const +/*N*/ void SwNodes::GoStartOfSection(SwNodeIndex* /*pIdx*/) const /*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*N*/ } diff --git a/binfilter/bf_sw/source/core/docnode/sw_section.cxx b/binfilter/bf_sw/source/core/docnode/sw_section.cxx index 1108fef..30052bf 100644 --- a/binfilter/bf_sw/source/core/docnode/sw_section.cxx +++ b/binfilter/bf_sw/source/core/docnode/sw_section.cxx @@ -659,9 +659,7 @@ void SwSectionFmt::MakeFrms() // alle Sections, die von dieser abgeleitet sind -/*N*/ USHORT SwSectionFmt::GetChildSections( SwSections& rArr, -/*N*/ SectionSort eSort, -/*N*/ int bAllSections ) const +/*N*/ USHORT SwSectionFmt::GetChildSections( SwSections& rArr,SectionSort /*eSort*/,int bAllSections ) const /*N*/ { /*N*/ rArr.Remove( 0, rArr.Count() ); /*N*/ @@ -1134,8 +1132,7 @@ void SwSectionFmt::MakeFrms() -/*N*/ BOOL SwIntrnlSectRefLink::IsInRange( ULONG nSttNd, ULONG nEndNd, -/*N*/ xub_StrLen nStt, xub_StrLen nEnd ) const +/*N*/ BOOL SwIntrnlSectRefLink::IsInRange( ULONG nSttNd, ULONG nEndNd, xub_StrLen nStt, xub_StrLen /*nEnd */) const /*N*/ { /*N*/ SwStartNode* pSttNd = rSectFmt.GetSectionNode( FALSE ); /*N*/ return pSttNd && diff --git a/binfilter/bf_sw/source/core/graphic/sw_grfatr.cxx b/binfilter/bf_sw/source/core/graphic/sw_grfatr.cxx index f194546..7c8ebf3 100644 --- a/binfilter/bf_sw/source/core/graphic/sw_grfatr.cxx +++ b/binfilter/bf_sw/source/core/graphic/sw_grfatr.cxx @@ -199,7 +199,7 @@ SwCropGrf::SwCropGrf(sal_Int32 nL, sal_Int32 nR, sal_Int32 nT, sal_Int32 nB ) /*N*/ } -/*N*/ bool SwRotationGrf::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +/*N*/ bool SwRotationGrf::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const /*N*/ { /*N*/ // SfxUInt16Item::QueryValue returns sal_Int32 in Any now... (srx642w) /*N*/ // where we still want this to be a sal_Int16 @@ -207,7 +207,7 @@ SwCropGrf::SwCropGrf(sal_Int32 nL, sal_Int32 nR, sal_Int32 nT, sal_Int32 nB ) /*N*/ return true; /*N*/ } -/*N*/ bool SwRotationGrf::PutValue( const uno::Any& rVal, BYTE nMemberId ) +/*N*/ bool SwRotationGrf::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ ) /*N*/ { /*N*/ // SfxUInt16Item::QueryValue returns sal_Int32 in Any now... (srx642w) /*N*/ // where we still want this to be a sal_Int16 @@ -225,42 +225,42 @@ SwCropGrf::SwCropGrf(sal_Int32 nL, sal_Int32 nR, sal_Int32 nT, sal_Int32 nB ) // ------------------------------------------------------------------ -/*N*/ SfxPoolItem* SwLuminanceGrf::Clone( SfxItemPool *pPool ) const +/*N*/ SfxPoolItem* SwLuminanceGrf::Clone( SfxItemPool* /*pPool*/ ) const /*N*/ { /*N*/ return new SwLuminanceGrf( *this ); /*N*/ } // ------------------------------------------------------------------ -/*N*/ SfxPoolItem* SwContrastGrf::Clone( SfxItemPool *pPool ) const +/*N*/ SfxPoolItem* SwContrastGrf::Clone( SfxItemPool* /*pPool*/ ) const /*N*/ { /*N*/ return new SwContrastGrf( *this ); /*N*/ } // ------------------------------------------------------------------ -/*N*/ SfxPoolItem* SwChannelRGrf::Clone( SfxItemPool *pPool ) const +/*N*/ SfxPoolItem* SwChannelRGrf::Clone( SfxItemPool* /*pPool*/ ) const /*N*/ { /*N*/ return new SwChannelRGrf( *this ); /*N*/ } // ------------------------------------------------------------------ -/*N*/ SfxPoolItem* SwChannelGGrf::Clone( SfxItemPool *pPool ) const +/*N*/ SfxPoolItem* SwChannelGGrf::Clone( SfxItemPool* /*pPool*/ ) const /*N*/ { /*N*/ return new SwChannelGGrf( *this ); /*N*/ } // ------------------------------------------------------------------ -/*N*/ SfxPoolItem* SwChannelBGrf::Clone( SfxItemPool *pPool ) const +/*N*/ SfxPoolItem* SwChannelBGrf::Clone( SfxItemPool* /*pPool*/ ) const /*N*/ { /*N*/ return new SwChannelBGrf( *this ); /*N*/ } // ------------------------------------------------------------------ -/*N*/ SfxPoolItem* SwGammaGrf::Clone( SfxItemPool *pPool ) const +/*N*/ SfxPoolItem* SwGammaGrf::Clone( SfxItemPool* /*pPool*/ ) const /*N*/ { /*N*/ return new SwGammaGrf( *this ); /*N*/ } @@ -271,33 +271,33 @@ SwCropGrf::SwCropGrf(sal_Int32 nL, sal_Int32 nR, sal_Int32 nT, sal_Int32 nB ) /*N*/ nValue == ((SwGammaGrf&)rCmp).GetValue(); /*N*/ } -/*N*/ bool SwGammaGrf::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +/*N*/ bool SwGammaGrf::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const /*N*/ { /*N*/ rVal <<= nValue; /*N*/ return true; /*N*/ } -/*N*/ bool SwGammaGrf::PutValue( const uno::Any& rVal, BYTE nMemberId ) +/*N*/ bool SwGammaGrf::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ ) /*N*/ { /*N*/ return rVal >>= nValue; /*N*/ } // ------------------------------------------------------------------ -/*N*/ SfxPoolItem* SwInvertGrf::Clone( SfxItemPool *pPool ) const +/*N*/ SfxPoolItem* SwInvertGrf::Clone( SfxItemPool* /*pPool*/ ) const /*N*/ { /*N*/ return new SwInvertGrf( *this ); /*N*/ } // ------------------------------------------------------------------ -/*N*/ SfxPoolItem* SwTransparencyGrf::Clone( SfxItemPool *pPool ) const +/*N*/ SfxPoolItem* SwTransparencyGrf::Clone( SfxItemPool* /*pPool*/ ) const /*N*/ { /*N*/ return new SwTransparencyGrf( *this ); /*N*/ } // ------------------------------------------------------------------ /*N*/ bool SwTransparencyGrf::QueryValue( ::com::sun::star::uno::Any& rVal, -/*N*/ BYTE nMemberId ) const +/*N*/ BYTE /*nMemberId*/ ) const /*N*/ { /*N*/ DBG_ASSERT(ISA(SfxByteItem),"Put/QueryValue should be removed!"); /*N*/ sal_Int16 nRet = GetValue(); @@ -307,7 +307,7 @@ SwCropGrf::SwCropGrf(sal_Int32 nL, sal_Int32 nR, sal_Int32 nT, sal_Int32 nB ) /*N*/ } // ------------------------------------------------------------------ /*N*/ bool SwTransparencyGrf::PutValue( const ::com::sun::star::uno::Any& rVal, -/*N*/ BYTE nMemberId ) +/*N*/ BYTE /*nMemberId*/ ) /*N*/ { /*N*/ //temporary conversion until this is a SfxInt16Item! /*N*/ DBG_ASSERT(ISA(SfxByteItem),"Put/QueryValue should be removed!"); @@ -329,14 +329,14 @@ SwCropGrf::SwCropGrf(sal_Int32 nL, sal_Int32 nR, sal_Int32 nT, sal_Int32 nB ) // ------------------------------------------------------------------ -/*N*/ SfxPoolItem* SwDrawModeGrf::Clone( SfxItemPool *pPool ) const +/*N*/ SfxPoolItem* SwDrawModeGrf::Clone( SfxItemPool* /*pPool*/ ) const /*N*/ { /*N*/ return new SwDrawModeGrf( *this ); /*N*/ } /*N*/ bool SwDrawModeGrf::QueryValue( ::com::sun::star::uno::Any& rVal, -/*N*/ BYTE nMemberId ) const +/*N*/ BYTE /*nMemberId*/ ) const /*N*/ { /*N*/ drawing::ColorMode eRet = (drawing::ColorMode)GetEnumValue(); /*N*/ rVal <<= eRet; @@ -344,7 +344,7 @@ SwCropGrf::SwCropGrf(sal_Int32 nL, sal_Int32 nR, sal_Int32 nT, sal_Int32 nB ) /*N*/ } /*N*/ bool SwDrawModeGrf::PutValue( const ::com::sun::star::uno::Any& rVal, -/*N*/ BYTE nMemberId ) +/*N*/ BYTE /*nMemberId*/ ) /*N*/ { /*N*/ sal_Int32 eVal = SWUnoHelper::GetEnumAsInt32( rVal ); /*N*/ if(eVal >= 0 && eVal <= GRAPHICDRAWMODE_WATERMARK) diff --git a/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx b/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx index d6aa1e0..7098497 100644 --- a/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx +++ b/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx @@ -315,7 +315,7 @@ namespace binfilter { /*N*/ } -/*N*/ SwCntntNode *SwGrfNode::SplitNode( const SwPosition &rPos ) +/*N*/ SwCntntNode *SwGrfNode::SplitNode( const SwPosition& /*rPos*/ ) /*N*/ { /*?*/ return this; /*N*/ } diff --git a/binfilter/bf_sw/source/core/view/sw_viewimp.cxx b/binfilter/bf_sw/source/core/view/sw_viewimp.cxx index 56f36a5..8fdd941 100644 --- a/binfilter/bf_sw/source/core/view/sw_viewimp.cxx +++ b/binfilter/bf_sw/source/core/view/sw_viewimp.cxx @@ -60,7 +60,7 @@ namespace binfilter { |* |*************************************************************************/ -/*N*/ void SwViewImp::Init( const SwViewOption *pNewOpt ) +/*N*/ void SwViewImp::Init( const SwViewOption* /*pNewOpt*/ ) /*N*/ { DBG_ERROR("Strip!"); /*N*/ } @@ -224,18 +224,18 @@ namespace binfilter { */ -/*N*/ void SwViewImp::DisposeAccessible( const SwFrm *pFrm, -/*N*/ const SdrObject *pObj, -/*N*/ sal_Bool bRecursive ) +/*N*/ void SwViewImp::DisposeAccessible( const SwFrm* /*pFrm*/, +/*N*/ const SdrObject* /*pObj*/, +/*N*/ sal_Bool /*bRecursive*/ ) /*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*N*/ } -/*N*/ void SwViewImp::MoveAccessible( const SwFrm *pFrm, const SdrObject *pObj, -/*N*/ const SwRect& rOldFrm ) +/*N*/ void SwViewImp::MoveAccessible( const SwFrm* /*pFrm*/, const SdrObject* /*pObj*/, +/*N*/ const SwRect& /*rOldFrm*/ ) /*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*N*/ } -/*N*/ void SwViewImp::InvalidateAccessibleFrmContent( const SwFrm *pFrm ) +/*N*/ void SwViewImp::InvalidateAccessibleFrmContent( const SwFrm* /*pFrm*/ ) /*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*N*/ } diff --git a/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx b/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx index c0f8ef6..c91b072 100644 --- a/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx +++ b/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx @@ -165,7 +165,7 @@ using namespace ::rtl; /*N*/ } /*N*/ } -/*N*/ void SwDoc::SetInfo( const SfxDocumentInfo& rInfo ) +/*N*/ void SwDoc::SetInfo( const SfxDocumentInfo& /*rInfo*/ ) /*N*/ { DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( pDocShell ) /*N*/ } @@ -243,8 +243,8 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( pDocShell ) /*N*/ Broadcast(SfxSimpleHint(SFX_HINT_DOCCHANGED)); /*N*/ } -/*N*/ULONG SwDocShell::LoadStylesFromFile( const String& rURL, -/*N*/ SwgReaderOption& rOpt, BOOL bUnoCall ) +/*N*/ULONG SwDocShell::LoadStylesFromFile( const String& /*rURL*/, +/*N*/ SwgReaderOption& /*rOpt*/, BOOL /*bUnoCall*/ ) /*N*/{ /*N*/ ULONG nErr = 0;DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*N*/ return nErr; diff --git a/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx b/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx index 00dfcae..46aadaf 100644 --- a/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx +++ b/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx @@ -1239,7 +1239,7 @@ namespace binfilter { /*N*/ const String& rName, /*N*/ SfxStyleFamily eFam, /*N*/ USHORT nMask, -/*N*/ USHORT nPos ) +/*N*/ USHORT /*nPos*/ ) /*N*/ { /*N*/ aStyleSheet.PresetName(rName); /*N*/ aStyleSheet.PresetParent(aEmptyStr); @@ -1266,8 +1266,8 @@ namespace binfilter { -/*N*/ BOOL SwDocStyleSheetPool::SetParent( SfxStyleFamily eFam, -/*N*/ const String &rStyle, const String &rParent ) +/*N*/ BOOL SwDocStyleSheetPool::SetParent( SfxStyleFamily /*eFam*/, +/*N*/ const String& /*rStyle*/, const String& /*rParent*/ ) /*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 /*N*/ } @@ -1683,7 +1683,7 @@ namespace binfilter { /*N*/ void SwStyleSheetIterator::AppendStyleList(const SvStringsDtor& rList, /*N*/ BOOL bTestUsed, -/*N*/ USHORT nSection, char cType ) +/*N*/ USHORT /*nSection*/, char cType ) /*N*/ { /*N*/ if( bTestUsed ) /*N*/ { diff --git a/binfilter/bf_sw/source/ui/app/sw_swmodul1.cxx b/binfilter/bf_sw/source/ui/app/sw_swmodul1.cxx index 5c549bf..f1243a0 100644 --- a/binfilter/bf_sw/source/ui/app/sw_swmodul1.cxx +++ b/binfilter/bf_sw/source/ui/app/sw_swmodul1.cxx @@ -91,8 +91,8 @@ using namespace ::com::sun::star::lang; folgenden aus. ------------------------------------------------------------------------*/ -/*M*/ void SwModule::ApplyUsrPref(const SwViewOption &rUsrPref, SwView* pActView, -/*M*/ sal_uInt16 nDest ) +/*M*/ void SwModule::ApplyUsrPref(const SwViewOption& /*rUsrPref*/, SwView* /*pActView*/, +/*M*/ sal_uInt16 /*nDest*/ ) /*M*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*M*/ } /*-----------------05.02.97 08.03------------------- diff --git a/binfilter/inc/bf_sw/fmthbsh.hxx b/binfilter/inc/bf_sw/fmthbsh.hxx index dd7df66..1854cd4 100644 --- a/binfilter/inc/bf_sw/fmthbsh.hxx +++ b/binfilter/inc/bf_sw/fmthbsh.hxx @@ -42,11 +42,11 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual int operator==( const SfxPoolItem& ) const{DBG_BF_ASSERT(0, "STRIP"); return 0;}; //STRIP001 virtual int operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const{DBG_BF_ASSERT(0, "STRIP");return NULL; }; //STRIP001 virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool* /*pPool = 0*/ ) const{DBG_BF_ASSERT(0, "STRIP");return NULL; }; //STRIP001 virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT nVer) const; virtual SvStream& Store(SvStream &, USHORT nIVer) const; - inline SwFmtSoftHyph& operator=(const SwFmtSoftHyph& rSH) { + inline SwFmtSoftHyph& operator=(const SwFmtSoftHyph& /*rSH*/) { return *this; } }; @@ -62,7 +62,7 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual int operator==( const SfxPoolItem& ) const{DBG_BF_ASSERT(0, "STRIP"); return 0;}; //STRIP001 virtual int operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const{DBG_BF_ASSERT(0, "STRIP"); return NULL;}; //STRIP001 virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool* /*pPool = 0*/ ) const{DBG_BF_ASSERT(0, "STRIP"); return NULL;}; //STRIP001 virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT nVer) const; virtual SvStream& Store(SvStream &, USHORT nIVer) const; -- 1.7.1
_______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice