regards
>From 86062da5291cc62d4f378fb8adb366d696ee11b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= <pjacq...@alumni.ethz.ch> Date: Sat, 4 Dec 2010 17:32:49 +0100 Subject: [PATCH 08/16] fix warning unused var in binfilter bf_sw layout
--- binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx | 22 ++++++------ binfilter/bf_sw/source/core/layout/sw_findfrm.cxx | 2 +- binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx | 6 ++-- binfilter/bf_sw/source/core/layout/sw_fly.cxx | 3 +- binfilter/bf_sw/source/core/layout/sw_flycnt.cxx | 8 ++-- binfilter/bf_sw/source/core/layout/sw_flyincnt.cxx | 2 +- binfilter/bf_sw/source/core/layout/sw_flylay.cxx | 36 ++------------------ binfilter/bf_sw/source/core/layout/sw_frmtool.cxx | 2 +- binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx | 10 +++--- binfilter/bf_sw/source/core/layout/sw_hffrm.cxx | 2 +- binfilter/bf_sw/source/core/layout/sw_layact.cxx | 6 ++-- binfilter/bf_sw/source/core/layout/sw_layouter.cxx | 2 +- binfilter/bf_sw/source/core/layout/sw_pagechg.cxx | 6 ++-- binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx | 10 +++--- binfilter/bf_sw/source/core/layout/sw_ssfrm.cxx | 3 +- binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx | 4 +- binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx | 2 +- binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx | 1 - 18 files changed, 47 insertions(+), 80 deletions(-) diff --git a/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx index bd7b593..7f3ff8c 100644 --- a/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx @@ -1661,7 +1661,7 @@ int SwFmtURL::operator==( const SfxPoolItem &rAttr ) const return bRet; } -SfxPoolItem* SwFmtURL::Clone( SfxItemPool* pPool ) const +SfxPoolItem* SwFmtURL::Clone( SfxItemPool* /*pPool*/ ) const { return new SwFmtURL( *this ); } @@ -1787,21 +1787,21 @@ bool SwFmtURL::PutValue( const uno::Any& rVal, BYTE nMemberId ) // class SwNoReadOnly -SfxPoolItem* SwFmtEditInReadonly::Clone( SfxItemPool* pPool ) const +SfxPoolItem* SwFmtEditInReadonly::Clone( SfxItemPool* /*pPool*/ ) const { return new SwFmtEditInReadonly( Which(), GetValue() ); } // class SwFmtLayoutSplit -SfxPoolItem* SwFmtLayoutSplit::Clone( SfxItemPool* pPool ) const +SfxPoolItem* SwFmtLayoutSplit::Clone( SfxItemPool* /*pPool*/ ) const { return new SwFmtLayoutSplit( GetValue() ); } // class SwFmtNoBalancedColumns -SfxPoolItem* SwFmtNoBalancedColumns::Clone( SfxItemPool* pPool ) const +SfxPoolItem* SwFmtNoBalancedColumns::Clone( SfxItemPool* /*pPool*/ ) const { return new SwFmtNoBalancedColumns( GetValue() ); } @@ -1938,7 +1938,7 @@ bool SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, BYTE nMemberId ) // class SwFmtFtnAtTxtEnd -SfxPoolItem* SwFmtFtnAtTxtEnd::Clone( SfxItemPool* pPool ) const +SfxPoolItem* SwFmtFtnAtTxtEnd::Clone( SfxItemPool* /*pPool*/ ) const { SwFmtFtnAtTxtEnd* pNew = new SwFmtFtnAtTxtEnd; *pNew = *this; @@ -1947,7 +1947,7 @@ SfxPoolItem* SwFmtFtnAtTxtEnd::Clone( SfxItemPool* pPool ) const // class SwFmtEndAtTxtEnd -SfxPoolItem* SwFmtEndAtTxtEnd::Clone( SfxItemPool* pPool ) const +SfxPoolItem* SwFmtEndAtTxtEnd::Clone( SfxItemPool* /*pPool*/ ) const { SwFmtEndAtTxtEnd* pNew = new SwFmtEndAtTxtEnd; *pNew = *this; @@ -1972,7 +1972,7 @@ SwFmtChain::SwFmtChain( const SwFmtChain &rCpy ) : SetNext( rCpy.GetNext() ); } -SfxPoolItem* SwFmtChain::Clone( SfxItemPool* pPool ) const +SfxPoolItem* SwFmtChain::Clone( SfxItemPool* /*pPool*/ ) const { SwFmtChain *pRet = new SwFmtChain; pRet->SetPrev( GetPrev() ); @@ -2044,7 +2044,7 @@ int SwFmtLineNumber::operator==( const SfxPoolItem &rAttr ) const bCountLines == ((SwFmtLineNumber&)rAttr).IsCount(); } -SfxPoolItem* SwFmtLineNumber::Clone( SfxItemPool* pPool ) const +SfxPoolItem* SwFmtLineNumber::Clone( SfxItemPool* /*pPool*/ ) const { return new SwFmtLineNumber( *this ); } @@ -2126,7 +2126,7 @@ int SwTextGridItem::operator==( const SfxPoolItem& rAttr ) const aColor == ((SwTextGridItem&)rAttr).GetColor(); } -SfxPoolItem* SwTextGridItem::Clone( SfxItemPool* pPool ) const +SfxPoolItem* SwTextGridItem::Clone( SfxItemPool* /*pPool*/ ) const { return new SwTextGridItem( *this ); } @@ -2286,7 +2286,7 @@ bool SwTextGridItem::PutValue( const ::com::sun::star::uno::Any& rVal, // class SwHeaderAndFooterEatSpacingItem -SfxPoolItem* SwHeaderAndFooterEatSpacingItem::Clone( SfxItemPool* pPool ) const +SfxPoolItem* SwHeaderAndFooterEatSpacingItem::Clone( SfxItemPool* /*pPool*/ ) const { return new SwHeaderAndFooterEatSpacingItem( Which(), GetValue() ); } @@ -2372,7 +2372,7 @@ SwRect SwFrmFmt::FindLayoutRect( const sal_Bool bPrtArea, const Point* pPoint, if( pFrm && pFrm->GetRegisteredIn() != this ) { // die Section hat keinen eigenen ::com::sun::star::frame::Frame, also falls - // jemand die tatsaechliche Groeáe braucht, so muss das + // jemand die tatsaechliche Groe�e braucht, so muss das // noch implementier werden, in dem sich vom Ende noch // der entsprechende ::com::sun::star::frame::Frame besorgt wird. // PROBLEM: was passiert bei SectionFrames, die auf unter- diff --git a/binfilter/bf_sw/source/core/layout/sw_findfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_findfrm.cxx index bb63449..aee9150 100644 --- a/binfilter/bf_sw/source/core/layout/sw_findfrm.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_findfrm.cxx @@ -276,7 +276,7 @@ SwCntntFrm *SwPageFrm::FindLastBodyCntnt() @return true, if <this> is positioned before the layout frame <p> */ -/*N*/ bool SwLayoutFrm::IsBefore( const SwLayoutFrm* _pCheckRefLayFrm ) const +/*N*/ bool SwLayoutFrm::IsBefore( const SwLayoutFrm* /*_pCheckRefLayFrm*/ ) const /*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 /*N*/ } diff --git a/binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx index 52f1c09..78744b3 100644 --- a/binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx @@ -946,7 +946,7 @@ namespace binfilter { |*************************************************************************/ -/*N*/ SwLayoutFrm *SwFrm::GetPrevLeaf( MakePageType eMakeFtn ) +/*N*/ SwLayoutFrm *SwFrm::GetPrevLeaf( MakePageType /*eMakeFtn*/ ) /*N*/ { /*N*/ ASSERT( !IsInFtn(), "GetPrevLeaf(), don't call me for Ftn." ); /*N*/ @@ -1334,11 +1334,11 @@ namespace binfilter { |*************************************************************************/ -/*N*/ BOOL SwFlowFrm::CheckMoveFwd( BOOL &rbMakePage, BOOL bKeep, BOOL bMovedBwd ) +/*N*/ BOOL SwFlowFrm::CheckMoveFwd( BOOL &rbMakePage, BOOL bKeep, BOOL /*bMovedBwd*/ ) /*N*/ { /*N*/ const SwFrm* pNxt = rThis.GetIndNext(); /*N*/ -/*N*/ if ( bKeep && //!bMovedBwd && +/*N*/ if ( bKeep && /*N*/ ( !pNxt || ( pNxt->IsTxtFrm() && ((SwTxtFrm*)pNxt)->IsEmptyMaster() ) ) && /*N*/ ( 0 != (pNxt = rThis.FindNext()) ) && IsKeepFwdMoveAllowed() ) /*N*/ { diff --git a/binfilter/bf_sw/source/core/layout/sw_fly.cxx b/binfilter/bf_sw/source/core/layout/sw_fly.cxx index 8c0180f..7c45681 100644 --- a/binfilter/bf_sw/source/core/layout/sw_fly.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_fly.cxx @@ -520,7 +520,7 @@ namespace binfilter { /*M*/ { /*M*/ BOOL bClear = TRUE; /*M*/ const USHORT nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0; -/*M*/ ViewShell *pSh = GetShell(); +/*M*/ GetShell(); /*M*/ switch( nWhich ) /*M*/ { /*M*/ case RES_VERT_ORIENT: @@ -1902,7 +1902,6 @@ void SwFrm::CalcFlys( BOOL bPosOnly ) /*N*/ if ( pPage && pPage->GetSortedObjs() ) /*N*/ { /*N*/ //Die Seite nur einmal antriggern. -/*N*/ bool bPageInva = TRUE; /*N*/ /*N*/ SwSortDrawObjs &rObjs = *pPage->GetSortedObjs(); /*N*/ const BOOL bHeadFoot = IsHeaderFrm() || IsFooterFrm(); diff --git a/binfilter/bf_sw/source/core/layout/sw_flycnt.cxx b/binfilter/bf_sw/source/core/layout/sw_flycnt.cxx index 007d9e1..6d656b1 100644 --- a/binfilter/bf_sw/source/core/layout/sw_flycnt.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_flycnt.cxx @@ -258,9 +258,9 @@ namespace binfilter { /*?*/ SwOszControl::pStk5 = 0; /*N*/ } -/*N*/ bool IsInProgress( const SwFlyFrm *pFly ) +/*N*/ bool IsInProgress( const SwFlyFrm* /*pFly*/ ) /*N*/ { - DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 return SwOszControl::IsInProgress( pFly ); + DBG_BF_ASSERT(0, "STRIP"); return FALSE; /*N*/ } /*N*/ bool SwOszControl::IsInProgress( const SwFlyFrm *pFly ) @@ -1307,8 +1307,8 @@ namespace binfilter { /*N*/ } // Wer weicht wem aus bzw. welcher Bereich ist "linker"/"rechter" als welcher? -/*N*/ BOOL MA_FASTCALL lcl_Minor( SwRelationOrient eRelO, SwRelationOrient eRelO2, -/*N*/ BOOL bLeft ) +/*N*/ BOOL MA_FASTCALL lcl_Minor( SwRelationOrient /*eRelO*/, SwRelationOrient /*eRelO2*/, +/*N*/ BOOL /*bLeft*/ ) /*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 /*N*/ } diff --git a/binfilter/bf_sw/source/core/layout/sw_flyincnt.cxx b/binfilter/bf_sw/source/core/layout/sw_flyincnt.cxx index 5acfbc6..dbc1c8e 100644 --- a/binfilter/bf_sw/source/core/layout/sw_flyincnt.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_flyincnt.cxx @@ -310,7 +310,7 @@ namespace binfilter { /*N*/ const SwFlyNotify aNotify( this ); /*N*/ SwBorderAttrAccess aAccess( SwFrm::GetCache(), this ); /*N*/ const SwBorderAttrs &rAttrs = *aAccess.Get(); -/*N*/ const Size &rSz = rAttrs.GetSize(); +/*N*/ rAttrs.GetSize(); /*N*/ const SwFmtFrmSize &rFrmSz = GetFmt()->GetFrmSize(); /*N*/ /*N*/ if ( IsClipped() ) diff --git a/binfilter/bf_sw/source/core/layout/sw_flylay.cxx b/binfilter/bf_sw/source/core/layout/sw_flylay.cxx index 7a7fba9..5eebf7e 100644 --- a/binfilter/bf_sw/source/core/layout/sw_flylay.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_flylay.cxx @@ -233,7 +233,7 @@ namespace binfilter { |* |*************************************************************************/ -/*N*/ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz ) +/*N*/ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize & /*rSz*/ ) /*N*/ { /*N*/ //Jetzt ist es ggf. an der Zeit geignete Massnahmen zu ergreifen wenn /*N*/ //der Fly nicht in seine Umgebung passt. @@ -351,19 +351,7 @@ namespace binfilter { /*?*/ aOldSize.Height() ); /*?*/ bWidthClipped = TRUE; /*?*/ } -/*?*/ -/*?*/ // if( bWidthClipped || bHeightClipped ) -/*?*/ // { -/*?*/ // SwFlyFrmFmt *pFmt = (SwFlyFrmFmt*)GetFmt(); -/*?*/ // pFmt->LockModify(); -/*?*/ // SwFmtFrmSize aFrmSize( rSz ); -/*?*/ // aFrmSize.SetWidth( aFrmRect.Width() ); -/*?*/ // aFrmSize.SetHeight( aFrmRect.Height() ); -/*?*/ // pFmt->SetAttr( aFrmSize ); -/*?*/ // pFmt->UnlockModify(); -/*?*/ // } -/*N*/ } -/*N*/ + } /*N*/ //Jetzt die Einstellungen am Frm vornehmen, bei Spalten werden /*N*/ //die neuen Werte in die Attribute eingetragen, weil es sonst /*N*/ //ziemlich fiese Oszillationen gibt. @@ -387,24 +375,6 @@ namespace binfilter { /*?*/ } while ( pLow ); /*?*/ ::binfilter::CalcCntnt( this ); /*?*/ ColUnlock(); -/* MA 02. Sep. 96: Wenn das Attribut gesetzt wird funktionieren Flys in Flys - * nicht (30095 30096) - SwFlyFrmFmt *pFmt = (SwFlyFrmFmt*)GetFmt(); - pFmt->LockModify(); - SwFmtFrmSize aFrmSize( rSz ); - if ( bRig ) - aFrmSize.SetWidth( Frm().Width() ); - if ( bBot ) - { - aFrmSize.SetSizeType( ATT_FIX_SIZE ); - aFrmSize.SetHeight( Frm().Height() ); - bFixHeight = TRUE; - bMinHeight = FALSE; - } - pFmt->SetAttr( aFrmSize ); - pFmt->UnlockModify(); -*/ -/*?*/ //Stattdessen: /*?*/ if ( !bValidSize && !bWidthClipped ) /*?*/ bFormatHeightOnly = bValidSize = TRUE; /*N*/ } @@ -814,7 +784,7 @@ void SwPageFrm::AppendVirtDrawObj( SwDrawContact* _pDrawContact, /*N*/ //gerade 'laeuft' /*N*/ if ( pSortedObjs ) /*N*/ { -/*N*/ const SdrObjectPtr *pDel = pSortedObjs->GetData(); +/*N*/ pSortedObjs->GetData(); /*N*/ pSortedObjs->Remove( pToRemove->GetMaster() ); /*N*/ if ( !pSortedObjs->Count() ) /*N*/ { diff --git a/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx b/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx index 1c2bc5b..0d230db 100644 --- a/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx @@ -2856,7 +2856,7 @@ void SwBorderAttrs::_GetBottomLine( const SwFrm *pFrm ) /*N*/ pFly->Frm().Right() >= rRect.Left() && /*N*/ pFly->Frm().Left() <= rRect.Right() ) /*N*/ { -/*N*/ const SwFmtFrmSize &rSz = pFly->GetFmt()->GetFrmSize(); +/*N*/ pFly->GetFmt()->GetFrmSize(); /*N*/ pFly->InvalidateSize(); /*N*/ } /*N*/ } diff --git a/binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx index 65c9479..eaa3cbe 100644 --- a/binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx @@ -339,7 +339,7 @@ namespace binfilter { |* |*************************************************************************/ -/*N*/ SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) +/*N*/ SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL /*bInfo*/ ) /*N*/ { /*N*/ //Keine Pruefung ob FixSize oder nicht, die FtnContainer sind immer bis /*N*/ //zur Maximalhoehe variabel. @@ -1018,7 +1018,7 @@ void SwRootFrm::CheckFtnPageDescs( BOOL bEndNote ) /*N*/ pBoss = pRet->GetRef()->FindFtnBossFrm(); /*N*/ ASSERT( pBoss, "FindFirstFtn: No boss found" ); /*N*/ if( !pBoss ) -/*?*/ return FALSE; // ´There must be a bug, but no GPF +/*?*/ return FALSE; // �There must be a bug, but no GPF /*N*/ pPage = pBoss->FindPageFrm(); /*N*/ nPgNum = pPage->GetPhyPageNum(); /*N*/ if ( nPgNum == nRefNum ) @@ -2089,7 +2089,7 @@ void SwRootFrm::CheckFtnPageDescs( BOOL bEndNote ) |* |*************************************************************************/ -/*N*/ BYTE SwFtnBossFrm::_NeighbourhoodAdjustment( const SwFrm* pFrm ) const +/*N*/ BYTE SwFtnBossFrm::_NeighbourhoodAdjustment( const SwFrm* /*pFrm*/ ) const /*N*/ { /*N*/ BYTE nRet = NA_ONLY_ADJUST; /*N*/ if( GetUpper() && !GetUpper()->IsPageBodyFrm() ) @@ -2137,8 +2137,8 @@ void SwRootFrm::CheckFtnPageDescs( BOOL bEndNote ) |*************************************************************************/ -/*N*/ BOOL SwLayoutFrm::MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss, -/*N*/ SwFtnBossFrm *pNewBoss, const BOOL bFtnNums ) +/*N*/ BOOL SwLayoutFrm::MoveLowerFtns( SwCntntFrm* /*pStart*/, SwFtnBossFrm *pOldBoss, +/*N*/ SwFtnBossFrm *pNewBoss, const BOOL /*bFtnNums*/ ) /*N*/ { /*N*/ SwDoc *pDoc = GetFmt()->GetDoc(); /*N*/ if ( !pDoc->GetFtnIdxs().Count() ) diff --git a/binfilter/bf_sw/source/core/layout/sw_hffrm.cxx b/binfilter/bf_sw/source/core/layout/sw_hffrm.cxx index 5c3d97b..638266a 100644 --- a/binfilter/bf_sw/source/core/layout/sw_hffrm.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_hffrm.cxx @@ -110,7 +110,7 @@ namespace binfilter { /*M*/ } /*M*/ static void lcl_LayoutFrmEnsureMinHeight(SwLayoutFrm & rFrm, -/*M*/ const SwBorderAttrs * pAttrs) +/*M*/ const SwBorderAttrs * /*pAttrs*/) /*M*/ { /*M*/ SwTwips nMinHeight = lcl_GetFrmMinHeight(rFrm); /*M*/ diff --git a/binfilter/bf_sw/source/core/layout/sw_layact.cxx b/binfilter/bf_sw/source/core/layout/sw_layact.cxx index d0e63dc..47f8732 100644 --- a/binfilter/bf_sw/source/core/layout/sw_layact.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_layact.cxx @@ -1782,7 +1782,7 @@ namespace binfilter { // OD 31.10.2002 #104100# // NOTE: no adjustments for vertical layout support necessary -/*N*/ BOOL CheckPos( SwFrm *pFrm ) +/*N*/ BOOL CheckPos( SwFrm* /*pFrm*/ ) /*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*N*/ return TRUE; /*N*/ } @@ -2061,7 +2061,7 @@ namespace binfilter { /*N*/ } /*N*/ //Wenn der Frame die Seite vorwaerts gewechselt hat, so lassen wir /*N*/ //den Vorgaenger nocheinmal durchlaufen. -/*N*/ //So werden einerseits Vorgaenger erwischt, die jetzt fr Retouche +/*N*/ //So werden einerseits Vorgaenger erwischt, die jetzt f�r Retouche /*N*/ //verantwortlich sind, andererseits werden die Fusszeilen /*N*/ //auch angefasst. /*N*/ bool bSetCntnt = TRUE; @@ -2568,7 +2568,7 @@ namespace binfilter { /*N*/ } /*N*/ /*N*/ bool bInValid; -/*N*/ const SwViewOption& rVOpt = *pImp->GetShell()->GetViewOptions(); +/*N*/ *pImp->GetShell()->GetViewOptions(); /*N*/ SwPageFrm *pPg = (SwPageFrm*)pRoot->Lower(); /*N*/ do /*N*/ { bInValid = pPg->IsInvalidCntnt() || pPg->IsInvalidLayout() || diff --git a/binfilter/bf_sw/source/core/layout/sw_layouter.cxx b/binfilter/bf_sw/source/core/layout/sw_layouter.cxx index 91f3915..10b7e66 100644 --- a/binfilter/bf_sw/source/core/layout/sw_layouter.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_layouter.cxx @@ -138,7 +138,7 @@ namespace binfilter { -/*N*/ void SwLayouter::LoopControl( SwPageFrm* pPage, BYTE nLoop ) +/*N*/ void SwLayouter::LoopControl( SwPageFrm* pPage, BYTE /*nLoop*/ ) /*N*/ { /*N*/ ASSERT( pLooping, "Looping: Lost control" ); /*N*/ pLooping->Control( pPage ); diff --git a/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx b/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx index 7da34f2..398d16e 100644 --- a/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx @@ -90,7 +90,7 @@ namespace binfilter { |* Letzte Aenderung MA 20. Jan. 99 |* |*************************************************************************/ -/*N*/ void SwBodyFrm::Format( const SwBorderAttrs *pAttrs ) +/*N*/ void SwBodyFrm::Format( const SwBorderAttrs* /*pAttrs*/ ) /*N*/ { /*N*/ //Formatieren des Body ist zu einfach, deshalb bekommt er ein eigenes /*N*/ //Format; Umrandungen und dergl. sind hier nicht zu beruecksichtigen. @@ -1452,7 +1452,7 @@ namespace binfilter { |* |*************************************************************************/ -/*N*/ SwTwips SwRootFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) +/*N*/ SwTwips SwRootFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL /*bInfo*/ ) /*N*/ { /*N*/ if ( !bTst ) /*N*/ Frm().SSize().Height() += nDist; @@ -1466,7 +1466,7 @@ namespace binfilter { |* Letzte Aenderung MA 05. May. 94 |* |*************************************************************************/ -/*N*/ SwTwips SwRootFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) +/*N*/ SwTwips SwRootFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL /*bInfo*/ ) /*N*/ { /*N*/ ASSERT( nDist >= 0, "nDist < 0." ); /*N*/ ASSERT( nDist <= Frm().Height(), "nDist > als aktuelle Groesse." ); diff --git a/binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx index 13cebeb..84acc8f 100644 --- a/binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx @@ -453,7 +453,7 @@ namespace binfilter { /*N*/ void SwSectionFrm::MoveCntntAndDelete( SwSectionFrm* pDel, BOOL bSave ) /*N*/ { -/*N*/ BOOL bSize = pDel->Lower() && pDel->Lower()->IsColumnFrm(); +/*N*/ pDel->Lower() && pDel->Lower()->IsColumnFrm(); /*N*/ SwFrm* pPrv = pDel->GetPrev(); /*N*/ SwLayoutFrm* pUp = pDel->GetUpper(); /*N*/ // OD 27.03.2003 #i12711# - initialize local pointer variables. @@ -651,7 +651,7 @@ namespace binfilter { /*N*/ return pRet; /*N*/ } -/*N*/ BOOL SwSectionFrm::CalcMinDiff( SwTwips& rMinDiff ) const +/*N*/ BOOL SwSectionFrm::CalcMinDiff( SwTwips& /*rMinDiff*/ ) const /*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 /*N*/ } @@ -1264,7 +1264,7 @@ namespace binfilter { |*************************************************************************/ -/*N*/ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType eMakeFtn ) +/*N*/ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType /*eMakeFtn*/ ) /*N*/ { /*N*/ PROTOCOL_ENTER( this, PROT_LEAF, ACT_PREV_SECT, GetUpper()->FindSctFrm() ) /*N*/ @@ -1882,10 +1882,10 @@ namespace binfilter { /*N*/ { // Mehrspaltigkeit in Fussnoten unterdruecken... /*N*/ case RES_FMT_CHG: /*N*/ { -/*?*/ const SwFmtCol& rNewCol = GetFmt()->GetCol(); +/*?*/ GetFmt()->GetCol(); /*?*/ if( !IsInFtn() ) /*?*/ { -/*?*/ //Dummer Fall. Bei der Zuweisung einer Vorlage knnen wir uns +/*?*/ //Dummer Fall. Bei der Zuweisung einer Vorlage k�nnen wir uns /*?*/ //nicht auf das alte Spaltenattribut verlassen. Da diese /*?*/ //wenigstens anzahlgemass fuer ChgColumns vorliegen muessen, /*?*/ //bleibt uns nur einen temporaeres Attribut zu basteln. diff --git a/binfilter/bf_sw/source/core/layout/sw_ssfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_ssfrm.cxx index 571119f..d991d49 100644 --- a/binfilter/bf_sw/source/core/layout/sw_ssfrm.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_ssfrm.cxx @@ -367,9 +367,8 @@ namespace binfilter { /*?*/ SwTxtNode *pTxtNd = ((SwTxtFrm*)this)->GetTxtNode(); /*?*/ const SwFtnIdxs &rFtnIdxs = pCNd->GetDoc()->GetFtnIdxs(); /*?*/ USHORT nPos; -/*?*/ ULONG nIndex = pCNd->GetIndex(); +/*?*/ pCNd->GetIndex(); /*?*/ rFtnIdxs.SeekEntry( *pTxtNd, &nPos ); -/*?*/ SwTxtFtn* pTxtFtn; /*?*/ if( nPos < rFtnIdxs.Count() ) /*?*/ { /*?*/ while( nPos && pTxtNd == &(rFtnIdxs[ nPos ]->GetTxtNode()) ) diff --git a/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx index e88476d..cbeb4c4 100644 --- a/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx @@ -2369,8 +2369,8 @@ namespace binfilter { /*N*/ const SwFmtFrmSize &rSz = GetFmt()->GetFrmSize(); /*N*/ SwTwips nMinHeight = rSz.GetSizeType() == ATT_MIN_SIZE ? /*N*/ rSz.GetHeight() : 0; -/*N*/ SwLayoutFrm *pCell = (SwLayoutFrm*)Lower(); -/*N*/ if( nMinHeight < (Frm().*fnRect->fnGetHeight)() ) +/*N*/ (SwLayoutFrm*)Lower(); +/*N*/ if( nMinHeight < (Frm().*fnRect->fnGetHeight)() ) /*N*/ { /*N*/ SwLayoutFrm *pCell = (SwLayoutFrm*)Lower(); /*N*/ while ( pCell ) diff --git a/binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx index 288001d..2bf5f51 100644 --- a/binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx @@ -145,7 +145,7 @@ namespace binfilter { /*N*/ typedef const SwCntntFrm *(*GetNxtPrvCnt)( const SwCntntFrm* ); //Frame in wiederholter Headline? -/*N*/ bool lcl_IsInRepeatedHeadline( const SwFrm *pFrm, +/*N*/ bool lcl_IsInRepeatedHeadline( const SwFrm* /*pFrm*/, /*N*/ const SwTabFrm** ppTFrm = 0 ) /*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 /*N*/ } diff --git a/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx index ab28f78..418d397 100644 --- a/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx @@ -1418,7 +1418,6 @@ namespace binfilter { /*N*/ { /*N*/ const SwDrawObjs &rObjs = *pBoss->GetDrawObjs(); /*N*/ ASSERT( pBoss->IsPageFrm(), "Header/Footer out of page?" ); -/*N*/ SwPageFrm *pPage = (SwPageFrm*)pBoss; /*N*/ for ( USHORT i = 0; i < rObjs.Count(); ++i ) /*N*/ { /*N*/ SdrObject *pObj = rObjs[i]; -- 1.7.1
_______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice