[PATCH 04/16] warning fix for unused var in binfilter bf_sw doc
Pierre-André Jacquod
pjacquod at alumni.ethz.ch
Sat Dec 4 05:56:23 PST 2010
This is warning removing, not code optimization => minimum risks have
been taken and some function calls left behind are probably not usefull
anymore. But goal is not to produce new bugs. Once all warnings removed,
if needed we can do code optimization
---
binfilter/bf_sw/source/core/doc/sw_docbm.cxx | 7 ++--
binfilter/bf_sw/source/core/doc/sw_doccorr.cxx | 8 ++---
binfilter/bf_sw/source/core/doc/sw_docdesc.cxx | 19 -----------
binfilter/bf_sw/source/core/doc/sw_docedt.cxx | 10 +-----
binfilter/bf_sw/source/core/doc/sw_docfld.cxx | 15 +++------
binfilter/bf_sw/source/core/doc/sw_docfly.cxx | 23 +++----------
binfilter/bf_sw/source/core/doc/sw_docfmt.cxx | 29 +----------------
binfilter/bf_sw/source/core/doc/sw_docftn.cxx | 18 +++++-----
binfilter/bf_sw/source/core/doc/sw_doclay.cxx | 4 +-
binfilter/bf_sw/source/core/doc/sw_docnum.cxx | 39 +----------------------
binfilter/bf_sw/source/core/doc/sw_docredln.cxx | 17 +++++-----
binfilter/bf_sw/source/core/doc/sw_doctxm.cxx | 4 +--
binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx | 2 +-
13 files changed, 43 insertions(+), 152 deletions(-)
diff --git a/binfilter/bf_sw/source/core/doc/sw_docbm.cxx b/binfilter/bf_sw/source/core/doc/sw_docbm.cxx
index f0ce7bb..fa28dea 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docbm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docbm.cxx
@@ -165,13 +165,13 @@ namespace binfilter {
/*N*/{
/*?*/ if( bBkmrk )
/*?*/ {
-/*?*/ USHORT nCount = pBookmarkTbl->Count();
+/*?*/ pBookmarkTbl->Count();
/*?*/ USHORT i = 0;
/*?*/ do {
/*?*/ if(!(*pBookmarkTbl)[i]->IsBookMark())
-/*?*/ nPos++;
+/*?*/ ++nPos;
/*?*/
-/*?*/ i++;
+/*?*/ ++i;
/*?*/ }
/*?*/ while( i < nPos || !(*pBookmarkTbl)[nPos]->IsBookMark() );
/*?*/ }
@@ -324,7 +324,6 @@ namespace binfilter {
/*N*/ for( nCnt = 0; nCnt < rTbl.Count(); ++nCnt )
/*N*/ {
/*N*/ // liegt auf der Position ??
-/*N*/ int eType = BKMK_POS_NONE;
/*N*/ SwRedline* pRedl = rTbl[ nCnt ];
/*N*/
/*N*/ SwPosition *pRStt = &pRedl->GetBound(TRUE),
diff --git a/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx b/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
index ff0e123..da64d57 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
@@ -146,12 +146,11 @@ namespace binfilter {
/*N*/ const xub_StrLen nOffset,
/*N*/ BOOL bMoveCrsr )
/*N*/ {
-/*N*/ const SwNode* pOldNode = &rOldNode.GetNode();
+/*N*/ &rOldNode.GetNode();
/*N*/ SwPosition aNewPos( rNewPos );
/*N*/
/*N*/ { // erstmal die Bookmark korrigieren
/*N*/ register SwBookmarks& rBkmks = *pBookmarkTbl;
-/*N*/ register SwBookmark* pBkmk;
/*N*/ for( USHORT n = 0; n < rBkmks.Count(); ++n )
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // liegt auf der Position ??
@@ -282,11 +281,10 @@ namespace binfilter {
/*N*/ const SwPosition& rNewPos,
/*N*/ BOOL bMoveCrsr )
/*N*/ {
-/*N*/ const ULONG nSttNode = rStartNode.GetIndex();
-/*N*/ const ULONG nEndNode = rEndNode.GetIndex();
+/*N*/ rStartNode.GetIndex();
+/*N*/ rEndNode.GetIndex();
/*N*/ SwPosition aNewPos( rNewPos );
/*N*/
-/*N*/ // if( !DoesUndo() )
/*N*/ // erstmal die Bookmarks/Redlines korrigieren
/*N*/ _DelBookmarks( rStartNode, rEndNode );
/*N*/
diff --git a/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx b/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
index 3f2db13..2d509f6 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
@@ -838,25 +838,6 @@ extern SvPtrarr *pGlobalOLEExcludeList;
/*N*/
/*N*/ }
-/*
- * Kleiner Hack;
- *
-const SwPageDesc& SwDoc::GetPageDesc( USHORT i ) const
-{
- if( !i && !aPageDescs.Count() ) // noch keiner vorhanden?
- ((SwDoc*)this)->InitPageDescs(); //Default PageDescriptor
- return *aPageDescs[i];
-}
-
-SwPageDesc& SwDoc::_GetPageDesc( USHORT i ) const
-{
- if( !i && !aPageDescs.Count() ) // noch keiner vorhanden?
- ((SwDoc*)this)->InitPageDescs(); //Default PageDescriptor
- return *aPageDescs[i];
-}
-*/
-
-
/*N*/ IMPL_LINK( SwDoc, DoUpdateModifiedOLE, Timer *, pTimer )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/doc/sw_docedt.cxx b/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
index 0a19f58..84de4dc 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
@@ -132,11 +132,6 @@ SV_IMPL_PTRARR( SaveBookmarks, SaveBookmark* )
/*N*/ }
-
-
-
-// ------------------------------------------------------------------------
-
/*N*/ _SaveRedlEndPosForRestore::_SaveRedlEndPosForRestore( const SwNodeIndex& rInsIdx )
/*N*/ : pSavArr( 0 ), pSavIdx( 0 )
/*N*/ {
@@ -219,12 +214,11 @@ SV_IMPL_PTRARR( SaveBookmarks, SaveBookmark* )
/*N*/
/*N*/ if( pACEWord ) // Aufnahme in die Autokorrektur
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( pACEWord->IsDeleted() )
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ SwTxtNode *pNode = rPos.nNode.GetNode().GetTxtNode();
/*N*/ if(!pNode)
/*?*/ return sal_False;
-/*N*/ sal_Bool bInsOneChar = sal_True;
/*N*/
/*N*/ SwDataChanged aTmp( rRg, 0 );
/*N*/
@@ -233,7 +227,7 @@ SV_IMPL_PTRARR( SaveBookmarks, SaveBookmark* )
/*N*/
/*N*/ if( IsRedlineOn() || (!IsIgnoreRedline() && pRedlineTbl->Count() ))
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwPaM aPam( rPos.nNode, rPos.nContent.GetIndex() - 1,
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/
/*N*/ SetModified();
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
index 5b8fc0f..6404a99 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
@@ -677,7 +677,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
Beschreibung:
--------------------------------------------------------------------*/
-/*N*/ void lcl_CalcFld( SwDoc& /*rDo*/c, SwCalc& /*rCalc*/, const _SetGetExpFld& rSGEFld,
+/*N*/ void lcl_CalcFld( SwDoc& /*rDoc*/, SwCalc& /*rCalc*/, const _SetGetExpFld& rSGEFld,
/*N*/ SwNewDBMgr* pMgr )
/*N*/ {
/*N*/ const SwTxtFld* pTxtFld = rSGEFld.GetFld();
@@ -857,7 +857,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ SwDBData aDBData(((SwDBField*)pFld)->GetDBData());
/*N*/
/*N*/ if( pMgr->IsDataSourceOpen(aDBData.sDataSource, aDBData.sCommand, sal_False))
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 aCalc.VarChange( sDBNumNm, pMgr->GetSelectedRecordId(aDBData.sDataSource, aDBData.sCommand, aDBData.nCommandType));
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
/*N*/
/*N*/ const String& rName = pFld->GetTyp()->GetName();
/*N*/
@@ -1334,7 +1334,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ aData.sDataSource = rDBName.GetToken(0, DB_DELIM);
/*N*/ aData.sCommand = rDBName.GetToken(1, DB_DELIM);
/*N*/ aData.nCommandType = -1;
-/*N*/ const SwDSParam* pParam = GetNewDBMgr()->CreateDSData(aData);
+/*N*/ GetNewDBMgr()->CreateDSData(aData);
/*N*/ String* pNew = new String( rDBName );
/*N*/ rDBNameList.Insert( pNew, rDBNameList.Count() );
/*N*/ }
@@ -1344,9 +1344,8 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ // teste ggfs. mal, ob die angegbenen Nodes ueberhaupt Felder beinhalten.
/*N*/ // wenn nicht, braucht das Flag nicht veraendert werden.
/*N*/ BOOL bFldsFnd = FALSE;
-/*N*/ if( b && pChk && !GetUpdtFlds().IsFieldsDirty() && !IsInDtor()
+/*N*/ if( b && pChk && !GetUpdtFlds().IsFieldsDirty() && !IsInDtor() )
/*N*/ // ?? was ist mit Undo, da will man es doch auch haben !!
-/*N*/ /*&& &pChk->GetNodes() == &GetNodes()*/ )
/*N*/ {
/*N*/ b = FALSE;
/*N*/ if( !nLen )
@@ -1544,11 +1543,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ /// (eGetMode == GETFLD_EXPAND||GETFLD_CALC||GETFLD_ALL)
/*N*/ /// and fields of other subtypes only in the modes
/*N*/ /// (eGetMode == GETFLD_CALC||GETFLD_ALL)
- /* "old" if construct - not deleted for history and code review
- if( ( GSE_STRING & pFld->GetSubType()
- ? GETFLD_EXPAND : GETFLD_CALC )
- & eGetMode )
- */
+
/*N*/ if ( !(eGetMode == GETFLD_EXPAND) ||
/*N*/ (GSE_STRING & pFld->GetSubType()) )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfly.cxx b/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
index 6bac85c..51d71af 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
@@ -486,11 +486,11 @@ extern USHORT GetHtmlMode( const SwDocShell* );
/*M*/ //OS: #96584# HORI_NONE and VERT_NONE are allowed now
/*M*/ if( !bKeepOrient )
/*M*/ {
-/*M*/ const SwFmtVertOrient &rVert = rNewFmt.GetVertOrient();
-/*M*/ rFmt.ResetAttr( RES_VERT_ORIENT );
+/*M*/ rNewFmt.GetVertOrient();
+/*M*/ rFmt.ResetAttr( RES_VERT_ORIENT );
/*M*/
-/*M*/ const SwFmtHoriOrient &rHori = rNewFmt.GetHoriOrient();
-/*M*/ rFmt.ResetAttr( RES_HORI_ORIENT );
+/*M*/ rNewFmt.GetHoriOrient();
+/*M*/ rFmt.ResetAttr( RES_HORI_ORIENT );
/*M*/ }
/*M*/
/*M*/ rFmt.ResetAttr( RES_PRINT, RES_SURROUND );
@@ -816,27 +816,16 @@ extern USHORT GetHtmlMode( const SwDocShell* );
/*?*/ return bUnmark;
/*?*/ }
-
-/* -----------------23.07.98 13:56-------------------
- *
- * --------------------------------------------------*/
-/* -----------------23.07.98 13:56-------------------
- *
- * --------------------------------------------------*/
/*N*/ int SwDoc::Chain( SwFrmFmt& /*rSource*/, const SwFrmFmt& /*rDest*/ )
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 int nErr = Chainable( rSource, rDest );
/*N*/ }
-/* -----------------23.07.98 13:56-------------------
- *
- * --------------------------------------------------*/
+
/*N*/ void SwDoc::Unchain( SwFrmFmt& /*rFmt*/ )
/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwFmtChain aChain( rFmt.GetChain() );
+ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
index cb23604..4dad61c 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
@@ -233,7 +233,6 @@ struct ParaRstFmt
/*M*/ const SvUShortsSort* pAttrs )
/*M*/ {
/*M*/ SwPaM* pPam = (SwPaM*)&rRg;
-/*M*/ BOOL bStopAttr = FALSE;
/*M*/ if( !bTxtAttr && pAttrs && pAttrs->Count() &&
/*M*/ RES_TXTATR_END > (*pAttrs)[ 0 ] )
/*M*/ bTxtAttr = TRUE;
@@ -248,7 +247,7 @@ struct ParaRstFmt
/*M*/
/*M*/ SwIndex& rSt = pPam->GetPoint()->nContent;
/*M*/ USHORT nMkPos = 0, nPtPos = rSt.GetIndex();
-/*M*/ const String& rStr = pTxtNd->GetTxt();
+/*M*/ pTxtNd->GetTxt();
/*M*/
/*M*/ // JP 22.08.96: Sonderfall: steht der Crsr in einem URL-Attribut
/*M*/ // dann wird dessen Bereich genommen
@@ -604,11 +603,10 @@ struct ParaRstFmt
/*N*/ const SfxPoolItem* pChrFmtItem = 0;
/*N*/ aCharSet.GetItemState( RES_TXTATR_CHARFMT, FALSE, &pChrFmtItem );
/*N*/ #endif
-/*N*/ BOOL bCreateSwpHints =
/*N*/ SFX_ITEM_SET == aCharSet.GetItemState( RES_TXTATR_CHARFMT, FALSE ) ||
/*N*/ SFX_ITEM_SET == aCharSet.GetItemState( RES_TXTATR_INETFMT, FALSE );
/*N*/
-/*N*/ for(; aSt < aEnd; aSt++ )
+/*N*/ for(; aSt < aEnd; ++aSt )
/*N*/ {
/*N*/ pNode = aSt.GetNode().GetCntntNode();
/*N*/ if( !pNode )
@@ -637,29 +635,6 @@ struct ParaRstFmt
/*N*/ aSet.Put( rHt );
/*N*/ bRet = InsAttr( this, rRg, aSet, nFlags );
-/* if( INSATTR_DONTEXPAND & nFlags )
- {
- USHORT nWhich = rHt.Which();
- const SwPosition* pPos = rRg.End();
- SwTxtNode* pTxtNd = GetNodes()[ pPos->nNode ]->GetTxtNode();
- SwpHints* pHts;
- if( pTxtNd && 0 != ( pHts = pTxtNd->GetpSwpHints()) )
- {
- USHORT nPos = pHts->GetEndCount();
- while( nPos )
- {
- SwTxtAttr *pTmp = pHts->GetEnd( --nPos );
- USHORT *pEnd = pTmp->GetEnd();
- if( !pEnd || *pEnd > nEnd )
- continue;
- if( nEnd != *pEnd )
- nPos = 0;
- else if( nWhich == pTmp->Which() )
- pTmp->SetDontExpand( TRUE );
- }
- }
- }
-*/
/*N*/ if( bRet )
/*N*/ SetModified();
/*N*/ return bRet;
diff --git a/binfilter/bf_sw/source/core/doc/sw_docftn.cxx b/binfilter/bf_sw/source/core/doc/sw_docftn.cxx
index 383fe0f..a32aeac 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docftn.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docftn.cxx
@@ -267,16 +267,16 @@ namespace binfilter {
/*N*/ const SwFtnInfo &rOld = GetFtnInfo();
/*N*/
/*N*/
-/*N*/ bool bPageNum = rInfo.eNum == FTNNUM_PAGE &&
-/*N*/ rOld.eNum != FTNNUM_PAGE;
+/*N*/ rInfo.eNum == FTNNUM_PAGE &&
+/*N*/ rOld.eNum != FTNNUM_PAGE;
/*N*/ bool bFtnPos = rInfo.ePos != rOld.ePos;
-/*N*/ bool bFtnDesc = rOld.ePos == FTNPOS_CHAPTER &&
-/*N*/ rInfo.GetPageDesc( *this ) != rOld.GetPageDesc( *this );
-/*N*/ bool bExtra = rInfo.aQuoVadis != rOld.aQuoVadis ||
-/*N*/ rInfo.aErgoSum != rOld.aErgoSum ||
-/*N*/ rInfo.aFmt.GetNumberingType() != rOld.aFmt.GetNumberingType() ||
-/*N*/ rInfo.GetPrefix() != rOld.GetPrefix() ||
-/*N*/ rInfo.GetSuffix() != rOld.GetSuffix();
+/*N*/ rOld.ePos == FTNPOS_CHAPTER &&
+/*N*/ rInfo.GetPageDesc( *this ) != rOld.GetPageDesc( *this );
+/*N*/ rInfo.aQuoVadis != rOld.aQuoVadis ||
+/*N*/ rInfo.aErgoSum != rOld.aErgoSum ||
+/*N*/ rInfo.aFmt.GetNumberingType() != rOld.aFmt.GetNumberingType() ||
+/*N*/ rInfo.GetPrefix() != rOld.GetPrefix() ||
+/*N*/ rInfo.GetSuffix() != rOld.GetSuffix();
/*N*/ SwCharFmt *pOldChrFmt = rOld.GetCharFmt( *this ),
/*N*/ *pNewChrFmt = rInfo.GetCharFmt( *this );
/*N*/ bool bFtnChrFmts = pOldChrFmt != pNewChrFmt;
diff --git a/binfilter/bf_sw/source/core/doc/sw_doclay.cxx b/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
index 1f730b4..61bd067 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
@@ -235,7 +235,7 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
/*N*/ //Frms vernichten.
/*N*/ pFmt->DelFrms();
-/*N*/ const sal_uInt16 nWh = pFmt->Which();
+/*N*/ pFmt->Which();
/*N*/ {
/*N*/ //Inhalt Loeschen.
/*N*/ if( pCntIdx )
@@ -446,7 +446,7 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
/*N*/ {
/*?*/ // bei Controls muss der Name erhalten bleiben
/*?*/ uno::Reference< awt::XControlModel > xModel = ((SdrUnoObj*)pObj)->GetUnoControlModel();
-/*?*/ sal_Bool bModel = xModel.is();
+/*?*/ xModel.is();
/*?*/ uno::Any aVal;
/*?*/ uno::Reference< beans::XPropertySet > xSet(xModel, uno::UNO_QUERY);
/*?*/ OUString sName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" )) );
diff --git a/binfilter/bf_sw/source/core/doc/sw_docnum.cxx b/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
index 2d87b7c..399706b 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
@@ -526,19 +526,6 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwTxtNode* pTxtNd = rPos.nNode.GetNode().
/*N*/ for( USHORT n = pNumRuleTbl->Count(); n; )
/*N*/ if( (*pNumRuleTbl)[ --n ]->GetName() == rName )
/*N*/ return n;
-/*
-//JP 20.11.97: sollte man im Find neue Rule anlegen??
- erstmal nicht
- USHORT nPoolId = GetPoolId( rName, GET_POOLID_NUMRULE );
- if( USHRT_MAX != nPoolId )
- {
- SwDoc* pThis = (SwDoc*)this;
- SwNumRule* pR = pThis->GetNumRuleFromPool( nPoolId );
- for( n = pNumRuleTbl->Count(); n; )
- if( (*pNumRuleTbl)[ --n ] == pR )
- return n;
- }
-*/
/*N*/ return USHRT_MAX;
/*N*/ }
@@ -547,17 +534,6 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwTxtNode* pTxtNd = rPos.nNode.GetNode().
/*N*/ for( USHORT n = pNumRuleTbl->Count(); n; )
/*N*/ if( (*pNumRuleTbl)[ --n ]->GetName() == rName )
/*N*/ return (*pNumRuleTbl)[ n ];
-/*N*/
-/*
-//JP 20.11.97: sollte man im Find neue Rule anlegen??
- erstmal nicht
- USHORT nPoolId = GetPoolId( rName, GET_POOLID_NUMRULE );
- if( USHRT_MAX != nPoolId )
- {
- SwDoc* pThis = (SwDoc*)this;
- return pThis->GetNumRuleFromPool( nPoolId );
- }
-*/
/*N*/ return 0;
/*N*/ }
@@ -881,21 +857,8 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwTxtNode* pTxtNd = rPos.nNode.GetNode().
/*N*/ BOOL bCheck = TRUE;
/*N*/ if( RES_CONDTXTFMTCOLL == pStt->GetFmtColl()->Which() )
/*N*/ {
-/*N*/ // SwFmtColl* pChgColl = pStt->GetCondFmtColl();
/*N*/ pStt->ChkCondColl();
-/*
-//JP 19.11.97:
-// setzen der bedingten Vorlage aendert nichts an den Einzuegen, die bleiben
-// als harte vorhanden
- if( pStt->GetCondFmtColl() )
- {
- // es gab eine Aenderung -> harte Einzuege entfernen
- if( pChgColl != pStt->GetCondFmtColl() )
- pStt->ResetAttr( RES_LR_SPACE );
- bCheck = FALSE;
}
-*/
- }
/*N*/ else if( !pOutlNd && NO_NUMBERING !=
/*N*/ ((SwTxtFmtColl*)pStt->GetFmtColl())->GetOutlineLevel() )
/*N*/ pOutlNd = pStt;
@@ -905,7 +868,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwTxtNode* pTxtNd = rPos.nNode.GetNode().
/*N*/ #ifndef NUM_RELSPACE
/*N*/ // hat sich eine Level - Aenderung ergeben, so setze jetzt die
/*N*/ // gueltigen Einzuege
-/*N*/ if( bCheck && ( nLevel != nNdOldLvl || pStt->IsSetNumLSpace())
+/*N*/ if( sbCheck && ( nLevel != nNdOldLvl || pStt->IsSetNumLSpace())
/*N*/ && GetRealLevel( nLevel ) < MAXLEVEL )
/*N*/ {
/*N*/ SvxLRSpaceItem aLR( ((SvxLRSpaceItem&)pStt->SwCntntNode::GetAttr(
diff --git a/binfilter/bf_sw/source/core/doc/sw_docredln.cxx b/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
index f07b152..c25f758 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
@@ -180,14 +180,14 @@ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 _CHECK_REDLINE( t
/*N*/
/*N*/ BOOL bChg = FALSE;
/*N*/
-/*N*/ const SwPosition* pStt = rRange.Start(),
-/*N*/ * pEnd = pStt == rRange.GetPoint() ? rRange.GetMark()
-/*N*/ : rRange.GetPoint();
+/*N*/ const SwPosition* pStt = rRange.Start();
+/*N*/ pStt == rRange.GetPoint() ? rRange.GetMark() : rRange.GetPoint();
+
/*N*/ USHORT n = 0;
/*N*/ GetRedline( *pStt, &n );
/*N*/ for( ; n < pRedlineTbl->Count() ; ++n )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwRedline* pRedl = (*pRedlineTbl)[ n ];
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/
/*N*/ if( bChg )
@@ -206,10 +206,10 @@ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 _CHECK_REDLINE( t
/*N*/ USHORT SwDoc::GetRedlinePos( const SwNode& rNd, USHORT /*nType*/ ) const
/*N*/ {
-/*N*/ const ULONG nNdIdx = rNd.GetIndex();
+/*N*/ rNd.GetIndex();
/*N*/ for( USHORT n = 0; n < pRedlineTbl->Count() ; ++n )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const SwRedline* pTmp = (*pRedlineTbl)[ n ];
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ return USHRT_MAX;
/*N*/ }
@@ -217,10 +217,10 @@ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 _CHECK_REDLINE( t
/*N*/ const SwRedline* SwDoc::GetRedline( const SwPosition& /*rPos*/,
/*N*/ USHORT* pFndPos ) const
/*N*/ {
-/*N*/ register USHORT nO = pRedlineTbl->Count(), nM, nU = 0;
+/*N*/ register USHORT nO = pRedlineTbl->Count(), nU = 0;
/*N*/ if( nO > 0 )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 nO--;
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ if( pFndPos )
/*N*/ *pFndPos = nU;
@@ -313,7 +313,6 @@ typedef BOOL (*Fn_AcceptReject)( SwRedlineTbl& rArr, USHORT& rPos,
/*N*/ GoEndSection( pNew->GetPoint() );
/*N*/ if( *pNew->GetPoint() > *pEnd )
/*N*/ {
-/*N*/ BOOL bWeiter = TRUE;
/*N*/ pC = 0;
/*N*/ if( aNewStt.nNode != pEnd->nNode )
/*N*/ do {
diff --git a/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx b/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
index ae2404e..fce2abb 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
@@ -489,9 +489,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // hole den TextNode und
/*N*/ return ;
// die aktuellen Seitennummern ins Verzeichnis eintragen
-/*?*/ SwPageFrm* pAktPage = 0;
-/*?*/ USHORT nPage = 0;
-/*?*/ SwDoc* pDoc = (SwDoc*)GetFmt()->GetDoc();
+/*?*/ (SwDoc*)GetFmt()->GetDoc();
/*?*/
/*?*/ SwTOXInternational aIntl( GetLanguage(),
/*?*/ TOX_INDEX == GetTOXType()->GetType() ?
diff --git a/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx b/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx
index 1be5f13..eaedab7 100644
--- a/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx
@@ -436,7 +436,7 @@ void lcl_LastBoxSetWidth( SwTableBoxes &rBoxes, const long nOffset,
return FALSE;
// es darf nie die gesamte Tabelle geloescht werden
- SwNodes& rNds = pDoc->GetNodes();
+ pDoc->GetNodes();
if( rBoxes[0]->GetSttIdx()-1 == pTblNd->GetIndex() &&
rBoxes[rBoxes.Count()-1]->GetSttNd()->EndOfSectionIndex()+1
== pTblNd->EndOfSectionIndex() )
--
1.7.1
--------------080706050005080908080201--
More information about the LibreOffice
mailing list