[PATCH 12/16] fix warning unused var binfilter bf_sw text
Pierre-André Jacquod
pjacquod at alumni.ethz.ch
Sat Dec 4 11:38:53 PST 2010
---
binfilter/bf_sw/source/core/text/sw_atrstck.cxx | 5 ++---
binfilter/bf_sw/source/core/text/sw_frmform.cxx | 6 +-----
binfilter/bf_sw/source/core/text/sw_itrform2.cxx | 4 ++--
binfilter/bf_sw/source/core/text/sw_itrtxt.cxx | 4 ----
binfilter/bf_sw/source/core/text/sw_porexp.cxx | 2 +-
binfilter/bf_sw/source/core/text/sw_porfld.cxx | 5 ++---
binfilter/bf_sw/source/core/text/sw_porlin.cxx | 6 +++---
binfilter/bf_sw/source/core/text/sw_porrst.cxx | 6 +++---
binfilter/bf_sw/source/core/text/sw_portxt.cxx | 2 +-
binfilter/bf_sw/source/core/text/sw_txtfld.cxx | 2 +-
binfilter/bf_sw/source/core/text/sw_txtfly.cxx | 2 +-
binfilter/bf_sw/source/core/text/sw_txtftn.cxx | 15 +++++++--------
binfilter/bf_sw/source/core/text/sw_txthyph.cxx | 2 +-
13 files changed, 25 insertions(+), 36 deletions(-)
diff --git a/binfilter/bf_sw/source/core/text/sw_atrstck.cxx b/binfilter/bf_sw/source/core/text/sw_atrstck.cxx
index 91eeaec..4c678ac 100644
--- a/binfilter/bf_sw/source/core/text/sw_atrstck.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_atrstck.cxx
@@ -376,7 +376,7 @@ const BYTE StackPos[ RES_TXTATR_WITHEND_END - RES_CHRATR_BEGIN + 1 ] = {
* SwAttrHandler::Push()
*************************************************************************/
-/*M*/ sal_Bool SwAttrHandler::Push( const SwTxtAttr& rAttr, const SfxPoolItem& rItem, SwFont& rFnt )
+/*M*/ sal_Bool SwAttrHandler::Push( const SwTxtAttr& rAttr, const SfxPoolItem& rItem, SwFont& /*rFnt*/ )
/*M*/ {
/*M*/ ASSERT( rItem.Which() < RES_TXTATR_WITHEND_END ||
/*M*/ RES_UNKNOWNATR_CONTAINER == rItem.Which() ,
@@ -692,12 +692,11 @@ const BYTE StackPos[ RES_TXTATR_WITHEND_END - RES_CHRATR_BEGIN + 1 ] = {
/*M*/ break;
/*M*/
/*M*/ USHORT nRotateStack = StackPos[ RES_CHRATR_ROTATE ];
-/*M*/ const SfxPoolItem* pRotateItem = 0;
/*M*/ const SwTxtAttr* pRotateAttr = aAttrStack[ nRotateStack ].Top();
/*M*/
/*M*/ if ( pRotateAttr )
/*M*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pRotateItem = lcl_GetItem( *pRotateAttr, RES_CHRATR_ROTATE );
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*M*/ }
/*M*/ else
/*M*/ rFnt.SetVertical(
diff --git a/binfilter/bf_sw/source/core/text/sw_frmform.cxx b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
index a373014..afa7067 100644
--- a/binfilter/bf_sw/source/core/text/sw_frmform.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
@@ -606,8 +606,6 @@ MSHORT FormatLevel::nLevel = 0;
/*?*/ const SwpHints *pHints = pFoll->GetTxtNode()->GetpSwpHints();
/*?*/ if( pHints )
/*?*/ {
-/*?*/ SwFtnBossFrm *pFtnBoss = 0;
-/*?*/ SwFtnBossFrm *pEndBoss = 0;
/*?*/ for( MSHORT i = 0; i < pHints->Count(); ++i )
/*?*/ {
/*?*/ const SwTxtAttr *pHt = (*pHints)[i];
@@ -662,8 +660,6 @@ MSHORT FormatLevel::nLevel = 0;
/*?*/ const SwpHints *pHints = GetTxtNode()->GetpSwpHints();
/*?*/ if( pHints )
/*?*/ {
-/*?*/ SwFtnBossFrm *pFtnBoss = 0;
-/*?*/ SwFtnBossFrm *pEndBoss = 0;
/*?*/ for( MSHORT i = 0; i < pHints->Count(); ++i )
/*?*/ {
/*?*/ const SwTxtAttr *pHt = (*pHints)[i];
@@ -991,7 +987,7 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/ { // Wenn wir Zeilen abgeben, darf kein Join auf den Folows gerufen werden,
/*N*/ // im Gegenteil, es muss ggf. sogar ein Follow erzeugt werden.
/*N*/ // Dies muss auch geschehen, wenn die Textmasse komplett im Master
-/*N*/ // bleibt, denn es könnte ja ein harter Zeilenumbruch noch eine weitere
+/*N*/ // bleibt, denn es k�nnte ja ein harter Zeilenumbruch noch eine weitere
/*N*/ // Zeile (ohne Textmassse) notwendig machen!
/*N*/ nEnd = rLine.GetEnd();
/*N*/ if( GetFollow() )
diff --git a/binfilter/bf_sw/source/core/text/sw_itrform2.cxx b/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
index 2a974cc..9465c2e 100644
--- a/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
@@ -1445,7 +1445,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*M*/ xub_StrLen nNewStart = nStart + pCurr->GetLen();
/*M*/
/*M*/ // adjust text if kana compression is enabled
-/*M*/ const SwScriptInfo& rSI = GetInfo().GetParaPortion()->GetScriptInfo();
+/*M*/ GetInfo().GetParaPortion()->GetScriptInfo();
/*M*/
/*M*/ if ( GetInfo().CompressLine() )
/*M*/ {
@@ -1535,7 +1535,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*N*/
/*N*/ // Das Dummyflag besitzen Zeilen, die nur Flyportions enthalten, diese
/*N*/ // sollten kein Register etc. beachten. Dummerweise hat kann es eine leere
-/*N*/ // Zeile am Absatzende geben (bei leeren Abs„tzen oder nach einem
+/*N*/ // Zeile am Absatzende geben (bei leeren Abs�tzen oder nach einem
/*N*/ // Shift-Return), die das Register durchaus beachten soll.
/*N*/ if( !pCurr->IsDummy() || ( !pCurr->GetNext() &&
/*N*/ GetStart() >= GetTxtFrm()->GetTxt().Len() && !bNewLine ) )
diff --git a/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx b/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx
index e3599f0..a7ddb78 100644
--- a/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx
@@ -310,10 +310,6 @@ namespace binfilter {
/*N*/
/*N*/ if ( bHasGrid )
/*N*/ {
-/*?*/ const USHORT nGridWidth = pGrid->GetBaseHeight();
-/*?*/ const USHORT nRubyHeight = pGrid->GetRubyHeight();
-/*?*/ const sal_Bool bRubyTop = ! pGrid->GetRubyTextBelow();
-/*?*/
/*?*/ if ( GetInfo().IsMulti() )
/*?*/ // we are inside the GetCharRect recursion for multi portions
/*?*/ // we center the portion in its surrounding line
diff --git a/binfilter/bf_sw/source/core/text/sw_porexp.cxx b/binfilter/bf_sw/source/core/text/sw_porexp.cxx
index 816255a..6bee722 100644
--- a/binfilter/bf_sw/source/core/text/sw_porexp.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_porexp.cxx
@@ -182,7 +182,7 @@ namespace binfilter {
* virtual SwBlankPortion::GetExpTxt()
*************************************************************************/
-/*N*/ sal_Bool SwBlankPortion::GetExpTxt( const SwTxtSizeInfo &rInf, XubString &rTxt ) const
+/*N*/ sal_Bool SwBlankPortion::GetExpTxt( const SwTxtSizeInfo & /*rInf*/, XubString &rTxt ) const
/*N*/ {
/*N*/ rTxt = cChar;
/*N*/ return sal_True;
diff --git a/binfilter/bf_sw/source/core/text/sw_porfld.cxx b/binfilter/bf_sw/source/core/text/sw_porfld.cxx
index fef4bfe..a701531 100644
--- a/binfilter/bf_sw/source/core/text/sw_porfld.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_porfld.cxx
@@ -64,7 +64,7 @@ using namespace ::com::sun::star;
/*N*/ return pClone;
/*N*/ }
-/*N*/ void SwFldPortion::TakeNextOffset( const SwFldPortion* pFld )
+/*N*/ void SwFldPortion::TakeNextOffset( const SwFldPortion* /*pFld*/ )
/*N*/ {
/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 ASSERT( pFld, "TakeNextOffset: Missing Source" );
/*N*/ }
@@ -209,7 +209,6 @@ public:
/*N*/ {
/*N*/ nScript = pBreakIt->xBreak->getScriptType( aTxt, 0 );
/*N*/ xub_StrLen nChg = 0;
-/*N*/ USHORT nCnt = 0;
/*N*/ if( i18n::ScriptType::WEAK == nScript )
/*N*/ {
/*N*/ nChg =(xub_StrLen)pBreakIt->xBreak->endOfScript(aTxt,0,nScript);
@@ -263,7 +262,7 @@ public:
/*M*/ rInf.GetUnderScorePos() > rInf.GetIdx() )
/*M*/ rInf.SetUnderScorePos( rInf.GetIdx() );
/*M*/ }
-/*M*/ BYTE nScriptChg = ScriptChange( rInf, nFullLen );
+/*M*/ ScriptChange( rInf, nFullLen );
/*M*/ rInf.SetLen( nFullLen );
/*M*/ if( pFnt )
/*M*/ pFnt->GoMagic( rInf.GetVsh(), pFnt->GetActual() );
diff --git a/binfilter/bf_sw/source/core/text/sw_porlin.cxx b/binfilter/bf_sw/source/core/text/sw_porlin.cxx
index 13c6b83..2943089 100644
--- a/binfilter/bf_sw/source/core/text/sw_porlin.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_porlin.cxx
@@ -271,7 +271,7 @@ const sal_Char *GetPortionName( const MSHORT nType );
// Format end of line
-/*N*/ void SwLinePortion::FormatEOL( SwTxtFormatInfo &rInf )
+/*N*/ void SwLinePortion::FormatEOL( SwTxtFormatInfo & /*rInf*/ )
/*N*/ { }
/*************************************************************************
@@ -325,7 +325,7 @@ const sal_Char *GetPortionName( const MSHORT nType );
* virtual SwLinePortion::CalcSpacing()
*************************************************************************/
-/*N*/ long SwLinePortion::CalcSpacing( short nSpaceAdd, const SwTxtSizeInfo &rInf ) const
+/*N*/ long SwLinePortion::CalcSpacing( short /*nSpaceAdd*/, const SwTxtSizeInfo & /*rInf*/ ) const
/*N*/ {
/*N*/ return 0;
/*N*/ }
@@ -334,7 +334,7 @@ const sal_Char *GetPortionName( const MSHORT nType );
* virtual SwLinePortion::GetExpTxt()
*************************************************************************/
-/*N*/ sal_Bool SwLinePortion::GetExpTxt( const SwTxtSizeInfo &rInf, XubString &rTxt ) const
+/*N*/ sal_Bool SwLinePortion::GetExpTxt( const SwTxtSizeInfo & /*rInf*/, XubString &/*rTxt*/ ) const
/*N*/ {
/*N*/ return sal_False;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/text/sw_porrst.cxx b/binfilter/bf_sw/source/core/text/sw_porrst.cxx
index 842723d..a6962ce 100644
--- a/binfilter/bf_sw/source/core/text/sw_porrst.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_porrst.cxx
@@ -112,7 +112,7 @@ namespace binfilter {
/*N*/ }
-/*N*/ void SwKernPortion::Paint( const SwTxtPaintInfo &rInf ) const
+/*N*/ void SwKernPortion::Paint( const SwTxtPaintInfo & /*rInf*/ ) const
/*N*/ {
DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if( Width() )
/*N*/ }
@@ -131,13 +131,13 @@ namespace binfilter {
/*N*/ rInf.GetLast()->FormatEOL( rInf );
/*N*/ }
-/*N*/ SwArrowPortion::SwArrowPortion( const SwLinePortion &rPortion ) :
+/*N*/ SwArrowPortion::SwArrowPortion( const SwLinePortion & /*rPortion*/ ) :
/*N*/ bLeft( sal_True )
/*N*/ {
/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Height( rPortion.Height() );
/*N*/ }
-/*N*/ void SwArrowPortion::Paint( const SwTxtPaintInfo &rInf ) const
+/*N*/ void SwArrowPortion::Paint( const SwTxtPaintInfo & /*rInf*/ ) const
/*N*/ {
/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ((SwArrowPortion*)this)->aPos = rInf.GetPos();
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/text/sw_portxt.cxx b/binfilter/bf_sw/source/core/text/sw_portxt.cxx
index 61ad29f..3667766 100644
--- a/binfilter/bf_sw/source/core/text/sw_portxt.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_portxt.cxx
@@ -543,7 +543,7 @@ using namespace ::com::sun::star::i18n::ScriptType;
-/*N*/ sal_Bool SwTxtPortion::GetExpTxt( const SwTxtSizeInfo &rInf, XubString &rTxt ) const
+/*N*/ sal_Bool SwTxtPortion::GetExpTxt( const SwTxtSizeInfo &/*rInf*/, XubString &/*rTxt*/ ) const
/*N*/ {
/*N*/ return sal_False;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/text/sw_txtfld.cxx b/binfilter/bf_sw/source/core/text/sw_txtfld.cxx
index 4c83297..c1db88f 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtfld.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtfld.cxx
@@ -354,7 +354,7 @@ namespace binfilter {
/*?*/ rNumFmt.GetGraphicOrientation(), rNumFmt.GetGraphicSize(),
/*?*/ bLeft, bCenter, nMinDist );
/*?*/ long nTmpA = rInf.GetLast()->GetAscent();
-/*?*/ long nTmpD = rInf.GetLast()->Height() - nTmpA;
+/*?*/ rInf.GetLast()->Height() - nTmpA;
/*?*/ if( !rInf.IsTest() )
{DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ ((SwGrfNumPortion*)pRet)->SetBase( nTmpA, nTmpD, nTmpA, nTmpD );
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/text/sw_txtfly.cxx b/binfilter/bf_sw/source/core/text/sw_txtfly.cxx
index 3c5c8c0..f48fa5a 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtfly.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtfly.cxx
@@ -1053,7 +1053,7 @@ namespace binfilter {
/*N*/ SWRECTFN( pCurrFrm )
/*N*/ const long nRight = (aRect.*fnRect->fnGetRight)() - 1;
/*N*/ const long nLeft = (aRect.*fnRect->fnGetLeft)() + 1;
-/*N*/ const sal_Bool bFooter = pCurrFrm->IsInFtn();
+/*N*/ pCurrFrm->IsInFtn();
/*N*/ const sal_Bool bR2L = pCurrFrm->IsRightToLeft();
/*N*/
/*N*/ for( MSHORT i = 0; i < nCount; i++ )
diff --git a/binfilter/bf_sw/source/core/text/sw_txtftn.cxx b/binfilter/bf_sw/source/core/text/sw_txtftn.cxx
index d786a44..8671033 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtftn.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtftn.cxx
@@ -425,7 +425,6 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*?*/
/*?*/ if( pFtnFrm )
/*?*/ {
-/*?*/ const sal_Bool bEndDoc = bEndn ? sal_True : bFtnEndDoc;
/*?*/ if( bRollBack )
/*?*/ {
/*?*/ while ( pFtnFrm )
@@ -958,12 +957,12 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/ return 0;
/*N*/
/*N*/ // Aha, wir sind also im Fussnotenbereich
-/*N*/ const SwFtnInfo &rFtnInfo = pFrm->GetNode()->GetDoc()->GetFtnInfo();
+/*N*/ pFrm->GetNode()->GetDoc()->GetFtnInfo();
/*N*/ SwTxtFrm *pQuoFrm = pFrm->FindQuoVadisFrm();
/*N*/ if( !pQuoFrm )
/*N*/ return 0;
/*?*/ const SwPageFrm* pPage = pFrm->FindPageFrm();
-/*?*/ const SwPageFrm* pQuoPage = pQuoFrm->FindPageFrm();
+/*?*/ pQuoFrm->FindPageFrm();
/*?*/ if( pPage == pQuoFrm->FindPageFrm() )
/*?*/ return 0; // Wenn der QuoVadis auf der selben (spaltigen) Seite steht
{DBG_BF_ASSERT(0, "STRIP");} return 0;//STRIP001 /*?*/ const XubString aPage = lcl_GetPageNumber( pPage );
@@ -998,7 +997,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*M*/ else
/*M*/ {
/*M*/ const SwPageFrm* pPage = pFrm->FindPageFrm();
-/*M*/ const SwPageFrm* pErgoPage = pErgoFrm->FindPageFrm();
+/*M*/ pErgoFrm->FindPageFrm();
/*M*/ if( pPage == pErgoFrm->FindPageFrm() )
/*M*/ return nOffset; // Wenn der ErgoSum auf der selben Seite steht
/*M*/ }
@@ -1304,7 +1303,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
* virtual SwFtnPortion::Paint()
*************************************************************************/
-/*N*/ void SwFtnPortion::Paint( const SwTxtPaintInfo &rInf ) const
+/*N*/ void SwFtnPortion::Paint( const SwTxtPaintInfo &/*rInf*/ ) const
/*N*/ {
DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SwFtnSave aFtnSave( rInf, pFtn );
/*N*/ }
@@ -1313,7 +1312,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
* virtual SwFtnPortion::GetTxtSize()
*************************************************************************/
-/*N*/ SwPosSize SwFtnPortion::GetTxtSize( const SwTxtSizeInfo &rInfo ) const
+/*N*/ SwPosSize SwFtnPortion::GetTxtSize( const SwTxtSizeInfo &/*rInfo*/ ) const
/*N*/ {
DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 SwFtnSave aFtnSave( rInfo, pFtn );
/*N*/ }
@@ -1384,7 +1383,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
* Wird im SwTxtFrm::Prepare() gerufen
*************************************************************************/
-/*N*/ sal_Bool SwParaPortion::UpdateQuoVadis( const XubString &rQuo )
+/*N*/ sal_Bool SwParaPortion::UpdateQuoVadis( const XubString & /*rQuo*/ )
/*N*/ {
/*N*/ SwLineLayout *pLay = this;
/*N*/ while( pLay->GetNext() )
@@ -1404,7 +1403,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/ if( !pQuo )
/*N*/ return sal_False;
/*N*/
- {DBG_BF_ASSERT(0, "STRIP");} return sal_False;//STRIP001 /*?*/ return pQuo->GetQuoTxt() == rQuo;
+ {DBG_BF_ASSERT(0, "STRIP");} return sal_False;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/text/sw_txthyph.cxx b/binfilter/bf_sw/source/core/text/sw_txthyph.cxx
index 44b69b9..df9dc01 100644
--- a/binfilter/bf_sw/source/core/text/sw_txthyph.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txthyph.cxx
@@ -153,7 +153,7 @@ using namespace ::com::sun::star::i18n;
* virtual SwHyphPortion::GetExpTxt()
*************************************************************************/
-/*N*/ sal_Bool SwHyphPortion::GetExpTxt( const SwTxtSizeInfo &rInf, XubString &rTxt ) const
+/*N*/ sal_Bool SwHyphPortion::GetExpTxt( const SwTxtSizeInfo &/*rInf*/, XubString &rTxt ) const
/*N*/ {
/*N*/ rTxt = '-';
/*N*/ return sal_True;
--
1.7.1
--------------090607020703020504000508--
More information about the LibreOffice
mailing list