diff options
Diffstat (limited to 'sw/source/core/doc/docftn.cxx')
-rw-r--r-- | sw/source/core/doc/docftn.cxx | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx index 306f7b3dfcc8..4ee3811ec4a2 100644 --- a/sw/source/core/doc/docftn.cxx +++ b/sw/source/core/doc/docftn.cxx @@ -78,7 +78,7 @@ SwEndNoteInfo& SwEndNoteInfo::operator=(const SwEndNoteInfo& rInfo) } -BOOL SwEndNoteInfo::operator==( const SwEndNoteInfo& rInfo ) const +sal_Bool SwEndNoteInfo::operator==( const SwEndNoteInfo& rInfo ) const { return aPageDescDep.GetRegisteredIn() == rInfo.aPageDescDep.GetRegisteredIn() && @@ -185,7 +185,7 @@ void SwEndNoteInfo::SetAnchorCharFmt( SwCharFmt* pChFmt ) void SwEndNoteInfo::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ) { - USHORT nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0 ; + sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0 ; if( RES_ATTRSET_CHG == nWhich || RES_FMT_CHG == nWhich ) @@ -196,7 +196,7 @@ void SwEndNoteInfo::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ) else pDoc = ((SwCharFmt*)aAnchorCharFmtDep.GetRegisteredIn())->GetDoc(); SwFtnIdxs& rFtnIdxs = pDoc->GetFtnIdxs(); - for( USHORT nPos = 0; nPos < rFtnIdxs.Count(); ++nPos ) + for( sal_uInt16 nPos = 0; nPos < rFtnIdxs.Count(); ++nPos ) { SwTxtFtn *pTxtFtn = rFtnIdxs[ nPos ]; const SwFmtFtn &rFtn = pTxtFtn->GetFtn(); @@ -221,7 +221,7 @@ SwFtnInfo& SwFtnInfo::operator=(const SwFtnInfo& rInfo) } -BOOL SwFtnInfo::operator==( const SwFtnInfo& rInfo ) const +sal_Bool SwFtnInfo::operator==( const SwFtnInfo& rInfo ) const { return ePos == rInfo.ePos && eNum == rInfo.eNum && @@ -265,17 +265,17 @@ void SwDoc::SetFtnInfo(const SwFtnInfo& rInfo) AppendUndo( new SwUndoFootNoteInfo( rOld ) ); } - BOOL bFtnPos = rInfo.ePos != rOld.ePos; - BOOL bFtnDesc = rOld.ePos == FTNPOS_CHAPTER && + sal_Bool bFtnPos = rInfo.ePos != rOld.ePos; + sal_Bool bFtnDesc = rOld.ePos == FTNPOS_CHAPTER && rInfo.GetPageDesc( *this ) != rOld.GetPageDesc( *this ); - BOOL bExtra = rInfo.aQuoVadis != rOld.aQuoVadis || + sal_Bool bExtra = rInfo.aQuoVadis != rOld.aQuoVadis || rInfo.aErgoSum != rOld.aErgoSum || rInfo.aFmt.GetNumberingType() != rOld.aFmt.GetNumberingType() || rInfo.GetPrefix() != rOld.GetPrefix() || rInfo.GetSuffix() != rOld.GetSuffix(); SwCharFmt *pOldChrFmt = rOld.GetCharFmt( *this ), *pNewChrFmt = rInfo.GetCharFmt( *this ); - BOOL bFtnChrFmts = pOldChrFmt != pNewChrFmt; + sal_Bool bFtnChrFmts = pOldChrFmt != pNewChrFmt; *pFtnInfo = rInfo; @@ -287,13 +287,13 @@ void SwDoc::SetFtnInfo(const SwFtnInfo& rInfo) { GetRootFrm()->UpdateFtnNums(); if ( bFtnDesc ) - GetRootFrm()->CheckFtnPageDescs( FALSE ); + GetRootFrm()->CheckFtnPageDescs( sal_False ); if ( bExtra ) { //Fuer die Benachrichtung bezueglich ErgoSum usw. sparen wir uns //extra-Code und nutzen die vorhandenen Wege. SwFtnIdxs& rFtnIdxs = GetFtnIdxs(); - for( USHORT nPos = 0; nPos < rFtnIdxs.Count(); ++nPos ) + for( sal_uInt16 nPos = 0; nPos < rFtnIdxs.Count(); ++nPos ) { SwTxtFtn *pTxtFtn = rFtnIdxs[ nPos ]; const SwFmtFtn &rFtn = pTxtFtn->GetFtn(); @@ -332,7 +332,7 @@ void SwDoc::SetEndNoteInfo(const SwEndNoteInfo& rInfo) AppendUndo( new SwUndoEndNoteInfo( GetEndNoteInfo() ) ); } - BOOL bNumChg = rInfo.nFtnOffset != GetEndNoteInfo().nFtnOffset; + sal_Bool bNumChg = rInfo.nFtnOffset != GetEndNoteInfo().nFtnOffset; // this seems to be an optimization: UpdateAllFtn() is only called // if the offset changes; if the offset is the same, // but type/prefix/suffix changes, just set new numbers. @@ -342,24 +342,24 @@ void SwDoc::SetEndNoteInfo(const SwEndNoteInfo& rInfo) || (rInfo.GetPrefix() != GetEndNoteInfo().GetPrefix()) || (rInfo.GetSuffix() != GetEndNoteInfo().GetSuffix()) ); - BOOL bFtnDesc = rInfo.GetPageDesc( *this ) != + sal_Bool bFtnDesc = rInfo.GetPageDesc( *this ) != GetEndNoteInfo().GetPageDesc( *this ); SwCharFmt *pOldChrFmt = GetEndNoteInfo().GetCharFmt( *this ), *pNewChrFmt = rInfo.GetCharFmt( *this ); - BOOL bFtnChrFmts = pOldChrFmt != pNewChrFmt; + sal_Bool bFtnChrFmts = pOldChrFmt != pNewChrFmt; *pEndNoteInfo = rInfo; if ( GetRootFrm() ) { if ( bFtnDesc ) - GetRootFrm()->CheckFtnPageDescs( TRUE ); + GetRootFrm()->CheckFtnPageDescs( sal_True ); if ( bExtra ) { //Fuer die Benachrichtung bezueglich ErgoSum usw. sparen wir uns //extra-Code und nutzen die vorhandenen Wege. SwFtnIdxs& rFtnIdxs = GetFtnIdxs(); - for( USHORT nPos = 0; nPos < rFtnIdxs.Count(); ++nPos ) + for( sal_uInt16 nPos = 0; nPos < rFtnIdxs.Count(); ++nPos ) { SwTxtFtn *pTxtFtn = rFtnIdxs[ nPos ]; const SwFmtFtn &rFtn = pTxtFtn->GetFtn(); @@ -394,12 +394,12 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const String& rNumStr, SwFtnIdxs& rFtnArr = GetFtnIdxs(); const SwPosition* pStt = rPam.Start(), *pEnd = rPam.End(); - const ULONG nSttNd = pStt->nNode.GetIndex(); + const sal_uLong nSttNd = pStt->nNode.GetIndex(); const xub_StrLen nSttCnt = pStt->nContent.GetIndex(); - const ULONG nEndNd = pEnd->nNode.GetIndex(); + const sal_uLong nEndNd = pEnd->nNode.GetIndex(); const xub_StrLen nEndCnt = pEnd->nContent.GetIndex(); - USHORT nPos; + sal_uInt16 nPos; rFtnArr.SeekEntry( pStt->nNode, &nPos ); SwUndoChangeFootNote* pUndo = 0; @@ -410,10 +410,10 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const String& rNumStr, } SwTxtFtn* pTxtFtn; - ULONG nIdx; - BOOL bChg = FALSE; - BOOL bTypeChgd = FALSE; - USHORT n = nPos; // sichern + sal_uLong nIdx; + sal_Bool bChg = sal_False; + sal_Bool bTypeChgd = sal_False; + sal_uInt16 n = nPos; // sichern while( nPos < rFtnArr.Count() && (( nIdx = _SwTxtFtn_GetIndex((pTxtFtn = rFtnArr[ nPos++ ] ))) < nEndNd || ( nIdx == nEndNd && @@ -426,7 +426,7 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const String& rNumStr, rFtn.GetNumStr() != rNumStr || rFtn.IsEndNote() != bIsEndNote ) { - bChg = TRUE; + bChg = sal_True; if ( pUndo ) { pUndo->GetHistory().Add( *pTxtFtn ); @@ -436,7 +436,7 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const String& rNumStr, if( rFtn.IsEndNote() != bIsEndNote ) { ((SwFmtFtn&)rFtn).SetEndNote( bIsEndNote ); - bTypeChgd = TRUE; + bTypeChgd = sal_True; pTxtFtn->CheckCondColl(); //#i11339# dispose UNO wrapper when a footnote is changed to an endnote or vice versa SwPtrMsgPoolItem aMsgHint( RES_FOOTNOTE_DELETED, (void*)&pTxtFtn->GetAttr() ); @@ -458,7 +458,7 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const String& rNumStr, rFtn.GetNumStr() != rNumStr || rFtn.IsEndNote() != bIsEndNote ) { - bChg = TRUE; + bChg = sal_True; if ( pUndo ) { pUndo->GetHistory().Add( *pTxtFtn ); @@ -468,7 +468,7 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const String& rNumStr, if( rFtn.IsEndNote() != bIsEndNote ) { ((SwFmtFtn&)rFtn).SetEndNote( bIsEndNote ); - bTypeChgd = TRUE; + bTypeChgd = sal_True; pTxtFtn->CheckCondColl(); } } |