diff options
Diffstat (limited to 'sw/source/core/layout')
34 files changed, 2479 insertions, 2593 deletions
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx index 5c6ee5f03623..301c4a8372ec 100644 --- a/sw/source/core/layout/anchoreddrawobject.cxx +++ b/sw/source/core/layout/anchoreddrawobject.cxx @@ -878,7 +878,7 @@ void SwAnchoredDrawObject::NotifyBackground( SwPageFrm* _pPageFrm, const SwRect& _rRect, PrepareHint _eHint ) { - ::Notify_Background( GetDrawObj(), _pPageFrm, _rRect, _eHint, TRUE ); + ::Notify_Background( GetDrawObj(), _pPageFrm, _rRect, _eHint, sal_True ); } /** method to assure that anchored object is registered at the correct diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 37ec80632153..e56c34c4bff1 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -78,6 +78,7 @@ #include <tgrditem.hxx> #include <hfspacingitem.hxx> #include <doc.hxx> +#include <IDocumentUndoRedo.hxx> #include <pagefrm.hxx> #include <rootfrm.hxx> #include <cntfrm.hxx> @@ -106,9 +107,7 @@ #include <cmdid.h> #include <unomid.h> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <svx/svdundo.hxx> // #111827# // OD 2004-05-24 #i28701# #include <sortedobjs.hxx> @@ -218,7 +217,7 @@ void DelHFFormat( SwClient *pToRemove, SwFrmFmt *pFmt ) // <-- //Wenn in einem der Nodes noch ein Crsr angemeldet ist, muss das //ParkCrsr einer (beliebigen) Shell gerufen werden. - pNode = pDoc->GetNodes()[ aIdx ]; + pNode = & aIdx.GetNode(); sal_uInt32 nEnd = pNode->EndOfSectionIndex(); while ( aIdx < nEnd ) { @@ -237,21 +236,17 @@ void DelHFFormat( SwClient *pToRemove, SwFrmFmt *pFmt ) } while ( aIter++ ); } aIdx++; - pNode = pDoc->GetNodes()[ aIdx ]; + pNode = & aIdx.GetNode(); } } rCnt.SetNewCntntIdx( (const SwNodeIndex*)0 ); // beim Loeschen von Header/Footer-Formaten IMMER das Undo // abschalten! (Bug 31069) - sal_Bool bDoesUndo = pDoc->DoesUndo(); - pDoc->DoUndo( sal_False ); + ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo()); ASSERT( pNode, "Ein grosses Problem." ); pDoc->DeleteSection( pNode ); - - if( bDoesUndo ) - pDoc->DoUndo( sal_True ); } delete pFmt; } @@ -298,7 +293,7 @@ SfxPoolItem* SwFmtFrmSize::Clone( SfxItemPool* ) const /* -----------------24.04.98 11:36------------------- * * --------------------------------------------------*/ -BOOL SwFmtFrmSize::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +sal_Bool SwFmtFrmSize::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; @@ -320,13 +315,13 @@ BOOL SwFmtFrmSize::QueryValue( uno::Any& rVal, BYTE nMemberId ) const break; case MID_FRMSIZE_IS_SYNC_HEIGHT_TO_WIDTH: { - BOOL bTmp = 0xFF == GetHeightPercent(); + sal_Bool bTmp = 0xFF == GetHeightPercent(); rVal.setValue(&bTmp, ::getBooleanCppuType()); } break; case MID_FRMSIZE_IS_SYNC_WIDTH_TO_HEIGHT: { - BOOL bTmp = 0xFF == GetWidthPercent(); + sal_Bool bTmp = 0xFF == GetWidthPercent(); rVal.setValue(&bTmp, ::getBooleanCppuType()); } break; @@ -345,7 +340,7 @@ BOOL SwFmtFrmSize::QueryValue( uno::Any& rVal, BYTE nMemberId ) const break; case MID_FRMSIZE_IS_AUTO_HEIGHT: { - BOOL bTmp = ATT_FIX_SIZE != GetHeightSizeType(); + sal_Bool bTmp = ATT_FIX_SIZE != GetHeightSizeType(); rVal.setValue(&bTmp, ::getBooleanCppuType()); } break; @@ -359,7 +354,7 @@ BOOL SwFmtFrmSize::QueryValue( uno::Any& rVal, BYTE nMemberId ) const /* -----------------24.04.98 11:36------------------- * * --------------------------------------------------*/ -BOOL SwFmtFrmSize::PutValue( const uno::Any& rVal, BYTE nMemberId ) +sal_Bool SwFmtFrmSize::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Bool bConvert = 0 != (nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -391,7 +386,7 @@ BOOL SwFmtFrmSize::PutValue( const uno::Any& rVal, BYTE nMemberId ) sal_Int16 nSet = 0; rVal >>= nSet; if(nSet >= 0 && nSet <= 0xfe) - SetHeightPercent((BYTE)nSet); + SetHeightPercent((sal_uInt8)nSet); else bRet = sal_False; } @@ -401,7 +396,7 @@ BOOL SwFmtFrmSize::PutValue( const uno::Any& rVal, BYTE nMemberId ) sal_Int16 nSet = 0; rVal >>= nSet; if(nSet >= 0 && nSet <= 0xfe) - SetWidthPercent((BYTE)nSet); + SetWidthPercent((sal_uInt8)nSet); else bRet = sal_False; } @@ -704,7 +699,7 @@ void SwFmtPageDesc::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ) } } -BOOL SwFmtPageDesc::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +sal_Bool SwFmtPageDesc::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; @@ -735,7 +730,7 @@ BOOL SwFmtPageDesc::QueryValue( uno::Any& rVal, BYTE nMemberId ) const return bRet; } -BOOL SwFmtPageDesc::PutValue( const uno::Any& rVal, BYTE nMemberId ) +sal_Bool SwFmtPageDesc::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; @@ -1010,7 +1005,7 @@ void SwFmtCol::Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct ) } } -BOOL SwFmtCol::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +sal_Bool SwFmtCol::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; @@ -1026,7 +1021,7 @@ BOOL SwFmtCol::QueryValue( uno::Any& rVal, BYTE nMemberId ) const return sal_True; } -BOOL SwFmtCol::PutValue( const uno::Any& rVal, BYTE nMemberId ) +sal_Bool SwFmtCol::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; @@ -1054,10 +1049,10 @@ BOOL SwFmtCol::PutValue( const uno::Any& rVal, BYTE nMemberId ) for(sal_uInt16 i = 0; i < nCount; i++) { SwColumn* pCol = new SwColumn; - pCol->SetWishWidth( static_cast<USHORT>(pArray[i].Width) ); - nWidthSum = static_cast<USHORT>(nWidthSum + pArray[i].Width); - pCol->SetLeft ( static_cast<USHORT>(MM100_TO_TWIP(pArray[i].LeftMargin)) ); - pCol->SetRight( static_cast<USHORT>(MM100_TO_TWIP(pArray[i].RightMargin)) ); + pCol->SetWishWidth( static_cast<sal_uInt16>(pArray[i].Width) ); + nWidthSum = static_cast<sal_uInt16>(nWidthSum + pArray[i].Width); + pCol->SetLeft ( static_cast<sal_uInt16>(MM100_TO_TWIP(pArray[i].LeftMargin)) ); + pCol->SetRight( static_cast<sal_uInt16>(MM100_TO_TWIP(pArray[i].RightMargin)) ); aColumns.Insert(pCol, i); } bRet = sal_True; @@ -1131,7 +1126,7 @@ sal_uInt16 SwFmtSurround::GetValueCount() const } -BOOL SwFmtSurround::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +sal_Bool SwFmtSurround::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; @@ -1143,19 +1138,19 @@ BOOL SwFmtSurround::QueryValue( uno::Any& rVal, BYTE nMemberId ) const break; case MID_SURROUND_ANCHORONLY: { - BOOL bTmp = IsAnchorOnly(); + sal_Bool bTmp = IsAnchorOnly(); rVal.setValue(&bTmp, ::getBooleanCppuType()); } break; case MID_SURROUND_CONTOUR: { - BOOL bTmp = IsContour(); + sal_Bool bTmp = IsContour(); rVal.setValue(&bTmp, ::getBooleanCppuType()); } break; case MID_SURROUND_CONTOUROUTSIDE: { - BOOL bTmp = IsOutside(); + sal_Bool bTmp = IsOutside(); rVal.setValue(&bTmp, ::getBooleanCppuType()); } break; @@ -1166,7 +1161,7 @@ BOOL SwFmtSurround::QueryValue( uno::Any& rVal, BYTE nMemberId ) const return bRet; } -BOOL SwFmtSurround::PutValue( const uno::Any& rVal, BYTE nMemberId ) +sal_Bool SwFmtSurround::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; @@ -1177,7 +1172,7 @@ BOOL SwFmtSurround::PutValue( const uno::Any& rVal, BYTE nMemberId ) { sal_Int32 eVal = SWUnoHelper::GetEnumAsInt32( rVal ); if( eVal >= 0 && eVal < (sal_Int16)SURROUND_END ) - SetValue( static_cast<USHORT>(eVal) ); + SetValue( static_cast<sal_uInt16>(eVal) ); else { //exception ; @@ -1225,7 +1220,7 @@ SfxPoolItem* SwFmtVertOrient::Clone( SfxItemPool* ) const return new SwFmtVertOrient( nYPos, eOrient, eRelation ); } -BOOL SwFmtVertOrient::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +sal_Bool SwFmtVertOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; @@ -1264,7 +1259,7 @@ BOOL SwFmtVertOrient::QueryValue( uno::Any& rVal, BYTE nMemberId ) const return bRet; } -BOOL SwFmtVertOrient::PutValue( const uno::Any& rVal, BYTE nMemberId ) +sal_Bool SwFmtVertOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Bool bConvert = 0 != (nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -1339,7 +1334,7 @@ SfxPoolItem* SwFmtHoriOrient::Clone( SfxItemPool* ) const return new SwFmtHoriOrient( nXPos, eOrient, eRelation, bPosToggle ); } -BOOL SwFmtHoriOrient::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +sal_Bool SwFmtHoriOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; @@ -1375,7 +1370,7 @@ BOOL SwFmtHoriOrient::QueryValue( uno::Any& rVal, BYTE nMemberId ) const break; case MID_HORIORIENT_PAGETOGGLE: { - BOOL bTmp = IsPosToggle(); + sal_Bool bTmp = IsPosToggle(); rVal.setValue(&bTmp, ::getBooleanCppuType()); } break; @@ -1386,7 +1381,7 @@ BOOL SwFmtHoriOrient::QueryValue( uno::Any& rVal, BYTE nMemberId ) const return bRet; } -BOOL SwFmtHoriOrient::PutValue( const uno::Any& rVal, BYTE nMemberId ) +sal_Bool SwFmtHoriOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Bool bConvert = 0 != (nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -1524,7 +1519,7 @@ sal_uInt32 SwFmtAnchor::GetOrder() const /*-----------------16.02.98 15:21------------------- --------------------------------------------------*/ -BOOL SwFmtAnchor::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +sal_Bool SwFmtAnchor::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; @@ -1578,7 +1573,7 @@ BOOL SwFmtAnchor::QueryValue( uno::Any& rVal, BYTE nMemberId ) const return bRet; } -BOOL SwFmtAnchor::PutValue( const uno::Any& rVal, BYTE nMemberId ) +sal_Bool SwFmtAnchor::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; @@ -1711,7 +1706,7 @@ void SwFmtURL::SetMap( const ImageMap *pM ) } extern const SvEventDescription* lcl_GetSupportedMacroItems(); -BOOL SwFmtURL::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +sal_Bool SwFmtURL::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; @@ -1751,7 +1746,7 @@ BOOL SwFmtURL::QueryValue( uno::Any& rVal, BYTE nMemberId ) const break; case MID_URL_SERVERMAP: { - BOOL bTmp = IsServerMap(); + sal_Bool bTmp = IsServerMap(); rVal.setValue(&bTmp, ::getBooleanCppuType()); } break; @@ -1762,7 +1757,7 @@ BOOL SwFmtURL::QueryValue( uno::Any& rVal, BYTE nMemberId ) const return bRet; } -BOOL SwFmtURL::PutValue( const uno::Any& rVal, BYTE nMemberId ) +sal_Bool SwFmtURL::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; @@ -1802,7 +1797,7 @@ BOOL SwFmtURL::PutValue( const uno::Any& rVal, BYTE nMemberId ) bRet = SvUnoImageMap_fillImageMap( xCont, *pMap ); } else - bRet = FALSE; + bRet = sal_False; } break; case MID_URL_SERVERMAP: @@ -1873,7 +1868,7 @@ int SwFmtFtnEndAtTxtEnd::operator==( const SfxPoolItem& rItem ) const sSuffix == rAttr.sSuffix; } -BOOL SwFmtFtnEndAtTxtEnd::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +sal_Bool SwFmtFtnEndAtTxtEnd::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; switch(nMemberId) @@ -1900,14 +1895,14 @@ BOOL SwFmtFtnEndAtTxtEnd::QueryValue( uno::Any& rVal, BYTE nMemberId ) const case MID_NUM_TYPE : rVal <<= aFmt.GetNumberingType(); break; case MID_PREFIX : rVal <<= OUString(sPrefix); break; case MID_SUFFIX : rVal <<= OUString(sSuffix); break; - default: return FALSE; + default: return sal_False; } - return TRUE; + return sal_True; } -BOOL SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, BYTE nMemberId ) +sal_Bool SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { - BOOL bRet = TRUE; + sal_Bool bRet = sal_True; nMemberId &= ~CONVERT_TWIPS; switch(nMemberId) { @@ -1936,7 +1931,7 @@ BOOL SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, BYTE nMemberId ) if(nVal >= 0) nOffset = nVal; else - bRet = FALSE; + bRet = sal_False; } break; case MID_OWN_NUM : @@ -1958,7 +1953,7 @@ BOOL SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, BYTE nMemberId ) SVX_NUM_CHARS_LOWER_LETTER_N == nVal )) aFmt.SetNumberingType(nVal); else - bRet = FALSE; + bRet = sal_False; } break; case MID_PREFIX : @@ -1973,7 +1968,7 @@ BOOL SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, BYTE nMemberId ) sSuffix = sVal; } break; - default: bRet = FALSE; + default: bRet = sal_False; } return bRet; } @@ -2039,7 +2034,7 @@ void SwFmtChain::SetNext( SwFlyFrmFmt *pFmt ) ((SwModify*)aNext.GetRegisteredIn())->Remove( &aNext ); } -BOOL SwFmtChain::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +sal_Bool SwFmtChain::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; @@ -2092,7 +2087,7 @@ SfxPoolItem* SwFmtLineNumber::Clone( SfxItemPool* ) const return new SwFmtLineNumber( *this ); } -BOOL SwFmtLineNumber::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +sal_Bool SwFmtLineNumber::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; @@ -2101,7 +2096,7 @@ BOOL SwFmtLineNumber::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { case MID_LINENUMBER_COUNT: { - BOOL bTmp = IsCount(); + sal_Bool bTmp = IsCount(); rVal.setValue(&bTmp, ::getBooleanCppuType()); } break; @@ -2115,7 +2110,7 @@ BOOL SwFmtLineNumber::QueryValue( uno::Any& rVal, BYTE nMemberId ) const return bRet; } -BOOL SwFmtLineNumber::PutValue( const uno::Any& rVal, BYTE nMemberId ) +sal_Bool SwFmtLineNumber::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { // hier wird immer konvertiert! nMemberId &= ~CONVERT_TWIPS; @@ -2195,9 +2190,9 @@ SwTextGridItem& SwTextGridItem::operator=( const SwTextGridItem& rCpy ) return *this; } -BOOL SwTextGridItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +sal_Bool SwTextGridItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { - BOOL bRet = TRUE; + sal_Bool bRet = sal_True; switch( nMemberId & ~CONVERT_TWIPS ) { @@ -2245,7 +2240,7 @@ BOOL SwTextGridItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const break; default: DBG_ERROR("unknown SwTextGrid value"); - bRet = FALSE; + bRet = sal_False; break; } break; @@ -2260,16 +2255,16 @@ BOOL SwTextGridItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const break; default: DBG_ERROR("Unknown SwTextGridItem member"); - bRet = FALSE; + bRet = sal_False; break; } return bRet; } -BOOL SwTextGridItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) +sal_Bool SwTextGridItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { - BOOL bRet = TRUE; + sal_Bool bRet = sal_True; switch( nMemberId & ~CONVERT_TWIPS ) { case MID_GRID_COLOR: @@ -2287,7 +2282,7 @@ BOOL SwTextGridItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) if( bRet && (nTmp >= 0) ) SetLines( (sal_uInt16)nTmp ); else - bRet = FALSE; + bRet = sal_False; } break; case MID_GRID_RUBY_BELOW: @@ -2310,13 +2305,13 @@ BOOL SwTextGridItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) nTmp = MM100_TO_TWIP( nTmp ); if( bRet && (nTmp >= 0) && ( nTmp <= USHRT_MAX) ) if( (nMemberId & ~CONVERT_TWIPS) == MID_GRID_BASEHEIGHT ) - SetBaseHeight( (USHORT)nTmp ); + SetBaseHeight( (sal_uInt16)nTmp ); else if( (nMemberId & ~CONVERT_TWIPS) == MID_GRID_BASEWIDTH ) - SetBaseWidth( (USHORT)nTmp ); + SetBaseWidth( (sal_uInt16)nTmp ); else - SetRubyHeight( (USHORT)nTmp ); + SetRubyHeight( (sal_uInt16)nTmp ); else - bRet = FALSE; + bRet = sal_False; } break; case MID_GRID_TYPE: @@ -2337,7 +2332,7 @@ BOOL SwTextGridItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) SetGridType( GRID_LINES_CHARS ); break; default: - bRet = FALSE; + bRet = sal_False; break; } } @@ -2354,13 +2349,13 @@ BOOL SwTextGridItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) } default: DBG_ERROR("Unknown SwTextGridItem member"); - bRet = FALSE; + bRet = sal_False; } return bRet; } -void SwTextGridItem::SwitchPaperMode(BOOL bNew) +void SwTextGridItem::SwitchPaperMode(sal_Bool bNew) { if( bNew == bSquaredMode ) { @@ -2811,7 +2806,7 @@ void SwFlyFrmFmt::MakeFrms() pFrm; pFrm = (SwFrm*)aIter.Next() ) { - BOOL bAdd = !pFrm->IsCntntFrm() || + sal_Bool bAdd = !pFrm->IsCntntFrm() || !((SwCntntFrm*)pFrm)->IsFollow(); if ( FLY_AT_FLY == aAnchorAttr.GetAnchorId() && !pFrm->IsFlyFrm() ) diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 5cd97d1a1d26..0f4a60c3fa5b 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -78,7 +78,7 @@ |*************************************************************************/ -BOOL SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL, BOOL & ) +sal_Bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool & ) { if ( (SwFlowFrm::IsMoveBwdJump() || !IsPrevObjMove())) { @@ -103,12 +103,12 @@ BOOL SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL, BOOL & ) //von Leerseiten), so muss in jedemfall gemoved werden - sonst wuerde, //falls der Frm nicht in das Blatt passt, nicht mehr auf die //dazwischenliegenden Blaetter geachtet werden. - BYTE nMoveAnyway = 0; + sal_uInt8 nMoveAnyway = 0; SwPageFrm * const pNewPage = pNewUpper->FindPageFrm(); SwPageFrm *pOldPage = FindPageFrm(); if ( SwFlowFrm::IsMoveBwdJump() ) - return TRUE; + return sal_True; if( IsInFtn() && IsInSct() ) { @@ -121,7 +121,7 @@ BOOL SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL, BOOL & ) pSect = pSect->GetUpper()->FindSctFrm(); ASSERT( pSect, "Escaping footnote" ); if( pSect != pMySect ) - return FALSE; + return sal_False; } } SWRECTFN( this ) @@ -187,7 +187,7 @@ BOOL SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL, BOOL & ) ( pNewUpper->IsColBodyFrm() && !pNewUpper->GetUpper()->GetPrev() && !pNewUpper->GetUpper()->GetNext() ) ) ) ) - nSpace += pNewUpper->Grow( LONG_MAX, TRUE ); + nSpace += pNewUpper->Grow( LONG_MAX, sal_True ); if ( nMoveAnyway < 3 ) { @@ -204,7 +204,7 @@ BOOL SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL, BOOL & ) // dabei ist sogar die Breite egal, da ein TestFormat in der neuen Umgebung // vorgenommen wird. // --> OD 2007-11-26 #b6614158# - const BYTE nBwdMoveNecessaryResult = + const sal_uInt8 nBwdMoveNecessaryResult = BwdMoveNecessary( pNewPage, aRect); const bool bObjsInNewUpper( nBwdMoveNecessaryResult == 2 || nBwdMoveNecessaryResult == 3 ); @@ -220,21 +220,21 @@ BOOL SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL, BOOL & ) !(pNewUpper->Prt().*fnRectX->fnGetWidth)() && ( pNewUpper->GetUpper()->GetPrev() || pNewUpper->GetUpper()->GetNext() ) ) - return TRUE; + return sal_True; else - return FALSE; // Kein Platz, dann ist es sinnlos, zurueckzufliessen + return sal_False; // Kein Platz, dann ist es sinnlos, zurueckzufliessen } else { // OD 2004-05-26 #i25904# - check for space left in new upper if ( nSpace ) - return TRUE; + return sal_True; else - return FALSE; + return sal_False; } } } - return FALSE; + return sal_False; } //------------------------------------------------------------------------ @@ -294,10 +294,10 @@ void SwFrm::PrepareMake() if ( !GetUpper() ) return; - const BOOL bCnt = IsCntntFrm(); - const BOOL bTab = IsTabFrm(); - BOOL bNoSect = IsInSct(); - BOOL bOldTabLock = FALSE, bFoll = FALSE; + const sal_Bool bCnt = IsCntntFrm(); + const sal_Bool bTab = IsTabFrm(); + sal_Bool bNoSect = IsInSct(); + sal_Bool bOldTabLock = sal_False, bFoll = sal_False; SwFlowFrm* pThis = bCnt ? (SwCntntFrm*)this : NULL; if ( bTab ) @@ -311,9 +311,9 @@ void SwFrm::PrepareMake() { pThis = (SwSectionFrm*)this; bFoll = pThis->IsFollow(); - bNoSect = FALSE; + bNoSect = sal_False; } - else if ( bCnt && TRUE == (bFoll = pThis->IsFollow()) && + else if ( bCnt && sal_True == (bFoll = pThis->IsFollow()) && GetPrev() ) { //Wenn der Master gereade ein CalcFollow ruft braucht die Kette @@ -426,11 +426,11 @@ void SwFrm::PrepareCrsr() if ( !GetUpper() ) return; - const BOOL bCnt = IsCntntFrm(); - const BOOL bTab = IsTabFrm(); - BOOL bNoSect = IsInSct(); + const sal_Bool bCnt = IsCntntFrm(); + const sal_Bool bTab = IsTabFrm(); + sal_Bool bNoSect = IsInSct(); - BOOL bOldTabLock = FALSE, bFoll; + sal_Bool bOldTabLock = sal_False, bFoll; SwFlowFrm* pThis = bCnt ? (SwCntntFrm*)this : NULL; if ( bTab ) @@ -442,7 +442,7 @@ void SwFrm::PrepareCrsr() else if( IsSctFrm() ) { pThis = (SwSectionFrm*)this; - bNoSect = FALSE; + bNoSect = sal_False; } bFoll = pThis && pThis->IsFollow(); @@ -504,7 +504,7 @@ void SwFrm::PrepareCrsr() // Hier wird GetPrev() zurueckgegeben, allerdings werden // dabei leere SectionFrms ueberlesen -SwFrm* lcl_Prev( SwFrm* pFrm, BOOL bSectPrv = TRUE ) +SwFrm* lcl_Prev( SwFrm* pFrm, sal_Bool bSectPrv = sal_True ) { SwFrm* pRet = pFrm->GetPrev(); if( !pRet && pFrm->GetUpper() && pFrm->GetUpper()->IsSctFrm() && @@ -530,8 +530,8 @@ void SwFrm::MakePos() { if ( !bValidPos ) { - bValidPos = TRUE; - BOOL bUseUpper = FALSE; + bValidPos = sal_True; + sal_Bool bUseUpper = sal_False; SwFrm* pPrv = lcl_Prev( this ); if ( pPrv && ( !pPrv->IsCntntFrm() || @@ -548,19 +548,19 @@ void SwFrm::MakePos() } else if ( pPrv->Frm().Top() == 0 ) { - bUseUpper = TRUE; + bUseUpper = sal_True; } } - pPrv = lcl_Prev( this, FALSE ); - USHORT nMyType = GetType(); + pPrv = lcl_Prev( this, sal_False ); + sal_uInt16 nMyType = GetType(); SWRECTFN( ( IsCellFrm() && GetUpper() ? GetUpper() : this ) ) if ( !bUseUpper && pPrv ) { aFrm.Pos( pPrv->Frm().Pos() ); if( FRM_NEIGHBOUR & nMyType ) { - BOOL bR2L = IsRightToLeft(); + sal_Bool bR2L = IsRightToLeft(); if( bR2L ) (aFrm.*fnRect->fnSetPosX)( (aFrm.*fnRect->fnGetLeft)() - (aFrm.*fnRect->fnGetWidth)() ); @@ -604,13 +604,13 @@ void SwFrm::MakePos() GetUpper()->Calc(); } // <-- - pPrv = lcl_Prev( this, FALSE ); + pPrv = lcl_Prev( this, sal_False ); if ( !bUseUpper && pPrv ) { aFrm.Pos( pPrv->Frm().Pos() ); if( FRM_NEIGHBOUR & nMyType ) { - BOOL bR2L = IsRightToLeft(); + sal_Bool bR2L = IsRightToLeft(); if( bR2L ) (aFrm.*fnRect->fnSetPosX)( (aFrm.*fnRect->fnGetLeft)() - (aFrm.*fnRect->fnGetWidth)() ); @@ -653,7 +653,7 @@ void SwFrm::MakePos() aFrm.Pos().X() = aFrm.Pos().Y() = 0; if( IsBodyFrm() && bVert && !bReverse && GetUpper() ) aFrm.Pos().X() += GetUpper()->Prt().Width() - aFrm.Width(); - bValidPos = TRUE; + bValidPos = sal_True; } } @@ -671,7 +671,7 @@ void lcl_CheckObjects( SwSortedObjs* pSortedObjs, SwFrm* pFrm, long& rBot ) //Und dann kann es natuerlich noch Absatzgebundene //Rahmen geben, die unterhalb ihres Absatzes stehen. long nMax = 0; - for ( USHORT i = 0; i < pSortedObjs->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pSortedObjs->Count(); ++i ) { // --> OD 2004-07-01 #i28701# - consider changed type of <SwSortedObjs> // entries. @@ -712,7 +712,7 @@ void SwPageFrm::MakeAll() if ( !bValidPos ) { // PAGES01 - bValidPos = TRUE; // positioning of the pages is taken care of by the root frame + bValidPos = sal_True; // positioning of the pages is taken care of by the root frame } if ( !bValidSize || !bValidPrtArea ) @@ -722,7 +722,7 @@ void SwPageFrm::MakeAll() Frm().Width( 0 ); Prt().Width( 0 ); Frm().Height( 0 ); Prt().Height( 0 ); Prt().Left( 0 ); Prt().Top( 0 ); - bValidSize = bValidPrtArea = TRUE; + bValidSize = bValidPrtArea = sal_True; } else { @@ -829,7 +829,7 @@ void SwPageFrm::MakeAll() Prt().Width( Frm().Width() - ( Prt().Left() + pAttrs->CalcRightLine() + aBorder.Width() ) ); Prt().Height( Frm().Height() - (nTop + nBottom) ); - bValidSize = bValidPrtArea = TRUE; + bValidSize = bValidPrtArea = sal_True; } else { //FixSize einstellen, bei Seiten nicht vom Upper sondern vom @@ -872,7 +872,7 @@ void SwLayoutFrm::MakeAll() //uebernimmt im DTor die Benachrichtigung const SwLayNotify aNotify( this ); - BOOL bVert = IsVertical(); + sal_Bool bVert = IsVertical(); SwRectFn fnRect = ( IsNeighbourFrm() == bVert )? fnRectHori : fnRectVert; SwBorderAttrAccess *pAccess = 0; @@ -889,7 +889,7 @@ void SwLayoutFrm::MakeAll() if ( IsLeaveUpperAllowed() ) { if ( !bValidSize ) - bValidPrtArea = FALSE; + bValidPrtArea = sal_False; } else { @@ -897,7 +897,7 @@ void SwLayoutFrm::MakeAll() { //FixSize einstellen, die VarSize wird von Format() nach //Berechnung der PrtArea eingestellt. - bValidPrtArea = FALSE; + bValidPrtArea = sal_False; SwTwips nPrtWidth = (GetUpper()->Prt().*fnRect->fnGetWidth)(); if( bVert && ( IsBodyFrm() || IsFtnContFrm() ) ) @@ -926,7 +926,7 @@ void SwLayoutFrm::MakeAll() // Don't leave your upper const SwTwips nDeadLine = (GetUpper()->*fnRect->fnGetPrtBottom)(); if( (Frm().*fnRect->fnOverStep)( nDeadLine ) ) - bValidSize = FALSE; + bValidSize = sal_False; } } } @@ -953,16 +953,16 @@ void SwLayoutFrm::MakeAll() |* |*************************************************************************/ -BOOL SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs ) +sal_Bool SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs ) { - BOOL bSizeChgd = FALSE; + sal_Bool bSizeChgd = sal_False; if ( !bValidPrtArea ) { - bValidPrtArea = TRUE; + bValidPrtArea = sal_True; SWRECTFN( this ) - const BOOL bTxtFrm = IsTxtFrm(); + const sal_Bool bTxtFrm = IsTxtFrm(); SwTwips nUpper = 0; if ( bTxtFrm && ((SwTxtFrm*)this)->IsHiddenNow() ) { @@ -997,13 +997,13 @@ BOOL SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs ) //geben kann (RootFrm::ImplCalcBrowseWidth()) long nMinWidth = 0; - for (USHORT i = 0; GetDrawObjs() && i < GetDrawObjs()->Count();++i) + for (sal_uInt16 i = 0; GetDrawObjs() && i < GetDrawObjs()->Count();++i) { // --> OD 2004-07-01 #i28701# - consider changed type of // <SwSortedObjs> entries SwAnchoredObject* pObj = (*GetDrawObjs())[i]; const SwFrmFmt& rFmt = pObj->GetFrmFmt(); - const BOOL bFly = pObj->ISA(SwFlyFrm); + const sal_Bool bFly = pObj->ISA(SwFlyFrm); if ((bFly && (WEIT_WECH == pObj->GetObjRect().Width())) || rFmt.GetFrmSize().GetWidthPercent()) { @@ -1080,7 +1080,7 @@ BOOL SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs ) GrowFrm( nUpper ); else ShrinkFrm( -nUpper ); - bSizeChgd = TRUE; + bSizeChgd = sal_True; } } return bSizeChgd; @@ -1104,8 +1104,8 @@ inline void ValidateSz( SwFrm *pFrm ) { if ( pFrm ) { - pFrm->bValidSize = TRUE; - pFrm->bValidPrtArea = TRUE; + pFrm->bValidSize = sal_True; + pFrm->bValidPrtArea = sal_True; } } @@ -1126,7 +1126,7 @@ void SwCntntFrm::MakeAll() if ( ((SwTxtFrm*)this)->IsLocked() ) { - ASSERT( FALSE, "Format fuer gelockten TxtFrm." ); + ASSERT( sal_False, "Format fuer gelockten TxtFrm." ); return; } @@ -1155,31 +1155,31 @@ void SwCntntFrm::MakeAll() //uebernimmt im DTor die Benachrichtigung SwCntntNotify *pNotify = new SwCntntNotify( this ); - BOOL bMakePage = TRUE; //solange TRUE kann eine neue Seite + sal_Bool bMakePage = sal_True; //solange sal_True kann eine neue Seite //angelegt werden (genau einmal) - BOOL bMovedBwd = FALSE; //Wird TRUE wenn der Frame zurueckfliesst - BOOL bMovedFwd = FALSE; //solange FALSE kann der Frm zurueck- + sal_Bool bMovedBwd = sal_False; //Wird sal_True wenn der Frame zurueckfliesst + sal_Bool bMovedFwd = sal_False; //solange sal_False kann der Frm zurueck- //fliessen (solange, bis er einmal //vorwaerts ge'moved wurde). - BOOL bFormatted = FALSE; //Fuer die Witwen und Waisen Regelung + sal_Bool bFormatted = sal_False; //Fuer die Witwen und Waisen Regelung //wird der letzte CntntFrm einer Kette //u.U. zum Formatieren angeregt, dies //braucht nur einmal zu passieren. //Immer wenn der Frm gemoved wird muss //das Flag zurueckgesetzt werden. - BOOL bMustFit = FALSE; //Wenn einmal die Notbremse gezogen wurde, + sal_Bool bMustFit = sal_False; //Wenn einmal die Notbremse gezogen wurde, //werden keine anderen Prepares mehr //abgesetzt. - BOOL bFitPromise = FALSE; //Wenn ein Absatz nicht passte, mit WouldFit + sal_Bool bFitPromise = sal_False; //Wenn ein Absatz nicht passte, mit WouldFit //aber verspricht, dass er sich passend //einstellt wird dieses Flag gesetzt. //Wenn er dann sein Versprechen nicht haelt, //kann kontrolliert verfahren werden. - BOOL bMoveable; - const BOOL bFly = IsInFly(); - const BOOL bTab = IsInTab(); - const BOOL bFtn = IsInFtn(); - const BOOL bSct = IsInSct(); + sal_Bool bMoveable; + const sal_Bool bFly = IsInFly(); + const sal_Bool bTab = IsInTab(); + const sal_Bool bFtn = IsInFtn(); + const sal_Bool bSct = IsInSct(); Point aOldFrmPos; //Damit bei Turnarounds jew. mit der Point aOldPrtPos; //letzten Pos verglichen und geprueft //werden kann, ob ein Prepare sinnvoll ist. @@ -1193,7 +1193,7 @@ void SwCntntFrm::MakeAll() pNotify->SetBordersJoinedWithPrev(); } - const BOOL bKeep = IsKeep( rAttrs.GetAttrSet() ); + const sal_Bool bKeep = IsKeep( rAttrs.GetAttrSet() ); SwSaveFtnHeight *pSaveFtn = 0; if ( bFtn ) @@ -1238,8 +1238,8 @@ void SwCntntFrm::MakeAll() GetUpper()->GetUpper()->IsCellFrm() ) ) && IsMoveable() ) { - bMovedFwd = TRUE; - MoveFwd( bMakePage, FALSE ); + bMovedFwd = sal_True; + MoveFwd( bMakePage, sal_False ); } // <-- } @@ -1249,7 +1249,7 @@ void SwCntntFrm::MakeAll() //gleich verschoben werden. if ( lcl_Prev( this ) && ((SwTxtFrm*)this)->IsFollow() && IsMoveable() ) { - bMovedFwd = TRUE; + bMovedFwd = sal_True; // OD 2004-03-02 #106629# - If follow frame is in table, it's master // will be the last in the current table cell. Thus, invalidate the // printing area of the master, @@ -1257,7 +1257,7 @@ void SwCntntFrm::MakeAll() { lcl_Prev( this )->InvalidatePrt(); } - MoveFwd( bMakePage, FALSE ); + MoveFwd( bMakePage, sal_False ); } // OD 08.11.2002 #104840# - check footnote content for forward move. @@ -1276,8 +1276,8 @@ void SwCntntFrm::MakeAll() pFtnBossOfFtn != pFtnBossOfRef && pFtnBossOfFtn->IsBefore( pFtnBossOfRef ) ) { - bMovedFwd = TRUE; - MoveFwd( bMakePage, FALSE ); + bMovedFwd = sal_True; + MoveFwd( bMakePage, sal_False ); } } } @@ -1290,13 +1290,13 @@ void SwCntntFrm::MakeAll() SwRect aOldFrm_StopFormat( Frm() ); SwRect aOldPrt_StopFormat( Prt() ); // <-- - if ( TRUE == (bMoveable = IsMoveable()) ) + if ( sal_True == (bMoveable = IsMoveable()) ) { SwFrm *pPre = GetIndPrev(); if ( CheckMoveFwd( bMakePage, bKeep, bMovedBwd ) ) { SWREFRESHFN( this ) - bMovedFwd = TRUE; + bMovedFwd = sal_True; if ( bMovedBwd ) { //Beim zurueckfliessen wurde der Upper angeregt sich @@ -1326,7 +1326,7 @@ void SwCntntFrm::MakeAll() // - current frame width is 0. // - current printing area width is 0. // - frame width is adjusted to a value greater than 0. - // - printing area flag is TRUE. + // - printing area flag is sal_True. // Thus, it's assured that the printing area is adjusted, if the // frame area width changes its width from 0 to something greater // than 0. @@ -1338,7 +1338,7 @@ void SwCntntFrm::MakeAll() (Frm().*fnRect->fnGetWidth)() == 0 && (Prt().*fnRect->fnGetWidth)() == 0 ) { - bValidPrtArea = FALSE; + bValidPrtArea = sal_False; } (Frm().*fnRect->fnSetWidth)( nNewFrmWidth ); @@ -1374,7 +1374,7 @@ void SwCntntFrm::MakeAll() if ( !bNoPrepAdjustFrm ) { Prepare( PREP_ADJUST_FRM ); - bValidSize = FALSE; + bValidSize = sal_False; } // <-- } @@ -1388,32 +1388,32 @@ void SwCntntFrm::MakeAll() //- Er muss mit der Unterkante der PrtArea des Upper ueberlappen. if ( !bMustFit ) { - BOOL bWidow = TRUE; + sal_Bool bWidow = sal_True; const SwTwips nDeadLine = (GetUpper()->*fnRect->fnGetPrtBottom)(); if ( bMoveable && !bFormatted && ( GetFollow() || ( (Frm().*fnRect->fnOverStep)( nDeadLine ) ) ) ) { - Prepare( PREP_WIDOWS_ORPHANS, 0, FALSE ); - bValidSize = bWidow = FALSE; + Prepare( PREP_WIDOWS_ORPHANS, 0, sal_False ); + bValidSize = bWidow = sal_False; } if( (Frm().*fnRect->fnGetPos)() != aOldFrmPos || (Prt().*fnRect->fnGetPos)() != aOldPrtPos ) { // In diesem Prepare erfolgt ggf. ein _InvalidateSize(). - // bValidSize wird FALSE und das Format() wird gerufen. - Prepare( PREP_POS_CHGD, (const void*)&bFormatted, FALSE ); + // bValidSize wird sal_False und das Format() wird gerufen. + Prepare( PREP_POS_CHGD, (const void*)&bFormatted, sal_False ); if ( bWidow && GetFollow() ) - { Prepare( PREP_WIDOWS_ORPHANS, 0, FALSE ); - bValidSize = FALSE; + { Prepare( PREP_WIDOWS_ORPHANS, 0, sal_False ); + bValidSize = sal_False; } } } if ( !bValidSize ) { - bValidSize = bFormatted = TRUE; + bValidSize = bFormatted = sal_True; ++nFormatCount; if( nFormatCount > STOP_FLY_FORMAT ) - SetFlyLock( TRUE ); + SetFlyLock( sal_True ); // --> OD 2006-09-25 #b6448963# - loop prevention // No format any longer, if <cnStopFormat> consequetive formats // without change occur. @@ -1442,10 +1442,10 @@ void SwCntntFrm::MakeAll() ) { SwFrm* pOldUpper = GetUpper(); - MoveFwd( TRUE, FALSE ); + MoveFwd( sal_True, sal_False ); if ( GetUpper() != pOldUpper ) { - bMovedFwd = TRUE; + bMovedFwd = sal_True; SWREFRESHFN( this ) continue; } @@ -1455,7 +1455,7 @@ void SwCntntFrm::MakeAll() //ich zurueckfliessen kann (wenn ich mich ueberhaupt bewegen soll). //Damit es keine Oszillation gibt, darf ich nicht gerade vorwaerts //geflossen sein. - BOOL bDummy; + sal_Bool bDummy; if ( !lcl_Prev( this ) && !bMovedFwd && ( bMoveable || ( bFly && !bTab ) ) && @@ -1463,13 +1463,13 @@ void SwCntntFrm::MakeAll() && MoveBwd( bDummy ) ) { SWREFRESHFN( this ) - bMovedBwd = TRUE; - bFormatted = FALSE; + bMovedBwd = sal_True; + bFormatted = sal_False; if ( bKeep && bMoveable ) { - if( CheckMoveFwd( bMakePage, FALSE, bMovedBwd ) ) + if( CheckMoveFwd( bMakePage, sal_False, bMovedBwd ) ) { - bMovedFwd = TRUE; + bMovedFwd = sal_True; bMoveable = IsMoveable(); SWREFRESHFN( this ) } @@ -1477,7 +1477,7 @@ void SwCntntFrm::MakeAll() MakePos(); if( aOldPos != (Frm().*fnRect->fnGetPos)() ) { - Prepare( PREP_POS_CHGD, (const void*)&bFormatted, FALSE ); + Prepare( PREP_POS_CHGD, (const void*)&bFormatted, sal_False ); if ( !bValidSize ) { (Frm().*fnRect->fnSetWidth)( (GetUpper()-> @@ -1487,11 +1487,11 @@ void SwCntntFrm::MakeAll() const long nOldW = (Prt().*fnRect->fnGetWidth)(); MakePrtArea( rAttrs ); if( nOldW != (Prt().*fnRect->fnGetWidth)() ) - Prepare( PREP_FIXSIZE_CHG, 0, FALSE ); + Prepare( PREP_FIXSIZE_CHG, 0, sal_False ); } if( GetFollow() ) - Prepare( PREP_WIDOWS_ORPHANS, 0, FALSE ); - bValidSize = bFormatted = TRUE; + Prepare( PREP_WIDOWS_ORPHANS, 0, sal_False ); + bValidSize = bFormatted = sal_True; Format(); } } @@ -1519,10 +1519,10 @@ void SwCntntFrm::MakeAll() { SwSectionFrm* pNxtSct = pNxt->FindSctFrm(); if( pNxtSct && pSct->IsAnFollow( pNxtSct ) ) - bValidPos = FALSE; + bValidPos = sal_False; } else - bValidPos = FALSE; + bValidPos = sal_False; } } } @@ -1544,7 +1544,7 @@ void SwCntntFrm::MakeAll() !GetDrawObjs() ) // <-- { - bValidPos = FALSE; + bValidPos = sal_False; MakePos(); aOldFrmPos = (Frm().*fnRect->fnGetPos)(); aOldPrtPos = (Prt().*fnRect->fnGetPos)(); @@ -1599,8 +1599,8 @@ void SwCntntFrm::MakeAll() } if ( pNxt ) { - const BOOL bMoveFwdInvalid = 0 != GetIndNext(); - const BOOL bNxtNew = + const sal_Bool bMoveFwdInvalid = 0 != GetIndNext(); + const sal_Bool bNxtNew = ( 0 == (pNxt->Prt().*fnRect->fnGetHeight)() ) && (!pNxt->IsTxtFrm() ||!((SwTxtFrm*)pNxt)->IsHiddenNow()); @@ -1612,7 +1612,7 @@ void SwCntntFrm::MakeAll() { if( bMovedFwd ) pNotify->SetInvaKeep(); - bMovedFwd = FALSE; + bMovedFwd = sal_False; } } } @@ -1648,8 +1648,8 @@ void SwCntntFrm::MakeAll() //Wenn ich nicht passe und nicht Spaltbar (WouldFit()) bin, so schicke //ich meinem TxtFrmanteil die Nachricht, dass eben falls moeglich //trotz des Attributes 'nicht aufspalten' aufgespalten werden muss. - BOOL bMoveOrFit = FALSE; - BOOL bDontMoveMe = !GetIndPrev(); + sal_Bool bMoveOrFit = sal_False; + sal_Bool bDontMoveMe = !GetIndPrev(); if( bDontMoveMe && IsInSct() ) { SwFtnBossFrm* pBoss = FindFtnBossFrm(); @@ -1658,10 +1658,10 @@ void SwCntntFrm::MakeAll() } // Finally, we are able to split table rows. Therefore, bDontMoveMe - // can be set to FALSE: + // can be set to sal_False: if( bDontMoveMe && IsInTab() && 0 != const_cast<SwCntntFrm*>(this)->GetNextCellLeaf( MAKEPAGE_NONE ) ) - bDontMoveMe = FALSE; + bDontMoveMe = sal_False; if ( bDontMoveMe && (Frm().*fnRect->fnGetHeight)() > (GetUpper()->Prt().*fnRect->fnGetHeight)() ) @@ -1670,12 +1670,12 @@ void SwCntntFrm::MakeAll() { SwTwips nTmp = (GetUpper()->Prt().*fnRect->fnGetHeight)() - (Prt().*fnRect->fnGetTop)(); - BOOL bSplit = !IsFwdMoveAllowed(); + sal_Bool bSplit = !IsFwdMoveAllowed(); if ( nTmp > 0 && WouldFit( nTmp, bSplit, sal_False ) ) { - Prepare( PREP_WIDOWS_ORPHANS, 0, FALSE ); - bValidSize = FALSE; - bFitPromise = TRUE; + Prepare( PREP_WIDOWS_ORPHANS, 0, sal_False ); + bValidSize = sal_False; + bFitPromise = sal_True; continue; } /* -----------------19.02.99 12:58------------------- @@ -1691,12 +1691,12 @@ void SwCntntFrm::MakeAll() else if ( !bFtn && bMoveable && ( !bFly || !FindFlyFrm()->IsColLocked() ) && ( !bSct || !FindSctFrm()->IsColLocked() ) ) - bMoveOrFit = TRUE; + bMoveOrFit = sal_True; } #ifdef DBG_UTIL else { - ASSERT( FALSE, "+TxtFrm hat WouldFit-Versprechen nicht eingehalten." ); + ASSERT( sal_False, "+TxtFrm hat WouldFit-Versprechen nicht eingehalten." ); } #endif } @@ -1715,13 +1715,13 @@ void SwCntntFrm::MakeAll() pOldUp->GetUpper()->GetUpper()->IsSctFrm() && ( pPre || pOldUp->GetUpper()->GetPrev() ) && ((SwSectionFrm*)pOldUp->GetUpper()->GetUpper())->MoveAllowed(this) ) - bMovedFwd = FALSE; + bMovedFwd = sal_False; const sal_Bool bCheckForGrownBody = pOldUp->IsBodyFrm(); const long nOldBodyHeight = (pOldUp->Frm().*fnRect->fnGetHeight)(); - if ( !bMovedFwd && !MoveFwd( bMakePage, FALSE ) ) - bMakePage = FALSE; + if ( !bMovedFwd && !MoveFwd( bMakePage, sal_False ) ) + bMakePage = sal_False; SWREFRESHFN( this ) // If MoveFwd moves the paragraph to the next page, a following @@ -1732,19 +1732,19 @@ void SwCntntFrm::MakeAll() // Therefore we only check for growing body frames. if ( bCheckForGrownBody && ! bMovedBwd && pOldUp != GetUpper() && (pOldUp->Frm().*fnRect->fnGetHeight)() > nOldBodyHeight ) - bMovedFwd = FALSE; + bMovedFwd = sal_False; else - bMovedFwd = TRUE; + bMovedFwd = sal_True; - bFormatted = FALSE; + bFormatted = sal_False; if ( bMoveOrFit && GetUpper() == pOldUp ) { // FME 2007-08-30 #i81146# new loop control if ( nConsequetiveFormatsWithoutChange <= cnStopFormat ) { - Prepare( PREP_MUST_FIT, 0, FALSE ); - bValidSize = FALSE; - bMustFit = TRUE; + Prepare( PREP_MUST_FIT, 0, sal_False ); + bValidSize = sal_False; + bMustFit = sal_True; continue; } @@ -1793,7 +1793,7 @@ void SwCntntFrm::MakeAll() pNotify->SetInvalidatePrevPrtArea(); } delete pNotify; - SetFlyLock( FALSE ); + SetFlyLock( sal_False ); } /************************************************************************* @@ -1814,10 +1814,10 @@ void MakeNxt( SwFrm *pFrm, SwFrm *pNxt ) //Der erste Versuch, der Abbruch mit pFrm = 0 wenn !Valid, //fuehrt leider zu dem Problem, dass das Keep dann u.U. nicht mehr //korrekt beachtet wird (27417) - const BOOL bOldPos = pFrm->GetValidPosFlag(); - const BOOL bOldSz = pFrm->GetValidSizeFlag(); - const BOOL bOldPrt = pFrm->GetValidPrtAreaFlag(); - pFrm->bValidPos = pFrm->bValidPrtArea = pFrm->bValidSize = TRUE; + const sal_Bool bOldPos = pFrm->GetValidPosFlag(); + const sal_Bool bOldSz = pFrm->GetValidSizeFlag(); + const sal_Bool bOldPrt = pFrm->GetValidPrtAreaFlag(); + pFrm->bValidPos = pFrm->bValidPrtArea = pFrm->bValidSize = sal_True; //fix(29272): Nicht MakeAll rufen, dort wird evtl. pFrm wieder invalidert //und kommt rekursiv wieder herein. @@ -1859,7 +1859,7 @@ void MakeNxt( SwFrm *pFrm, SwFrm *pNxt ) // Diese Routine ueberprueft, ob zwischen dem FtnBoss von pFrm und dem // von pNxt keine anderen FtnBosse liegen -BOOL lcl_IsNextFtnBoss( const SwFrm *pFrm, const SwFrm* pNxt ) +sal_Bool lcl_IsNextFtnBoss( const SwFrm *pFrm, const SwFrm* pNxt ) { ASSERT( pFrm && pNxt, "lcl_IsNextFtnBoss: No Frames?" ); pFrm = pFrm->FindFtnBossFrm(); @@ -1875,9 +1875,9 @@ BOOL lcl_IsNextFtnBoss( const SwFrm *pFrm, const SwFrm* pNxt ) } // --> OD 2007-11-26 #b6614158# -BOOL SwCntntFrm::_WouldFit( SwTwips nSpace, +sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace, SwLayoutFrm *pNewUpper, - BOOL bTstMove, + sal_Bool bTstMove, const bool bObjsInNewUpper ) // <-- { @@ -1889,12 +1889,12 @@ BOOL SwCntntFrm::_WouldFit( SwTwips nSpace, if ( IsInFtn() ) { if( !lcl_IsNextFtnBoss( pNewUpper, this ) ) - return TRUE; + return sal_True; pFtnFrm = FindFtnFrm(); } - BOOL bRet; - BOOL bSplit = !pNewUpper->Lower(); + sal_Bool bRet; + sal_Bool bSplit = !pNewUpper->Lower(); SwCntntFrm *pFrm = this; const SwFrm *pTmpPrev = pNewUpper->Lower(); if( pTmpPrev && pTmpPrev->IsFtnFrm() ) @@ -1906,7 +1906,7 @@ BOOL SwCntntFrm::_WouldFit( SwTwips nSpace, // --> FME 2005-03-31 #b6236853# #i46181# SwTwips nSecondCheck = 0; SwTwips nOldSpace = nSpace; - BOOL bOldSplit = bSplit; + sal_Bool bOldSplit = bSplit; // <-- if ( bTstMove || IsInFly() || ( IsInSct() && @@ -1939,7 +1939,7 @@ BOOL SwCntntFrm::_WouldFit( SwTwips nSpace, ) ) { - bTstMove = TRUE; + bTstMove = sal_True; bRet = ((SwTxtFrm*)pFrm)->TestFormat( pTmpPrev, nSpace, bSplit ); } else @@ -2007,7 +2007,7 @@ BOOL SwCntntFrm::_WouldFit( SwTwips nSpace, if ( nSpace < 0 ) { - bRet = FALSE; + bRet = sal_False; // --> FME 2005-03-31 #b6236853# #i46181# if ( nSecondCheck > 0 ) @@ -2024,8 +2024,8 @@ BOOL SwCntntFrm::_WouldFit( SwTwips nSpace, const bool bSecondRet = nOldSpace >= 0 && pFrm->WouldFit( nOldSpace, bOldSplit, sal_False ); if ( bSecondRet && bOldSplit && nOldSpace >= 0 ) { - bRet = TRUE; - bSplit = TRUE; + bRet = sal_True; + bSplit = sal_True; } } // <-- @@ -2039,7 +2039,7 @@ BOOL SwCntntFrm::_WouldFit( SwTwips nSpace, nSpace -= rAttrs.GetULSpace().GetLower(); if ( nSpace < 0 ) { - bRet = FALSE; + bRet = sal_False; } } @@ -2053,11 +2053,11 @@ BOOL SwCntntFrm::_WouldFit( SwTwips nSpace, } // OD 11.04.2003 #108824# - If last follow frame of <this> text // frame isn't valid, a formatting of the next content frame - // doesn't makes sense. Thus, return TRUE. + // doesn't makes sense. Thus, return sal_True. if ( IsAnFollow( pFrm ) && !pFrm->IsValid() ) { ASSERT( false, "Only a warning for task 108824:/n<SwCntntFrm::_WouldFit(..) - follow not valid!" ); - return TRUE; + return sal_True; } } SwFrm *pNxt; @@ -2072,7 +2072,7 @@ BOOL SwCntntFrm::_WouldFit( SwTwips nSpace, if ( bTstMove && ( pNxt->GetDrawObjs() || bObjsInNewUpper ) ) { - return TRUE; + return sal_True; } // <-- diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx index f64752a18708..854012ca9e57 100644 --- a/sw/source/core/layout/colfrm.cxx +++ b/sw/source/core/layout/colfrm.cxx @@ -47,7 +47,7 @@ #include "sectfrm.hxx" // wg. FtnAtEnd-Flag // ftnfrm.cxx: -void lcl_RemoveFtns( SwFtnBossFrm* pBoss, BOOL bPageOnly, BOOL bEndNotes ); +void lcl_RemoveFtns( SwFtnBossFrm* pBoss, sal_Bool bPageOnly, sal_Bool bEndNotes ); /************************************************************************* @@ -89,20 +89,20 @@ SwColumnFrm::~SwColumnFrm() |* |*************************************************************************/ -void MA_FASTCALL lcl_RemoveColumns( SwLayoutFrm *pCont, USHORT nCnt ) +void MA_FASTCALL lcl_RemoveColumns( SwLayoutFrm *pCont, sal_uInt16 nCnt ) { ASSERT( pCont && pCont->Lower() && pCont->Lower()->IsColumnFrm(), "Keine Spalten zu entfernen." ); SwColumnFrm *pColumn = (SwColumnFrm*)pCont->Lower(); - ::lcl_RemoveFtns( pColumn, TRUE, TRUE ); + ::lcl_RemoveFtns( pColumn, sal_True, sal_True ); while ( pColumn->GetNext() ) { ASSERT( pColumn->GetNext()->IsColumnFrm(), "Nachbar von ColFrm kein ColFrm." ); pColumn = (SwColumnFrm*)pColumn->GetNext(); } - for ( USHORT i = 0; i < nCnt; ++i ) + for ( sal_uInt16 i = 0; i < nCnt; ++i ) { SwColumnFrm *pTmp = (SwColumnFrm*)pColumn->GetPrev(); pColumn->Cut(); @@ -111,7 +111,7 @@ void MA_FASTCALL lcl_RemoveColumns( SwLayoutFrm *pCont, USHORT nCnt ) } } -SwLayoutFrm * MA_FASTCALL lcl_FindColumns( SwLayoutFrm *pLay, USHORT nCount ) +SwLayoutFrm * MA_FASTCALL lcl_FindColumns( SwLayoutFrm *pLay, sal_uInt16 nCount ) { SwFrm *pCol = pLay->Lower(); if ( pLay->IsPageFrm() ) @@ -120,7 +120,7 @@ SwLayoutFrm * MA_FASTCALL lcl_FindColumns( SwLayoutFrm *pLay, USHORT nCount ) if ( pCol && pCol->IsColumnFrm() ) { SwFrm *pTmp = pCol; - USHORT i; + sal_uInt16 i; for ( i = 0; pTmp; pTmp = pTmp->GetNext(), ++i ) /* do nothing */; return i == nCount ? (SwLayoutFrm*)pCol : 0; @@ -129,10 +129,10 @@ SwLayoutFrm * MA_FASTCALL lcl_FindColumns( SwLayoutFrm *pLay, USHORT nCount ) } -static BOOL lcl_AddColumns( SwLayoutFrm *pCont, USHORT nCount ) +static sal_Bool lcl_AddColumns( SwLayoutFrm *pCont, sal_uInt16 nCount ) { SwDoc *pDoc = pCont->GetFmt()->GetDoc(); - const BOOL bMod = pDoc->IsModified(); + const sal_Bool bMod = pDoc->IsModified(); //Format sollen soweit moeglich geshared werden. Wenn es also schon einen //Nachbarn mit den selben Spalteneinstellungen gibt, so koennen die @@ -146,7 +146,7 @@ static BOOL lcl_AddColumns( SwLayoutFrm *pCont, USHORT nCount ) SwClientIter aIter( *pAttrOwner->GetFmt() ); SwLayoutFrm *pNeighbour = (SwLayoutFrm*)aIter.First( TYPE(SwLayoutFrm) ); - USHORT nAdd = 0; + sal_uInt16 nAdd = 0; SwFrm *pCol = pCont->Lower(); if ( pCol && pCol->IsColumnFrm() ) for ( nAdd = 1; pCol; pCol = pCol->GetNext(), ++nAdd ) @@ -160,19 +160,19 @@ static BOOL lcl_AddColumns( SwLayoutFrm *pCont, USHORT nCount ) pNeighbour = (SwLayoutFrm*)aIter.Next(); } - BOOL bRet; + sal_Bool bRet; SwTwips nMax = pCont->IsPageBodyFrm() ? pCont->FindPageFrm()->GetMaxFtnHeight() : LONG_MAX; if ( pNeighbourCol ) { - bRet = FALSE; + bRet = sal_False; SwFrm *pTmp = pCont->Lower(); while ( pTmp ) { pTmp = pTmp->GetNext(); pNeighbourCol = (SwLayoutFrm*)pNeighbourCol->GetNext(); } - for ( USHORT i = 0; i < nCount; ++i ) + for ( sal_uInt16 i = 0; i < nCount; ++i ) { SwColumnFrm *pTmpCol = new SwColumnFrm( pNeighbourCol->GetFmt() ); pTmpCol->SetMaxFtnHeight( nMax ); @@ -182,8 +182,8 @@ static BOOL lcl_AddColumns( SwLayoutFrm *pCont, USHORT nCount ) } else { - bRet = TRUE; - for ( USHORT i = 0; i < nCount; ++i ) + bRet = sal_True; + for ( sal_uInt16 i = 0; i < nCount; ++i ) { SwFrmFmt *pFmt = pDoc->MakeFrmFmt( aEmptyStr, pDoc->GetDfltFrmFmt()); SwColumnFrm *pTmp = new SwColumnFrm( pFmt ); @@ -206,7 +206,7 @@ static BOOL lcl_AddColumns( SwLayoutFrm *pCont, USHORT nCount ) * --------------------------------------------------*/ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew, - const BOOL bChgFtn ) + const sal_Bool bChgFtn ) { if ( rOld.GetNumCols() <= 1 && rNew.GetNumCols() <= 1 && !bChgFtn ) return; @@ -219,7 +219,7 @@ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew, } // <-- - USHORT nNewNum, nOldNum = 1; + sal_uInt16 nNewNum, nOldNum = 1; if( Lower() && Lower()->IsColumnFrm() ) { SwFrm* pCol = Lower(); @@ -229,14 +229,14 @@ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew, nNewNum = rNew.GetNumCols(); if( !nNewNum ) ++nNewNum; - BOOL bAtEnd; + sal_Bool bAtEnd; if( IsSctFrm() ) bAtEnd = ((SwSectionFrm*)this)->IsAnyNoteAtEnd(); else - bAtEnd = FALSE; + bAtEnd = sal_False; //Einstellung der Spaltenbreiten ist nur bei neuen Formaten notwendig. - BOOL bAdjustAttributes = nOldNum != rOld.GetNumCols(); + sal_Bool bAdjustAttributes = nOldNum != rOld.GetNumCols(); //Wenn die Spaltenanzahl unterschiedlich ist, wird der Inhalt //gesichert und restored. @@ -248,7 +248,7 @@ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew, // SaveCntnt wuerde auch den Inhalt der Fussnotencontainer aufsaugen // und im normalen Textfluss unterbringen. if( IsPageBodyFrm() ) - pDoc->GetRootFrm()->RemoveFtns( (SwPageFrm*)GetUpper(), TRUE, FALSE ); + pDoc->GetRootFrm()->RemoveFtns( (SwPageFrm*)GetUpper(), sal_True, sal_False ); pSave = ::SaveCntnt( this ); //Wenn Spalten existieren, jetzt aber eine Spaltenanzahl von @@ -276,11 +276,11 @@ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew, if ( nOldNum > nNewNum ) { ::lcl_RemoveColumns( this, nOldNum - nNewNum ); - bAdjustAttributes = TRUE; + bAdjustAttributes = sal_True; } else if( nOldNum < nNewNum ) { - USHORT nAdd = nNewNum - nOldNum; + sal_uInt16 nAdd = nNewNum - nOldNum; bAdjustAttributes = lcl_AddColumns( this, nAdd ); } } @@ -290,14 +290,14 @@ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew, if ( rOld.GetLineWidth() != rNew.GetLineWidth() || rOld.GetWishWidth() != rNew.GetWishWidth() || rOld.IsOrtho() != rNew.IsOrtho() ) - bAdjustAttributes = TRUE; + bAdjustAttributes = sal_True; else { - USHORT nCount = Min( rNew.GetColumns().Count(), rOld.GetColumns().Count() ); - for ( USHORT i = 0; i < nCount; ++i ) + sal_uInt16 nCount = Min( rNew.GetColumns().Count(), rOld.GetColumns().Count() ); + for ( sal_uInt16 i = 0; i < nCount; ++i ) if ( !(*rOld.GetColumns()[i] == *rNew.GetColumns()[i]) ) { - bAdjustAttributes = TRUE; + bAdjustAttributes = sal_True; break; } } @@ -327,7 +327,7 @@ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew, |* |*************************************************************************/ -void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, BOOL bAdjustAttributes ) +void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, sal_Bool bAdjustAttributes ) { if( !Lower()->GetNext() ) { @@ -335,7 +335,7 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, BOOL bAdjustAttributes ) return; } - const BOOL bVert = IsVertical(); + const sal_Bool bVert = IsVertical(); SwRectFn fnRect = bVert ? fnRectVert : fnRectHori; //Ist ein Pointer da, oder sollen wir die Attribute einstellen, @@ -360,26 +360,26 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, BOOL bAdjustAttributes ) //Die Breiten werden mitgezaehlt, damit wir dem letzten den Rest geben //koennen. SwTwips nAvail = (Prt().*fnRect->fnGetWidth)(); - const BOOL bLine = pAttr->GetLineAdj() != COLADJ_NONE; - const USHORT nMin = bLine ? USHORT( 20 + ( pAttr->GetLineWidth() / 2) ) : 0; + const sal_Bool bLine = pAttr->GetLineAdj() != COLADJ_NONE; + const sal_uInt16 nMin = bLine ? sal_uInt16( 20 + ( pAttr->GetLineWidth() / 2) ) : 0; - const BOOL bR2L = IsRightToLeft(); + const sal_Bool bR2L = IsRightToLeft(); SwFrm *pCol = bR2L ? GetLastLower() : Lower(); // --> FME 2004-07-16 #i27399# // bOrtho means we have to adjust the column frames manually. Otherwise // we may use the values returned by CalcColWidth: - const BOOL bOrtho = pAttr->IsOrtho() && pAttr->GetNumCols() > 0; + const sal_Bool bOrtho = pAttr->IsOrtho() && pAttr->GetNumCols() > 0; long nGutter = 0; // <-- - for ( USHORT i = 0; i < pAttr->GetNumCols(); ++i ) + for ( sal_uInt16 i = 0; i < pAttr->GetNumCols(); ++i ) { if( !bOrtho ) { const SwTwips nWidth = i == (pAttr->GetNumCols() - 1) ? nAvail : - pAttr->CalcColWidth( i, USHORT( (Prt().*fnRect->fnGetWidth)() ) ); + pAttr->CalcColWidth( i, sal_uInt16( (Prt().*fnRect->fnGetWidth)() ) ); const Size aColSz = bVert ? Size( Prt().Width(), nWidth ) : @@ -407,8 +407,8 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, BOOL bAdjustAttributes ) //Beruecksichtigung finden. Ueberall wo zwei Spalten aufeinanderstossen //wird jeweils rechts bzw. links ein Sicherheitsabstand von 20 plus //der halben Penbreite einkalkuliert. - const USHORT nLeft = pC->GetLeft(); - const USHORT nRight = pC->GetRight(); + const sal_uInt16 nLeft = pC->GetLeft(); + const sal_uInt16 nRight = pC->GetRight(); aLR.SetLeft ( nLeft ); aLR.SetRight( nRight ); @@ -450,7 +450,7 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, BOOL bAdjustAttributes ) { long nInnerWidth = ( nAvail - nGutter ) / pAttr->GetNumCols(); pCol = Lower(); - for( USHORT i = 0; i < pAttr->GetNumCols(); pCol = pCol->GetNext(), ++i ) + for( sal_uInt16 i = 0; i < pAttr->GetNumCols(); pCol = pCol->GetNext(), ++i ) { SwTwips nWidth; if ( i == pAttr->GetNumCols() - 1 ) diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx index ca2f9f748145..82bce24fc8ee 100644 --- a/sw/source/core/layout/dbg_lay.cxx +++ b/sw/source/core/layout/dbg_lay.cxx @@ -28,6 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" +#ifdef DBG_UTIL + /* -----------------08.01.99 14:55------------------- * Und hier die Beschreibung: * @@ -131,13 +133,13 @@ // OD 2004-05-24 #i28701# #include <sortedobjs.hxx> -ULONG SwProtocol::nRecord = 0; +sal_uLong SwProtocol::nRecord = 0; SwImplProtocol* SwProtocol::pImpl = NULL; -ULONG lcl_GetFrameId( const SwFrm* pFrm ) +sal_uLong lcl_GetFrameId( const SwFrm* pFrm ) { #ifdef DBG_UTIL - static BOOL bFrameId = FALSE; + static sal_Bool bFrameId = sal_False; if( bFrameId ) return pFrm->GetFrmId(); #endif @@ -152,28 +154,28 @@ class SwImplProtocol SvUShortsSort *pFrmIds; // welche FrmIds sollen aufgezeichnet werden ( NULL == alle ) SvLongs *pVar; // Variables ByteString aLayer; // Einrueckung der Ausgabe (" " pro Start/End) - USHORT nTypes; // welche Typen sollen aufgezeichnet werden - USHORT nLineCount; // Ausgegebene Zeilen - USHORT nMaxLines; // Maximal auszugebende Zeilen - BYTE nInitFile; // Bereich (FrmId,FrmType,Record) beim Einlesen der INI-Datei - BYTE nTestMode; // Special fuer Testformatierung, es wird ggf. nur + sal_uInt16 nTypes; // welche Typen sollen aufgezeichnet werden + sal_uInt16 nLineCount; // Ausgegebene Zeilen + sal_uInt16 nMaxLines; // Maximal auszugebende Zeilen + sal_uInt8 nInitFile; // Bereich (FrmId,FrmType,Record) beim Einlesen der INI-Datei + sal_uInt8 nTestMode; // Special fuer Testformatierung, es wird ggf. nur // innerhalb einer Testformatierung aufgezeichnet. - void _Record( const SwFrm* pFrm, ULONG nFunction, ULONG nAct, void* pParam ); - BOOL NewStream(); + void _Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong nAct, void* pParam ); + sal_Bool NewStream(); void CheckLine( ByteString& rLine ); - void SectFunc( ByteString &rOut, const SwFrm* pFrm, ULONG nAct, void* pParam ); + void SectFunc( ByteString &rOut, const SwFrm* pFrm, sal_uLong nAct, void* pParam ); public: SwImplProtocol(); ~SwImplProtocol(); // Aufzeichnen - void Record( const SwFrm* pFrm, ULONG nFunction, ULONG nAct, void* pParam ) + void Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong nAct, void* pParam ) { if( pStream ) _Record( pFrm, nFunction, nAct, pParam ); } - BOOL InsertFrm( USHORT nFrmId ); // FrmId aufnehmen zum Aufzeichnen - BOOL DeleteFrm( USHORT nFrmId ); // FrmId entfernen, diesen nicht mehr Aufzeichnen + sal_Bool InsertFrm( sal_uInt16 nFrmId ); // FrmId aufnehmen zum Aufzeichnen + sal_Bool DeleteFrm( sal_uInt16 nFrmId ); // FrmId entfernen, diesen nicht mehr Aufzeichnen void FileInit(); // Auslesen der INI-Datei void ChkStream() { if( !pStream ) NewStream(); } - void SnapShot( const SwFrm* pFrm, ULONG nFlags ); - void GetVar( const USHORT nNo, long& rVar ) + void SnapShot( const SwFrm* pFrm, sal_uLong nFlags ); + void GetVar( const sal_uInt16 nNo, long& rVar ) { if( pVar && nNo < pVar->Count() ) rVar = (*pVar)[ nNo ]; } }; @@ -196,10 +198,10 @@ class SwImplEnterLeave { protected: const SwFrm* pFrm; // Der Frame, - ULONG nFunction, nAction; // die Funktion, ggf. die Aktion + sal_uLong nFunction, nAction; // die Funktion, ggf. die Aktion void* pParam; // und weitere Parameter public: - SwImplEnterLeave( const SwFrm* pF, ULONG nFunct, ULONG nAct, void* pPar ) + SwImplEnterLeave( const SwFrm* pF, sal_uLong nFunct, sal_uLong nAct, void* pPar ) : pFrm( pF ), nFunction( nFunct ), nAction( nAct ), pParam( pPar ) {} virtual void Enter(); // Ausgabe beim Eintritt virtual void Leave(); // Ausgabe beim Verlassen @@ -209,16 +211,16 @@ class SwSizeEnterLeave : public SwImplEnterLeave { long nFrmHeight; public: - SwSizeEnterLeave( const SwFrm* pF, ULONG nFunct, ULONG nAct, void* pPar ) + SwSizeEnterLeave( const SwFrm* pF, sal_uLong nFunct, sal_uLong nAct, void* pPar ) : SwImplEnterLeave( pF, nFunct, nAct, pPar ), nFrmHeight( pF->Frm().Height() ) {} virtual void Leave(); // Ausgabe der Groessenaenderung }; class SwUpperEnterLeave : public SwImplEnterLeave { - USHORT nFrmId; + sal_uInt16 nFrmId; public: - SwUpperEnterLeave( const SwFrm* pF, ULONG nFunct, ULONG nAct, void* pPar ) + SwUpperEnterLeave( const SwFrm* pF, sal_uLong nFunct, sal_uLong nAct, void* pPar ) : SwImplEnterLeave( pF, nFunct, nAct, pPar ), nFrmId( 0 ) {} virtual void Enter(); // Ausgabe virtual void Leave(); // Ausgabe der FrmId des Uppers @@ -228,17 +230,17 @@ class SwFrmChangesLeave : public SwImplEnterLeave { SwRect aFrm; public: - SwFrmChangesLeave( const SwFrm* pF, ULONG nFunct, ULONG nAct, void* pPar ) + SwFrmChangesLeave( const SwFrm* pF, sal_uLong nFunct, sal_uLong nAct, void* pPar ) : SwImplEnterLeave( pF, nFunct, nAct, pPar ), aFrm( pF->Frm() ) {} virtual void Enter(); // keine Ausgabe virtual void Leave(); // Ausgabe bei Aenderung der Frm-Area }; -void SwProtocol::Record( const SwFrm* pFrm, ULONG nFunction, ULONG nAct, void* pParam ) +void SwProtocol::Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong nAct, void* pParam ) { if( Start() ) { // Hier landen wir, wenn im Debugger SwProtocol::nRecord mit PROT_INIT(0x1) oderiert wurde - BOOL bFinit = FALSE; // Dies bietet im Debugger die Moeglichkeit, + sal_Bool bFinit = sal_False; // Dies bietet im Debugger die Moeglichkeit, if( bFinit ) // die Aufzeichnung dieser Action zu beenden { nRecord &= ~nFunction; // Diese Funktion nicht mehr aufzeichnen @@ -287,13 +289,13 @@ void SwProtocol::Stop() // Creates a more or less detailed snapshot of the layout structur -void SwProtocol::SnapShot( const SwFrm* pFrm, ULONG nFlags ) +void SwProtocol::SnapShot( const SwFrm* pFrm, sal_uLong nFlags ) { if( pImpl ) pImpl->SnapShot( pFrm, nFlags ); } -void SwProtocol::GetVar( const USHORT nNo, long& rVar ) +void SwProtocol::GetVar( const sal_uInt16 nNo, long& rVar ) { if( pImpl ) pImpl->GetVar( nNo, rVar ); @@ -306,7 +308,7 @@ SwImplProtocol::SwImplProtocol() NewStream(); } -BOOL SwImplProtocol::NewStream() +sal_Bool SwImplProtocol::NewStream() { XubString aName( "dbg_lay.out", RTL_TEXTENCODING_MS_1252 ); nLineCount = 0; @@ -380,26 +382,26 @@ void SwImplProtocol::CheckLine( ByteString& rLine ) nInitFile = 0; // Nanu: Unbekannter Bereich? rLine.Erase( 0, aTmp.Len() + 1 ); } - USHORT nToks = rLine.GetTokenCount( ' ' ); // Blanks (oder Tabs) sind die Trenner - for( USHORT i=0; i < nToks; ++i ) + sal_uInt16 nToks = rLine.GetTokenCount( ' ' ); // Blanks (oder Tabs) sind die Trenner + for( sal_uInt16 i=0; i < nToks; ++i ) { ByteString aTok = rLine.GetToken( i, ' ' ); - BOOL bNo = FALSE; + sal_Bool bNo = sal_False; if( '!' == aTok.GetChar(0) ) { - bNo = TRUE; // Diese(n) Funktion/Typ entfernen + bNo = sal_True; // Diese(n) Funktion/Typ entfernen aTok.Erase( 0, 1 ); } if( aTok.Len() ) { - ULONG nVal; + sal_uLong nVal; sscanf( aTok.GetBuffer(), "%li", &nVal ); switch ( nInitFile ) { - case 1: InsertFrm( USHORT( nVal ) ); // FrmId aufnehmen + case 1: InsertFrm( sal_uInt16( nVal ) ); // FrmId aufnehmen break; case 2: { - USHORT nNew = (USHORT)nVal; + sal_uInt16 nNew = (sal_uInt16)nVal; if( bNo ) nTypes &= ~nNew; // Typ entfernen else @@ -407,7 +409,7 @@ void SwImplProtocol::CheckLine( ByteString& rLine ) } break; case 3: { - ULONG nOld = SwProtocol::Record(); + sal_uLong nOld = SwProtocol::Record(); if( bNo ) nOld &= ~nVal; // Funktion entfernen else @@ -416,14 +418,14 @@ void SwImplProtocol::CheckLine( ByteString& rLine ) } break; case 4: { - BYTE nNew = (BYTE)nVal; + sal_uInt8 nNew = (sal_uInt8)nVal; if( bNo ) nTestMode &= ~nNew; // TestMode zuruecksetzen else nTestMode |= nNew; // TestMode setzen } break; - case 5: nMaxLines = (USHORT)nVal; + case 5: nMaxLines = (sal_uInt16)nVal; break; case 6: pVar->Insert( (long)nVal, pVar->Count() ); break; @@ -469,7 +471,7 @@ void SwImplProtocol::FileInit() * lcl_Start sorgt fuer Einrueckung um zwei Blanks bei ACT_START * und nimmt diese bei ACT_END wieder zurueck. * --------------------------------------------------*/ -void lcl_Start( ByteString& rOut, ByteString& rLay, ULONG nAction ) +void lcl_Start( ByteString& rOut, ByteString& rLay, sal_uLong nAction ) { if( nAction == ACT_START ) { @@ -558,12 +560,12 @@ void lcl_FrameType( ByteString& rOut, const SwFrm* pFrm ) * ob die FrmId und der FrameType zu den aufzuzeichnenden gehoeren. * --------------------------------------------------*/ -void SwImplProtocol::_Record( const SwFrm* pFrm, ULONG nFunction, ULONG nAct, void* pParam ) +void SwImplProtocol::_Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong nAct, void* pParam ) { - USHORT nSpecial = 0; + sal_uInt16 nSpecial = 0; if( nSpecial ) // Debugger-Manipulationsmoeglichkeit { - USHORT nId = USHORT(lcl_GetFrameId( pFrm )); + sal_uInt16 nId = sal_uInt16(lcl_GetFrameId( pFrm )); switch ( nSpecial ) { case 1: InsertFrm( nId ); break; @@ -576,7 +578,7 @@ void SwImplProtocol::_Record( const SwFrm* pFrm, ULONG nFunction, ULONG nAct, vo if( !pStream && !NewStream() ) return; // Immer noch kein Stream - if( pFrmIds && !pFrmIds->Seek_Entry( USHORT(lcl_GetFrameId( pFrm )) ) ) + if( pFrmIds && !pFrmIds->Seek_Entry( sal_uInt16(lcl_GetFrameId( pFrm )) ) ) return; // gehoert nicht zu den gewuenschten FrmIds if( !(pFrm->GetType() & nTypes) ) @@ -584,7 +586,7 @@ void SwImplProtocol::_Record( const SwFrm* pFrm, ULONG nFunction, ULONG nAct, vo if( 1 == nTestMode && nFunction != PROT_TESTFORMAT ) return; // Wir sollen nur innerhalb einer Testformatierung aufzeichnen - BOOL bTmp = FALSE; + sal_Bool bTmp = sal_False; ByteString aOut = aLayer; aOut += ByteString::CreateFromInt64( lcl_GetFrameId( pFrm ) ); aOut += ' '; @@ -598,13 +600,13 @@ void SwImplProtocol::_Record( const SwFrm* pFrm, ULONG nFunction, ULONG nAct, vo if( nAct == ACT_START ) lcl_Flags( aOut, pFrm ); break; - case PROT_MOVE_FWD: bTmp = TRUE; // NoBreak + case PROT_MOVE_FWD: bTmp = sal_True; // NoBreak case PROT_MOVE_BWD: aOut += ( nFunction == bTmp ) ? "Fwd" : "Bwd"; lcl_Start( aOut, aLayer, nAct ); if( pParam ) { aOut += ' '; - aOut += ByteString::CreateFromInt32( *((USHORT*)pParam) ); + aOut += ByteString::CreateFromInt32( *((sal_uInt16*)pParam) ); } break; case PROT_GROW_TST: if( ACT_START != nAct ) @@ -616,7 +618,7 @@ void SwImplProtocol::_Record( const SwFrm* pFrm, ULONG nFunction, ULONG nAct, vo aOut += "TestShrink"; break; case PROT_ADJUSTN : - case PROT_SHRINK: bTmp = TRUE; // NoBreak + case PROT_SHRINK: bTmp = sal_True; // NoBreak case PROT_GROW: aOut += !bTmp ? "Grow" : ( nFunction == PROT_SHRINK ? "Shrink" : "AdjustNgbhd" ); lcl_Start( aOut, aLayer, nAct ); @@ -649,7 +651,7 @@ void SwImplProtocol::_Record( const SwFrm* pFrm, ULONG nFunction, ULONG nAct, vo break; case PROT_SECTION: SectFunc( aOut, pFrm, nAct, pParam ); break; - case PROT_CUT: bTmp = TRUE; // NoBreak + case PROT_CUT: bTmp = sal_True; // NoBreak case PROT_PASTE: aOut += bTmp ? "Cut from " : "Paste to "; aOut += ByteString::CreateFromInt64( lcl_GetFrameId( (SwFrm*)pParam ) ); break; @@ -705,20 +707,20 @@ void SwImplProtocol::_Record( const SwFrm* pFrm, ULONG nFunction, ULONG nAct, vo * hier werden die Ausgaben rund um SectionFrms abgehandelt. * --------------------------------------------------*/ -void SwImplProtocol::SectFunc( ByteString &rOut, const SwFrm* , ULONG nAct, void* pParam ) +void SwImplProtocol::SectFunc( ByteString &rOut, const SwFrm* , sal_uLong nAct, void* pParam ) { - BOOL bTmp = FALSE; + sal_Bool bTmp = sal_False; switch( nAct ) { case ACT_MERGE: rOut += "Merge Section "; rOut += ByteString::CreateFromInt64( lcl_GetFrameId( (SwFrm*)pParam ) ); break; - case ACT_CREATE_MASTER: bTmp = TRUE; // NoBreak + case ACT_CREATE_MASTER: bTmp = sal_True; // NoBreak case ACT_CREATE_FOLLOW: rOut += "Create Section "; rOut += bTmp ? "Master to " : "Follow from "; rOut += ByteString::CreateFromInt64( lcl_GetFrameId( (SwFrm*)pParam ) ); break; - case ACT_DEL_MASTER: bTmp = TRUE; // NoBreak + case ACT_DEL_MASTER: bTmp = sal_True; // NoBreak case ACT_DEL_FOLLOW: rOut += "Delete Section "; rOut += bTmp ? "Master to " : "Follow from "; rOut += ByteString::CreateFromInt64( lcl_GetFrameId( (SwFrm*)pParam ) ); @@ -732,34 +734,34 @@ void SwImplProtocol::SectFunc( ByteString &rOut, const SwFrm* , ULONG nAct, void * pFrmIds angelegt wird, werden nur noch die enthaltenen FrmIds aufgezeichnet. * --------------------------------------------------*/ -BOOL SwImplProtocol::InsertFrm( USHORT nId ) +sal_Bool SwImplProtocol::InsertFrm( sal_uInt16 nId ) { if( !pFrmIds ) pFrmIds = new SvUShortsSort(5,5); if( pFrmIds->Seek_Entry( nId ) ) - return FALSE; + return sal_False; pFrmIds->Insert( nId ); - return TRUE; + return sal_True; } /* -----------------11.01.99 11:52------------------- * SwImplProtocol::DeleteFrm(..) entfernt eine FrmId aus dem pFrmIds-Array, * so dass diese Frame nicht mehr aufgezeichnet wird. * --------------------------------------------------*/ -BOOL SwImplProtocol::DeleteFrm( USHORT nId ) +sal_Bool SwImplProtocol::DeleteFrm( sal_uInt16 nId ) { - USHORT nPos; + sal_uInt16 nPos; if( !pFrmIds || !pFrmIds->Seek_Entry( nId, &nPos ) ) - return FALSE; + return sal_False; pFrmIds->Remove( nPos ); - return TRUE; + return sal_True; } /*-----------------20.9.2001 10:29------------------ * SwProtocol::SnapShot(..) * creates a snapshot of the given frame and its content. * --------------------------------------------------*/ -void SwImplProtocol::SnapShot( const SwFrm* pFrm, ULONG nFlags ) +void SwImplProtocol::SnapShot( const SwFrm* pFrm, sal_uLong nFlags ) { while( pFrm ) { @@ -768,7 +770,7 @@ void SwImplProtocol::SnapShot( const SwFrm* pFrm, ULONG nFlags ) { aLayer += "[ "; const SwSortedObjs &rObjs = *pFrm->GetDrawObjs(); - for ( USHORT i = 0; i < rObjs.Count(); ++i ) + for ( sal_uInt16 i = 0; i < rObjs.Count(); ++i ) { SwAnchoredObject* pObj = rObjs[i]; if ( pObj->ISA(SwFlyFrm) ) @@ -795,7 +797,7 @@ void SwImplProtocol::SnapShot( const SwFrm* pFrm, ULONG nFlags ) * Die Aufgabe ist es abhaengig von der Funktion das richtige SwImplEnterLeave-Objekt * zu erzeugen, alles weitere geschieht dann in dessen Ctor/Dtor. * --------------------------------------------------*/ -void SwEnterLeave::Ctor( const SwFrm* pFrm, ULONG nFunc, ULONG nAct, void* pPar ) +void SwEnterLeave::Ctor( const SwFrm* pFrm, sal_uLong nFunc, sal_uLong nAct, void* pPar ) { switch( nFunc ) { @@ -843,13 +845,13 @@ void SwSizeEnterLeave::Leave() void SwUpperEnterLeave::Enter() { - nFrmId = pFrm->GetUpper() ? USHORT(lcl_GetFrameId( pFrm->GetUpper() )) : 0; + nFrmId = pFrm->GetUpper() ? sal_uInt16(lcl_GetFrameId( pFrm->GetUpper() )) : 0; SwProtocol::Record( pFrm, nFunction, ACT_START, &nFrmId ); } void SwUpperEnterLeave::Leave() { - nFrmId = pFrm->GetUpper() ? USHORT(lcl_GetFrameId( pFrm->GetUpper() )) : 0; + nFrmId = pFrm->GetUpper() ? sal_uInt16(lcl_GetFrameId( pFrm->GetUpper() )) : 0; SwProtocol::Record( pFrm, nFunction, ACT_END, &nFrmId ); } @@ -863,4 +865,5 @@ void SwFrmChangesLeave::Leave() SwProtocol::Record( pFrm, PROT_FRMCHANGES, 0, &aFrm ); } +#endif // DBG_UTIL diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index e52fc31fb0b5..dfdc9dc04c53 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -238,19 +238,19 @@ SwFrm* SwFrm::GetLower() |* Letzte Aenderung MA 18. Mar. 93 |* |*************************************************************************/ -BOOL SwLayoutFrm::IsAnLower( const SwFrm *pAssumed ) const +sal_Bool SwLayoutFrm::IsAnLower( const SwFrm *pAssumed ) const { const SwFrm *pUp = pAssumed; while ( pUp ) { if ( pUp == this ) - return TRUE; + return sal_True; if ( pUp->IsFlyFrm() ) pUp = ((SwFlyFrm*)pUp)->GetAnchorFrm(); else pUp = pUp->GetUpper(); } - return FALSE; + return sal_False; } /** method to check relative position of layout frame to @@ -422,10 +422,10 @@ const SwCntntFrm* SwCntntFrm::ImplGetNextCntntFrm( bool bFwd ) const const SwFrm *pFrm = this; // #100926# SwCntntFrm *pCntntFrm = 0; - BOOL bGoingUp = FALSE; + sal_Bool bGoingUp = sal_False; do { const SwFrm *p = 0; - BOOL bGoingFwdOrBwd = FALSE, bGoingDown = FALSE; + sal_Bool bGoingFwdOrBwd = sal_False, bGoingDown = sal_False; bGoingDown = ( !bGoingUp && ( 0 != ( p = lcl_GetLower( pFrm, true ) ) ) ); if ( !bGoingDown ) @@ -505,7 +505,7 @@ SwPageFrm* SwFrm::FindPageFrm() return (SwPageFrm*)pRet; } -SwFtnBossFrm* SwFrm::FindFtnBossFrm( BOOL bFootnotes ) +SwFtnBossFrm* SwFrm::FindFtnBossFrm( sal_Bool bFootnotes ) { SwFrm *pRet = this; // Innerhalb einer Tabelle gibt es keine Fussnotenbosse, auch spaltige @@ -533,7 +533,7 @@ SwFtnBossFrm* SwFrm::FindFtnBossFrm( BOOL bFootnotes ) SwSectionFrm* pSct = pRet->FindSctFrm(); ASSERT( pSct, "FindFtnBossFrm: Single column outside section?" ); if( !pSct->IsFtnAtEnd() ) - return pSct->FindFtnBossFrm( TRUE ); + return pSct->FindFtnBossFrm( sal_True ); } return (SwFtnBossFrm*)pRet; } @@ -644,7 +644,7 @@ const SwPageFrm* SwRootFrm::GetPageAtPos( const Point& rPt, const Size* pSize, b } ASSERT( GetPageNum() <= maPageRects.size(), "number of pages differes from page rect array size" ) - USHORT nPageIdx = 0; + sal_uInt16 nPageIdx = 0; while ( pPage && !pRet ) { @@ -706,12 +706,12 @@ const SwAttrSet* SwFrm::GetAttrSet() const SwFrm* lcl_NextFrm( SwFrm* pFrm ) { SwFrm *pRet = 0; - BOOL bGoingUp = FALSE; + sal_Bool bGoingUp = sal_False; do { SwFrm *p = 0; - BOOL bGoingFwd = FALSE; - BOOL bGoingDown = (!bGoingUp && ( 0 != (p = pFrm->IsLayoutFrm() ? ((SwLayoutFrm*)pFrm)->Lower() : 0))); + sal_Bool bGoingFwd = sal_False; + sal_Bool bGoingDown = (!bGoingUp && ( 0 != (p = pFrm->IsLayoutFrm() ? ((SwLayoutFrm*)pFrm)->Lower() : 0))); if( !bGoingDown ) { @@ -734,7 +734,7 @@ SwFrm* lcl_NextFrm( SwFrm* pFrm ) SwFrm *SwFrm::_FindNext() { - BOOL bIgnoreTab = FALSE; + sal_Bool bIgnoreTab = sal_False; SwFrm *pThis = this; if ( IsTabFrm() ) @@ -748,7 +748,7 @@ SwFrm *SwFrm::_FindNext() pThis = ((SwTabFrm*)this)->FindLastCntnt(); if ( !pThis ) pThis = this; - bIgnoreTab = TRUE; + bIgnoreTab = sal_True; } else if ( IsSctFrm() ) { @@ -777,7 +777,7 @@ SwFrm *SwFrm::_FindNext() return NULL; SwFrm* pRet = NULL; - const BOOL bFtn = pThis->IsInFtn(); + const sal_Bool bFtn = pThis->IsInFtn(); if ( !bIgnoreTab && pThis->IsInTab() ) { SwLayoutFrm *pUp = pThis->GetUpper(); @@ -798,7 +798,7 @@ SwFrm *SwFrm::_FindNext() } else { - const BOOL bBody = pThis->IsInDocBody(); + const sal_Bool bBody = pThis->IsInDocBody(); SwFrm *pNxtCnt = lcl_NextFrm( pThis ); if ( pNxtCnt ) { @@ -897,8 +897,8 @@ SwCntntFrm *SwFrm::_FindNextCnt( const bool _bInSameFtn ) if ( pThis->IsCntntFrm() ) { - const BOOL bBody = pThis->IsInDocBody(); - const BOOL bFtn = pThis->IsInFtn(); + const sal_Bool bBody = pThis->IsInDocBody(); + const sal_Bool bFtn = pThis->IsInFtn(); SwCntntFrm *pNxtCnt = ((SwCntntFrm*)pThis)->GetNextCntntFrm(); if ( pNxtCnt ) { @@ -1122,7 +1122,7 @@ SwCntntFrm* SwFrm::_FindPrevCnt( const bool _bInSameFtn ) SwFrm *SwFrm::_FindPrev() { - BOOL bIgnoreTab = FALSE; + sal_Bool bIgnoreTab = sal_False; SwFrm *pThis = this; if ( IsTabFrm() ) @@ -1134,7 +1134,7 @@ SwFrm *SwFrm::_FindPrev() return ((SwTabFrm*)this)->FindMaster(); else pThis = ((SwTabFrm*)this)->ContainsCntnt(); - bIgnoreTab = TRUE; + bIgnoreTab = sal_True; } if ( pThis && pThis->IsCntntFrm() ) @@ -1154,8 +1154,8 @@ SwFrm *SwFrm::_FindPrev() else { SwFrm* pRet; - const BOOL bBody = pThis->IsInDocBody(); - const BOOL bFtn = bBody ? FALSE : pThis->IsInFtn(); + const sal_Bool bBody = pThis->IsInDocBody(); + const sal_Bool bFtn = bBody ? sal_False : pThis->IsInFtn(); if ( bBody || bFtn ) { while ( pPrvCnt ) @@ -1197,7 +1197,7 @@ SwFrm *SwFrm::_FindPrev() return 0; } -void SwFrm::ImplInvalidateNextPos( BOOL bNoFtn ) +void SwFrm::ImplInvalidateNextPos( sal_Bool bNoFtn ) { SwFrm *pFrm; if ( 0 != (pFrm = _FindNext()) ) @@ -1295,25 +1295,25 @@ void SwFrm::InvalidateNextPrtArea() /************************************************************************* |* |* lcl_IsInColSect() -|* liefert nur TRUE, wenn der Frame _direkt_ in einem spaltigen Bereich steht, +|* liefert nur sal_True, wenn der Frame _direkt_ in einem spaltigen Bereich steht, |* nicht etwa, wenn er in einer Tabelle steht, die in einem spaltigen Bereich ist. |* |*************************************************************************/ -BOOL lcl_IsInColSct( const SwFrm *pUp ) +sal_Bool lcl_IsInColSct( const SwFrm *pUp ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; while( pUp ) { if( pUp->IsColumnFrm() ) - bRet = TRUE; + bRet = sal_True; else if( pUp->IsSctFrm() ) return bRet; else if( pUp->IsTabFrm() ) - return FALSE; + return sal_False; pUp = pUp->GetUpper(); } - return FALSE; + return sal_False; } /************************************************************************* @@ -1327,7 +1327,7 @@ BOOL lcl_IsInColSct( const SwFrm *pUp ) /** determine, if frame is moveable in given environment OD 08.08.2003 #110978# - method replaced 'old' method <BOOL IsMoveable() const>. + method replaced 'old' method <sal_Bool IsMoveable() const>. Determines, if frame is moveable in given environment. if no environment is given (parameter _pLayoutFrm == 0L), the movability in the actual environment (<this->GetUpper()) is checked. @@ -1410,26 +1410,26 @@ void SwFrm::SetInfFlags() if ( !IsFlyFrm() && !GetUpper() ) //noch nicht gepastet, keine Informationen return; //lieferbar - bInfInvalid = bInfBody = bInfTab = bInfFly = bInfFtn = bInfSct = FALSE; + bInfInvalid = bInfBody = bInfTab = bInfFly = bInfFtn = bInfSct = sal_False; SwFrm *pFrm = this; if( IsFtnContFrm() ) - bInfFtn = TRUE; + bInfFtn = sal_True; do { // bInfBody wird nur am Seitenbody, nicht im ColumnBody gesetzt if ( pFrm->IsBodyFrm() && !bInfFtn && pFrm->GetUpper() && pFrm->GetUpper()->IsPageFrm() ) - bInfBody = TRUE; + bInfBody = sal_True; else if ( pFrm->IsTabFrm() || pFrm->IsCellFrm() ) { - bInfTab = TRUE; + bInfTab = sal_True; } else if ( pFrm->IsFlyFrm() ) - bInfFly = TRUE; + bInfFly = sal_True; else if ( pFrm->IsSctFrm() ) - bInfSct = TRUE; + bInfSct = sal_True; else if ( pFrm->IsFtnFrm() ) - bInfFtn = TRUE; + bInfFtn = sal_True; pFrm = pFrm->GetUpper(); @@ -1437,13 +1437,13 @@ void SwFrm::SetInfFlags() } /*-----------------22.8.2001 14:30------------------ - * SwFrm::SetDirFlags( BOOL ) + * SwFrm::SetDirFlags( sal_Bool ) * actualizes the vertical or the righttoleft-flags. * If the property is derived, it's from the upper or (for fly frames) from * the anchor. Otherwise we've to call a virtual method to check the property. * --------------------------------------------------*/ -void SwFrm::SetDirFlags( BOOL bVert ) +void SwFrm::SetDirFlags( sal_Bool bVert ) { if( bVert ) { @@ -1461,7 +1461,7 @@ void SwFrm::SetDirFlags( BOOL bVert ) bVertical = pAsk->IsVertical() ? 1 : 0; bReverse = pAsk->IsReverse() ? 1 : 0; if ( !pAsk->bInvalidVert ) - bInvalidVert = FALSE; + bInvalidVert = sal_False; } } else @@ -1469,7 +1469,7 @@ void SwFrm::SetDirFlags( BOOL bVert ) } else { - BOOL bInv = 0; + sal_Bool bInv = 0; if( !bDerivedR2L ) // CheckDirection is able to set bDerivedR2L! CheckDirection( bVert ); if( bDerivedR2L ) @@ -1664,7 +1664,7 @@ const SwCellFrm& SwCellFrm::FindStartEndOfRowSpanCell( bool bStart, bool bCurren { const SwTable* pTable = pTableFrm->GetTable(); - USHORT nMax = USHRT_MAX; + sal_uInt16 nMax = USHRT_MAX; if ( bCurrentTableOnly ) { const SwFrm* pCurrentRow = GetUpper(); diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index d0015b12114d..f5edaf5bbab4 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -71,7 +71,7 @@ #include <fmtfollowtextflow.hxx> // <-- -BOOL SwFlowFrm::bMoveBwdJump = FALSE; +sal_Bool SwFlowFrm::bMoveBwdJump = sal_False; /************************************************************************* @@ -89,14 +89,14 @@ SwFlowFrm::SwFlowFrm( SwFrm &rFrm ) : pFollow( 0 ) { bLockJoin = bIsFollow = bCntntLock = bOwnFtnNum = - bFtnLock = bFlyLock = FALSE; + bFtnLock = bFlyLock = sal_False; } /************************************************************************* |* |* SwFlowFrm::IsFollowLocked() -|* return TRUE if any follow has the JoinLocked flag +|* return sal_True if any follow has the JoinLocked flag |* |*************************************************************************/ @@ -122,24 +122,24 @@ sal_Bool SwFlowFrm::HasLockedFollow() const |*************************************************************************/ -BOOL SwFlowFrm::IsKeepFwdMoveAllowed() +sal_Bool SwFlowFrm::IsKeepFwdMoveAllowed() { //Wenn der Vorgaenger das KeepAttribut traegt und auch dessen //Vorgaenger usw. bis zum ersten der Kette und fuer diesen das - //IsFwdMoveAllowed ein FALSE liefert, so ist das Moven eben nicht erlaubt. + //IsFwdMoveAllowed ein sal_False liefert, so ist das Moven eben nicht erlaubt. SwFrm *pFrm = &rThis; if ( !pFrm->IsInFtn() ) do { if ( pFrm->GetAttrSet()->GetKeep().GetValue() ) pFrm = pFrm->GetIndPrev(); else - return TRUE; + return sal_True; } while ( pFrm ); //Siehe IsFwdMoveAllowed() - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if ( pFrm && pFrm->GetIndPrev() ) - bRet = TRUE; + bRet = sal_True; return bRet; } @@ -168,8 +168,8 @@ void SwFlowFrm::CheckKeep() return; } SwFrm* pTmp; - BOOL bKeep; - while ( TRUE == (bKeep = pPre->GetAttrSet()->GetKeep().GetValue()) && + sal_Bool bKeep; + while ( sal_True == (bKeep = pPre->GetAttrSet()->GetKeep().GetValue()) && 0 != ( pTmp = pPre->GetIndPrev() ) ) { if( pTmp->IsSctFrm() ) @@ -195,7 +195,7 @@ void SwFlowFrm::CheckKeep() |* |*************************************************************************/ -BOOL SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldKeep ) const +sal_Bool SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldKeep ) const { // 1. The keep attribute is ignored inside footnotes // 2. For compatibility reasons, the keep attribute is @@ -203,7 +203,7 @@ BOOL SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldKeep // 3. If bBreakCheck is set to true, this function only checks // if there are any break after attributes set at rAttrs // or break before attributes set for the next content (or next table) - BOOL bKeep = bCheckIfLastRowShouldKeep || + sal_Bool bKeep = bCheckIfLastRowShouldKeep || ( !rThis.IsInFtn() && ( !rThis.IsInTab() || rThis.IsTabFrm() ) && rAttrs.GetKeep().GetValue() ); @@ -221,7 +221,7 @@ BOOL SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldKeep case SVX_BREAK_PAGE_AFTER: case SVX_BREAK_PAGE_BOTH: { - bKeep = FALSE; + bKeep = sal_False; } default: break; } @@ -248,7 +248,7 @@ BOOL SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldKeep pNextSection = pNextSectionFrm->GetSection(); if ( pThisSection != pNextSection ) - bKeep = FALSE; + bKeep = sal_False; } // <-- @@ -269,14 +269,14 @@ BOOL SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldKeep ASSERT( pSet, "No AttrSet to check keep attribute" ) if ( pSet->GetPageDesc().GetPageDesc() ) - bKeep = FALSE; + bKeep = sal_False; else switch ( pSet->GetBreak().GetBreak() ) { case SVX_BREAK_COLUMN_BEFORE: case SVX_BREAK_COLUMN_BOTH: case SVX_BREAK_PAGE_BEFORE: case SVX_BREAK_PAGE_BOTH: - bKeep = FALSE; + bKeep = sal_False; default: break; } } @@ -296,7 +296,7 @@ BOOL SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldKeep |*************************************************************************/ -BYTE SwFlowFrm::BwdMoveNecessary( const SwPageFrm *pPage, const SwRect &rRect ) +sal_uInt8 SwFlowFrm::BwdMoveNecessary( const SwPageFrm *pPage, const SwRect &rRect ) { // Der return-Wert entscheidet mit, // ob auf Zurueckgeflossen werden muss, (3) @@ -316,7 +316,7 @@ BYTE SwFlowFrm::BwdMoveNecessary( const SwPageFrm *pPage, const SwRect &rRect ) //#32639# Wenn das Objekt bei mir verankert ist kann ich es //vernachlaessigen, weil es hoechstwahrscheinlich (!?) mitfliesst, //eine TestFormatierung ist dann allerdings nicht erlaubt! - BYTE nRet = 0; + sal_uInt8 nRet = 0; SwFlowFrm *pTmp = this; do { // Wenn an uns oder einem Follow Objekte haengen, so @@ -331,8 +331,8 @@ BYTE SwFlowFrm::BwdMoveNecessary( const SwPageFrm *pPage, const SwRect &rRect ) { // --> OD 2004-07-01 #i28701# - new type <SwSortedObjs> const SwSortedObjs &rObjs = *pPage->GetSortedObjs(); - ULONG nIndex = ULONG_MAX; - for ( USHORT i = 0; nRet < 3 && i < rObjs.Count(); ++i ) + sal_uLong nIndex = ULONG_MAX; + for ( sal_uInt16 i = 0; nRet < 3 && i < rObjs.Count(); ++i ) { // --> OD 2004-07-01 #i28701# - consider changed type of // <SwSortedObjs> entries. @@ -366,7 +366,7 @@ BYTE SwFlowFrm::BwdMoveNecessary( const SwPageFrm *pPage, const SwRect &rRect ) if ( rFmt.GetAnchor().GetAnchorId() == FLY_AT_PARA ) { // Den Index des anderen erhalten wir immer ueber das Ankerattr. - ULONG nTmpIndex = rFmt.GetAnchor().GetCntntAnchor()->nNode.GetIndex(); + sal_uLong nTmpIndex = rFmt.GetAnchor().GetCntntAnchor()->nNode.GetIndex(); // Jetzt wird noch ueberprueft, ob der aktuelle Absatz vor dem // Anker des verdraengenden Objekts im Text steht, dann wird // nicht ausgewichen. @@ -456,7 +456,7 @@ SwLayoutFrm *SwFlowFrm::CutTree( SwFrm *pStart ) } else { - BOOL bUnlock = !((SwFtnFrm*)pLay)->IsBackMoveLocked(); + sal_Bool bUnlock = !((SwFtnFrm*)pLay)->IsBackMoveLocked(); ((SwFtnFrm*)pLay)->LockBackMove(); pLay->InvalidateSize(); pLay->Calc(); @@ -483,11 +483,11 @@ SwLayoutFrm *SwFlowFrm::CutTree( SwFrm *pStart ) -BOOL SwFlowFrm::PasteTree( SwFrm *pStart, SwLayoutFrm *pParent, SwFrm *pSibling, +sal_Bool SwFlowFrm::PasteTree( SwFrm *pStart, SwLayoutFrm *pParent, SwFrm *pSibling, SwFrm *pOldParent ) { - //returnt TRUE wenn in der Kette ein LayoutFrm steht. - BOOL bRet = FALSE; + //returnt sal_True wenn in der Kette ein LayoutFrm steht. + sal_Bool bRet = sal_False; //Die mit pStart beginnende Kette wird vor den Sibling unter den Parent //gehaengt. Fuer geeignete Invalidierung wird ebenfalls gesorgt. @@ -560,7 +560,7 @@ BOOL SwFlowFrm::PasteTree( SwFrm *pStart, SwLayoutFrm *pParent, SwFrm *pSibling, ((SwTxtFrm*)pFloat)->Init(); //Ich bin sein Freund. } else - bRet = TRUE; + bRet = sal_True; nGrowVal += (pFloat->Frm().*fnRect->fnGetHeight)(); if ( pFloat->GetNext() ) @@ -606,7 +606,7 @@ void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling ) //Sparsamer benachrichtigen wenn eine Action laeuft. ViewShell *pSh = rThis.GetShell(); const SwViewImp *pImp = pSh ? pSh->Imp() : 0; - const BOOL bComplete = pImp && pImp->IsAction() && pImp->GetLayAction().IsComplete(); + const sal_Bool bComplete = pImp && pImp->IsAction() && pImp->GetLayAction().IsComplete(); if ( !bComplete ) { @@ -632,7 +632,7 @@ void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling ) SwPageFrm *pOldPage = rThis.FindPageFrm(); SwLayoutFrm *pOldParent = CutTree( &rThis ); - const BOOL bInvaLay = PasteTree( &rThis, pParent, pSibling, pOldParent ); + const sal_Bool bInvaLay = PasteTree( &rThis, pParent, pSibling, pOldParent ); // Wenn durch das Cut&Paste ein leerer SectionFrm entstanden ist, sollte // dieser automatisch verschwinden. @@ -645,7 +645,7 @@ void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling ) !pSct->ContainsAny( true ) ) ) // <-- { - pSct->DelEmpty( FALSE ); + pSct->DelEmpty( sal_False ); } // In einem spaltigen Bereich rufen wir lieber kein Calc "von unten" @@ -655,11 +655,11 @@ void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling ) else if( rThis.GetUpper()->IsSctFrm() ) { SwSectionFrm* pTmpSct = (SwSectionFrm*)rThis.GetUpper(); - BOOL bOld = pTmpSct->IsCntntLocked(); - pTmpSct->SetCntntLock( TRUE ); + sal_Bool bOld = pTmpSct->IsCntntLocked(); + pTmpSct->SetCntntLock( sal_True ); pTmpSct->Calc(); if( !bOld ) - pTmpSct->SetCntntLock( FALSE ); + pTmpSct->SetCntntLock( sal_False ); } SwPageFrm *pPage = rThis.FindPageFrm(); @@ -692,15 +692,15 @@ void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling ) |*************************************************************************/ -BOOL SwFlowFrm::IsAnFollow( const SwFlowFrm *pAssumed ) const +sal_Bool SwFlowFrm::IsAnFollow( const SwFlowFrm *pAssumed ) const { const SwFlowFrm *pFoll = this; do { if ( pAssumed == pFoll ) - return TRUE; + return sal_True; pFoll = pFoll->GetFollow(); } while ( pFoll ); - return FALSE; + return sal_False; } @@ -729,7 +729,7 @@ SwTxtFrm* SwCntntFrm::FindMaster() const pCnt = pCnt->GetPrevCntntFrm(); } - ASSERT( FALSE, "Follow ist lost in Space." ); + ASSERT( sal_False, "Follow ist lost in Space." ); return 0; } @@ -753,7 +753,7 @@ SwSectionFrm* SwSectionFrm::FindMaster() const pLast = aIter++; } - ASSERT( FALSE, "Follow ist lost in Space." ); + ASSERT( sal_False, "Follow ist lost in Space." ); return 0; } @@ -799,7 +799,7 @@ SwTabFrm* SwTabFrm::FindMaster( bool bFirstMaster ) const pLast = aIter++; } - ASSERT( FALSE, "Follow ist lost in Space." ); + ASSERT( sal_False, "Follow ist lost in Space." ); return 0; } @@ -817,7 +817,7 @@ SwTabFrm* SwTabFrm::FindMaster( bool bFirstMaster ) const |*************************************************************************/ -const SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, BOOL bFwd, +const SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, sal_Bool bFwd, const SwFrm *pAnch ) const { //Ohne Fluss kein genuss... @@ -825,7 +825,7 @@ const SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, BOOL bFwd, return 0; const SwFrm *pLeaf = this; - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; do { pLeaf = ((SwFrm*)pLeaf)->GetLeaf( eMakePage, bFwd ); @@ -836,7 +836,7 @@ const SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, BOOL bFwd, if ( pAnch->IsInDocBody() == pLeaf->IsInDocBody() && pAnch->IsInFtn() == pLeaf->IsInFtn() ) { - bFound = TRUE; + bFound = sal_True; } } } while ( !bFound && pLeaf ); @@ -856,7 +856,7 @@ const SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, BOOL bFwd, |*************************************************************************/ -SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, BOOL bFwd ) +SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, sal_Bool bFwd ) { if ( IsInFtn() ) return bFwd ? GetNextFtnLeaf( eMakePage ) : GetPrevFtnLeaf( eMakePage ); @@ -900,7 +900,7 @@ SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, BOOL bFwd ) -BOOL SwFrm::WrongPageDesc( SwPageFrm* pNew ) +sal_Bool SwFrm::WrongPageDesc( SwPageFrm* pNew ) { //Jetzt wirds leider etwas kompliziert: //Ich bringe ich evtl. selbst @@ -930,7 +930,7 @@ BOOL SwFrm::WrongPageDesc( SwPageFrm* pNew ) //Mein Pagedesc zaehlt nicht, wenn ich ein Follow bin! SwPageDesc *pDesc = 0; - USHORT nTmp = 0; + sal_uInt16 nTmp = 0; SwFlowFrm *pFlow = SwFlowFrm::CastFlowFrm( this ); if ( !pFlow || !pFlow->IsFollow() ) { @@ -949,7 +949,7 @@ BOOL SwFrm::WrongPageDesc( SwPageFrm* pNew ) //Bringt der Cntnt einen Pagedesc mit oder muss zaehlt die //virtuelle Seitennummer des neuen Layoutleafs? // Bei Follows zaehlt der PageDesc nicht - const BOOL bOdd = nTmp ? ( nTmp % 2 ? TRUE : FALSE ) + const sal_Bool bOdd = nTmp ? ( nTmp % 2 ? sal_True : sal_False ) : pNew->OnRightPage(); if ( !pDesc ) pDesc = pNew->FindPageDesc(); @@ -985,7 +985,7 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage ) ASSERT( !IsInFtn(), "GetNextLeaf(), don't call me for Ftn." ); ASSERT( !IsInSct(), "GetNextLeaf(), don't call me for Sections." ); - const BOOL bBody = IsInDocBody(); //Wenn ich aus dem DocBody komme + const sal_Bool bBody = IsInDocBody(); //Wenn ich aus dem DocBody komme //Will ich auch im Body landen. // Bei Flys macht es keinen Sinn, Seiten einzufuegen, wir wollen lediglich @@ -1009,9 +1009,9 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage ) SwLayoutFrm *pOldLayLeaf = 0; //Damit bei neu erzeugten Seiten //nicht wieder vom Anfang gesucht //wird. - BOOL bNewPg = FALSE; //nur einmal eine neue Seite einfuegen. + sal_Bool bNewPg = sal_False; //nur einmal eine neue Seite einfuegen. - while ( TRUE ) + while ( sal_True ) { if ( pLayLeaf ) { @@ -1061,7 +1061,7 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage ) SwFtnFrm *pFtn = (SwFtnFrm*)pCont->Lower(); if( pFtn && pFtn->GetRef() ) { - const USHORT nRefNum = pNew->GetPhyPageNum(); + const sal_uInt16 nRefNum = pNew->GetPhyPageNum(); if( pFtn->GetRef()->GetPhyPageNum() < nRefNum ) break; } @@ -1070,7 +1070,7 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage ) //muss eine neue eingefuegt werden. if ( eMakePage == MAKEPAGE_INSERT ) { - bNewPg = TRUE; + bNewPg = sal_True; SwPageFrm *pPg = pOldLayLeaf ? pOldLayLeaf->FindPageFrm() : 0; @@ -1081,7 +1081,7 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage ) if ( !pPg || pPg == pNew ) pPg = FindPageFrm(); - InsertPage( pPg, FALSE ); + InsertPage( pPg, sal_False ); pLayLeaf = GetNextLayoutLeaf(); pOldLayLeaf = 0; continue; @@ -1100,7 +1100,7 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage ) { InsertPage( pOldLayLeaf ? pOldLayLeaf->FindPageFrm() : FindPageFrm(), - FALSE ); + sal_False ); //und nochmal das ganze pLayLeaf = pOldLayLeaf ? pOldLayLeaf : GetNextLayoutLeaf(); @@ -1128,9 +1128,9 @@ SwLayoutFrm *SwFrm::GetPrevLeaf( MakePageType ) { ASSERT( !IsInFtn(), "GetPrevLeaf(), don't call me for Ftn." ); - const BOOL bBody = IsInDocBody(); //Wenn ich aus dem DocBody komme + const sal_Bool bBody = IsInDocBody(); //Wenn ich aus dem DocBody komme //will ich auch im Body landen. - const BOOL bFly = IsInFly(); + const sal_Bool bFly = IsInFly(); SwLayoutFrm *pLayLeaf = GetPrevLayoutLeaf(); SwLayoutFrm *pPrevLeaf = 0; @@ -1147,7 +1147,7 @@ SwLayoutFrm *SwFrm::GetPrevLeaf( MakePageType ) pPrevLeaf = pLayLeaf; pLayLeaf = pLayLeaf->GetPrevLayoutLeaf(); if ( pLayLeaf ) - SwFlowFrm::SetMoveBwdJump( TRUE ); + SwFlowFrm::SetMoveBwdJump( sal_True ); } else if ( bFly ) break; //Cntnts in Flys sollte jedes Layout-Blatt recht sein. @@ -1167,14 +1167,14 @@ SwLayoutFrm *SwFrm::GetPrevLeaf( MakePageType ) |*************************************************************************/ -BOOL SwFlowFrm::IsPrevObjMove() const +sal_Bool SwFlowFrm::IsPrevObjMove() const { - //TRUE der FlowFrm soll auf einen Rahmen des Vorgaengers Ruecksicht nehmen + //sal_True der FlowFrm soll auf einen Rahmen des Vorgaengers Ruecksicht nehmen // und fuer diesen ggf. Umbrechen. //!!!!!!!!!!!Hack!!!!!!!!!!! if ( rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) ) - return FALSE; + return sal_False; SwFrm *pPre = rThis.FindPrev(); @@ -1182,7 +1182,7 @@ BOOL SwFlowFrm::IsPrevObjMove() const { ASSERT( SwFlowFrm::CastFlowFrm( pPre ), "new flowfrm?" ); if( SwFlowFrm::CastFlowFrm( pPre )->IsAnFollow( this ) ) - return FALSE; + return sal_False; SwLayoutFrm* pPreUp = pPre->GetUpper(); // Wenn der Upper ein SectionFrm oder die Spalte eines SectionFrms ist, // duerfen wir aus diesem durchaus heraushaengen, @@ -1198,7 +1198,7 @@ BOOL SwFlowFrm::IsPrevObjMove() const // --> OD 2004-10-15 #i26945# - re-factoring: // use <GetVertPosOrientFrm()> to determine, if object has followed the // text flow to the next layout frame - for ( USHORT i = 0; i < pPre->GetDrawObjs()->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pPre->GetDrawObjs()->Count(); ++i ) { // --> OD 2004-07-01 #i28701# - consider changed type of // <SwSortedObjs> entries. @@ -1216,23 +1216,23 @@ BOOL SwFlowFrm::IsPrevObjMove() const pPreUp != pVertPosOrientFrm && !pPreUp->IsAnLower( pVertPosOrientFrm ) ) { - return TRUE; + return sal_True; } } } // <-- } - return FALSE; + return sal_False; } /************************************************************************* |* -|* BOOL SwFlowFrm::IsPageBreak() +|* sal_Bool SwFlowFrm::IsPageBreak() |* |* Beschreibung Wenn vor dem Frm ein harter Seitenumbruch steht UND -|* es einen Vorgaenger auf der gleichen Seite gibt, wird TRUE -|* zurueckgeliefert (es muss ein PageBreak erzeugt werden) FALSE sonst. -|* Wenn in bAct TRUE uebergeben wird, gibt die Funktion dann TRUE +|* es einen Vorgaenger auf der gleichen Seite gibt, wird sal_True +|* zurueckgeliefert (es muss ein PageBreak erzeugt werden) sal_False sonst. +|* Wenn in bAct sal_True uebergeben wird, gibt die Funktion dann sal_True |* zurueck, wenn ein PageBreak besteht. |* Fuer Follows wird der harte Seitenumbruch natuerlich nicht |* ausgewertet. @@ -1249,7 +1249,7 @@ BOOL SwFlowFrm::IsPrevObjMove() const |*************************************************************************/ -BOOL SwFlowFrm::IsPageBreak( BOOL bAct ) const +sal_Bool SwFlowFrm::IsPageBreak( sal_Bool bAct ) const { if ( !IsFollow() && rThis.IsInDocBody() && ( !rThis.IsInTab() || ( rThis.IsTabFrm() && !rThis.GetUpper()->IsInTab() ) ) && // i66968 @@ -1268,37 +1268,37 @@ BOOL SwFlowFrm::IsPageBreak( BOOL bAct ) const ASSERT( pPrev->IsInDocBody(), "IsPageBreak: Not in DocBody?" ); if ( bAct ) { if ( rThis.FindPageFrm() == pPrev->FindPageFrm() ) - return FALSE; + return sal_False; } else { if ( rThis.FindPageFrm() != pPrev->FindPageFrm() ) - return FALSE; + return sal_False; } const SvxBreak eBreak = pSet->GetBreak().GetBreak(); if ( eBreak == SVX_BREAK_PAGE_BEFORE || eBreak == SVX_BREAK_PAGE_BOTH ) - return TRUE; + return sal_True; else { const SvxBreak &ePrB = pPrev->GetAttrSet()->GetBreak().GetBreak(); if ( ePrB == SVX_BREAK_PAGE_AFTER || ePrB == SVX_BREAK_PAGE_BOTH || pSet->GetPageDesc().GetPageDesc() ) - return TRUE; + return sal_True; } } } - return FALSE; + return sal_False; } /************************************************************************* |* -|* BOOL SwFlowFrm::IsColBreak() +|* sal_Bool SwFlowFrm::IsColBreak() |* |* Beschreibung Wenn vor dem Frm ein harter Spaltenumbruch steht UND -|* es einen Vorgaenger in der gleichen Spalte gibt, wird TRUE -|* zurueckgeliefert (es muss ein PageBreak erzeugt werden) FALSE sonst. -|* Wenn in bAct TRUE uebergeben wird, gibt die Funktion dann TRUE +|* es einen Vorgaenger in der gleichen Spalte gibt, wird sal_True +|* zurueckgeliefert (es muss ein PageBreak erzeugt werden) sal_False sonst. +|* Wenn in bAct sal_True uebergeben wird, gibt die Funktion dann sal_True |* zurueck, wenn ein ColBreak besteht. |* Fuer Follows wird der harte Spaltenumbruch natuerlich nicht |* ausgewertet. @@ -1312,7 +1312,7 @@ BOOL SwFlowFrm::IsPageBreak( BOOL bAct ) const |* |*************************************************************************/ -BOOL SwFlowFrm::IsColBreak( BOOL bAct ) const +sal_Bool SwFlowFrm::IsColBreak( sal_Bool bAct ) const { if ( !IsFollow() && (rThis.IsMoveable() || bAct) ) { @@ -1329,31 +1329,31 @@ BOOL SwFlowFrm::IsColBreak( BOOL bAct ) const { if ( bAct ) { if ( pCol == pPrev->FindColFrm() ) - return FALSE; + return sal_False; } else { if ( pCol != pPrev->FindColFrm() ) - return FALSE; + return sal_False; } const SvxBreak eBreak = rThis.GetAttrSet()->GetBreak().GetBreak(); if ( eBreak == SVX_BREAK_COLUMN_BEFORE || eBreak == SVX_BREAK_COLUMN_BOTH ) - return TRUE; + return sal_True; else { const SvxBreak &ePrB = pPrev->GetAttrSet()->GetBreak().GetBreak(); if ( ePrB == SVX_BREAK_COLUMN_AFTER || ePrB == SVX_BREAK_COLUMN_BOTH ) - return TRUE; + return sal_True; } } } } - return FALSE; + return sal_False; } -BOOL SwFlowFrm::HasParaSpaceAtPages( BOOL bSct ) const +sal_Bool SwFlowFrm::HasParaSpaceAtPages( sal_Bool bSct ) const { if( rThis.IsInSct() ) { @@ -1363,26 +1363,26 @@ BOOL SwFlowFrm::HasParaSpaceAtPages( BOOL bSct ) const if( pTmp->IsCellFrm() || pTmp->IsFlyFrm() || pTmp->IsFooterFrm() || pTmp->IsHeaderFrm() || ( pTmp->IsFtnFrm() && !((SwFtnFrm*)pTmp)->GetMaster() ) ) - return TRUE; + return sal_True; if( pTmp->IsPageFrm() ) - return ( pTmp->GetPrev() && !IsPageBreak(TRUE) ) ? FALSE : TRUE; + return ( pTmp->GetPrev() && !IsPageBreak(sal_True) ) ? sal_False : sal_True; if( pTmp->IsColumnFrm() && pTmp->GetPrev() ) - return IsColBreak( TRUE ); + return IsColBreak( sal_True ); if( pTmp->IsSctFrm() && ( !bSct || pTmp->GetPrev() ) ) - return FALSE; + return sal_False; pTmp = pTmp->GetUpper(); } - ASSERT( FALSE, "HasParaSpaceAtPages: Where's my page?" ); - return FALSE; + ASSERT( sal_False, "HasParaSpaceAtPages: Where's my page?" ); + return sal_False; } if( !rThis.IsInDocBody() || ( rThis.IsInTab() && !rThis.IsTabFrm()) || - IsPageBreak( TRUE ) || ( rThis.FindColFrm() && IsColBreak( TRUE ) ) ) - return TRUE; + IsPageBreak( sal_True ) || ( rThis.FindColFrm() && IsColBreak( sal_True ) ) ) + return sal_True; const SwFrm* pTmp = rThis.FindColFrm(); if( pTmp ) { if( pTmp->GetPrev() ) - return FALSE; + return sal_False; } else pTmp = &rThis; @@ -1842,7 +1842,7 @@ SwTwips SwFlowFrm::CalcAddLowerSpaceAsLastInTableCell( /************************************************************************* |* -|* BOOL SwFlowFrm::CheckMoveFwd() +|* sal_Bool SwFlowFrm::CheckMoveFwd() |* |* Beschreibung Moved den Frm vorwaerts wenn es durch die aktuellen |* Bedingungen und Attribute notwendig erscheint. @@ -1852,7 +1852,7 @@ SwTwips SwFlowFrm::CalcAddLowerSpaceAsLastInTableCell( |*************************************************************************/ -BOOL SwFlowFrm::CheckMoveFwd( BOOL &rbMakePage, BOOL bKeep, BOOL ) +sal_Bool SwFlowFrm::CheckMoveFwd( sal_Bool &rbMakePage, sal_Bool bKeep, sal_Bool ) { const SwFrm* pNxt = rThis.GetIndNext(); @@ -1875,61 +1875,61 @@ BOOL SwFlowFrm::CheckMoveFwd( BOOL &rbMakePage, BOOL bKeep, BOOL ) } if( pNxt && pNxt->GetValidPosFlag() ) { - BOOL bMove = FALSE; + sal_Bool bMove = sal_False; const SwSectionFrm *pSct = rThis.FindSctFrm(); if( pSct && !pSct->GetValidSizeFlag() ) { const SwSectionFrm* pNxtSct = pNxt->FindSctFrm(); if( pNxtSct && pSct->IsAnFollow( pNxtSct ) ) - bMove = TRUE; + bMove = sal_True; } else - bMove = TRUE; + bMove = sal_True; if( bMove ) { //Keep together with the following frame - MoveFwd( rbMakePage, FALSE ); - return TRUE; + MoveFwd( rbMakePage, sal_False ); + return sal_True; } } } - BOOL bMovedFwd = FALSE; + sal_Bool bMovedFwd = sal_False; if ( rThis.GetIndPrev() ) { if ( IsPrevObjMove() ) //Auf Objekte des Prev Ruecksicht nehmen? { - bMovedFwd = TRUE; - if ( !MoveFwd( rbMakePage, FALSE ) ) - rbMakePage = FALSE; + bMovedFwd = sal_True; + if ( !MoveFwd( rbMakePage, sal_False ) ) + rbMakePage = sal_False; } else { - if ( IsPageBreak( FALSE ) ) + if ( IsPageBreak( sal_False ) ) { - while ( MoveFwd( rbMakePage, TRUE ) ) + while ( MoveFwd( rbMakePage, sal_True ) ) /* do nothing */; - rbMakePage = FALSE; - bMovedFwd = TRUE; + rbMakePage = sal_False; + bMovedFwd = sal_True; } - else if ( IsColBreak ( FALSE ) ) + else if ( IsColBreak ( sal_False ) ) { const SwPageFrm *pPage = rThis.FindPageFrm(); SwFrm *pCol = rThis.FindColFrm(); do - { MoveFwd( rbMakePage, FALSE ); + { MoveFwd( rbMakePage, sal_False ); SwFrm *pTmp = rThis.FindColFrm(); if( pTmp != pCol ) { - bMovedFwd = TRUE; + bMovedFwd = sal_True; pCol = pTmp; } else break; - } while ( IsColBreak( FALSE ) ); + } while ( IsColBreak( sal_False ) ); if ( pPage != rThis.FindPageFrm() ) - rbMakePage = FALSE; + rbMakePage = sal_False; } } } @@ -1938,7 +1938,7 @@ BOOL SwFlowFrm::CheckMoveFwd( BOOL &rbMakePage, BOOL bKeep, BOOL ) /************************************************************************* |* -|* BOOL SwFlowFrm::MoveFwd() +|* sal_Bool SwFlowFrm::MoveFwd() |* |* Beschreibung Returnwert sagt, ob der Frm die Seite gewechselt hat. |* Ersterstellung MA 05. Dec. 96 @@ -1947,7 +1947,7 @@ BOOL SwFlowFrm::CheckMoveFwd( BOOL &rbMakePage, BOOL bKeep, BOOL ) |*************************************************************************/ -BOOL SwFlowFrm::MoveFwd( BOOL bMakePage, BOOL bPageBreak, BOOL bMoveAlways ) +sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool bMoveAlways ) { //!!!!MoveFtnCntFwd muss ggf. mitgepflegt werden. SwFtnBossFrm *pOldBoss = rThis.FindFtnBossFrm(); @@ -1956,7 +1956,7 @@ BOOL SwFlowFrm::MoveFwd( BOOL bMakePage, BOOL bPageBreak, BOOL bMoveAlways ) if( !IsFwdMoveAllowed() && !bMoveAlways ) { - BOOL bNoFwd = TRUE; + sal_Bool bNoFwd = sal_True; if( rThis.IsInSct() ) { SwFtnBossFrm* pBoss = rThis.FindFtnBossFrm(); @@ -1976,7 +1976,7 @@ BOOL SwFlowFrm::MoveFwd( BOOL bMakePage, BOOL bPageBreak, BOOL bMoveAlways ) // Have a look at our main competitor: We don't move inside row span cells: ( !rThis.GetUpper()->IsCellFrm() || !rThis.GetUpper()->IsLeaveUpperAllowed() ) )*/ { - bNoFwd = FALSE; + bNoFwd = sal_False; } if( bNoFwd ) @@ -1984,17 +1984,17 @@ BOOL SwFlowFrm::MoveFwd( BOOL bMakePage, BOOL bPageBreak, BOOL bMoveAlways ) //Fuer PageBreak ist das Moven erlaubt, wenn der Frm nicht //bereits der erste der Seite ist. if ( !bPageBreak ) - return FALSE; + return sal_False; const SwFrm *pCol = rThis.FindColFrm(); if ( !pCol || !pCol->GetPrev() ) - return FALSE; + return sal_False; } } - BOOL bSamePage = TRUE; + sal_Bool bSamePage = sal_True; SwLayoutFrm *pNewUpper = - rThis.GetLeaf( bMakePage ? MAKEPAGE_INSERT : MAKEPAGE_NONE, TRUE ); + rThis.GetLeaf( bMakePage ? MAKEPAGE_INSERT : MAKEPAGE_NONE, sal_True ); if ( pNewUpper ) { @@ -2006,7 +2006,7 @@ BOOL SwFlowFrm::MoveFwd( BOOL bMakePage, BOOL bPageBreak, BOOL bMoveAlways ) // Wenn unser NewUpper in einem SectionFrm liegt, muessen wir // verhindern, dass sich dieser im Calc selbst zerstoert SwSectionFrm* pSect = pNewUpper->FindSctFrm(); - BOOL bUnlock = FALSE; + sal_Bool bUnlock = sal_False; if( pSect ) { // Wenn wir nur innerhalb unseres SectionFrms die Spalte wechseln, @@ -2026,13 +2026,13 @@ BOOL SwFlowFrm::MoveFwd( BOOL bMakePage, BOOL bPageBreak, BOOL bMoveAlways ) pNewUpper->Calc(); SwFtnBossFrm *pNewBoss = pNewUpper->FindFtnBossFrm(); - BOOL bBossChg = pNewBoss != pOldBoss; - pNewBoss = pNewBoss->FindFtnBossFrm( TRUE ); - pOldBoss = pOldBoss->FindFtnBossFrm( TRUE ); + sal_Bool bBossChg = pNewBoss != pOldBoss; + pNewBoss = pNewBoss->FindFtnBossFrm( sal_True ); + pOldBoss = pOldBoss->FindFtnBossFrm( sal_True ); SwPageFrm* pNewPage = pOldPage; // First, we move the footnotes. - BOOL bFtnMoved = FALSE; + sal_Bool bFtnMoved = sal_False; // --> FME 2004-07-15 #i26831# // If pSect has just been created, the printing area of pSect has @@ -2062,7 +2062,7 @@ BOOL SwFlowFrm::MoveFwd( BOOL bMakePage, BOOL bPageBreak, BOOL bMoveAlways ) (SwLayoutFrm*)((SwTxtFrm*)pStart)->FindBodyFrm() : 0 ) : 0; if( pBody ) bFtnMoved = pBody->MoveLowerFtns( pStart, pOldBoss, pNewBoss, - FALSE); + sal_False); } // Bei SectionFrms ist es moeglich, dass wir selbst durch pNewUpper->Calc() // bewegt wurden, z. B. in den pNewUpper. @@ -2110,7 +2110,7 @@ BOOL SwFlowFrm::MoveFwd( BOOL bMakePage, BOOL bPageBreak, BOOL bMoveAlways ) if( bBossChg ) { - rThis.Prepare( PREP_BOSS_CHGD, 0, FALSE ); + rThis.Prepare( PREP_BOSS_CHGD, 0, sal_False ); if( !bSamePage ) { ViewShell *pSh = rThis.GetShell(); @@ -2133,7 +2133,7 @@ BOOL SwFlowFrm::MoveFwd( BOOL bMakePage, BOOL bPageBreak, BOOL bMoveAlways ) ( rThis.GetAttrSet()->GetPageDesc().GetPageDesc() || pOldPage->GetPageDesc()->GetFollow() != pNewPage->GetPageDesc() ) ) { - SwFrm::CheckPageDescs( pNewPage, FALSE ); + SwFrm::CheckPageDescs( pNewPage, sal_False ); } // <-- } @@ -2144,7 +2144,7 @@ BOOL SwFlowFrm::MoveFwd( BOOL bMakePage, BOOL bPageBreak, BOOL bMoveAlways ) /************************************************************************* |* -|* BOOL SwFlowFrm::MoveBwd() +|* sal_Bool SwFlowFrm::MoveBwd() |* |* Beschreibung Returnwert sagt, ob der Frm die Seite wechseln soll. |* Sollte von abgeleiteten Klassen gerufen werden. @@ -2154,13 +2154,13 @@ BOOL SwFlowFrm::MoveFwd( BOOL bMakePage, BOOL bPageBreak, BOOL bMoveAlways ) |* |*************************************************************************/ -BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat ) +sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) { - SwFlowFrm::SetMoveBwdJump( FALSE ); + SwFlowFrm::SetMoveBwdJump( sal_False ); SwFtnFrm* pFtn = rThis.FindFtnFrm(); if ( pFtn && pFtn->IsBackMoveLocked() ) - return FALSE; + return sal_False; // --> OD 2004-11-29 #115759# - text frames, which are directly inside // tables aren't allowed to move backward. @@ -2171,7 +2171,7 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat ) { if ( pUpperFrm->IsTabFrm() ) { - return FALSE; + return sal_False; } else if ( pUpperFrm->IsColumnFrm() && pUpperFrm->IsInSct() ) { @@ -2185,7 +2185,7 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat ) SwFtnBossFrm * pOldBoss = rThis.FindFtnBossFrm(); SwPageFrm * const pOldPage = pOldBoss->FindPageFrm(); SwLayoutFrm *pNewUpper = 0; - BOOL bCheckPageDescs = FALSE; + sal_Bool bCheckPageDescs = sal_False; bool bCheckPageDescOfNextPage = false; if ( pFtn ) @@ -2211,16 +2211,16 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat ) ASSERT( pRef, "MoveBwd: Endnote for an empty section?" ); if( !bEndnote ) - pOldBoss = pOldBoss->FindFtnBossFrm( TRUE ); + pOldBoss = pOldBoss->FindFtnBossFrm( sal_True ); SwFtnBossFrm *pRefBoss = pRef->FindFtnBossFrm( !bEndnote ); if ( pOldBoss != pRefBoss && // OD 08.11.2002 #104840# - use <SwLayoutFrm::IsBefore(..)> ( !bEndnote || pRefBoss->IsBefore( pOldBoss ) ) ) - pNewUpper = rThis.GetLeaf( MAKEPAGE_FTN, FALSE ); + pNewUpper = rThis.GetLeaf( MAKEPAGE_FTN, sal_False ); } - else if ( IsPageBreak( TRUE ) ) //PageBreak zu beachten? + else if ( IsPageBreak( sal_True ) ) //PageBreak zu beachten? { //Wenn auf der vorhergehenden Seite kein Frm im Body steht, //so ist das Zurueckfliessen trotz Pagebreak sinnvoll @@ -2242,7 +2242,7 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat ) nDiff -= 1; if ( nDiff > 1 ) { - pNewUpper = rThis.GetLeaf( MAKEPAGE_NONE, FALSE ); + pNewUpper = rThis.GetLeaf( MAKEPAGE_NONE, sal_False ); // --> OD 2006-05-08 #i53139# // Now <pNewUpper> is a previous layout frame, which contains // content. But the new upper layout frame has to be the next one. @@ -2267,7 +2267,7 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat ) // returns new upper on page 2. if ( pNewUpper->Lower() ) { - SwLayoutFrm* pNewNextUpper = pNewUpper->GetLeaf( MAKEPAGE_NONE, TRUE ); + SwLayoutFrm* pNewNextUpper = pNewUpper->GetLeaf( MAKEPAGE_NONE, sal_True ); if ( pNewNextUpper && pNewNextUpper != rThis.GetUpper() && pNewNextUpper->GetType() == pNewUpper->GetType() && @@ -2283,19 +2283,19 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat ) } // <-- - bCheckPageDescs = TRUE; + bCheckPageDescs = sal_True; } } } } - else if ( IsColBreak( TRUE ) ) + else if ( IsColBreak( sal_True ) ) { //Wenn in der vorhergehenden Spalte kein CntntFrm steht, so ist //das Zurueckfliessen trotz ColumnBreak sinnvoll //(sonst: leere Spalte). if( rThis.IsInSct() ) { - pNewUpper = rThis.GetLeaf( MAKEPAGE_NONE, FALSE ); + pNewUpper = rThis.GetLeaf( MAKEPAGE_NONE, sal_False ); if( pNewUpper && !SwFlowFrm::IsMoveBwdJump() && ( pNewUpper->ContainsCntnt() || ( ( !pNewUpper->IsColBodyFrm() || @@ -2320,7 +2320,7 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat ) // --> OD 2006-07-05 #136538# - another correction of fix for i53139 // Beside type check, check also, if proposed new next upper // frame is inside the same frame types. - SwLayoutFrm* pNewNextUpper = pNewUpper->GetLeaf( MAKEPAGE_NOSECTION, TRUE ); + SwLayoutFrm* pNewNextUpper = pNewUpper->GetLeaf( MAKEPAGE_NOSECTION, sal_True ); if ( pNewNextUpper && pNewNextUpper->GetType() == pNewUpper->GetType() && pNewNextUpper->IsInDocBody() == pNewUpper->IsInDocBody() && @@ -2337,16 +2337,16 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat ) else { const SwFrm *pCol = rThis.FindColFrm(); - BOOL bGoOn = TRUE; - BOOL bJump = FALSE; + sal_Bool bGoOn = sal_True; + sal_Bool bJump = sal_False; do { if ( pCol->GetPrev() ) pCol = pCol->GetPrev(); else { - bGoOn = FALSE; - pCol = rThis.GetLeaf( MAKEPAGE_NONE, FALSE ); + bGoOn = sal_False; + pCol = rThis.GetLeaf( MAKEPAGE_NONE, sal_False ); } if ( pCol ) { @@ -2356,7 +2356,7 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat ) (SwLayoutFrm*)pCol; if ( pColBody->ContainsCntnt() ) { - bGoOn = FALSE; // Hier gibt's Inhalt, wir akzeptieren diese + bGoOn = sal_False; // Hier gibt's Inhalt, wir akzeptieren diese // nur, wenn GetLeaf() das MoveBwdJump-Flag gesetzt hat. if( SwFlowFrm::IsMoveBwdJump() ) { @@ -2375,7 +2375,7 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat ) // --> OD 2006-11-02 #i71065# // Check that the proposed new next upper layout // frame isn't the current one. - SwLayoutFrm* pNewNextUpper = pNewUpper->GetLeaf( MAKEPAGE_NONE, TRUE ); + SwLayoutFrm* pNewNextUpper = pNewUpper->GetLeaf( MAKEPAGE_NONE, sal_True ); if ( pNewNextUpper && pNewNextUpper != rThis.GetUpper() && pNewNextUpper->GetType() == pNewUpper->GetType() && @@ -2393,18 +2393,18 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat ) else { if( pNewUpper ) // Wir hatten schon eine leere Spalte, haben - bJump = TRUE; // also eine uebersprungen + bJump = sal_True; // also eine uebersprungen pNewUpper = pColBody; // Diese leere Spalte kommt in Frage, // trotzdem weitersuchen } } } while( bGoOn ); if( bJump ) - SwFlowFrm::SetMoveBwdJump( TRUE ); + SwFlowFrm::SetMoveBwdJump( sal_True ); } } else //Keine Breaks also kann ich zurueckfliessen - pNewUpper = rThis.GetLeaf( MAKEPAGE_NONE, FALSE ); + pNewUpper = rThis.GetLeaf( MAKEPAGE_NONE, sal_False ); // --> OD 2004-06-23 #i27801# - no move backward of 'master' text frame, // if - due to its object positioning - it isn't allowed to be on the new page frame @@ -2483,7 +2483,7 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat ) SwFrm *pFrm = pNewUpper->Lower(); while ( pFrm->GetNext() ) pFrm = pFrm->GetNext(); - pNewUpper = pFrm->GetLeaf( MAKEPAGE_INSERT, TRUE ); + pNewUpper = pFrm->GetLeaf( MAKEPAGE_INSERT, sal_True ); if( pNewUpper == rThis.GetUpper() ) //Landen wir wieder an der gleichen Stelle? pNewUpper = NULL; //dann eruebrigt sich das Moven } @@ -2492,7 +2492,7 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat ) } // <-- } - if ( pNewUpper && !ShouldBwdMoved( pNewUpper, TRUE, rbReformat ) ) + if ( pNewUpper && !ShouldBwdMoved( pNewUpper, sal_True, rbReformat ) ) { if( !pNewUpper->Lower() ) { @@ -2510,9 +2510,9 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat ) !pSectFrm->ContainsCntnt() && !pSectFrm->ContainsAny( true ) ) // <-- { - pSectFrm->DelEmpty( TRUE ); + pSectFrm->DelEmpty( sal_True ); delete pSectFrm; - rThis.bValidPos = TRUE; + rThis.bValidPos = sal_True; } } } @@ -2567,7 +2567,7 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat ) ( !rThis.IsSctFrm() && rThis.IsInSct() ) ? MAKEPAGE_NOSECTION : MAKEPAGE_NONE, - TRUE ); + sal_True ); // --> OD 2007-01-10 #i73194# - make code robust ASSERT( pNextNewUpper, "<SwFlowFrm::MoveBwd(..)> - missing next new upper" ); if ( pNextNewUpper && @@ -2625,7 +2625,7 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat ) pNewUpper = (SwSectionFrm*)pTmp; else { - pSct = new SwSectionFrm( *pSct, TRUE ); + pSct = new SwSectionFrm( *pSct, sal_True ); pSct->Paste( pNewUpper ); pSct->Init(); pNewUpper = pSct; @@ -2633,8 +2633,8 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat ) } } } - BOOL bUnlock = FALSE; - BOOL bFollow = FALSE; + sal_Bool bUnlock = sal_False; + sal_Bool bFollow = sal_False; //Section locken, sonst kann sie bei Fluss des einzigen Cntnt etwa //von zweiter in die erste Spalte zerstoert werden. SwSectionFrm* pSect = pNewUpper->FindSctFrm(); @@ -2673,7 +2673,7 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat ) SwPageFrm *pNewPage = rThis.FindPageFrm(); if( pNewPage != pOldPage ) { - rThis.Prepare( PREP_BOSS_CHGD, (const void*)pOldPage, FALSE ); + rThis.Prepare( PREP_BOSS_CHGD, (const void*)pOldPage, sal_False ); ViewShell *pSh = rThis.GetShell(); if ( pSh && !pSh->Imp()->IsUpdateExpFlds() ) pSh->GetDoc()->SetNewFldLst(true); //Wird von CalcLayout() hinterher eledigt! @@ -2691,12 +2691,12 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat ) SwPageFrm* pStartPage = bCheckPageDescOfNextPage ? pNewPage : (SwPageFrm*)pNewPage->GetNext(); - SwFrm::CheckPageDescs( pStartPage, FALSE); + SwFrm::CheckPageDescs( pStartPage, sal_False); } else if ( rThis.GetAttrSet()->GetPageDesc().GetPageDesc() ) { //Erste Seite wird etwa durch Ausblenden eines Bereiches leer - SwFrm::CheckPageDescs( (SwPageFrm*)pNewPage, FALSE); + SwFrm::CheckPageDescs( (SwPageFrm*)pNewPage, sal_False); } } } diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index d71db56cf10f..38ce56f902d4 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -122,30 +122,30 @@ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm *pAnch ) : // aRelPos(), pPrevLink( 0 ), pNextLink( 0 ), - bInCnt( FALSE ), - bAtCnt( FALSE ), - bLayout( FALSE ), - bAutoPosition( FALSE ), - bNoShrink( FALSE ), - bLockDeleteContent( FALSE ) + bInCnt( sal_False ), + bAtCnt( sal_False ), + bLayout( sal_False ), + bAutoPosition( sal_False ), + bNoShrink( sal_False ), + bLockDeleteContent( sal_False ) { nType = FRMC_FLY; - bInvalid = bNotifyBack = TRUE; + bInvalid = bNotifyBack = sal_True; bLocked = bMinHeight = - bHeightClipped = bWidthClipped = bFormatHeightOnly = FALSE; + bHeightClipped = bWidthClipped = bFormatHeightOnly = sal_False; //Grosseneinstellung, Fixe groesse ist immer die Breite const SwFmtFrmSize &rFrmSize = pFmt->GetFrmSize(); - BOOL bVert = FALSE; - UINT16 nDir = + sal_Bool bVert = sal_False; + sal_uInt16 nDir = ((SvxFrameDirectionItem&)pFmt->GetFmtAttr( RES_FRAMEDIR )).GetValue(); if( FRMDIR_ENVIRONMENT == nDir ) { bDerivedVert = 1; bDerivedR2L = 1; if( pAnch && pAnch->IsVertical() ) - bVert = TRUE; + bVert = sal_True; } else { @@ -170,16 +170,16 @@ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm *pAnch ) : //Hoehe Fix oder Variabel oder was? if ( rFrmSize.GetHeightSizeType() == ATT_MIN_SIZE ) - bMinHeight = TRUE; + bMinHeight = sal_True; else if ( rFrmSize.GetHeightSizeType() == ATT_FIX_SIZE ) - bFixSize = TRUE; + bFixSize = sal_True; // OD 2004-02-12 #110582#-2 - insert columns, if necessary InsertColumns(); //Erst das Init, dann den Inhalt, denn zum Inhalt koennen widerum //Objekte/Rahmen gehoeren die dann angemeldet werden. - InitDrawObj( FALSE ); + InitDrawObj( sal_False ); // OD 2004-01-19 #110582# Chain( pAnch ); @@ -231,7 +231,7 @@ void SwFlyFrm::InsertCnt() { const SwFmtCntnt& rCntnt = GetFmt()->GetCntnt(); ASSERT( rCntnt.GetCntntIdx(), ":-( no content prepared." ); - ULONG nIndex = rCntnt.GetCntntIdx()->GetIndex(); + sal_uLong nIndex = rCntnt.GetCntntIdx()->GetIndex(); // Lower() bedeutet SwColumnFrm, eingefuegt werden muss der Inhalt dann in den (Column)BodyFrm ::_InsertCnt( Lower() ? (SwLayoutFrm*)((SwLayoutFrm*)Lower())->Lower() : (SwLayoutFrm*)this, GetFmt()->GetDoc(), nIndex ); @@ -239,8 +239,8 @@ void SwFlyFrm::InsertCnt() //NoTxt haben immer eine FixHeight. if ( Lower() && Lower()->IsNoTxtFrm() ) { - bFixSize = TRUE; - bMinHeight = FALSE; + bFixSize = sal_True; + bMinHeight = sal_False; } } } @@ -382,7 +382,7 @@ void SwFlyFrm::DeleteCnt() |* Letzte Aenderung MA 30. Nov. 95 |* |*************************************************************************/ -void SwFlyFrm::InitDrawObj( BOOL bNotify ) +void SwFlyFrm::InitDrawObj( sal_Bool bNotify ) { //ContactObject aus dem Format suchen. Wenn bereits eines existiert, so //braucht nur eine neue Ref erzeugt werden, anderfalls ist es jetzt an @@ -563,7 +563,7 @@ void SwFlyFrm::UnchainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow ) //Der Follow muss mit seinem eigenen Inhalt versorgt werden. const SwFmtCntnt &rCntnt = pFollow->GetFmt()->GetCntnt(); ASSERT( rCntnt.GetCntntIdx(), ":-( Kein Inhalt vorbereitet." ); - ULONG nIndex = rCntnt.GetCntntIdx()->GetIndex(); + sal_uLong nIndex = rCntnt.GetCntntIdx()->GetIndex(); // Lower() bedeutet SwColumnFrm, dieser beinhaltet wieder einen SwBodyFrm ::_InsertCnt( pFollow->Lower() ? (SwLayoutFrm*)((SwLayoutFrm*)pFollow->Lower())->Lower() : (SwLayoutFrm*)pFollow, @@ -663,23 +663,23 @@ SwFrm *SwFlyFrm::FindLastLower() |* |*************************************************************************/ -BOOL SwFlyFrm::FrmSizeChg( const SwFmtFrmSize &rFrmSize ) +sal_Bool SwFlyFrm::FrmSizeChg( const SwFmtFrmSize &rFrmSize ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; SwTwips nDiffHeight = Frm().Height(); if ( rFrmSize.GetHeightSizeType() == ATT_VAR_SIZE ) - bFixSize = bMinHeight = FALSE; + bFixSize = bMinHeight = sal_False; else { if ( rFrmSize.GetHeightSizeType() == ATT_FIX_SIZE ) { - bFixSize = TRUE; - bMinHeight = FALSE; + bFixSize = sal_True; + bMinHeight = sal_False; } else if ( rFrmSize.GetHeightSizeType() == ATT_MIN_SIZE ) { - bFixSize = FALSE; - bMinHeight = TRUE; + bFixSize = sal_False; + bMinHeight = sal_True; } nDiffHeight -= rFrmSize.GetHeight(); } @@ -702,13 +702,13 @@ BOOL SwFlyFrm::FrmSizeChg( const SwFmtFrmSize &rFrmSize ) aPrt.Width ( aPrt.Width() - nDiffWidth ); ChgLowersProp( aOldSz ); ::Notify( this, FindPageFrm(), aOld ); - bValidPos = FALSE; - bRet = TRUE; + bValidPos = sal_False; + bRet = sal_True; } else if ( Lower()->IsNoTxtFrm() ) { - bFixSize = TRUE; - bMinHeight = FALSE; + bFixSize = sal_True; + bMinHeight = sal_False; } } return bRet; @@ -725,7 +725,7 @@ BOOL SwFlyFrm::FrmSizeChg( const SwFmtFrmSize &rFrmSize ) void SwFlyFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) { - BYTE nInvFlags = 0; + sal_uInt8 nInvFlags = 0; if( pNew && RES_ATTRSET_CHG == pNew->Which() ) { @@ -733,7 +733,7 @@ void SwFlyFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) SfxItemIter aOIter( *((SwAttrSetChg*)pOld)->GetChgSet() ); SwAttrSetChg aOldSet( *(SwAttrSetChg*)pOld ); SwAttrSetChg aNewSet( *(SwAttrSetChg*)pNew ); - while( TRUE ) + while( sal_True ) { _UpdateAttr( (SfxPoolItem*)aOIter.GetCurItem(), (SfxPoolItem*)aNIter.GetCurItem(), nInvFlags, @@ -792,11 +792,11 @@ void SwFlyFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) } void SwFlyFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, - BYTE &rInvFlags, + sal_uInt8 &rInvFlags, SwAttrSetChg *pOldSet, SwAttrSetChg *pNewSet ) { - BOOL bClear = TRUE; - const USHORT nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0; + sal_Bool bClear = sal_True; + const sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0; ViewShell *pSh = GetShell(); switch( nWhich ) { @@ -891,7 +891,7 @@ void SwFlyFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, SwFmtCol aCol; if ( Lower() && Lower()->IsColumnFrm() ) { - USHORT nCol = 0; + sal_uInt16 nCol = 0; SwFrm *pTmp = Lower(); do { ++nCol; @@ -928,7 +928,7 @@ void SwFlyFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, if ( pSh ) pSh->InvalidateWindows( Frm() ); const IDocumentDrawModelAccess* pIDDMA = GetFmt()->getIDocumentDrawModelAccess(); - const BYTE nId = GetFmt()->GetOpaque().GetValue() ? + const sal_uInt8 nId = GetFmt()->GetOpaque().GetValue() ? pIDDMA->GetHeavenId() : pIDDMA->GetHellId(); GetVirtDrawObj()->SetLayer( nId ); @@ -988,8 +988,8 @@ void SwFlyFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, break; case RES_FRAMEDIR : - SetDerivedVert( FALSE ); - SetDerivedR2L( FALSE ); + SetDerivedVert( sal_False ); + SetDerivedR2L( sal_False ); CheckDirChange(); break; @@ -999,7 +999,7 @@ void SwFlyFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, pSh->InvalidateWindows( Frm() ); const IDocumentDrawModelAccess* pIDDMA = GetFmt()->getIDocumentDrawModelAccess(); - const BYTE nId = ((SvxOpaqueItem*)pNew)->GetValue() ? + const sal_uInt8 nId = ((SvxOpaqueItem*)pNew)->GetValue() ? pIDDMA->GetHeavenId() : pIDDMA->GetHellId(); GetVirtDrawObj()->SetLayer( nId ); @@ -1077,7 +1077,7 @@ void SwFlyFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, } default: - bClear = FALSE; + bClear = sal_False; } if ( bClear ) { @@ -1104,11 +1104,11 @@ void SwFlyFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, *************************************************************************/ // erfrage vom Modify Informationen -BOOL SwFlyFrm::GetInfo( SfxPoolItem & rInfo ) const +sal_Bool SwFlyFrm::GetInfo( SfxPoolItem & rInfo ) const { if( RES_AUTOFMT_DOCNODE == rInfo.Which() ) - return FALSE; // es gibt einen FlyFrm also wird er benutzt - return TRUE; // weiter suchen + return sal_False; // es gibt einen FlyFrm also wird er benutzt + return sal_True; // weiter suchen } /************************************************************************* @@ -1123,7 +1123,7 @@ BOOL SwFlyFrm::GetInfo( SfxPoolItem & rInfo ) const void SwFlyFrm::_Invalidate( SwPageFrm *pPage ) { InvalidatePage( pPage ); - bNotifyBack = bInvalid = TRUE; + bNotifyBack = bInvalid = sal_True; SwFlyFrm *pFrm; if ( GetAnchorFrm() && 0 != (pFrm = AnchorFrm()->FindFlyFrm()) ) @@ -1237,13 +1237,13 @@ void SwFlyFrm::ChgRelPos( const Point &rNewPos ) { aHori.SetHoriOrient( text::HoriOrientation::NONE ); aHori.SetRelationOrient( text::RelOrientation::PAGE_FRAME ); - aHori.SetPosToggle( FALSE ); + aHori.SetPosToggle( sal_False ); } else if ( eAnchorType == FLY_AT_FLY ) { aHori.SetHoriOrient( text::HoriOrientation::NONE ); aHori.SetRelationOrient( text::RelOrientation::FRAME ); - aHori.SetPosToggle( FALSE ); + aHori.SetPosToggle( sal_False ); } // <-- else if ( IsFlyAtCntFrm() || text::HoriOrientation::NONE != aHori.GetHoriOrient() ) @@ -1268,7 +1268,7 @@ void SwFlyFrm::ChgRelPos( const Point &rNewPos ) } else aHori.SetRelationOrient( text::RelOrientation::FRAME ); - aHori.SetPosToggle( FALSE ); + aHori.SetPosToggle( sal_False ); } aHori.SetPos( nTmpX ); aSet.Put( aHori ); @@ -1307,9 +1307,9 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs ) //Breite der Spalten pruefen und ggf. einstellen. if ( Lower() && Lower()->IsColumnFrm() ) - AdjustColumns( 0, FALSE ); + AdjustColumns( 0, sal_False ); - bValidSize = TRUE; + bValidSize = sal_True; const SwTwips nUL = pAttrs->CalcTopLine() + pAttrs->CalcBottomLine(); const SwTwips nLR = pAttrs->CalcLeftLine() + pAttrs->CalcRightLine(); @@ -1364,7 +1364,7 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs ) SwTwips nTop = (Frm().*fnRect->fnGetTop)(); SwTwips nBorder = (Frm().*fnRect->fnGetHeight)() - (Prt().*fnRect->fnGetHeight)(); - for ( USHORT i = 0; i < nCnt; ++i ) + for ( sal_uInt16 i = 0; i < nCnt; ++i ) { SwAnchoredObject* pAnchoredObj = (*GetDrawObjs())[i]; if ( pAnchoredObj->ISA(SwFlyFrm) ) @@ -1405,11 +1405,11 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs ) InvalidateObjRectWithSpaces(); } // <-- - bValidSize = TRUE; + bValidSize = sal_True; } else { - bValidSize = TRUE; //Fixe Frms formatieren sich nicht. + bValidSize = sal_True; //Fixe Frms formatieren sich nicht. //Flys stellen ihre Groesse anhand des Attr ein. SwTwips nNewSize = bVert ? aRelSize.Width() : aRelSize.Height(); nNewSize -= nUL; @@ -1472,19 +1472,19 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs ) // problems in method <SwCntntFrm::_WouldFit(..)>, // which assumes that the follows are formatted. // Thus, <bNoCalcFollow> no longer used by <FormatWidthCols(..)>. -//void CalcCntnt( SwLayoutFrm *pLay, BOOL bNoColl ) +//void CalcCntnt( SwLayoutFrm *pLay, sal_Bool bNoColl ) void CalcCntnt( SwLayoutFrm *pLay, bool bNoColl, bool bNoCalcFollow ) { SwSectionFrm* pSect; - BOOL bCollect = FALSE; + sal_Bool bCollect = sal_False; if( pLay->IsSctFrm() ) { pSect = (SwSectionFrm*)pLay; if( pSect->IsEndnAtEnd() && !bNoColl ) { - bCollect = TRUE; + bCollect = sal_True; SwLayouter::CollectEndnotes( pLay->GetFmt()->GetDoc(), pSect ); } pSect->CalcFtnCntnt(); @@ -1505,8 +1505,8 @@ void CalcCntnt( SwLayoutFrm *pLay, if( bCollect ) pLay->GetFmt()->GetDoc()->GetLayouter()-> InsertEndnotes( pSect ); - BOOL bLock = pSect->IsFtnLock(); - pSect->SetFtnLock( TRUE ); + sal_Bool bLock = pSect->IsFtnLock(); + pSect->SetFtnLock( sal_True ); pSect->CalcFtnCntnt(); pSect->CalcFtnCntnt(); pSect->SetFtnLock( bLock ); @@ -1527,8 +1527,8 @@ void CalcCntnt( SwLayoutFrm *pLay, SwAnchoredObject* pAgainObj2 = 0; // FME 2007-08-30 #i81146# new loop control - USHORT nLoopControlRuns = 0; - const USHORT nLoopControlMax = 20; + sal_uInt16 nLoopControlRuns = 0; + const sal_uInt16 nLoopControlMax = 20; const SwFrm* pLoopControlCond = 0; SwFrm* pLast; @@ -1545,14 +1545,14 @@ void CalcCntnt( SwLayoutFrm *pLay, if ( pFrm->IsTabFrm() ) { - ((SwTabFrm*)pFrm)->bCalcLowers = TRUE; + ((SwTabFrm*)pFrm)->bCalcLowers = sal_True; // OD 26.08.2003 #i18103# - lock move backward of follow table, // if no section content is formatted or follow table belongs // to the section, which content is formatted. if ( ((SwTabFrm*)pFrm)->IsFollow() && ( !pSect || pSect == pFrm->FindSctFrm() ) ) { - ((SwTabFrm*)pFrm)->bLockBackMove = TRUE; + ((SwTabFrm*)pFrm)->bLockBackMove = sal_True; } } @@ -1597,7 +1597,7 @@ void CalcCntnt( SwLayoutFrm *pLay, bool bAgain = false; SwPageFrm* pPageFrm = pFrm->FindPageFrm(); sal_uInt32 nCnt = pFrm->GetDrawObjs()->Count(); - for ( USHORT i = 0; i < nCnt; ++i ) + for ( sal_uInt16 i = 0; i < nCnt; ++i ) { // --> OD 2004-07-01 #i28701# SwAnchoredObject* pAnchoredObj = (*pFrm->GetDrawObjs())[i]; @@ -1727,7 +1727,7 @@ void CalcCntnt( SwLayoutFrm *pLay, if ( pFrm->IsTabFrm() ) { if ( ((SwTabFrm*)pFrm)->IsFollow() ) - ((SwTabFrm*)pFrm)->bLockBackMove = FALSE; + ((SwTabFrm*)pFrm)->bLockBackMove = sal_False; } pFrm = bPrevInvalid ? pTmpPrev : pFrm->FindNext(); @@ -1778,14 +1778,14 @@ void CalcCntnt( SwLayoutFrm *pLay, if( bCollect ) { pFrm = pLay->ContainsAny(); - bCollect = FALSE; + bCollect = sal_False; if( pFrm ) continue; } } break; } - while( TRUE ); + while( sal_True ); } /************************************************************************* @@ -1802,7 +1802,7 @@ void SwFlyFrm::MakeObjPos() { if ( !bValidPos ) { - bValidPos = TRUE; + bValidPos = sal_True; // OD 29.10.2003 #113049# - use new class to position object GetAnchorFrm()->Calc(); @@ -1837,7 +1837,7 @@ void SwFlyFrm::MakePrtArea( const SwBorderAttrs &rAttrs ) if ( !bValidPrtArea ) { - bValidPrtArea = TRUE; + bValidPrtArea = sal_True; // OD 31.07.2003 #110978# - consider vertical layout SWRECTFN( this ) @@ -1857,7 +1857,7 @@ void SwFlyFrm::MakePrtArea( const SwBorderAttrs &rAttrs ) |* |*************************************************************************/ -SwTwips SwFlyFrm::_Grow( SwTwips nDist, BOOL bTst ) +SwTwips SwFlyFrm::_Grow( SwTwips nDist, sal_Bool bTst ) { SWRECTFN( this ) if ( Lower() && !IsColLocked() && !HasFixSize() ) @@ -1886,7 +1886,7 @@ SwTwips SwFlyFrm::_Grow( SwTwips nDist, BOOL bTst ) { const SwRect aOld( GetObjRectWithSpaces() ); _InvalidateSize(); - const BOOL bOldLock = bLocked; + const sal_Bool bOldLock = bLocked; Unlock(); if ( IsFlyFreeFrm() ) { @@ -1896,16 +1896,16 @@ SwTwips SwFlyFrm::_Grow( SwTwips nDist, BOOL bTst ) // Writer fly frames - inner Writer fly frames format its // anchor, which grows/shrinks the outer Writer fly frame. // Note: position will be invalidated below. - bValidPos = TRUE; + bValidPos = sal_True; // --> OD 2005-10-10 #i55416# // Suppress format of width for autowidth frame, because the // format of the width would call <SwTxtFrm::CalcFitToContent()> // for the lower frame, which initiated this grow. - const BOOL bOldFormatHeightOnly = bFormatHeightOnly; + const sal_Bool bOldFormatHeightOnly = bFormatHeightOnly; const SwFmtFrmSize& rFrmSz = GetFmt()->GetFrmSize(); if ( rFrmSz.GetWidthSizeType() != ATT_FIX_SIZE ) { - bFormatHeightOnly = TRUE; + bFormatHeightOnly = sal_True; } // <-- static_cast<SwFlyFreeFrm*>(this)->SetNoMoveOnCheckClip( true ); @@ -1935,7 +1935,7 @@ SwTwips SwFlyFrm::_Grow( SwTwips nDist, BOOL bTst ) return 0L; } -SwTwips SwFlyFrm::_Shrink( SwTwips nDist, BOOL bTst ) +SwTwips SwFlyFrm::_Shrink( SwTwips nDist, sal_Bool bTst ) { if( Lower() && !IsColLocked() && !HasFixSize() && !IsNoShrink() ) { @@ -1985,7 +1985,7 @@ SwTwips SwFlyFrm::_Shrink( SwTwips nDist, BOOL bTst ) { const SwRect aOld( GetObjRectWithSpaces() ); _InvalidateSize(); - const BOOL bOldLocked = bLocked; + const sal_Bool bOldLocked = bLocked; Unlock(); if ( IsFlyFreeFrm() ) { @@ -1995,16 +1995,16 @@ SwTwips SwFlyFrm::_Shrink( SwTwips nDist, BOOL bTst ) // Writer fly frames - inner Writer fly frames format its // anchor, which grows/shrinks the outer Writer fly frame. // Note: position will be invalidated below. - bValidPos = TRUE; + bValidPos = sal_True; // --> OD 2005-10-10 #i55416# // Suppress format of width for autowidth frame, because the // format of the width would call <SwTxtFrm::CalcFitToContent()> // for the lower frame, which initiated this shrink. - const BOOL bOldFormatHeightOnly = bFormatHeightOnly; + const sal_Bool bOldFormatHeightOnly = bFormatHeightOnly; const SwFmtFrmSize& rFrmSz = GetFmt()->GetFrmSize(); if ( rFrmSz.GetWidthSizeType() != ATT_FIX_SIZE ) { - bFormatHeightOnly = TRUE; + bFormatHeightOnly = sal_True; } // <-- static_cast<SwFlyFreeFrm*>(this)->SetNoMoveOnCheckClip( true ); @@ -2061,7 +2061,7 @@ Size SwFlyFrm::ChgSize( const Size& aNewSize ) static_cast<SwNoTxtFrm*>(Lower())->GetNode()->GetOLENode() ) { SwRect aClipRect; - ::CalcClipRect( GetVirtDrawObj(), aClipRect, FALSE ); + ::CalcClipRect( GetVirtDrawObj(), aClipRect, sal_False ); if ( aAdjustedNewSize.Width() > aClipRect.Width() ) { aAdjustedNewSize.setWidth( aClipRect.Width() ); @@ -2101,19 +2101,19 @@ Size SwFlyFrm::ChgSize( const Size& aNewSize ) |* |*************************************************************************/ -BOOL SwFlyFrm::IsLowerOf( const SwLayoutFrm* pUpperFrm ) const +sal_Bool SwFlyFrm::IsLowerOf( const SwLayoutFrm* pUpperFrm ) const { ASSERT( GetAnchorFrm(), "8-( Fly is lost in Space." ); const SwFrm* pFrm = GetAnchorFrm(); do { if ( pFrm == pUpperFrm ) - return TRUE; + return sal_True; pFrm = pFrm->IsFlyFrm() ? ((const SwFlyFrm*)pFrm)->GetAnchorFrm() : pFrm->GetUpper(); } while ( pFrm ); - return FALSE; + return sal_False; } /************************************************************************* @@ -2164,7 +2164,7 @@ void SwFrm::AppendFly( SwFlyFrm *pNew ) SwPageFrm *pTmp = pRoot->GetLastPage(); if ( pTmp->GetPhyPageNum() > 30 ) { - for ( USHORT i = 0; i < 10; ++i ) + for ( sal_uInt16 i = 0; i < 10; ++i ) { pTmp = (SwPageFrm*)pTmp->GetPrev(); if( pTmp->GetPhyPageNum() <= pPage->GetPhyPageNum() ) @@ -2660,10 +2660,10 @@ SwTwips SwFlyFrm::CalcAutoWidth() const |*************************************************************************/ /// OD 16.04.2003 #i13147# - If called for paint and the <SwNoTxtFrm> contains /// a graphic, load of intrinsic graphic has to be avoided. -BOOL SwFlyFrm::GetContour( PolyPolygon& rContour, +sal_Bool SwFlyFrm::GetContour( PolyPolygon& rContour, const sal_Bool _bForPaint ) const { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( GetFmt()->GetSurround().IsContour() && Lower() && Lower()->IsNoTxtFrm() ) { @@ -2689,7 +2689,7 @@ BOOL SwFlyFrm::GetContour( PolyPolygon& rContour, if( !pNd->HasContour() ) { // OD 16.04.2003 #i13147# - no <CreateContour> for a graphic - // during paint. Thus, return (value of <bRet> should be <FALSE>). + // during paint. Thus, return (value of <bRet> should be <sal_False>). if ( pGrfNd && _bForPaint ) { ASSERT( false, "SwFlyFrm::GetContour() - No Contour found at <SwNoTxtNode> during paint." ); @@ -2703,7 +2703,7 @@ BOOL SwFlyFrm::GetContour( PolyPolygon& rContour, SwRect aClip; SwRect aOrig; Lower()->Calc(); - ((SwNoTxtFrm*)Lower())->GetGrfArea( aClip, &aOrig, FALSE ); + ((SwNoTxtFrm*)Lower())->GetGrfArea( aClip, &aOrig, sal_False ); // OD 16.04.2003 #i13147# - copy method code <SvxContourDlg::ScaleContour(..)> // in order to avoid that graphic has to be loaded for contour scale. //SvxContourDlg::ScaleContour( rContour, aGrf, MAP_TWIP, aOrig.SSize() ); @@ -2716,7 +2716,7 @@ BOOL SwFlyFrm::GetContour( PolyPolygon& rContour, double fScaleY; Size aOrgSize; Point aNewPoint; - BOOL bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL; + sal_Bool bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL; if ( bPixelMap ) aOrgSize = pOutDev->PixelToLogic( aGrfSize, aDispMap ); @@ -2728,11 +2728,11 @@ BOOL SwFlyFrm::GetContour( PolyPolygon& rContour, fScaleX = (double) aOrig.Width() / aOrgSize.Width(); fScaleY = (double) aOrig.Height() / aOrgSize.Height(); - for ( USHORT j = 0, nPolyCount = rContour.Count(); j < nPolyCount; j++ ) + for ( sal_uInt16 j = 0, nPolyCount = rContour.Count(); j < nPolyCount; j++ ) { Polygon& rPoly = rContour[ j ]; - for ( USHORT i = 0, nCount = rPoly.GetSize(); i < nCount; i++ ) + for ( sal_uInt16 i = 0, nCount = rPoly.GetSize(); i < nCount; i++ ) { if ( bPixelMap ) aNewPoint = pOutDev->PixelToLogic( rPoly[ i ], aDispMap ); @@ -2756,7 +2756,7 @@ BOOL SwFlyFrm::GetContour( PolyPolygon& rContour, aClip.Height( 1 ); rContour.Clip( aClip.SVRect() ); rContour.Optimize(POLY_OPTIMIZE_CLOSE); - bRet = TRUE; + bRet = sal_True; } } return bRet; diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx index 4d9b654fb79c..aa0661f126b3 100644 --- a/sw/source/core/layout/flycnt.cxx +++ b/sw/source/core/layout/flycnt.cxx @@ -27,13 +27,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" + #include <tools/bigint.hxx> #include "pagefrm.hxx" #include "rootfrm.hxx" #include "cntfrm.hxx" #include "flyfrm.hxx" #include "txtfrm.hxx" -#include "doc.hxx" +#include <doc.hxx> +#include <IDocumentUndoRedo.hxx> #include "viewsh.hxx" #include "viewimp.hxx" #include "pam.hxx" @@ -86,7 +88,7 @@ using namespace ::com::sun::star; SwFlyAtCntFrm::SwFlyAtCntFrm( SwFlyFrmFmt *pFmt, SwFrm *pAnch ) : SwFlyFreeFrm( pFmt, pAnch ) { - bAtCnt = TRUE; + bAtCnt = sal_True; bAutoPosition = (FLY_AT_CHAR == pFmt->GetAnchor().GetAnchorId()); } @@ -104,11 +106,11 @@ TYPEINIT1(SwFlyAtCntFrm,SwFlyFreeFrm); void SwFlyAtCntFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ) { - USHORT nWhich = pNew ? pNew->Which() : 0; + sal_uInt16 nWhich = pNew ? pNew->Which() : 0; const SwFmtAnchor *pAnch = 0; if( RES_ATTRSET_CHG == nWhich && SFX_ITEM_SET == - ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_ANCHOR, FALSE, + ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_ANCHOR, sal_False, (const SfxPoolItem**)&pAnch )) ; // Beim GetItemState wird der AnkerPointer gesetzt ! @@ -132,7 +134,7 @@ void SwFlyAtCntFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ) SwCntntFrm *pCntnt = (SwCntntFrm*)GetAnchorFrm(); AnchorFrm()->RemoveFly( this ); - const BOOL bBodyFtn = (pCntnt->IsInDocBody() || pCntnt->IsInFtn()); + const sal_Bool bBodyFtn = (pCntnt->IsInDocBody() || pCntnt->IsInFtn()); //Den neuen Anker anhand des NodeIdx suchen, am alten und //neuen NodeIdx kann auch erkannt werden, in welche Richtung @@ -194,7 +196,7 @@ void SwFlyAtCntFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ) if ( !pCntnt ) { SwCntntNode *pNode = aNewIdx.GetNode().GetCntntNode(); - pCntnt = pNode->GetFrm( &pOldAnchor->Frm().Pos(), 0, FALSE ); + pCntnt = pNode->GetFrm( &pOldAnchor->Frm().Pos(), 0, sal_False ); ASSERT( pCntnt, "Neuen Anker nicht gefunden" ); } //Flys haengen niemals an einem Follow sondern immer am @@ -269,7 +271,7 @@ public: SwOszControl( const SwFlyFrm *pFrm ); ~SwOszControl(); bool ChkOsz(); - static BOOL IsInProgress( const SwFlyFrm *pFly ); + static sal_Bool IsInProgress( const SwFlyFrm *pFly ); }; const SwFlyFrm *SwOszControl::pStk1 = 0; const SwFlyFrm *SwOszControl::pStk2 = 0; @@ -318,19 +320,19 @@ SwOszControl::~SwOszControl() // <-- } -BOOL SwOszControl::IsInProgress( const SwFlyFrm *pFly ) +sal_Bool SwOszControl::IsInProgress( const SwFlyFrm *pFly ) { if ( SwOszControl::pStk1 && !pFly->IsLowerOf( SwOszControl::pStk1 ) ) - return TRUE; + return sal_True; if ( SwOszControl::pStk2 && !pFly->IsLowerOf( SwOszControl::pStk2 ) ) - return TRUE; + return sal_True; if ( SwOszControl::pStk3 && !pFly->IsLowerOf( SwOszControl::pStk3 ) ) - return TRUE; + return sal_True; if ( SwOszControl::pStk4 && !pFly->IsLowerOf( SwOszControl::pStk4 ) ) - return TRUE; + return sal_True; if ( SwOszControl::pStk5 && !pFly->IsLowerOf( SwOszControl::pStk5 ) ) - return TRUE; - return FALSE; + return sal_True; + return sal_False; } bool SwOszControl::ChkOsz() @@ -387,7 +389,7 @@ void SwFlyAtCntFrm::MakeAll() // --> OD 2004-06-30 #i28701# - use new method <GetPageFrm()> if( GetPageFrm() ) { - bSetCompletePaintOnInvalidate = TRUE; + bSetCompletePaintOnInvalidate = sal_True; { SwFlyFrmFmt *pFmt = (SwFlyFrmFmt*)GetFmt(); const SwFmtFrmSize &rFrmSz = GetFmt()->GetFrmSize(); @@ -421,7 +423,7 @@ void SwFlyAtCntFrm::MakeAll() if( pFooter && !pFooter->IsFooterFrm() ) pFooter = NULL; bool bOsz = false; - BOOL bExtra = Lower() && Lower()->IsColumnFrm(); + sal_Bool bExtra = Lower() && Lower()->IsColumnFrm(); // --> OD 2004-08-25 #i3317# - boolean, to apply temporarly the // 'straightforward positioning process' for the frame due to its // overlapping with a previous column. @@ -548,7 +550,7 @@ void SwFlyAtCntFrm::MakeAll() // Spalten hinterlaesst, so drehen wir lieber hier eine weitere // Runde und formatieren unseren Inhalt via FormatWidthCols nochmal. _InvalidateSize(); - bExtra = FALSE; // Sicherhaltshalber gibt es nur eine Ehrenrunde. + bExtra = sal_False; // Sicherhaltshalber gibt es nur eine Ehrenrunde. } } while ( !IsValid() && !bOsz && // --> OD 2004-08-25 #i3317# @@ -595,7 +597,7 @@ void SwFlyAtCntFrm::MakeAll() // <-- } // <-- - bSetCompletePaintOnInvalidate = FALSE; + bSetCompletePaintOnInvalidate = sal_False; } } } @@ -632,10 +634,10 @@ public: SwDistance() { nMain = nSub = 0; } SwDistance& operator=( const SwDistance &rTwo ) { nMain = rTwo.nMain; nSub = rTwo.nSub; return *this; } - BOOL operator<( const SwDistance& rTwo ) + sal_Bool operator<( const SwDistance& rTwo ) { return nMain < rTwo.nMain || ( nMain == rTwo.nMain && nSub && rTwo.nSub && nSub < rTwo.nSub ); } - BOOL operator<=( const SwDistance& rTwo ) + sal_Bool operator<=( const SwDistance& rTwo ) { return nMain < rTwo.nMain || ( nMain == rTwo.nMain && ( !nSub || !rTwo.nSub || nSub <= rTwo.nSub ) ); } }; @@ -691,7 +693,7 @@ const SwFrm * MA_FASTCALL lcl_CalcDownDist( SwDistance &rRet, { // OD 26.09.2003 - <rPt> point is left of environment of given content frame // OD: seems not to be correct for vertical layout!? - const SwFrm *pLay = pUp->GetLeaf( MAKEPAGE_NONE, FALSE, pCnt ); + const SwFrm *pLay = pUp->GetLeaf( MAKEPAGE_NONE, sal_False, pCnt ); if( !pLay || (bVert && (pLay->Frm().Top() + pLay->Prt().Bottom()) <rPt.Y())|| (!bVert && (pLay->Frm().Left() + pLay->Prt().Right())<rPt.X()) ) @@ -717,10 +719,10 @@ const SwFrm * MA_FASTCALL lcl_CalcDownDist( SwDistance &rRet, // <-- const SwFrm *pPre = pCnt; - const SwFrm *pLay = pUp->GetLeaf( MAKEPAGE_NONE, TRUE, pCnt ); + const SwFrm *pLay = pUp->GetLeaf( MAKEPAGE_NONE, sal_True, pCnt ); SwTwips nFrmTop = 0; SwTwips nPrtHeight = 0; - BOOL bSct = FALSE; + sal_Bool bSct = sal_False; const SwSectionFrm *pSect = pUp->FindSctFrm(); if( pSect ) { @@ -729,7 +731,7 @@ const SwFrm * MA_FASTCALL lcl_CalcDownDist( SwDistance &rRet, } if( pSect && !pSect->IsAnLower( pLay ) ) { - bSct = FALSE; + bSct = sal_False; const SwSectionFrm* pNxtSect = pLay ? pLay->FindSctFrm() : 0; if( pSect->IsAnFollow( pNxtSect ) ) { @@ -801,13 +803,13 @@ const SwFrm * MA_FASTCALL lcl_CalcDownDist( SwDistance &rRet, else rRet.nMain += nPrtHeight; pPre = pLay; - pLay = pLay->GetLeaf( MAKEPAGE_NONE, TRUE, pCnt ); + pLay = pLay->GetLeaf( MAKEPAGE_NONE, sal_True, pCnt ); if( pSect && !pSect->IsAnLower( pLay ) ) { // If we're leaving a SwSectionFrm, the next Leaf-Frm // is the part of the upper below the SectionFrm. const SwSectionFrm* pNxtSect = pLay ? pLay->FindSctFrm() : NULL; - bSct = FALSE; + bSct = sal_False; if( pSect->IsAnFollow( pNxtSect ) ) { pSect = pNxtSect; @@ -884,9 +886,9 @@ const SwFrm * MA_FASTCALL lcl_CalcDownDist( SwDistance &rRet, return 0; } -ULONG MA_FASTCALL lcl_FindCntDiff( const Point &rPt, const SwLayoutFrm *pLay, +sal_uLong MA_FASTCALL lcl_FindCntDiff( const Point &rPt, const SwLayoutFrm *pLay, const SwCntntFrm *& rpCnt, - const BOOL bBody, const BOOL bFtn ) + const sal_Bool bBody, const sal_Bool bFtn ) { //Sucht unterhalb von pLay den dichtesten Cnt zum Point. Der Bezugspunkt //der Cntnts ist immer die linke obere Ecke. @@ -897,8 +899,8 @@ ULONG MA_FASTCALL lcl_FindCntDiff( const Point &rPt, const SwLayoutFrm *pLay, #endif rpCnt = 0; - ULONG nDistance = ULONG_MAX; - ULONG nNearest = ULONG_MAX; + sal_uLong nDistance = ULONG_MAX; + sal_uLong nNearest = ULONG_MAX; const SwCntntFrm *pCnt = pLay->ContainsCntnt(); while ( pCnt && (bBody != pCnt->IsInDocBody() || bFtn != pCnt->IsInFtn())) @@ -920,7 +922,7 @@ ULONG MA_FASTCALL lcl_FindCntDiff( const Point &rPt, const SwLayoutFrm *pLay, Min( pCnt->Frm().Top(), rPt.Y() ); BigInt dX1( dX ), dY1( dY ); dX1 *= dX1; dY1 *= dY1; - const ULONG nDiff = ::SqRt( dX1 + dY1 ); + const sal_uLong nDiff = ::SqRt( dX1 + dY1 ); if ( pCnt->Frm().Top() <= rPt.Y() ) { if ( nDiff < nDistance ) @@ -949,7 +951,7 @@ ULONG MA_FASTCALL lcl_FindCntDiff( const Point &rPt, const SwLayoutFrm *pLay, } const SwCntntFrm * MA_FASTCALL lcl_FindCnt( const Point &rPt, const SwCntntFrm *pCnt, - const BOOL bBody, const BOOL bFtn ) + const sal_Bool bBody, const sal_Bool bFtn ) { //Sucht ausgehen von pCnt denjenigen CntntFrm, dessen linke obere //Ecke am dichtesten am Point liegt. @@ -963,7 +965,7 @@ const SwCntntFrm * MA_FASTCALL lcl_FindCnt( const Point &rPt, const SwCntntFrm * //des Point sitzt. const SwCntntFrm *pRet, *pNew; const SwLayoutFrm *pLay = pCnt->FindPageFrm(); - ULONG nDist; + sal_uLong nDist; nDist = ::lcl_FindCntDiff( rPt, pLay, pNew, bBody, bFtn ); if ( pNew ) @@ -973,16 +975,16 @@ const SwCntntFrm * MA_FASTCALL lcl_FindCnt( const Point &rPt, const SwCntntFrm * nDist = ULONG_MAX; } const SwCntntFrm *pNearest = pRet; - ULONG nNearest = nDist; + sal_uLong nNearest = nDist; if ( pLay ) { const SwLayoutFrm *pPge = pLay; - ULONG nOldNew = ULONG_MAX; - for ( USHORT i = 0; pPge->GetPrev() && (i < 3); ++i ) + sal_uLong nOldNew = ULONG_MAX; + for ( sal_uInt16 i = 0; pPge->GetPrev() && (i < 3); ++i ) { pPge = (SwLayoutFrm*)pPge->GetPrev(); - const ULONG nNew = ::lcl_FindCntDiff( rPt, pPge, pNew, bBody, bFtn ); + const sal_uLong nNew = ::lcl_FindCntDiff( rPt, pPge, pNew, bBody, bFtn ); if ( nNew < nDist ) { if ( pNew->Frm().Top() <= rPt.Y() ) @@ -1004,10 +1006,10 @@ const SwCntntFrm * MA_FASTCALL lcl_FindCnt( const Point &rPt, const SwCntntFrm * } pPge = pLay; nOldNew = ULONG_MAX; - for ( USHORT j = 0; pPge->GetNext() && (j < 3); ++j ) + for ( sal_uInt16 j = 0; pPge->GetNext() && (j < 3); ++j ) { pPge = (SwLayoutFrm*)pPge->GetNext(); - const ULONG nNew = ::lcl_FindCntDiff( rPt, pPge, pNew, bBody, bFtn ); + const sal_uLong nNew = ::lcl_FindCntDiff( rPt, pPge, pNew, bBody, bFtn ); if ( nNew < nDist ) { if ( pNew->Frm().Top() <= rPt.Y() ) @@ -1049,7 +1051,7 @@ void lcl_PointToPrt( Point &rPoint, const SwFrm *pFrm ) } const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew, - const BOOL bBodyOnly ) + const sal_Bool bBodyOnly ) { //Zu der angegebenen DokumentPosition wird der dichteste Cnt im //Textfluss gesucht. AusgangsFrm ist der uebergebene Anker. @@ -1067,14 +1069,14 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew, SwRect aTmpRect( aTmp, Size(0,0) ); pTmpLay = (SwLayoutFrm*)::FindPage( aTmpRect, pTmpLay->Lower() ); } - pCnt = pTmpLay->GetCntntPos( aTmp, FALSE, bBodyOnly ); + pCnt = pTmpLay->GetCntntPos( aTmp, sal_False, bBodyOnly ); } //Beim Suchen darauf achten, dass die Bereiche sinnvoll erhalten //bleiben. D.h. in diesem Fall nicht in Header/Footer hinein und //nicht aus Header/Footer hinaus. - const BOOL bBody = pCnt->IsInDocBody() || bBodyOnly; - const BOOL bFtn = !bBodyOnly && pCnt->IsInFtn(); + const sal_Bool bBody = pCnt->IsInDocBody() || bBodyOnly; + const sal_Bool bFtn = !bBodyOnly && pCnt->IsInFtn(); Point aNew( rNew ); if ( bBody ) @@ -1096,7 +1098,7 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew, //So gibt es kein Problem mit Spalten. Point aTmp( aNew ); const SwCntntFrm *pTmp = pCnt->FindPageFrm()-> - GetCntntPos( aTmp, FALSE, TRUE, FALSE ); + GetCntntPos( aTmp, sal_False, sal_True, sal_False ); if ( pTmp && pTmp->Frm().IsInside( aNew ) ) return pTmp; } @@ -1110,7 +1112,7 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew, SwDistance nUp, nUpLst; ::lcl_CalcDownDist( nUp, aNew, pUpFrm ); SwDistance nDown = nUp; - BOOL bNegAllowed = TRUE;//Einmal aus dem negativen Bereich heraus lassen. + sal_Bool bNegAllowed = sal_True;//Einmal aus dem negativen Bereich heraus lassen. do { pUpLst = pUpFrm; nUpLst = nUp; @@ -1138,7 +1140,7 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew, nUp.nMain = LONG_MAX; if ( nUp.nMain >= 0 && LONG_MAX != nUp.nMain ) { - bNegAllowed = FALSE; + bNegAllowed = sal_False; if ( nUpLst.nMain < 0 ) //nicht den falschen erwischen, wenn der Wert //gerade von negativ auf positiv gekippt ist. { pUpLst = pUpFrm; @@ -1336,7 +1338,7 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew ) SwFlyFrmFmt *pFmt = (SwFlyFrmFmt*)GetFmt(); const SwFmtSurround& rSurround = pFmt->GetSurround(); - const BOOL bWrapThrough = + const sal_Bool bWrapThrough = rSurround.GetSurround() == SURROUND_THROUGHT; SwTwips nBaseOfstForFly = 0; const SwFrm* pTmpFrm = pFrm ? pFrm : pCnt; @@ -1370,7 +1372,7 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew ) nX = rNew.X() - pFrm->Frm().Left() - nBaseOfstForFly; } } - GetFmt()->GetDoc()->StartUndo( UNDO_START, NULL ); + GetFmt()->GetDoc()->GetIDocumentUndoRedo().StartUndo( UNDO_START, NULL ); if( pCnt != GetAnchorFrm() || ( IsAutoPos() && pCnt->IsTxtFrm() && GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::HTML_MODE)) ) @@ -1421,11 +1423,11 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew ) const Point aRelPos = bVert ? Point( -nY, nX ) : Point( nX, nY ); ChgRelPos( aRelPos ); - GetFmt()->GetDoc()->EndUndo( UNDO_END, NULL ); + GetFmt()->GetDoc()->GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL ); if ( pOldPage != FindPageFrm() ) ::Notify_Background( GetVirtDrawObj(), pOldPage, aOld, PREP_FLY_LEAVE, - FALSE ); + sal_False ); } // OD 2004-08-12 #i32795# - Note: method no longer used in <flyincnt.cxx> @@ -1438,9 +1440,9 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew ) // if( pFlow && pFlow->IsAnyJoinLocked() ) // return; -// USHORT nCnt = 0; +// sal_uInt16 nCnt = 0; -// BOOL bContinue = FALSE; +// sal_Bool bContinue = sal_False; // do // { // if ( ++nCnt == 10 ) @@ -1449,7 +1451,7 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew ) // break; // } -// const BOOL bSetComplete = !pFrm->IsValid(); +// const sal_Bool bSetComplete = !pFrm->IsValid(); // const SwRect aOldFrm( pFrm->Frm() ); // const SwRect aOldPrt( pFrm->Prt() ); @@ -1480,7 +1482,7 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew ) // (((SwFlyFrm*)pUp)->IsFlyAtCntFrm() && // SwOszControl::IsInProgress( (const SwFlyFrm*)pUp )) ) // { -// bContinue = FALSE; +// bContinue = sal_False; // } // } // } while ( bContinue ); @@ -1522,7 +1524,7 @@ void SwFlyAtCntFrm::MakeObjPos() } // OD 2004-03-24 #i26791# - validate position flag here. - bValidPos = TRUE; + bValidPos = sal_True; // --> OD 2004-10-22 #i35911# - no calculation of new position, if // anchored object is marked that it clears its environment and its diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx index 99f9ed7e30ba..1ff29c582696 100644 --- a/sw/source/core/layout/flyincnt.cxx +++ b/sw/source/core/layout/flyincnt.cxx @@ -55,7 +55,7 @@ void DeepCalc( const SwFrm *pFrm ); SwFlyInCntFrm::SwFlyInCntFrm( SwFlyFrmFmt *pFmt, SwFrm *pAnch ) : SwFlyFrm( pFmt, pAnch ) { - bInCnt = bInvalidLayout = bInvalidCntnt = TRUE; + bInCnt = bInvalidLayout = bInvalidCntnt = sal_True; SwTwips nRel = pFmt->GetVertOrient().GetPos(); // OD 2004-05-27 #i26791# - member <aRelPos> moved to <SwAnchoredObject> Point aRelPos; @@ -108,8 +108,8 @@ void SwFlyInCntFrm::SetRefPoint( const Point& rPoint, if( pNotify ) { InvalidatePage(); - bValidPos = FALSE; - bInvalid = TRUE; + bValidPos = sal_False; + bInvalid = sal_True; Calc(); delete pNotify; } @@ -125,14 +125,14 @@ void SwFlyInCntFrm::SetRefPoint( const Point& rPoint, |*************************************************************************/ void SwFlyInCntFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ) { - BOOL bCallPrepare = FALSE; - USHORT nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0; + sal_Bool bCallPrepare = sal_False; + sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0; if( RES_ATTRSET_CHG == nWhich ) { if( SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()-> - GetItemState( RES_SURROUND, FALSE ) || + GetItemState( RES_SURROUND, sal_False ) || SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()-> - GetItemState( RES_FRMMACRO, FALSE ) ) + GetItemState( RES_FRMMACRO, sal_False ) ) { SwAttrSetChg aOld( *(SwAttrSetChg*)pOld ); SwAttrSetChg aNew( *(SwAttrSetChg*)pNew ); @@ -144,19 +144,19 @@ void SwFlyInCntFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ) if( aNew.Count() ) { SwFlyFrm::Modify( &aOld, &aNew ); - bCallPrepare = TRUE; + bCallPrepare = sal_True; } } else if( ((SwAttrSetChg*)pNew)->GetChgSet()->Count()) { SwFlyFrm::Modify( pOld, pNew ); - bCallPrepare = TRUE; + bCallPrepare = sal_True; } } else if( nWhich != RES_SURROUND && RES_FRMMACRO != nWhich ) { SwFlyFrm::Modify( pOld, pNew ); - bCallPrepare = TRUE; + bCallPrepare = sal_True; } if ( bCallPrepare && GetAnchorFrm() ) @@ -202,7 +202,7 @@ void SwFlyInCntFrm::MakeObjPos() { if ( !bValidPos ) { - bValidPos = TRUE; + bValidPos = sal_True; SwFlyFrmFmt *pFmt = (SwFlyFrmFmt*)GetFmt(); const SwFmtVertOrient &rVert = pFmt->GetVertOrient(); //Und ggf. noch die aktuellen Werte im Format updaten, dabei darf @@ -305,14 +305,14 @@ void SwFlyInCntFrm::MakeAll() const SwBorderAttrs &rAttrs = *aAccess.Get(); if ( IsClipped() ) - bValidSize = bHeightClipped = bWidthClipped = FALSE; + bValidSize = bHeightClipped = bWidthClipped = sal_False; while ( !bValidPos || !bValidSize || !bValidPrtArea ) { //Nur einstellen wenn das Flag gesetzt ist!! if ( !bValidSize ) { - bValidPrtArea = FALSE; + bValidPrtArea = sal_False; /* // This is also done in the Format function, so I think // this code is not necessary anymore: @@ -350,8 +350,8 @@ void SwFlyInCntFrm::MakeAll() Frm().Width() > pFrm->Prt().Width() ) { Frm().Width( pFrm->Prt().Width() ); - bValidPrtArea = FALSE; - bWidthClipped = TRUE; + bValidPrtArea = sal_False; + bWidthClipped = sal_True; } } // <-- diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx index 63d067c175b4..4a240b9d256d 100644 --- a/sw/source/core/layout/flylay.cxx +++ b/sw/source/core/layout/flylay.cxx @@ -134,7 +134,7 @@ TYPEINIT1(SwFlyFreeFrm,SwFlyFrm); void SwFlyFreeFrm::NotifyBackground( SwPageFrm *pPageFrm, const SwRect& rRect, PrepareHint eHint ) { - ::Notify_Background( GetVirtDrawObj(), pPageFrm, rRect, eHint, TRUE ); + ::Notify_Background( GetVirtDrawObj(), pPageFrm, rRect, eHint, sal_True ); } /************************************************************************* @@ -174,7 +174,7 @@ void SwFlyFreeFrm::MakeAll() if ( IsClipped() ) { - bValidSize = bHeightClipped = bWidthClipped = FALSE; + bValidSize = bHeightClipped = bWidthClipped = sal_False; // --> OD 2004-11-03 #114798# - no invalidation of position, // if anchored object is anchored inside a Writer fly frame, // its position is already locked, and it follows the text flow. @@ -186,14 +186,14 @@ void SwFlyFreeFrm::MakeAll() GetFrmFmt().GetFollowTextFlow().GetValue() ) ) // <-- { - bValidPos = FALSE; + bValidPos = sal_False; } // <-- } // FME 2007-08-30 #i81146# new loop control - USHORT nLoopControlRuns = 0; - const USHORT nLoopControlMax = 10; + sal_uInt16 nLoopControlRuns = 0; + const sal_uInt16 nLoopControlMax = 10; while ( !bValidPos || !bValidSize || !bValidPrtArea || bFormatHeightOnly ) { @@ -208,7 +208,7 @@ void SwFlyFreeFrm::MakeAll() //Nur einstellen wenn das Flag gesetzt ist!! if ( !bValidSize ) { - bValidPrtArea = FALSE; + bValidPrtArea = sal_False; /* // This is also done in the Format function, so I think // this code is not necessary anymore: @@ -221,7 +221,7 @@ void SwFlyFreeFrm::MakeAll() if( nDiff ) { (aFrm.*fnRect->fnAddRight)( nDiff ); - bValidPos = FALSE; + bValidPos = sal_False; } */ } @@ -231,9 +231,9 @@ void SwFlyFreeFrm::MakeAll() if ( !bValidSize || bFormatHeightOnly ) { - bValidSize = FALSE; + bValidSize = sal_False; Format( &rAttrs ); - bFormatHeightOnly = FALSE; + bFormatHeightOnly = sal_False; } if ( !bValidPos ) @@ -242,7 +242,7 @@ void SwFlyFreeFrm::MakeAll() // OD 2004-03-23 #i26791# - use new method <MakeObjPos()> // --> OD 2004-11-15 #i34753# - no positioning, if requested. if ( IsNoMakePos() ) - bValidPos = TRUE; + bValidPos = sal_True; else // OD 2004-03-23 #i26791# - use new method <MakeObjPos()> MakeObjPos(); @@ -251,10 +251,10 @@ void SwFlyFreeFrm::MakeAll() { if( !bValidPos && GetAnchorFrm()->IsInSct() && !GetAnchorFrm()->FindSctFrm()->IsValid() ) - bValidPos = TRUE; + bValidPos = sal_True; } else - bValidSize = FALSE; + bValidSize = sal_False; } } @@ -341,8 +341,8 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz ) const SwVirtFlyDrawObj *pObj = GetVirtDrawObj(); SwRect aClip, aTmpStretch; - ::CalcClipRect( pObj, aClip, TRUE ); - ::CalcClipRect( pObj, aTmpStretch, FALSE ); + ::CalcClipRect( pObj, aClip, sal_True ); + ::CalcClipRect( pObj, aTmpStretch, sal_False ); aClip._Intersection( aTmpStretch ); const long nBot = Frm().Top() + Frm().Height(); @@ -350,11 +350,11 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz ) const long nClipBot = aClip.Top() + aClip.Height(); const long nClipRig = aClip.Left() + aClip.Width(); - const BOOL bBot = nBot > nClipBot; - const BOOL bRig = nRig > nClipRig; + const sal_Bool bBot = nBot > nClipBot; + const sal_Bool bRig = nRig > nClipRig; if ( bBot || bRig ) { - BOOL bAgain = FALSE; + sal_Bool bAgain = sal_False; // --> OD 2004-11-12 #i37068# - no move, if it's requested if ( bBot && !IsNoMoveOnCheckClip() && !GetDrawObjs() && !GetAnchorFrm()->IsInTab() ) @@ -370,8 +370,8 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz ) const long nOld = Frm().Top(); Frm().Pos().Y() = Max( aClip.Top(), nClipBot - Frm().Height() ); if ( Frm().Top() != nOld ) - bAgain = TRUE; - bHeightClipped = TRUE; + bAgain = sal_True; + bHeightClipped = sal_True; } } if ( bRig ) @@ -386,12 +386,12 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz ) if( rH.GetHoriOrient() == text::HoriOrientation::LEFT ) Frm().Pos().X() = nOld; else - bAgain = TRUE; + bAgain = sal_True; } - bWidthClipped = TRUE; + bWidthClipped = sal_True; } if ( bAgain ) - bValidSize = FALSE; + bValidSize = sal_False; else { //Wenn wir hier ankommen ragt der Frm in unerlaubte Bereiche @@ -412,7 +412,7 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz ) nDiff -= aFrmRect.Top(); //nDiff ist die verfuegbare Strecke. nDiff = aFrmRect.Height() - nDiff; aFrmRect.Height( aFrmRect.Height() - nDiff ); - bHeightClipped = TRUE; + bHeightClipped = sal_True; } if ( bRig ) { @@ -420,7 +420,7 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz ) nDiff -= aFrmRect.Left();//nDiff ist die verfuegbare Strecke. nDiff = aFrmRect.Width() - nDiff; aFrmRect.Width( aFrmRect.Width() - nDiff ); - bWidthClipped = TRUE; + bWidthClipped = sal_True; } // OD 06.08.2003 #i17297#, #111066#, #111070# - no proportional @@ -454,14 +454,14 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz ) { aFrmRect.Height( aFrmRect.Width() * aOldSize.Height() / aOldSize.Width() ); - bHeightClipped = TRUE; + bHeightClipped = sal_True; } //Hoehe angepasst? - Breite dann proportional verkleinern else if( aFrmRect.Height() != aOldSize.Height() ) { aFrmRect.Width( aFrmRect.Height() * aOldSize.Width() / aOldSize.Height() ); - bWidthClipped = TRUE; + bWidthClipped = sal_True; } // OD 07.08.2003 #i17297#, #111066#, #111070# - reactivate change @@ -510,7 +510,7 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz ) ::CalcCntnt( this ); ColUnlock(); if ( !bValidSize && !bWidthClipped ) - bFormatHeightOnly = bValidSize = TRUE; + bFormatHeightOnly = bValidSize = sal_True; } else { @@ -551,7 +551,7 @@ bool SwFlyFreeFrm::IsFormatPossible() const SwFlyLayFrm::SwFlyLayFrm( SwFlyFrmFmt *pFmt, SwFrm *pAnch ) : SwFlyFreeFrm( pFmt, pAnch ) { - bLayout = TRUE; + bLayout = sal_True; } // --> OD 2004-06-29 #i28701# @@ -568,11 +568,11 @@ TYPEINIT1(SwFlyLayFrm,SwFlyFreeFrm); void SwFlyLayFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ) { - USHORT nWhich = pNew ? pNew->Which() : 0; + sal_uInt16 nWhich = pNew ? pNew->Which() : 0; SwFmtAnchor *pAnch = 0; if( RES_ATTRSET_CHG == nWhich && SFX_ITEM_SET == - ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_ANCHOR, FALSE, + ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_ANCHOR, sal_False, (const SfxPoolItem**)&pAnch )) ; // Beim GetItemState wird der AnkerPointer gesetzt ! @@ -599,10 +599,10 @@ void SwFlyLayFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ) if ( FLY_AT_PAGE == pAnch->GetAnchorId() ) { - USHORT nPgNum = pAnch->GetPageNum(); + sal_uInt16 nPgNum = pAnch->GetPageNum(); SwRootFrm *pRoot = FindRootFrm(); SwPageFrm *pTmpPage = (SwPageFrm*)pRoot->Lower(); - for ( USHORT i = 1; (i <= nPgNum) && pTmpPage; ++i, + for ( sal_uInt16 i = 1; (i <= nPgNum) && pTmpPage; ++i, pTmpPage = (SwPageFrm*)pTmpPage->GetNext() ) { if ( i == nPgNum ) @@ -622,7 +622,7 @@ void SwFlyLayFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ) { SwNodeIndex aIdx( pAnch->GetCntntAnchor()->nNode ); SwCntntFrm *pCntnt = GetFmt()->GetDoc()->GetNodes().GoNext( &aIdx )-> - GetCntntNode()->GetFrm( 0, 0, FALSE ); + GetCntntNode()->GetFrm( 0, 0, sal_False ); if( pCntnt ) { SwFlyFrm *pTmp = pCntnt->FindFlyFrm(); @@ -673,7 +673,7 @@ void SwPageFrm::AppendFlyToPage( SwFlyFrm *pNew ) const SwFlyFrm* pFly = pNew->GetAnchorFrm()->FindFlyFrm(); if ( pFly && pObj->GetOrdNum() < pFly->GetVirtDrawObj()->GetOrdNum() ) { - UINT32 nNewNum = pFly->GetVirtDrawObj()->GetOrdNumDirect(); + sal_uInt32 nNewNum = pFly->GetVirtDrawObj()->GetOrdNumDirect(); if ( pObj->GetPage() ) pObj->GetPage()->SetObjectOrdNum( pObj->GetOrdNumDirect(), nNewNum); else @@ -725,7 +725,7 @@ void SwPageFrm::AppendFlyToPage( SwFlyFrm *pNew ) if ( pNew->GetDrawObjs() ) { SwSortedObjs &rObjs = *pNew->GetDrawObjs(); - for ( USHORT i = 0; i < rObjs.Count(); ++i ) + for ( sal_uInt16 i = 0; i < rObjs.Count(); ++i ) { SwAnchoredObject* pTmpObj = rObjs[i]; if ( pTmpObj->ISA(SwFlyFrm) ) @@ -764,7 +764,7 @@ void SwPageFrm::AppendFlyToPage( SwFlyFrm *pNew ) void SwPageFrm::RemoveFlyFromPage( SwFlyFrm *pToRemove ) { - const UINT32 nOrdNum = pToRemove->GetVirtDrawObj()->GetOrdNum(); + const sal_uInt32 nOrdNum = pToRemove->GetVirtDrawObj()->GetOrdNum(); FindRootFrm()->GetDrawPage()->RemoveObject( nOrdNum ); pToRemove->GetVirtDrawObj()->ReferencedObj().SetOrdNum( nOrdNum ); @@ -944,7 +944,7 @@ void SwPageFrm::AppendDrawObjToPage( SwAnchoredObject& _rNewObj ) if ( pFlyFrm && _rNewObj.GetDrawObj()->GetOrdNum() < pFlyFrm->GetVirtDrawObj()->GetOrdNum() ) { - UINT32 nNewNum = pFlyFrm->GetVirtDrawObj()->GetOrdNumDirect(); + sal_uInt32 nNewNum = pFlyFrm->GetVirtDrawObj()->GetOrdNumDirect(); if ( _rNewObj.GetDrawObj()->GetPage() ) _rNewObj.DrawObj()->GetPage()->SetObjectOrdNum( _rNewObj.GetDrawObj()->GetOrdNumDirect(), nNewNum); @@ -1063,9 +1063,9 @@ void SwPageFrm::PlaceFly( SwFlyFrm* pFly, SwFlyFrmFmt* pFmt ) // --> OD 2004-07-06 #i28701# - if document compatibility option 'Consider // wrapping style influence on object positioning' is ON, the clip area // corresponds to the one as the object doesn't follows the text flow. -BOOL CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, BOOL bMove ) +sal_Bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, sal_Bool bMove ) { - BOOL bRet = TRUE; + sal_Bool bRet = sal_True; if ( pSdrObj->ISA(SwVirtFlyDrawObj) ) { const SwFlyFrm* pFly = ((const SwVirtFlyDrawObj*)pSdrObj)->GetFlyFrm(); @@ -1189,7 +1189,7 @@ BOOL CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, BOOL bMove ) SWRECTFN( pClip ) const SwLayoutFrm *pUp = pClip->GetUpper(); const SwFrm *pCell = pUp->IsCellFrm() ? pUp : 0; - USHORT nType = bMove ? FRM_ROOT | FRM_FLY | FRM_HEADER | + sal_uInt16 nType = bMove ? FRM_ROOT | FRM_FLY | FRM_HEADER | FRM_FOOTER | FRM_FTN : FRM_BODY | FRM_FLY | FRM_HEADER | FRM_FOOTER | FRM_CELL| FRM_FTN; @@ -1384,7 +1384,7 @@ BOOL CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, BOOL bMove ) } else { - bRet = FALSE; + bRet = sal_False; } } } diff --git a/sw/source/core/layout/flypos.cxx b/sw/source/core/layout/flypos.cxx index c724ad8779db..8d3b517c2efc 100644 --- a/sw/source/core/layout/flypos.cxx +++ b/sw/source/core/layout/flypos.cxx @@ -49,10 +49,10 @@ SV_IMPL_OP_PTRARR_SORT( SwPosFlyFrms, SwPosFlyFrmPtr ) SwPosFlyFrm::SwPosFlyFrm( const SwNodeIndex& rIdx, const SwFrmFmt* pFmt, - USHORT nArrPos ) + sal_uInt16 nArrPos ) : pFrmFmt( pFmt ), pNdIdx( (SwNodeIndex*) &rIdx ) { - BOOL bFnd = FALSE; + sal_Bool bFnd = sal_False; const SwFmtAnchor& rAnchor = pFmt->GetAnchor(); if (FLY_AT_PAGE == rAnchor.GetAnchorId()) { @@ -66,14 +66,14 @@ SwPosFlyFrm::SwPosFlyFrm( const SwNodeIndex& rIdx, const SwFrmFmt* pFmt, // Schauen, ob es ein SdrObject dafuer gibt if( aIter.First( TYPE( SwFlyFrm) ) ) nOrdNum = ((SwFlyFrm*)aIter())->GetVirtDrawObj()->GetOrdNum(), - bFnd = TRUE; + bFnd = sal_True; } else if( RES_DRAWFRMFMT == pFmt->Which() ) { // Schauen, ob es ein SdrObject dafuer gibt if( aIter.First( TYPE(SwDrawContact) ) ) nOrdNum = ((SwDrawContact*)aIter())->GetMaster()->GetOrdNum(), - bFnd = TRUE; + bFnd = sal_True; } } @@ -93,12 +93,12 @@ SwPosFlyFrm::~SwPosFlyFrm() } } -BOOL SwPosFlyFrm::operator==( const SwPosFlyFrm& ) +sal_Bool SwPosFlyFrm::operator==( const SwPosFlyFrm& ) { - return FALSE; // FlyFrames koennen auf der gleichen Position stehen + return sal_False; // FlyFrames koennen auf der gleichen Position stehen } -BOOL SwPosFlyFrm::operator<( const SwPosFlyFrm& rPosFly ) +sal_Bool SwPosFlyFrm::operator<( const SwPosFlyFrm& rPosFly ) { if( pNdIdx->GetIndex() == rPosFly.pNdIdx->GetIndex() ) { diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 661f68603603..3d820e7a1e69 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -92,17 +92,17 @@ // <-- // ftnfrm.cxx: -void lcl_RemoveFtns( SwFtnBossFrm* pBoss, BOOL bPageOnly, BOOL bEndNotes ); +void lcl_RemoveFtns( SwFtnBossFrm* pBoss, sal_Bool bPageOnly, sal_Bool bEndNotes ); using namespace ::com::sun::star; -BOOL bObjsDirect = TRUE; -BOOL bDontCreateObjects = FALSE; -BOOL bSetCompletePaintOnInvalidate = FALSE; +sal_Bool bObjsDirect = sal_True; +sal_Bool bDontCreateObjects = sal_False; +sal_Bool bSetCompletePaintOnInvalidate = sal_False; -BYTE StackHack::nCnt = 0; -BOOL StackHack::bLocked = FALSE; +sal_uInt8 StackHack::nCnt = 0; +sal_Bool StackHack::bLocked = sal_False; @@ -119,7 +119,7 @@ SwFrmNotify::SwFrmNotify( SwFrm *pF ) : pFrm( pF ), aFrm( pF->Frm() ), aPrt( pF->Prt() ), - bInvaKeep( FALSE ), + bInvaKeep( sal_False ), bValidSize( pF->GetValidSizeFlag() ), // --> OD 2005-07-29 #i49383# mbFrmDeleted( false ) @@ -137,8 +137,8 @@ SwFrmNotify::SwFrmNotify( SwFrm *pF ) : } bHadFollow = pF->IsCntntFrm() ? - (((SwCntntFrm*)pF)->GetFollow() ? TRUE : FALSE) : - FALSE; + (((SwCntntFrm*)pF)->GetFollow() ? sal_True : sal_False) : + sal_False; } /************************************************************************* @@ -160,12 +160,12 @@ SwFrmNotify::~SwFrmNotify() // <-- SWRECTFN( pFrm ) - const BOOL bAbsP = POS_DIFF( aFrm, pFrm->Frm() ); - const BOOL bChgWidth = + const sal_Bool bAbsP = POS_DIFF( aFrm, pFrm->Frm() ); + const sal_Bool bChgWidth = (aFrm.*fnRect->fnGetWidth)() != (pFrm->Frm().*fnRect->fnGetWidth)(); - const BOOL bChgHeight = + const sal_Bool bChgHeight = (aFrm.*fnRect->fnGetHeight)()!=(pFrm->Frm().*fnRect->fnGetHeight)(); - const BOOL bChgFlyBasePos = pFrm->IsTxtFrm() && + const sal_Bool bChgFlyBasePos = pFrm->IsTxtFrm() && ( ( mnFlyAnchorOfst != ((SwTxtFrm*)pFrm)->GetBaseOfstForFly( sal_True ) ) || ( mnFlyAnchorOfstNoWrap != ((SwTxtFrm*)pFrm)->GetBaseOfstForFly( sal_False ) ) ); @@ -248,9 +248,9 @@ SwFrmNotify::~SwFrmNotify() } //Fuer Hintergrundgrafiken muss bei Groessenaenderungen ein Repaint her. - const BOOL bPrtWidth = + const sal_Bool bPrtWidth = (aPrt.*fnRect->fnGetWidth)() != (pFrm->Prt().*fnRect->fnGetWidth)(); - const BOOL bPrtHeight = + const sal_Bool bPrtHeight = (aPrt.*fnRect->fnGetHeight)()!=(pFrm->Prt().*fnRect->fnGetHeight)(); if ( bPrtWidth || bPrtHeight ) { @@ -269,7 +269,7 @@ SwFrmNotify::~SwFrmNotify() } } - const BOOL bPrtP = POS_DIFF( aPrt, pFrm->Prt() ); + const sal_Bool bPrtP = POS_DIFF( aPrt, pFrm->Prt() ); if ( bAbsP || bPrtP || bChgWidth || bChgHeight || bPrtWidth || bPrtHeight || bChgFlyBasePos ) { @@ -468,7 +468,7 @@ SwFrmNotify::~SwFrmNotify() SwLayNotify::SwLayNotify( SwLayoutFrm *pLayFrm ) : SwFrmNotify( pLayFrm ), - bLowersComplete( FALSE ) + bLowersComplete( sal_False ) { } @@ -521,22 +521,22 @@ SwLayNotify::~SwLayNotify() SwLayoutFrm *pLay = GetLay(); SWRECTFN( pLay ) - BOOL bNotify = FALSE; + sal_Bool bNotify = sal_False; if ( pLay->Prt().SSize() != aPrt.SSize() ) { if ( !IsLowersComplete() ) { - BOOL bInvaPercent; + sal_Bool bInvaPercent; if ( pLay->IsRowFrm() ) { - bInvaPercent = TRUE; + bInvaPercent = sal_True; long nNew = (pLay->Prt().*fnRect->fnGetHeight)(); if( nNew != (aPrt.*fnRect->fnGetHeight)() ) - ((SwRowFrm*)pLay)->AdjustCells( nNew, TRUE); + ((SwRowFrm*)pLay)->AdjustCells( nNew, sal_True); if( (pLay->Prt().*fnRect->fnGetWidth)() != (aPrt.*fnRect->fnGetWidth)() ) - ((SwRowFrm*)pLay)->AdjustCells( 0, FALSE ); + ((SwRowFrm*)pLay)->AdjustCells( 0, sal_False ); } else { @@ -546,7 +546,7 @@ SwLayNotify::~SwLayNotify() //3. Wenn der Fly eine feste Hoehe hat und die Spalten in der // Hoehe danebenliegen. //4. niemals bei SectionFrms. - BOOL bLow; + sal_Bool bLow; if( pLay->IsFlyFrm() ) { if ( pLay->Lower() ) @@ -556,7 +556,7 @@ SwLayNotify::~SwLayNotify() != (pLay->Prt().*fnRect->fnGetHeight)(); } else - bLow = FALSE; + bLow = sal_False; } else if( pLay->IsSctFrm() ) { @@ -568,12 +568,12 @@ SwLayNotify::~SwLayNotify() bLow = pLay->Prt().Width() != aPrt.Width(); } else - bLow = FALSE; + bLow = sal_False; } else if( pLay->IsFooterFrm() && !pLay->HasFixSize() ) bLow = pLay->Prt().Width() != aPrt.Width(); else - bLow = TRUE; + bLow = sal_True; bInvaPercent = bLow; if ( bLow ) { @@ -599,7 +599,7 @@ SwLayNotify::~SwLayNotify() } } } - bNotify = TRUE; + bNotify = sal_True; //TEUER!! aber wie macht man es geschickter? if( bInvaPercent ) pLay->InvaPercentLowers( pLay->Prt().Height() - aPrt.Height() ); @@ -616,9 +616,9 @@ SwLayNotify::~SwLayNotify() } //Lower benachrichtigen wenn sich die Position veraendert hat. - const BOOL bPrtPos = POS_DIFF( aPrt, pLay->Prt() ); - const BOOL bPos = bPrtPos || POS_DIFF( aFrm, pLay->Frm() ); - const BOOL bSize = pLay->Frm().SSize() != aFrm.SSize(); + const sal_Bool bPrtPos = POS_DIFF( aPrt, pLay->Prt() ); + const sal_Bool bPos = bPrtPos || POS_DIFF( aFrm, pLay->Frm() ); + const sal_Bool bSize = pLay->Frm().SSize() != aFrm.SSize(); if ( bPos && pLay->Lower() && !IsLowersComplete() ) pLay->Lower()->InvalidatePos(); @@ -939,7 +939,7 @@ SwCntntNotify::~SwCntntNotify() } } - BOOL bFirst = (aFrm.*fnRect->fnGetWidth)() == 0; + sal_Bool bFirst = (aFrm.*fnRect->fnGetWidth)() == 0; if ( pCnt->IsNoTxtFrm() ) { @@ -986,7 +986,7 @@ SwCntntNotify::~SwCntntNotify() if ( pFESh && pNd->IsOLESizeInvalid() ) { - pNd->SetOLESizeInvalid( FALSE ); + pNd->SetOLESizeInvalid( sal_False ); //TODO/LATER: needs OnDocumentPrinterChanged //xObj->OnDocumentPrinterChanged( pNd->GetDoc()->getPrinter( false ) ); pFESh->CalcAndSetScale( xObj );//Client erzeugen lassen. @@ -1023,7 +1023,7 @@ SwCntntNotify::~SwCntntNotify() SwNodeIndex *pIdx = 0; SwSpzFrmFmts *pTbl = pDoc->GetSpzFrmFmts(); - for ( USHORT i = 0; i < pTbl->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pTbl->Count(); ++i ) { if ( !pPage ) pPage = pCnt->FindPageFrm(); @@ -1036,7 +1036,7 @@ SwCntntNotify::~SwCntntNotify() continue; //#60878# nicht etwa zeichengebundene. } - BOOL bCheckPos = FALSE; + sal_Bool bCheckPos = sal_False; if ( rAnch.GetCntntAnchor() ) { if ( !pIdx ) @@ -1045,7 +1045,7 @@ SwCntntNotify::~SwCntntNotify() } if ( rAnch.GetCntntAnchor()->nNode == *pIdx ) { - bCheckPos = TRUE; + bCheckPos = sal_True; if (FLY_AT_PAGE == rAnch.GetAnchorId()) { ASSERT( false, "<SwCntntNotify::~SwCntntNotify()> - to page anchored object with content position. Please inform OD." ); @@ -1118,10 +1118,10 @@ SwCntntNotify::~SwCntntNotify() |* |*************************************************************************/ -void AppendObjs( const SwSpzFrmFmts *pTbl, ULONG nIndex, +void AppendObjs( const SwSpzFrmFmts *pTbl, sal_uLong nIndex, SwFrm *pFrm, SwPageFrm *pPage ) { - for ( USHORT i = 0; i < pTbl->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pTbl->Count(); ++i ) { SwFrmFmt *pFmt = (SwFrmFmt*)(*pTbl)[i]; const SwFmtAnchor &rAnch = pFmt->GetAnchor(); @@ -1196,7 +1196,7 @@ void AppendObjs( const SwSpzFrmFmts *pTbl, ULONG nIndex, } } -BOOL MA_FASTCALL lcl_ObjConnected( SwFrmFmt *pFmt ) +sal_Bool MA_FASTCALL lcl_ObjConnected( SwFrmFmt *pFmt ) { SwClientIter aIter( *pFmt ); if ( RES_FLYFRMFMT == pFmt->Which() ) @@ -1207,7 +1207,7 @@ BOOL MA_FASTCALL lcl_ObjConnected( SwFrmFmt *pFmt ) if ( 0 != (pContact = (SwDrawContact*)aIter.First( TYPE(SwDrawContact)))) return pContact->GetAnchorFrm() != 0; } - return FALSE; + return sal_False; } /** helper method to determine, if a <SwFrmFmt>, which has an object connected, @@ -1245,24 +1245,24 @@ void AppendAllObjs( const SwSpzFrmFmts *pTbl ) SwSpzFrmFmts aCpy( 255, 255 ); aCpy.Insert( pTbl, 0 ); - USHORT nOldCnt = USHRT_MAX; + sal_uInt16 nOldCnt = USHRT_MAX; while ( aCpy.Count() && aCpy.Count() != nOldCnt ) { nOldCnt = aCpy.Count(); for ( int i = 0; i < int(aCpy.Count()); ++i ) { - SwFrmFmt *pFmt = (SwFrmFmt*)aCpy[ USHORT(i) ]; + SwFrmFmt *pFmt = (SwFrmFmt*)aCpy[ sal_uInt16(i) ]; const SwFmtAnchor &rAnch = pFmt->GetAnchor(); - BOOL bRemove = FALSE; + sal_Bool bRemove = sal_False; if ((rAnch.GetAnchorId() == FLY_AT_PAGE) || (rAnch.GetAnchorId() == FLY_AS_CHAR)) { //Seitengebunde sind bereits verankert, zeichengebundene //will ich hier nicht. - bRemove = TRUE; + bRemove = sal_True; } - else if ( FALSE == (bRemove = ::lcl_ObjConnected( pFmt )) || + else if ( sal_False == (bRemove = ::lcl_ObjConnected( pFmt )) || ::lcl_InHeaderOrFooter( *pFmt ) ) { // OD 23.06.2003 #108784# - correction: for objects in header @@ -1276,7 +1276,7 @@ void AppendAllObjs( const SwSpzFrmFmts *pTbl ) } if ( bRemove ) { - aCpy.Remove( USHORT(i) ); + aCpy.Remove( sal_uInt16(i) ); --i; } } @@ -1304,16 +1304,16 @@ void lcl_SetPos( SwFrm& _rNewFrm, } void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, - ULONG nIndex, BOOL bPages, ULONG nEndIndex, + sal_uLong nIndex, sal_Bool bPages, sal_uLong nEndIndex, SwFrm *pPrv ) { pDoc->BlockIdling(); SwRootFrm* pLayout = pDoc->GetRootFrm(); - const BOOL bOldCallbackActionEnabled = pLayout ? pLayout->IsCallbackActionEnabled() : sal_False; + const sal_Bool bOldCallbackActionEnabled = pLayout ? pLayout->IsCallbackActionEnabled() : sal_False; if(pLayout) - pLayout->SetCallbackActionEnabled( FALSE ); + pLayout->SetCallbackActionEnabled( sal_False ); - //Bei der Erzeugung des Layouts wird bPages mit TRUE uebergeben. Dann + //Bei der Erzeugung des Layouts wird bPages mit sal_True uebergeben. Dann //werden schon mal alle x Absaetze neue Seiten angelegt. Bei umbruechen //und/oder Pagedescriptorwechseln werden gleich die entsprechenden Seiten //angelegt. @@ -1327,17 +1327,17 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, //Wenn in der DocStatistik eine brauchebare Seitenzahl angegeben ist //(wird beim Schreiben gepflegt), so wird von dieser Seitenanzahl //ausgegengen. - const BOOL bStartPercent = bPages && !nEndIndex; + const sal_Bool bStartPercent = bPages && !nEndIndex; SwPageFrm *pPage = pLay->FindPageFrm(); const SwSpzFrmFmts *pTbl = pDoc->GetSpzFrmFmts(); SwFrm *pFrm = 0; - BOOL bBreakAfter = FALSE; + sal_Bool bBreakAfter = sal_False; SwActualSection *pActualSection = 0; SwLayHelper *pPageMaker; - //Wenn das Layout erzeugt wird (bPages == TRUE) steuern wir den Progress + //Wenn das Layout erzeugt wird (bPages == sal_True) steuern wir den Progress //an. Flys und DrawObjekte werden dann nicht gleich verbunden, dies //passiert erst am Ende der Funktion. if ( bPages ) @@ -1348,9 +1348,9 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, pActualSection, bBreakAfter, nIndex, 0 == nEndIndex ); if( bStartPercent ) { - const ULONG nPageCount = pPageMaker->CalcPageCount(); + const sal_uLong nPageCount = pPageMaker->CalcPageCount(); if( nPageCount ) - bObjsDirect = FALSE; + bObjsDirect = sal_False; } } else @@ -1384,7 +1384,7 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, //the SwActualSection class has a member, which points to an upper(section). //When the "inner" section finishs, the upper will used instead. - while( TRUE ) + while( sal_True ) { SwNode *pNd = pDoc->GetNodes()[nIndex]; if ( pNd->IsCntntNode() ) @@ -1523,7 +1523,7 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, if( pPrv->IsSctFrm() ) pPrv = ((SwSectionFrm*)pPrv)->ContainsCntnt(); if( pPrv && pPrv->IsTxtFrm() ) - ((SwTxtFrm*)pPrv)->Prepare( PREP_QUOVADIS, 0, FALSE ); + ((SwTxtFrm*)pPrv)->Prepare( PREP_QUOVADIS, 0, sal_False ); } } // --> OD 2005-12-01 #i27138# @@ -1627,7 +1627,7 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, if( ! pOuterSectionFrm->IsColLocked() && ! pOuterSectionFrm->ContainsCntnt() ) { - pOuterSectionFrm->DelEmpty( TRUE ); + pOuterSectionFrm->DelEmpty( sal_True ); delete pOuterSectionFrm; } pActualSection->SetSectionFrm( (SwSectionFrm*)pFrm ); @@ -1683,7 +1683,7 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, { if ( !bDontCreateObjects ) AppendAllObjs( pTbl ); - bObjsDirect = TRUE; + bObjsDirect = sal_True; } if( pPageMaker ) @@ -1710,29 +1710,29 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx, const SwNodeIndex &rEndIdx ) { - bObjsDirect = FALSE; + bObjsDirect = sal_False; SwNodeIndex aTmp( rSttIdx ); - ULONG nEndIdx = rEndIdx.GetIndex(); + sal_uLong nEndIdx = rEndIdx.GetIndex(); SwNode* pNd = pDoc->GetNodes().FindPrvNxtFrmNode( aTmp, pDoc->GetNodes()[ nEndIdx-1 ]); if ( pNd ) { - BOOL bApres = aTmp < rSttIdx; + sal_Bool bApres = aTmp < rSttIdx; SwNode2Layout aNode2Layout( *pNd, rSttIdx.GetIndex() ); SwFrm* pFrm; while( 0 != (pFrm = aNode2Layout.NextFrm()) ) { SwLayoutFrm *pUpper = pFrm->GetUpper(); SwFtnFrm* pFtnFrm = pUpper->FindFtnFrm(); - BOOL bOldLock, bOldFtn; + sal_Bool bOldLock, bOldFtn; if( pFtnFrm ) { bOldFtn = pFtnFrm->IsColLocked(); pFtnFrm->ColLock(); } else - bOldFtn = TRUE; + bOldFtn = sal_True; SwSectionFrm* pSct = pUpper->FindSctFrm(); // Es sind innerhalb von Fussnoten nur die Bereiche interessant, // die in den Fussnoten liegen, nicht etwa die (spaltigen) Bereiche, @@ -1746,14 +1746,14 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx, pSct->ColLock(); } else - bOldLock = TRUE; + bOldLock = sal_True; // Wenn pFrm sich nicht bewegen kann, koennen wir auch niemanden // auf die naechste Seite schieben. Innerhalb eines Rahmens auch // nicht ( in der 1. Spalte eines Rahmens waere pFrm Moveable()! ) // Auch in spaltigen Bereichen in Tabellen waere pFrm Moveable. - BOOL bMoveNext = nEndIdx - rSttIdx.GetIndex() > 120; - BOOL bAllowMove = !pFrm->IsInFly() && pFrm->IsMoveable() && + sal_Bool bMoveNext = nEndIdx - rSttIdx.GetIndex() > 120; + sal_Bool bAllowMove = !pFrm->IsInFly() && pFrm->IsMoveable() && (!pFrm->IsInTab() || pFrm->IsTabFrm() ); if ( bMoveNext && bAllowMove ) { @@ -1842,12 +1842,12 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx, if( pTmp ) { SwFrm* pOldUp = pTmp->GetFrm()->GetUpper(); - // MoveFwd==TRUE bedeutet, dass wir auf der gleichen + // MoveFwd==sal_True bedeutet, dass wir auf der gleichen // Seite geblieben sind, wir wollen aber die Seite wechseln, // sofern dies moeglich ist - BOOL bTmpOldLock = pTmp->IsJoinLocked(); + sal_Bool bTmpOldLock = pTmp->IsJoinLocked(); pTmp->LockJoin(); - while( pTmp->MoveFwd( TRUE, FALSE, TRUE ) ) + while( pTmp->MoveFwd( sal_True, sal_False, sal_True ) ) { if( pOldUp == pTmp->GetFrm()->GetUpper() ) break; @@ -1861,7 +1861,7 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx, } else { - BOOL bSplit; + sal_Bool bSplit; SwFrm* pPrv = bApres ? pFrm : pFrm->GetPrev(); // Wenn in einen SectionFrm ein anderer eingefuegt wird, // muss dieser aufgebrochen werden @@ -1876,8 +1876,8 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx, } } else - bSplit = FALSE; - ::_InsertCnt( pUpper, pDoc, rSttIdx.GetIndex(), FALSE, + bSplit = sal_False; + ::_InsertCnt( pUpper, pDoc, rSttIdx.GetIndex(), sal_False, nEndIdx, pPrv ); // OD 23.06.2003 #108784# - correction: append objects doesn't // depend on value of <bAllowMove> @@ -1900,7 +1900,7 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx, } SwPageFrm *pPage = pUpper->FindPageFrm(); - SwFrm::CheckPageDescs( pPage, FALSE ); + SwFrm::CheckPageDescs( pPage, sal_False ); if( !bOldFtn ) pFtnFrm->ColUnlock(); if( !bOldLock ) @@ -1911,7 +1911,7 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx, // und damit ruhig zerstoert werden. if( !pSct->ContainsCntnt() ) { - pSct->DelEmpty( TRUE ); + pSct->DelEmpty( sal_True ); pDoc->GetRootFrm()->RemoveFromList( pSct ); delete pSct; } @@ -1919,7 +1919,7 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx, } } - bObjsDirect = TRUE; + bObjsDirect = sal_True; } @@ -1958,20 +1958,20 @@ SwBorderAttrs::SwBorderAttrs( const SwModify *pMod, const SwFrm *pConstructor ) //Muessen alle einmal berechnet werden: bTopLine = bBottomLine = bLeftLine = bRightLine = - bTop = bBottom = bLine = TRUE; + bTop = bBottom = bLine = sal_True; - bCacheGetLine = bCachedGetTopLine = bCachedGetBottomLine = FALSE; + bCacheGetLine = bCachedGetTopLine = bCachedGetBottomLine = sal_False; // OD 21.05.2003 #108789# - init cache status for values <bJoinedWithPrev> // and <bJoinedWithNext>, which aren't initialized by default. - bCachedJoinedWithPrev = FALSE; - bCachedJoinedWithNext = FALSE; + bCachedJoinedWithPrev = sal_False; + bCachedJoinedWithNext = sal_False; bBorderDist = 0 != (pConstructor->GetType() & (FRM_CELL)); } SwBorderAttrs::~SwBorderAttrs() { - ((SwModify*)pOwner)->SetInCache( FALSE ); + ((SwModify*)pOwner)->SetInCache( sal_False ); } /************************************************************************* @@ -1991,13 +1991,13 @@ SwBorderAttrs::~SwBorderAttrs() void SwBorderAttrs::_CalcTop() { nTop = CalcTopLine() + rUL.GetUpper(); - bTop = FALSE; + bTop = sal_False; } void SwBorderAttrs::_CalcBottom() { nBottom = CalcBottomLine() + rUL.GetLower(); - bBottom = FALSE; + bBottom = sal_False; } long SwBorderAttrs::CalcRight( const SwFrm* pCaller ) const @@ -2077,7 +2077,7 @@ void SwBorderAttrs::_CalcTopLine() ? rBox.GetDistance (BOX_LINE_TOP) : rBox.CalcLineSpace(BOX_LINE_TOP); nTopLine = nTopLine + rShadow.CalcShadowSpace(SHADOW_TOP); - bTopLine = FALSE; + bTopLine = sal_False; } void SwBorderAttrs::_CalcBottomLine() @@ -2086,7 +2086,7 @@ void SwBorderAttrs::_CalcBottomLine() ? rBox.GetDistance (BOX_LINE_BOTTOM) : rBox.CalcLineSpace(BOX_LINE_BOTTOM); nBottomLine = nBottomLine + rShadow.CalcShadowSpace(SHADOW_BOTTOM); - bBottomLine = FALSE; + bBottomLine = sal_False; } void SwBorderAttrs::_CalcLeftLine() @@ -2095,7 +2095,7 @@ void SwBorderAttrs::_CalcLeftLine() ? rBox.GetDistance (BOX_LINE_LEFT) : rBox.CalcLineSpace(BOX_LINE_LEFT); nLeftLine = nLeftLine + rShadow.CalcShadowSpace(SHADOW_LEFT); - bLeftLine = FALSE; + bLeftLine = sal_False; } void SwBorderAttrs::_CalcRightLine() @@ -2104,7 +2104,7 @@ void SwBorderAttrs::_CalcRightLine() ? rBox.GetDistance (BOX_LINE_RIGHT) : rBox.CalcLineSpace(BOX_LINE_RIGHT); nRightLine = nRightLine + rShadow.CalcShadowSpace(SHADOW_RIGHT); - bRightLine = FALSE; + bRightLine = sal_False; } /************************************************************************* @@ -2120,7 +2120,7 @@ void SwBorderAttrs::_IsLine() { bIsLine = rBox.GetTop() || rBox.GetBottom() || rBox.GetLeft()|| rBox.GetRight(); - bLine = FALSE; + bLine = sal_False; } /************************************************************************* @@ -2154,7 +2154,7 @@ inline int CmpLines( const SvxBorderLine *pL1, const SvxBorderLine *pL2 ) // OD 21.05.2003 #108789# - compare <CalcRight()> and <rCmpAttrs.CalcRight()> // instead of only the right LR-spacing, because R2L-layout has to be // considered. -BOOL SwBorderAttrs::CmpLeftRight( const SwBorderAttrs &rCmpAttrs, +sal_Bool SwBorderAttrs::CmpLeftRight( const SwBorderAttrs &rCmpAttrs, const SwFrm *pCaller, const SwFrm *pCmp ) const { @@ -2165,10 +2165,10 @@ BOOL SwBorderAttrs::CmpLeftRight( const SwBorderAttrs &rCmpAttrs, CalcRight( pCaller ) == rCmpAttrs.CalcRight( pCmp ) ); } -BOOL SwBorderAttrs::_JoinWithCmp( const SwFrm& _rCallerFrm, +sal_Bool SwBorderAttrs::_JoinWithCmp( const SwFrm& _rCallerFrm, const SwFrm& _rCmpFrm ) const { - BOOL bReturnVal = FALSE; + sal_Bool bReturnVal = sal_False; SwBorderAttrAccess aCmpAccess( SwFrm::GetCache(), &_rCmpFrm ); const SwBorderAttrs &rCmpAttrs = *aCmpAccess.Get(); @@ -2178,7 +2178,7 @@ BOOL SwBorderAttrs::_JoinWithCmp( const SwFrm& _rCallerFrm, CmpLeftRight( rCmpAttrs, &_rCallerFrm, &_rCmpFrm ) ) { - bReturnVal = TRUE; + bReturnVal = sal_True; } return bReturnVal; @@ -2191,7 +2191,7 @@ void SwBorderAttrs::_CalcJoinedWithPrev( const SwFrm& _rFrm, const SwFrm* _pPrevFrm ) { // set default - bJoinedWithPrev = FALSE; + bJoinedWithPrev = sal_False; if ( _rFrm.IsTxtFrm() ) { @@ -2225,7 +2225,7 @@ void SwBorderAttrs::_CalcJoinedWithPrev( const SwFrm& _rFrm, void SwBorderAttrs::_CalcJoinedWithNext( const SwFrm& _rFrm ) { // set default - bJoinedWithNext = FALSE; + bJoinedWithNext = sal_False; if ( _rFrm.IsTxtFrm() ) { @@ -2253,7 +2253,7 @@ void SwBorderAttrs::_CalcJoinedWithNext( const SwFrm& _rFrm ) // OD 21.05.2003 #108789# - accessor for cached values <bJoinedWithPrev> // OD 2004-02-26 #i25029# - add 2nd parameter <_pPrevFrm>, which is passed to // method <_CalcJoindWithPrev(..)>. -BOOL SwBorderAttrs::JoinedWithPrev( const SwFrm& _rFrm, +sal_Bool SwBorderAttrs::JoinedWithPrev( const SwFrm& _rFrm, const SwFrm* _pPrevFrm ) const { if ( !bCachedJoinedWithPrev || _pPrevFrm ) @@ -2265,7 +2265,7 @@ BOOL SwBorderAttrs::JoinedWithPrev( const SwFrm& _rFrm, return bJoinedWithPrev; } -BOOL SwBorderAttrs::JoinedWithNext( const SwFrm& _rFrm ) const +sal_Bool SwBorderAttrs::JoinedWithNext( const SwFrm& _rFrm ) const { if ( !bCachedJoinedWithNext ) { @@ -2280,7 +2280,7 @@ BOOL SwBorderAttrs::JoinedWithNext( const SwFrm& _rFrm ) const void SwBorderAttrs::_GetTopLine( const SwFrm& _rFrm, const SwFrm* _pPrevFrm ) { - USHORT nRet = CalcTopLine(); + sal_uInt16 nRet = CalcTopLine(); // OD 21.05.2003 #108789# - use new method <JoinWithPrev()> // OD 2004-02-26 #i25029# - add 2nd parameter @@ -2296,7 +2296,7 @@ void SwBorderAttrs::_GetTopLine( const SwFrm& _rFrm, void SwBorderAttrs::_GetBottomLine( const SwFrm& _rFrm ) { - USHORT nRet = CalcBottomLine(); + sal_uInt16 nRet = CalcBottomLine(); // OD 21.05.2003 #108789# - use new method <JoinWithPrev()> if ( JoinedWithNext( _rFrm ) ) @@ -2322,7 +2322,7 @@ SwBorderAttrAccess::SwBorderAttrAccess( SwCache &rCach, const SwFrm *pFrm ) : SwCacheAccess( rCach, (pFrm->IsCntntFrm() ? (void*)((SwCntntFrm*)pFrm)->GetNode() : (void*)((SwLayoutFrm*)pFrm)->GetFmt()), - (BOOL)(pFrm->IsCntntFrm() ? + (sal_Bool)(pFrm->IsCntntFrm() ? ((SwModify*)((SwCntntFrm*)pFrm)->GetNode())->IsInCache() : ((SwModify*)((SwLayoutFrm*)pFrm)->GetFmt())->IsInCache()) ), pConstructor( pFrm ) @@ -2340,7 +2340,7 @@ SwBorderAttrAccess::SwBorderAttrAccess( SwCache &rCach, const SwFrm *pFrm ) : SwCacheObj *SwBorderAttrAccess::NewObj() { - ((SwModify*)pOwner)->SetInCache( TRUE ); + ((SwModify*)pOwner)->SetInCache( sal_True ); return new SwBorderAttrs( (SwModify*)pOwner, pConstructor ); } @@ -2358,7 +2358,7 @@ SwBorderAttrs *SwBorderAttrAccess::Get() |* |*************************************************************************/ -SwOrderIter::SwOrderIter( const SwPageFrm *pPg, BOOL bFlys ) : +SwOrderIter::SwOrderIter( const SwPageFrm *pPg, sal_Bool bFlys ) : pPage( pPg ), pCurrent( 0 ), bFlysOnly( bFlys ) @@ -2379,17 +2379,17 @@ const SdrObject *SwOrderIter::Top() pCurrent = 0; if ( pPage->GetSortedObjs() ) { - UINT32 nTopOrd = 0; + sal_uInt32 nTopOrd = 0; const SwSortedObjs *pObjs = pPage->GetSortedObjs(); if ( pObjs->Count() ) { (*pObjs)[0]->GetDrawObj()->GetOrdNum(); //Aktualisieren erzwingen! - for ( USHORT i = 0; i < pObjs->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pObjs->Count(); ++i ) { const SdrObject* pObj = (*pObjs)[i]->GetDrawObj(); if ( bFlysOnly && !pObj->ISA(SwVirtFlyDrawObj) ) continue; - UINT32 nTmp = pObj->GetOrdNumDirect(); + sal_uInt32 nTmp = pObj->GetOrdNumDirect(); if ( nTmp >= nTopOrd ) { nTopOrd = nTmp; @@ -2415,17 +2415,17 @@ const SdrObject *SwOrderIter::Bottom() pCurrent = 0; if ( pPage->GetSortedObjs() ) { - UINT32 nBotOrd = USHRT_MAX; + sal_uInt32 nBotOrd = USHRT_MAX; const SwSortedObjs *pObjs = pPage->GetSortedObjs(); if ( pObjs->Count() ) { (*pObjs)[0]->GetDrawObj()->GetOrdNum(); //Aktualisieren erzwingen! - for ( USHORT i = 0; i < pObjs->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pObjs->Count(); ++i ) { const SdrObject* pObj = (*pObjs)[i]->GetDrawObj(); if ( bFlysOnly && !pObj->ISA(SwVirtFlyDrawObj) ) continue; - UINT32 nTmp = pObj->GetOrdNumDirect(); + sal_uInt32 nTmp = pObj->GetOrdNumDirect(); if ( nTmp < nBotOrd ) { nBotOrd = nTmp; @@ -2448,21 +2448,21 @@ const SdrObject *SwOrderIter::Bottom() const SdrObject *SwOrderIter::Next() { - const UINT32 nCurOrd = pCurrent ? pCurrent->GetOrdNumDirect() : 0; + const sal_uInt32 nCurOrd = pCurrent ? pCurrent->GetOrdNumDirect() : 0; pCurrent = 0; if ( pPage->GetSortedObjs() ) { - UINT32 nOrd = USHRT_MAX; + sal_uInt32 nOrd = USHRT_MAX; const SwSortedObjs *pObjs = pPage->GetSortedObjs(); if ( pObjs->Count() ) { (*pObjs)[0]->GetDrawObj()->GetOrdNum(); //Aktualisieren erzwingen! - for ( USHORT i = 0; i < pObjs->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pObjs->Count(); ++i ) { const SdrObject* pObj = (*pObjs)[i]->GetDrawObj(); if ( bFlysOnly && !pObj->ISA(SwVirtFlyDrawObj) ) continue; - UINT32 nTmp = pObj->GetOrdNumDirect(); + sal_uInt32 nTmp = pObj->GetOrdNumDirect(); if ( nTmp > nCurOrd && nTmp < nOrd ) { nOrd = nTmp; @@ -2485,21 +2485,21 @@ const SdrObject *SwOrderIter::Next() const SdrObject *SwOrderIter::Prev() { - const UINT32 nCurOrd = pCurrent ? pCurrent->GetOrdNumDirect() : 0; + const sal_uInt32 nCurOrd = pCurrent ? pCurrent->GetOrdNumDirect() : 0; pCurrent = 0; if ( pPage->GetSortedObjs() ) { - UINT32 nOrd = 0; + sal_uInt32 nOrd = 0; const SwSortedObjs *pObjs = pPage->GetSortedObjs(); if ( pObjs->Count() ) { (*pObjs)[0]->GetDrawObj()->GetOrdNum(); //Aktualisieren erzwingen! - for ( USHORT i = 0; i < pObjs->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pObjs->Count(); ++i ) { const SdrObject* pObj = (*pObjs)[i]->GetDrawObj(); if ( bFlysOnly && !pObj->ISA(SwVirtFlyDrawObj) ) continue; - UINT32 nTmp = pObj->GetOrdNumDirect(); + sal_uInt32 nTmp = pObj->GetOrdNumDirect(); if ( nTmp < nCurOrd && nTmp >= nOrd ) { nOrd = nTmp; @@ -2539,7 +2539,7 @@ void MA_FASTCALL lcl_RemoveObjsFromPage( SwFrm* _pFrm ) { ASSERT( _pFrm->GetDrawObjs(), "Keine DrawObjs fuer lcl_RemoveFlysFromPage." ); SwSortedObjs &rObjs = *_pFrm->GetDrawObjs(); - for ( USHORT i = 0; i < rObjs.Count(); ++i ) + for ( sal_uInt16 i = 0; i < rObjs.Count(); ++i ) { SwAnchoredObject* pObj = rObjs[i]; // --> OD 2004-11-29 #115759# - reset member, at which the anchored @@ -2593,7 +2593,7 @@ void MA_FASTCALL lcl_RemoveObjsFromPage( SwFrm* _pFrm ) SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart ) { if( pLay->IsSctFrm() && pLay->Lower() && pLay->Lower()->IsColumnFrm() ) - lcl_RemoveFtns( (SwColumnFrm*)pLay->Lower(), TRUE, TRUE ); + lcl_RemoveFtns( (SwColumnFrm*)pLay->Lower(), sal_True, sal_True ); SwFrm *pSav; if ( 0 == (pSav = pLay->ContainsAny()) ) @@ -2628,7 +2628,7 @@ SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart ) SwFrm *pFloat = pSav; if( !pStart ) pStart = pSav; - BOOL bGo = pStart == pSav; + sal_Bool bGo = pStart == pSav; do { if( bGo ) @@ -2667,7 +2667,7 @@ SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart ) pFloat = pFloat->GetNext(); if( !bGo && pFloat == pStart ) { - bGo = TRUE; + bGo = sal_True; pFloat->pPrev->pNext = NULL; pFloat->pPrev = NULL; } @@ -2707,7 +2707,7 @@ void MA_FASTCALL lcl_AddObjsToPage( SwFrm* _pFrm, SwPageFrm* _pPage ) { ASSERT( _pFrm->GetDrawObjs(), "Keine DrawObjs fuer lcl_AddFlysToPage." ); SwSortedObjs &rObjs = *_pFrm->GetDrawObjs(); - for ( USHORT i = 0; i < rObjs.Count(); ++i ) + for ( sal_uInt16 i = 0; i < rObjs.Count(); ++i ) { SwAnchoredObject* pObj = rObjs[i]; @@ -2859,7 +2859,7 @@ void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGro |* |*************************************************************************/ -ULONG MA_FASTCALL SqRt( BigInt nX ) +sal_uLong MA_FASTCALL SqRt( BigInt nX ) { BigInt nErg = 1; @@ -2872,7 +2872,7 @@ ULONG MA_FASTCALL SqRt( BigInt nX ) nOldErg = nErg; } } - return nErg >= BigInt(SAL_MAX_UINT32) ? ULONG_MAX : (ULONG)nErg; + return nErg >= BigInt(SAL_MAX_UINT32) ? ULONG_MAX : (sal_uLong)nErg; } /************************************************************************* @@ -2885,7 +2885,7 @@ ULONG MA_FASTCALL SqRt( BigInt nX ) |*************************************************************************/ SwPageFrm * MA_FASTCALL InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper, - BOOL bOdd, BOOL bInsertEmpty, BOOL bFtn, + sal_Bool bOdd, sal_Bool bInsertEmpty, sal_Bool bFtn, SwFrm *pSibling ) { SwPageFrm *pRet; @@ -2930,7 +2930,7 @@ SwPageFrm * MA_FASTCALL InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper, void MA_FASTCALL lcl_Regist( SwPageFrm *pPage, const SwFrm *pAnch ) { SwSortedObjs *pObjs = (SwSortedObjs*)pAnch->GetDrawObjs(); - for ( USHORT i = 0; i < pObjs->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pObjs->Count(); ++i ) { SwAnchoredObject* pObj = (*pObjs)[i]; if ( pObj->ISA(SwFlyFrm) ) @@ -3127,7 +3127,7 @@ void MA_FASTCALL lcl_NotifyCntnt( const SdrObject *pThis, SwCntntFrm *pCnt, if ( pCnt->GetDrawObjs() ) { const SwSortedObjs &rObjs = *pCnt->GetDrawObjs(); - for ( USHORT i = 0; i < rObjs.Count(); ++i ) + for ( sal_uInt16 i = 0; i < rObjs.Count(); ++i ) { SwAnchoredObject* pObj = rObjs[i]; if ( pObj->ISA(SwFlyFrm) ) @@ -3152,7 +3152,7 @@ void Notify_Background( const SdrObject* pObj, SwPageFrm* pPage, const SwRect& rRect, const PrepareHint eHint, - const BOOL bInva ) + const sal_Bool bInva ) { //Wenn der Frm gerade erstmalig sinnvoll positioniert wurde, braucht der @@ -3257,7 +3257,7 @@ void Notify_Background( const SdrObject* pObj, { pObj->GetOrdNum(); const SwSortedObjs &rObjs = *pPage->GetSortedObjs(); - for ( USHORT i = 0; i < rObjs.Count(); ++i ) + for ( sal_uInt16 i = 0; i < rObjs.Count(); ++i ) { SwAnchoredObject* pAnchoredObj = rObjs[i]; if ( pAnchoredObj->ISA(SwFlyFrm) ) @@ -3370,7 +3370,7 @@ const SwFrm* GetVirtualUpper( const SwFrm* pFrm, const Point& rPos ) |* |*************************************************************************/ -BOOL Is_Lower_Of( const SwFrm *pCurrFrm, const SdrObject* pObj ) +sal_Bool Is_Lower_Of( const SwFrm *pCurrFrm, const SdrObject* pObj ) { Point aPos; const SwFrm* pFrm; @@ -3389,7 +3389,7 @@ BOOL Is_Lower_Of( const SwFrm *pCurrFrm, const SdrObject* pObj ) pFrm = GetVirtualUpper( pFrm, aPos ); do { if ( pFrm == pCurrFrm ) - return TRUE; + return sal_True; if( pFrm->IsFlyFrm() ) { aPos = pFrm->Frm().Pos(); @@ -3398,14 +3398,14 @@ BOOL Is_Lower_Of( const SwFrm *pCurrFrm, const SdrObject* pObj ) else pFrm = pFrm->GetUpper(); } while ( pFrm ); - return FALSE; + return sal_False; } -const SwFrm *FindKontext( const SwFrm *pFrm, USHORT nAdditionalKontextTyp ) +const SwFrm *FindKontext( const SwFrm *pFrm, sal_uInt16 nAdditionalKontextTyp ) { //Liefert die Umgebung des Frm in die kein Fly aus einer anderen //Umgebung hineinragen kann. - const USHORT nTyp = FRM_ROOT | FRM_HEADER | FRM_FOOTER | FRM_FTNCONT | + const sal_uInt16 nTyp = FRM_ROOT | FRM_HEADER | FRM_FOOTER | FRM_FTNCONT | FRM_FTN | FRM_FLY | FRM_TAB | FRM_ROW | FRM_CELL | nAdditionalKontextTyp; @@ -3417,20 +3417,20 @@ const SwFrm *FindKontext( const SwFrm *pFrm, USHORT nAdditionalKontextTyp ) return pFrm; } -BOOL IsFrmInSameKontext( const SwFrm *pInnerFrm, const SwFrm *pFrm ) +sal_Bool IsFrmInSameKontext( const SwFrm *pInnerFrm, const SwFrm *pFrm ) { const SwFrm *pKontext = FindKontext( pInnerFrm, 0 ); - const USHORT nTyp = FRM_ROOT | FRM_HEADER | FRM_FOOTER | FRM_FTNCONT | + const sal_uInt16 nTyp = FRM_ROOT | FRM_HEADER | FRM_FOOTER | FRM_FTNCONT | FRM_FTN | FRM_FLY | FRM_TAB | FRM_ROW | FRM_CELL; do { if ( pFrm->GetType() & nTyp ) { if( pFrm == pKontext ) - return TRUE; + return sal_True; if( pFrm->IsCellFrm() ) - return FALSE; + return sal_False; } if( pFrm->IsFlyFrm() ) { @@ -3441,7 +3441,7 @@ BOOL IsFrmInSameKontext( const SwFrm *pInnerFrm, const SwFrm *pFrm ) pFrm = pFrm->GetUpper(); } while( pFrm ); - return FALSE; + return sal_False; } @@ -3516,8 +3516,8 @@ const SwFrm* MA_FASTCALL FindPage( const SwRect &rRect, const SwFrm *pPage ) return pPage; } -SwFrm* GetFrmOfModify( SwModify const& rMod, USHORT const nFrmType, - const Point* pPoint, const SwPosition *pPos, const BOOL bCalcFrm ) +SwFrm* GetFrmOfModify( SwModify const& rMod, sal_uInt16 const nFrmType, + const Point* pPoint, const SwPosition *pPos, const sal_Bool bCalcFrm ) { SwFrm *pMinFrm = 0, *pTmpFrm; SwRect aCalcRect; @@ -3617,7 +3617,7 @@ SwFrm* GetFrmOfModify( SwModify const& rMod, USHORT const nFrmType, return pMinFrm; } -BOOL IsExtraData( const SwDoc *pDoc ) +sal_Bool IsExtraData( const SwDoc *pDoc ) { const SwLineNumberInfo &rInf = pDoc->GetLineNumberInfo(); return rInf.IsPaintLineNumbers() || diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index 3dc03053a23f..aacb9dcadd66 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -65,14 +65,14 @@ #define ENDNOTE 0x80000000 -ULONG MA_FASTCALL lcl_FindFtnPos( const SwDoc *pDoc, const SwTxtFtn *pAttr ) +sal_uLong MA_FASTCALL lcl_FindFtnPos( const SwDoc *pDoc, const SwTxtFtn *pAttr ) { const SwFtnIdxs &rFtnIdxs = pDoc->GetFtnIdxs(); #ifdef MA_DEBUG //Wenn das Array nicht stimmt haben wir ein Problem, denn viele //Ftn-Functions bauen auf dem Array auf. - for ( USHORT k = 0; k+1 < rFtnIdxs.Count(); ++k ) + for ( sal_uInt16 k = 0; k+1 < rFtnIdxs.Count(); ++k ) { SwIndex aIdx1(&pDoc->GetNodes()); SwIndex aIdx2(&pDoc->GetNodes()); @@ -92,19 +92,19 @@ ULONG MA_FASTCALL lcl_FindFtnPos( const SwDoc *pDoc, const SwTxtFtn *pAttr ) } #endif - USHORT nRet; + sal_uInt16 nRet; SwTxtFtnPtr pBla = (SwTxtFtn*)pAttr; if ( rFtnIdxs.Seek_Entry( pBla, &nRet ) ) { if( pAttr->GetFtn().IsEndNote() ) - return ULONG(nRet) + ENDNOTE; + return sal_uLong(nRet) + ENDNOTE; return nRet; } ASSERT( !pDoc, "FtnPos not found." ); return 0; } -BOOL SwFtnFrm::operator<( const SwTxtFtn* pTxtFtn ) const +sal_Bool SwFtnFrm::operator<( const SwTxtFtn* pTxtFtn ) const { const SwDoc* pDoc = GetFmt()->GetDoc(); ASSERT( pDoc, "SwFtnFrm: Missing doc!" ); @@ -114,25 +114,25 @@ BOOL SwFtnFrm::operator<( const SwTxtFtn* pTxtFtn ) const /************************************************************************* |* -|* BOOL lcl_NextFtnBoss( SwFtnBossFrm* pBoss, SwPageFrm* pPage) +|* sal_Bool lcl_NextFtnBoss( SwFtnBossFrm* pBoss, SwPageFrm* pPage) |* setzt pBoss auf den naechsten SwFtnBossFrm, das kann entweder eine Spalte |* oder eine Seite (ohne Spalten) sein. Wenn die Seite dabei gewechselt wird -|* enthaelt pPage die neue Seite und die Funktion liefert TRUE. +|* enthaelt pPage die neue Seite und die Funktion liefert sal_True. |* |* Ersterstellung AMA 06. Nov. 98 |* Letzte Aenderung AMA 06. Nov. 98 |* |*************************************************************************/ -BOOL lcl_NextFtnBoss( SwFtnBossFrm* &rpBoss, SwPageFrm* &rpPage, - BOOL bDontLeave ) +sal_Bool lcl_NextFtnBoss( SwFtnBossFrm* &rpBoss, SwPageFrm* &rpPage, + sal_Bool bDontLeave ) { if( rpBoss->IsColumnFrm() ) { if( rpBoss->GetNext() ) { rpBoss = (SwFtnBossFrm*)rpBoss->GetNext(); //naechste Spalte - return FALSE; + return sal_False; } if( rpBoss->IsInSct() ) { @@ -150,7 +150,7 @@ BOOL lcl_NextFtnBoss( SwFtnBossFrm* &rpBoss, SwPageFrm* &rpPage, { rpPage = NULL; rpBoss = NULL; - return FALSE; + return sal_False; } } } @@ -162,12 +162,12 @@ BOOL lcl_NextFtnBoss( SwFtnBossFrm* &rpBoss, SwPageFrm* &rpPage, if( pBody && pBody->Lower() && pBody->Lower()->IsColumnFrm() ) rpBoss = (SwFtnBossFrm*)pBody->Lower(); // erste Spalte } - return TRUE; + return sal_True; } /************************************************************************* |* -|* USHORT lcl_ColumnNum( SwFrm* pBoss ) +|* sal_uInt16 lcl_ColumnNum( SwFrm* pBoss ) |* liefert die Spaltennummer, wenn pBoss eine Spalte ist, |* sonst eine Null (bei Seiten). |* @@ -176,9 +176,9 @@ BOOL lcl_NextFtnBoss( SwFtnBossFrm* &rpBoss, SwPageFrm* &rpPage, |* |*************************************************************************/ -USHORT lcl_ColumnNum( const SwFrm* pBoss ) +sal_uInt16 lcl_ColumnNum( const SwFrm* pBoss ) { - USHORT nRet = 0; + sal_uInt16 nRet = 0; if( !pBoss->IsColumnFrm() ) return 0; const SwFrm* pCol; @@ -273,18 +273,18 @@ void SwFtnContFrm::Format( const SwBorderAttrs * ) SWRECTFN( this ) if ( !bValidPrtArea ) { - bValidPrtArea = TRUE; + bValidPrtArea = sal_True; (Prt().*fnRect->fnSetTop)( nBorder ); (Prt().*fnRect->fnSetWidth)( (Frm().*fnRect->fnGetWidth)() ); (Prt().*fnRect->fnSetHeight)((Frm().*fnRect->fnGetHeight)() - nBorder ); if( (Prt().*fnRect->fnGetHeight)() < 0 && !pPage->IsFtnPage() ) - bValidSize = FALSE; + bValidSize = sal_False; } if ( !bValidSize ) { if ( pPage->IsFtnPage() && !GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) ) - Grow( LONG_MAX, FALSE ); + Grow( LONG_MAX, sal_False ); else { //Die Groesse in der VarSize wird durch den Inhalt plus den @@ -333,7 +333,7 @@ void SwFtnContFrm::Format( const SwBorderAttrs * ) } } } - bValidSize = TRUE; + bValidSize = sal_True; } } /************************************************************************* @@ -345,7 +345,7 @@ void SwFtnContFrm::Format( const SwBorderAttrs * ) |* |*************************************************************************/ -SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL ) +SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool ) { //Keine Pruefung ob FixSize oder nicht, die FtnContainer sind immer bis //zur Maximalhoehe variabel. @@ -373,7 +373,7 @@ SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL ) // In a section, which has to maximize, a footnotecontainer is allowed // to grow, when the section can't grow anymore. if( !bTst && !pSect->IsColLocked() && - pSect->ToMaximize( FALSE ) && pSect->Growable() ) + pSect->ToMaximize( sal_False ) && pSect->Growable() ) { pSect->InvalidateSize(); return 0; @@ -428,7 +428,7 @@ SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL ) nReal = 0; if ( nGrow > 0 ) { - BYTE nAdjust = pBoss->NeighbourhoodAdjustment( this ); + sal_uInt8 nAdjust = pBoss->NeighbourhoodAdjustment( this ); if( NA_ONLY_ADJUST == nAdjust ) nReal = AdjustNeighbourhood( nGrow, bTst ); else @@ -480,7 +480,7 @@ SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL ) } -SwTwips SwFtnContFrm::ShrinkFrm( SwTwips nDiff, BOOL bTst, BOOL bInfo ) +SwTwips SwFtnContFrm::ShrinkFrm( SwTwips nDiff, sal_Bool bTst, sal_Bool bInfo ) { SwPageFrm *pPage = FindPageFrm(); if ( pPage && @@ -517,7 +517,7 @@ SwFtnFrm::SwFtnFrm( SwFrmFmt *pFmt, SwCntntFrm *pCnt, SwTxtFtn *pAt ): pMaster( 0 ), pRef( pCnt ), pAttr( pAt ), - bBackMoveLocked( FALSE ), + bBackMoveLocked( sal_False ), // --> OD 2005-08-11 #i49383# mbUnlockPosOfLowerObjs( true ) // <-- @@ -561,10 +561,10 @@ void SwFtnFrm::InvalidateNxtFtnCnts( SwPageFrm *pPage ) #ifdef DBG_UTIL -SwTwips SwFtnFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) +SwTwips SwFtnFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) { #if OSL_DEBUG_LEVEL > 1 - static USHORT nNum = USHRT_MAX; + static sal_uInt16 nNum = USHRT_MAX; SwTxtFtn* pTxtFtn = GetAttr(); if ( pTxtFtn->GetFtn().GetNumber() == nNum ) { @@ -577,10 +577,10 @@ SwTwips SwFtnFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) } -SwTwips SwFtnFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) +SwTwips SwFtnFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) { #if OSL_DEBUG_LEVEL > 1 - static USHORT nNum = USHRT_MAX; + static sal_uInt16 nNum = USHRT_MAX; if( nNum != USHRT_MAX ) { SwTxtFtn* pTxtFtn = GetAttr(); @@ -644,7 +644,7 @@ void SwFtnFrm::Cut() delete pUp; // Wenn der letzte Fussnotencontainer aus einem spaltigen Bereich verschwindet, // so kann dieser, falls er keinen Follow besitzt, zusammenschrumpfen. - if( pSect && !pSect->ToMaximize( FALSE ) && !pSect->IsColLocked() ) + if( pSect && !pSect->ToMaximize( sal_False ) && !pSect->IsColLocked() ) pSect->_InvalidateSize(); } else @@ -731,7 +731,7 @@ void SwFtnFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) |* |* Beschreibung Liefert das naechste LayoutBlatt in den das |* Frame gemoved werden kann. -|* Neue Seiten werden nur dann erzeugt, wenn der Parameter TRUE ist. +|* Neue Seiten werden nur dann erzeugt, wenn der Parameter sal_True ist. |* Ersterstellung MA 16. Nov. 92 |* Letzte Aenderung AMA 09. Nov. 98 |* @@ -861,13 +861,13 @@ SwLayoutFrm *SwFrm::GetPrevFtnLeaf( MakePageType eMakeFtn ) pTmpRef = pFtn->GetRef(); SwFtnBossFrm* pStop = pTmpRef->FindFtnBossFrm( !bEndn ); - const USHORT nNum = pStop->GetPhyPageNum(); + const sal_uInt16 nNum = pStop->GetPhyPageNum(); //Wenn die Fussnoten am Dokumentende angezeigt werden, so verlassen wir //die Entsprechenden Seiten nicht. //Selbiges gilt analog fuer die Endnotenseiten. - const BOOL bEndNote = pOldPage->IsEndNotePage(); - const BOOL bFtnEndDoc = pOldPage->IsFtnPage(); + const sal_Bool bEndNote = pOldPage->IsEndNotePage(); + const sal_Bool bFtnEndDoc = pOldPage->IsFtnPage(); SwFtnBossFrm* pNxtBoss = pOldBoss; SwSectionFrm *pSect = pNxtBoss->GetUpper()->IsSctFrm() ? (SwSectionFrm*)pNxtBoss->GetUpper() : 0; @@ -936,22 +936,22 @@ SwLayoutFrm *SwFrm::GetPrevFtnLeaf( MakePageType eMakeFtn ) if ( pRet ) { const SwFtnBossFrm* pNewBoss = pRet->FindFtnBossFrm(); - BOOL bJump = FALSE; + sal_Bool bJump = sal_False; if( pOldBoss->IsColumnFrm() && pOldBoss->GetPrev() ) // es gibt eine vorherige Spalte bJump = pOldBoss->GetPrev() != (SwFrm*)pNewBoss; // sind wir darin gelandet? else if( pNewBoss->IsColumnFrm() && pNewBoss->GetNext() ) - bJump = TRUE; // es gibt hinter dem neuen Boss noch eine Spalte, die aber nicht + bJump = sal_True; // es gibt hinter dem neuen Boss noch eine Spalte, die aber nicht // der alte Boss sein kann, das haben wir ja bereits geprueft. else // hier landen wir nur, wenn neuer und alter Boss entweder Seiten oder letzte (neu) { // bzw. erste (alt) Spalten einer Seite sind. In diesem Fall muss noch geprueft // werden, ob Seiten ueberspringen wurden. - USHORT nDiff = pOldPage->GetPhyPageNum() - pRet->FindPageFrm()->GetPhyPageNum(); + sal_uInt16 nDiff = pOldPage->GetPhyPageNum() - pRet->FindPageFrm()->GetPhyPageNum(); if ( nDiff > 2 || (nDiff > 1 && !((SwPageFrm*)pOldPage->GetPrev())->IsEmptyPage()) ) - bJump = TRUE; + bJump = sal_True; } if( bJump ) - SwFlowFrm::SetMoveBwdJump( TRUE ); + SwFlowFrm::SetMoveBwdJump( sal_True ); } return pRet; } @@ -966,10 +966,10 @@ SwLayoutFrm *SwFrm::GetPrevFtnLeaf( MakePageType eMakeFtn ) |*************************************************************************/ -BOOL SwFrm::IsFtnAllowed() const +sal_Bool SwFrm::IsFtnAllowed() const { if ( !IsInDocBody() ) - return FALSE; + return sal_False; if ( IsInTab() ) { @@ -978,7 +978,7 @@ BOOL SwFrm::IsFtnAllowed() const if ( pTab->IsFollow() ) return !pTab->IsInHeadline( *this ); } - return TRUE; + return sal_True; } /************************************************************************* @@ -1015,7 +1015,7 @@ void SwRootFrm::UpdateFtnNums() |* |*************************************************************************/ -void lcl_RemoveFtns( SwFtnBossFrm* pBoss, BOOL bPageOnly, BOOL bEndNotes ) +void lcl_RemoveFtns( SwFtnBossFrm* pBoss, sal_Bool bPageOnly, sal_Bool bEndNotes ) { do { @@ -1069,7 +1069,7 @@ void lcl_RemoveFtns( SwFtnBossFrm* pBoss, BOOL bPageOnly, BOOL bEndNotes ) } while( pBoss ); } -void SwRootFrm::RemoveFtns( SwPageFrm *pPage, BOOL bPageOnly, BOOL bEndNotes ) +void SwRootFrm::RemoveFtns( SwPageFrm *pPage, sal_Bool bPageOnly, sal_Bool bEndNotes ) { if ( !pPage ) pPage = (SwPageFrm*)Lower(); @@ -1111,7 +1111,7 @@ void SwRootFrm::RemoveFtns( SwPageFrm *pPage, BOOL bPageOnly, BOOL bEndNotes ) |* |*************************************************************************/ -void SwRootFrm::CheckFtnPageDescs( BOOL bEndNote ) +void SwRootFrm::CheckFtnPageDescs( sal_Bool bEndNote ) { SwPageFrm *pPage = (SwPageFrm*)Lower(); while ( pPage && !pPage->IsFtnPage() ) @@ -1119,7 +1119,7 @@ void SwRootFrm::CheckFtnPageDescs( BOOL bEndNote ) while ( pPage && pPage->IsEndNotePage() != bEndNote ) pPage = (SwPageFrm*)pPage->GetNext(); if ( pPage ) - SwFrm::CheckPageDescs( pPage, FALSE ); + SwFrm::CheckPageDescs( pPage, sal_False ); } @@ -1193,7 +1193,7 @@ SwFtnContFrm *SwFtnBossFrm::FindFtnCont() |* |*************************************************************************/ -SwFtnContFrm *SwFtnBossFrm::FindNearestFtnCont( BOOL bDontLeave ) +SwFtnContFrm *SwFtnBossFrm::FindNearestFtnCont( sal_Bool bDontLeave ) { SwFtnContFrm *pCont = 0; if ( GetFmt()->GetDoc()->GetFtnIdxs().Count() ) @@ -1203,10 +1203,10 @@ SwFtnContFrm *SwFtnBossFrm::FindNearestFtnCont( BOOL bDontLeave ) { SwPageFrm *pPage = FindPageFrm(); SwFtnBossFrm* pBoss = this; - BOOL bEndNote = pPage->IsEndNotePage(); + sal_Bool bEndNote = pPage->IsEndNotePage(); do { - BOOL bChgPage = lcl_NextFtnBoss( pBoss, pPage, bDontLeave ); + sal_Bool bChgPage = lcl_NextFtnBoss( pBoss, pPage, bDontLeave ); // Haben wir noch einen Boss gefunden? Bei einem Seitenwechsel muss // zudem noch das EndNotenFlag uebereinstimmen if( pBoss && ( !bChgPage || pPage->IsEndNotePage() == bEndNote ) ) @@ -1240,9 +1240,9 @@ SwFtnFrm *SwFtnBossFrm::FindFirstFtn() //von der aktuellen Spalte (bzw. einspaltigen Seite) referenziert wird. SwFtnFrm *pRet = (SwFtnFrm*)pCont->Lower(); - const USHORT nRefNum = FindPageFrm()->GetPhyPageNum(); - const USHORT nRefCol = lcl_ColumnNum( this ); - USHORT nPgNum, nColNum; //Seitennummer, Spaltennummer + const sal_uInt16 nRefNum = FindPageFrm()->GetPhyPageNum(); + const sal_uInt16 nRefCol = lcl_ColumnNum( this ); + sal_uInt16 nPgNum, nColNum; //Seitennummer, Spaltennummer SwFtnBossFrm* pBoss; SwPageFrm* pPage; if( pRet ) @@ -1250,7 +1250,7 @@ SwFtnFrm *SwFtnBossFrm::FindFirstFtn() pBoss = pRet->GetRef()->FindFtnBossFrm(); ASSERT( pBoss, "FindFirstFtn: No boss found" ); if( !pBoss ) - return FALSE; // ?There must be a bug, but no GPF + return sal_False; // ?There must be a bug, but no GPF pPage = pBoss->FindPageFrm(); nPgNum = pPage->GetPhyPageNum(); if ( nPgNum == nRefNum ) @@ -1279,7 +1279,7 @@ SwFtnFrm *SwFtnBossFrm::FindFirstFtn() { pBoss = pRet->FindFtnBossFrm(); pPage = pBoss->FindPageFrm(); - lcl_NextFtnBoss( pBoss, pPage, FALSE ); // naechster FtnBoss + lcl_NextFtnBoss( pBoss, pPage, sal_False ); // naechster FtnBoss pCont = pBoss ? pBoss->FindNearestFtnCont() : 0; if ( pCont ) pNxt = (SwFtnFrm*)pCont->Lower(); @@ -1323,8 +1323,8 @@ const SwFtnFrm *SwFtnBossFrm::FindFirstFtn( SwCntntFrm *pCnt ) const const SwFtnFrm *pRet = ((SwFtnBossFrm*)this)->FindFirstFtn(); if ( pRet ) { - const USHORT nColNum = lcl_ColumnNum( this ); //Spaltennummer - const USHORT nPageNum = GetPhyPageNum(); + const sal_uInt16 nColNum = lcl_ColumnNum( this ); //Spaltennummer + const sal_uInt16 nPageNum = GetPhyPageNum(); while ( pRet && (pRet->GetRef() != pCnt) ) { while ( pRet->GetFollow() ) @@ -1335,7 +1335,7 @@ const SwFtnFrm *SwFtnBossFrm::FindFirstFtn( SwCntntFrm *pCnt ) const else { SwFtnBossFrm *pBoss = (SwFtnBossFrm*)pRet->FindFtnBossFrm(); SwPageFrm *pPage = pBoss->FindPageFrm(); - lcl_NextFtnBoss( pBoss, pPage, FALSE ); // naechster FtnBoss + lcl_NextFtnBoss( pBoss, pPage, sal_False ); // naechster FtnBoss SwFtnContFrm *pCont = pBoss ? pBoss->FindNearestFtnCont() : 0; pRet = pCont ? (SwFtnFrm*)pCont->Lower() : 0; } @@ -1371,7 +1371,7 @@ void SwFtnBossFrm::ResetFtn( const SwFtnFrm *pCheck ) SwCntntNode *pNd = aIdx.GetNode().GetCntntNode(); if ( !pNd ) pNd = pCheck->GetFmt()->GetDoc()-> - GetNodes().GoNextSection( &aIdx, TRUE, FALSE ); + GetNodes().GoNextSection( &aIdx, sal_True, sal_False ); SwClientIter aIter( *pNd ); SwClient* pLast = aIter.GoStart(); while( pLast ) @@ -1414,7 +1414,7 @@ void SwFtnBossFrm::ResetFtn( const SwFtnFrm *pCheck ) void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew ) { #if (OSL_DEBUG_LEVEL > 1) && defined(DBG_UTIL) - static USHORT nStop = 0; + static sal_uInt16 nStop = 0; if ( nStop == pNew->GetFrmId() ) { int bla = 5; @@ -1432,7 +1432,7 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew ) ResetFtn( pNew ); SwFtnFrm *pSibling = FindFirstFtn(); - BOOL bDontLeave = FALSE; + sal_Bool bDontLeave = sal_False; // Ok, a sibling has been found, but is the sibling in an acceptable // environment? @@ -1479,10 +1479,10 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew ) //Damit die Position herausgefunden werden kann. SwDoc *pDoc = GetFmt()->GetDoc(); - const ULONG nStPos = ::lcl_FindFtnPos( pDoc, pNew->GetAttr() ); + const sal_uLong nStPos = ::lcl_FindFtnPos( pDoc, pNew->GetAttr() ); - ULONG nCmpPos = 0; - ULONG nLastPos = 0; + sal_uLong nCmpPos = 0; + sal_uLong nLastPos = 0; SwFtnContFrm *pParent = 0; if( pSibling ) { @@ -1553,8 +1553,8 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew ) { pNxtB = pSibling->FindFtnBossFrm(); SwPageFrm *pSibPage = pNxtB->FindPageFrm(); - BOOL bEndNote = pSibPage->IsEndNotePage(); - BOOL bChgPage = lcl_NextFtnBoss( pNxtB, pSibPage, bDontLeave ); + sal_Bool bEndNote = pSibPage->IsEndNotePage(); + sal_Bool bChgPage = lcl_NextFtnBoss( pNxtB, pSibPage, bDontLeave ); // Bei Seitenwechsel muss das EndNoteFlag ueberprueft werden. SwFtnContFrm *pCont = pNxtB && ( !bChgPage || pSibPage->IsEndNotePage() == bEndNote ) @@ -1598,9 +1598,9 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew ) //dann der Vorgaenger. SwFtnBossFrm* pBoss = pNew->GetRef()->FindFtnBossFrm( !pNew->GetAttr()->GetFtn().IsEndNote() ); - USHORT nRefNum = pBoss->GetPhyPageNum(); // Die Seiten- und - USHORT nRefCol = lcl_ColumnNum( pBoss ); // Spaltennummer der neuen Fussnote - BOOL bEnd = FALSE; + sal_uInt16 nRefNum = pBoss->GetPhyPageNum(); // Die Seiten- und + sal_uInt16 nRefCol = lcl_ColumnNum( pBoss ); // Spaltennummer der neuen Fussnote + sal_Bool bEnd = sal_False; SwFtnFrm *pLastSib = 0; while ( pSibling && !bEnd && (nCmpPos <= nStPos) ) { @@ -1615,20 +1615,20 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew ) { pBoss = pSibling->GetRef()->FindFtnBossFrm( !pSibling-> GetAttr()->GetFtn().IsEndNote() ); - USHORT nTmpRef; + sal_uInt16 nTmpRef; if( nStPos >= ENDNOTE || (nTmpRef = pBoss->GetPhyPageNum()) < nRefNum || ( nTmpRef == nRefNum && lcl_ColumnNum( pBoss ) <= nRefCol )) pSibling = pFoll; else - bEnd = TRUE; + bEnd = sal_True; } else { SwFtnBossFrm* pNxtB = pSibling->FindFtnBossFrm(); SwPageFrm *pSibPage = pNxtB->FindPageFrm(); - BOOL bEndNote = pSibPage->IsEndNotePage(); - BOOL bChgPage = lcl_NextFtnBoss( pNxtB, pSibPage, bDontLeave ); + sal_Bool bEndNote = pSibPage->IsEndNotePage(); + sal_Bool bChgPage = lcl_NextFtnBoss( pNxtB, pSibPage, bDontLeave ); // Bei Seitenwechsel muss das EndNoteFlag ueberprueft werden. SwFtnContFrm *pCont = pNxtB && ( !bChgPage || pSibPage->IsEndNotePage() == bEndNote ) @@ -1636,7 +1636,7 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew ) if ( pCont ) pSibling = (SwFtnFrm*)pCont->Lower(); else - bEnd = TRUE; + bEnd = sal_True; } if ( !bEnd && pSibling ) nCmpPos = ::lcl_FindFtnPos( pDoc, pSibling->GetAttr() ); @@ -1645,7 +1645,7 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew ) if ( (nLastPos < nCmpPos) && (nCmpPos > nStPos) ) { pSibling = pLastSib; - bEnd = TRUE; + bEnd = sal_True; } } } @@ -1666,7 +1666,7 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew ) { if( ENDNOTE > nCmpPos || nStPos >= ENDNOTE ) { - ASSERT( FALSE, "InsertFtn: Master expected II" ); + ASSERT( sal_False, "InsertFtn: Master expected II" ); do pSibling = pSibling->GetMaster(); while ( pSibling->GetMaster() ); @@ -1704,11 +1704,11 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr ) SwFtnBossFrm *pBoss = this; SwPageFrm *pPage = FindPageFrm(); SwPageFrm *pMyPage = pPage; - BOOL bChgPage = FALSE; - BOOL bEnd = FALSE; + sal_Bool bChgPage = sal_False; + sal_Bool bEnd = sal_False; if ( pAttr->GetFtn().IsEndNote() ) { - bEnd = TRUE; + bEnd = sal_True; if( GetUpper()->IsSctFrm() && ((SwSectionFrm*)GetUpper())->IsEndnAtEnd() ) { @@ -1725,15 +1725,15 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr ) while ( pPage->GetNext() && !pPage->IsEndNotePage() ) { pPage = (SwPageFrm*)pPage->GetNext(); - bChgPage = TRUE; + bChgPage = sal_True; } if ( !pPage->IsEndNotePage() ) { SwPageDesc *pDesc = pDoc->GetEndNoteInfo().GetPageDesc( *pDoc ); pPage = ::InsertNewPage( *pDesc, pPage->GetUpper(), - !pPage->OnRightPage(), FALSE, TRUE, 0 ); - pPage->SetEndNotePage( TRUE ); - bChgPage = TRUE; + !pPage->OnRightPage(), sal_False, sal_True, 0 ); + pPage->SetEndNotePage( sal_True ); + bChgPage = sal_True; } else { @@ -1741,7 +1741,7 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr ) //suchen. Damit stellen wir sicher das wir auch bei hunderten //Fussnoten noch in endlicher Zeit fertig werden. SwPageFrm *pNxt = (SwPageFrm*)pPage->GetNext(); - const ULONG nStPos = ::lcl_FindFtnPos( pDoc, pAttr ); + const sal_uLong nStPos = ::lcl_FindFtnPos( pDoc, pAttr ); while ( pNxt && pNxt->IsEndNotePage() ) { SwFtnContFrm *pCont = pNxt->FindFtnCont(); @@ -1768,15 +1768,15 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr ) !((SwPageFrm*)pPage->GetNext())->IsEndNotePage() ) { pPage = (SwPageFrm*)pPage->GetNext(); - bChgPage = TRUE; + bChgPage = sal_True; } if ( !pPage->IsFtnPage() ) { SwPageDesc *pDesc = pDoc->GetFtnInfo().GetPageDesc( *pDoc ); pPage = ::InsertNewPage( *pDesc, pPage->GetUpper(), - !pPage->OnRightPage(), FALSE, TRUE, pPage->GetNext() ); - bChgPage = TRUE; + !pPage->OnRightPage(), sal_False, sal_True, pPage->GetNext() ); + bChgPage = sal_True; } else { @@ -1784,7 +1784,7 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr ) //suchen. Damit stellen wir sicher das wir auch bei hunderten //Fussnoten noch in endlicher Zeit fertig werden. SwPageFrm *pNxt = (SwPageFrm*)pPage->GetNext(); - const ULONG nStPos = ::lcl_FindFtnPos( pDoc, pAttr ); + const sal_uLong nStPos = ::lcl_FindFtnPos( pDoc, pAttr ); while ( pNxt && pNxt->IsFtnPage() && !pNxt->IsEndNotePage() ) { SwFtnContFrm *pCont = pNxt->FindFtnCont(); @@ -1932,7 +1932,7 @@ SwFtnFrm *SwFtnBossFrm::FindFtn( const SwCntntFrm *pRef, const SwTxtFtn *pAttr ) SwCntntNode *pNd = aIdx.GetNode().GetCntntNode(); if ( !pNd ) pNd = pRef->GetAttrSet()->GetDoc()-> - GetNodes().GoNextSection( &aIdx, TRUE, FALSE ); + GetNodes().GoNextSection( &aIdx, sal_True, sal_False ); if ( !pNd ) return 0; SwClientIter aIter( *pNd ); @@ -1976,7 +1976,7 @@ SwFtnFrm *SwFtnBossFrm::FindFtn( const SwCntntFrm *pRef, const SwTxtFtn *pAttr ) void SwFtnBossFrm::RemoveFtn( const SwCntntFrm *pRef, const SwTxtFtn *pAttr, - BOOL bPrep ) + sal_Bool bPrep ) { SwFtnFrm *pFtn = FindFtn( pRef, pAttr ); if( pFtn ) @@ -2140,7 +2140,7 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm* _pRef, while ( _pFtn->GetMaster() ) _pFtn = _pFtn->GetMaster(); - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; while ( _pFtn ) { @@ -2157,7 +2157,7 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm* _pRef, SwPageFrm* pPage = pBoss->FindPageFrm(); do { - lcl_NextFtnBoss( pBoss, pPage, FALSE ); + lcl_NextFtnBoss( pBoss, pPage, sal_False ); if( pBoss ) { SwLayoutFrm* pCont = pBoss->FindFtnCont(); @@ -2182,7 +2182,7 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm* _pRef, } if ( pNxtFtn == _pFtn ) { - ASSERT( FALSE, "_CollectFtn: Devil's circle" ); + ASSERT( sal_False, "_CollectFtn: Devil's circle" ); pNxtFtn = 0; } @@ -2233,7 +2233,7 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm* _pRef, } _pFtn->Cut(); FtnInArr( _rFtnArr, _pFtn ); - bFound = TRUE; + bFound = sal_True; } else { @@ -2260,27 +2260,27 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm* _pRef, |*************************************************************************/ -void SwFtnBossFrm::_MoveFtns( SvPtrarr &rFtnArr, BOOL bCalc ) +void SwFtnBossFrm::_MoveFtns( SvPtrarr &rFtnArr, sal_Bool bCalc ) { //Alle Fussnoten die von pRef referenziert werden muessen von der //aktuellen Position, die sich durch die alte Spalte/Seite ergab, auf eine //neue Position, bestimmt durch die neue Spalte/Seite, gemoved werden. - const USHORT nMyNum = FindPageFrm()->GetPhyPageNum(); - const USHORT nMyCol = lcl_ColumnNum( this ); + const sal_uInt16 nMyNum = FindPageFrm()->GetPhyPageNum(); + const sal_uInt16 nMyCol = lcl_ColumnNum( this ); SWRECTFN( this ) // --> OD 2004-06-11 #i21478# - keep last inserted footnote in order to // format the content of the following one. SwFtnFrm* pLastInsertedFtn = 0L; - for ( USHORT i = 0; i < rFtnArr.Count(); ++i ) + for ( sal_uInt16 i = 0; i < rFtnArr.Count(); ++i ) { SwFtnFrm *pFtn = (SwFtnFrm*)rFtnArr[i]; - SwFtnBossFrm* pRefBoss = pFtn->GetRef()->FindFtnBossFrm( TRUE ); + SwFtnBossFrm* pRefBoss = pFtn->GetRef()->FindFtnBossFrm( sal_True ); if( pRefBoss != this ) { - const USHORT nRefNum = pRefBoss->FindPageFrm()->GetPhyPageNum(); - const USHORT nRefCol = lcl_ColumnNum( this ); + const sal_uInt16 nRefNum = pRefBoss->FindPageFrm()->GetPhyPageNum(); + const sal_uInt16 nRefCol = lcl_ColumnNum( this ); if( nRefNum < nMyNum || ( nRefNum == nMyNum && nRefCol <= nMyCol ) ) pRefBoss = this; } @@ -2321,7 +2321,7 @@ void SwFtnBossFrm::_MoveFtns( SvPtrarr &rFtnArr, BOOL bCalc ) { SwTxtFtn *pAttr = pFtn->GetAttr(); pCnt = pFtn->ContainsAny(); - BOOL bUnlock = !pFtn->IsBackMoveLocked(); + sal_Bool bUnlock = !pFtn->IsBackMoveLocked(); pFtn->LockBackMove(); // --> OD 2005-05-18 #i49383# - disable unlock of position of @@ -2415,7 +2415,7 @@ void SwFtnBossFrm::_MoveFtns( SvPtrarr &rFtnArr, BOOL bCalc ) SwTxtFtn* pAttr = pNextFtn->GetAttr(); SwFrm* pCnt = pNextFtn->ContainsAny(); - BOOL bUnlock = !pNextFtn->IsBackMoveLocked(); + sal_Bool bUnlock = !pNextFtn->IsBackMoveLocked(); pNextFtn->LockBackMove(); // --> OD 2005-05-18 #i49383# - disable unlock of position of // lower objects during format of footnote content. @@ -2486,14 +2486,14 @@ void SwFtnBossFrm::MoveFtns( const SwCntntFrm *pSrc, SwCntntFrm *pDest, || pAttr->GetFtn().IsEndNote() ) return; - ASSERT( this == pSrc->FindFtnBossFrm( TRUE ), + ASSERT( this == pSrc->FindFtnBossFrm( sal_True ), "SwPageFrm::MoveFtns: source frame isn't on that FtnBoss" ); SwFtnFrm *pFtn = FindFirstFtn(); if( pFtn ) { ChangeFtnRef( pSrc, pAttr, pDest ); - SwFtnBossFrm *pDestBoss = pDest->FindFtnBossFrm( TRUE ); + SwFtnBossFrm *pDestBoss = pDest->FindFtnBossFrm( sal_True ); ASSERT( pDestBoss, "+SwPageFrm::MoveFtns: no destination boss" ); if( pDestBoss ) // robust { @@ -2501,7 +2501,7 @@ void SwFtnBossFrm::MoveFtns( const SwCntntFrm *pSrc, SwCntntFrm *pDest, pDestBoss->_CollectFtns( pDest, pFtn, aFtnArr ); if ( aFtnArr.Count() ) { - pDestBoss->_MoveFtns( aFtnArr, TRUE ); + pDestBoss->_MoveFtns( aFtnArr, sal_True ); SwPageFrm* pSrcPage = FindPageFrm(); SwPageFrm* pDestPage = pDestBoss->FindPageFrm(); // Nur beim Seitenwechsel FtnNum Updaten @@ -2526,7 +2526,7 @@ void SwFtnBossFrm::MoveFtns( const SwCntntFrm *pSrc, SwCntntFrm *pDest, |*************************************************************************/ -void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const BOOL bLock, +void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock, const SwTxtFtn *pAttr ) { //Alle Fussnoten der Spalte/Seite dergestalt anformatieren, @@ -2540,7 +2540,7 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const BOOL bLock, SwFrm* pCntnt = pFirst->ContainsAny(); if( pCntnt ) { - BOOL bUnlock = !pFirst->IsBackMoveLocked(); + sal_Bool bUnlock = !pFirst->IsBackMoveLocked(); pFirst->LockBackMove(); pFirst->Calc(); pCntnt->Calc(); @@ -2557,12 +2557,12 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const BOOL bLock, pFtn = FindFirstFtn(); } SwDoc *pDoc = GetFmt()->GetDoc(); - const ULONG nFtnPos = pAttr ? ::lcl_FindFtnPos( pDoc, pAttr ) : 0; + const sal_uLong nFtnPos = pAttr ? ::lcl_FindFtnPos( pDoc, pAttr ) : 0; SwFrm *pCnt = pFtn ? pFtn->ContainsAny() : 0; if ( pCnt ) { - BOOL bMore = TRUE; - BOOL bStart = pAttr == 0; // wenn kein Attribut uebergeben wird, alle bearbeiten + sal_Bool bMore = sal_True; + sal_Bool bStart = pAttr == 0; // wenn kein Attribut uebergeben wird, alle bearbeiten // --> OD 2005-05-18 #i49383# - disable unlock of position of // lower objects during format of footnote and footnote content. SwFtnFrm* pLastFtnFrm( 0L ); @@ -2637,7 +2637,7 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const BOOL bLock, } if ( bLock ) { - BOOL bUnlock = !pFtnFrm->IsBackMoveLocked(); + sal_Bool bUnlock = !pFtnFrm->IsBackMoveLocked(); pFtnFrm->LockBackMove(); pFtnFrm->Calc(); pCnt->Calc(); @@ -2712,10 +2712,10 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const BOOL bLock, SwFtnFrm* pFtnFrm = pCnt->FindFtnFrm(); if( pFtnFrm->GetRef()->FindFtnBossFrm( pFtnFrm->GetAttr()->GetFtn().IsEndNote() ) != this ) - bMore = FALSE; + bMore = sal_False; } else - bMore = FALSE; + bMore = sal_False; } if( pDel ) { @@ -2729,7 +2729,7 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const BOOL bLock, if ( pAttr && (::lcl_FindFtnPos( pDoc, pCnt->FindFtnFrm()->GetAttr()) > nFtnPos ) ) - bMore = FALSE; + bMore = sal_False; } } while ( bMore ); // --> OD 2005-05-18 #i49383# @@ -2780,13 +2780,13 @@ void SwPageFrm::UpdateFtnNum() return; SwCntntFrm* pCntnt = pBody->ContainsCntnt(); - USHORT nNum = 0; + sal_uInt16 nNum = 0; while( pCntnt && pCntnt->FindPageFrm() == this ) { if( ((SwTxtFrm*)pCntnt)->HasFtn() ) { - SwFtnBossFrm* pBoss = pCntnt->FindFtnBossFrm( TRUE ); + SwFtnBossFrm* pBoss = pCntnt->FindFtnBossFrm( sal_True ); if( pBoss->GetUpper()->IsSctFrm() && ((SwSectionFrm*)pBoss->GetUpper())->IsOwnFtnNum() ) pCntnt = ((SwSectionFrm*)pBoss->GetUpper())->FindLastCntnt(); @@ -2805,10 +2805,10 @@ void SwPageFrm::UpdateFtnNum() pFtn = (SwFtnFrm*)pFtn->GetNext(); else { - SwFtnBossFrm* pTmpBoss = pFtn->FindFtnBossFrm( TRUE ); + SwFtnBossFrm* pTmpBoss = pFtn->FindFtnBossFrm( sal_True ); SwPageFrm* pPage = pTmpBoss->FindPageFrm(); pFtn = NULL; - lcl_NextFtnBoss( pTmpBoss, pPage, FALSE ); + lcl_NextFtnBoss( pTmpBoss, pPage, sal_False ); if( pTmpBoss ) { SwFtnContFrm *pCont = pTmpBoss->FindNearestFtnCont(); @@ -2851,9 +2851,9 @@ void SwFtnBossFrm::SetFtnDeadLine( const SwTwips nDeadLine ) nMaxFtnHeight = -(pBody->Frm().*fnRect->fnBottomDist)( nDeadLine ); if ( GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) ) - nMaxFtnHeight += pBody->Grow( LONG_MAX, TRUE ); + nMaxFtnHeight += pBody->Grow( LONG_MAX, sal_True ); if ( IsInSct() ) - nMaxFtnHeight += FindSctFrm()->Grow( LONG_MAX, TRUE ); + nMaxFtnHeight += FindSctFrm()->Grow( LONG_MAX, sal_True ); if ( nMaxFtnHeight < 0 ) nMaxFtnHeight = 0; @@ -2955,9 +2955,9 @@ SwTwips SwFtnBossFrm::GetVarSpace() const |* |*************************************************************************/ -BYTE SwFtnBossFrm::_NeighbourhoodAdjustment( const SwFrm* ) const +sal_uInt8 SwFtnBossFrm::_NeighbourhoodAdjustment( const SwFrm* ) const { - BYTE nRet = NA_ONLY_ADJUST; + sal_uInt8 nRet = NA_ONLY_ADJUST; if( GetUpper() && !GetUpper()->IsPageBodyFrm() ) { // Spaltige Rahmen erfordern Grow/Shrink @@ -3016,22 +3016,22 @@ void SwPageFrm::SetColMaxFtnHeight() |*************************************************************************/ -BOOL SwLayoutFrm::MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss, - SwFtnBossFrm *pNewBoss, const BOOL bFtnNums ) +sal_Bool SwLayoutFrm::MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss, + SwFtnBossFrm *pNewBoss, const sal_Bool bFtnNums ) { SwDoc *pDoc = GetFmt()->GetDoc(); if ( !pDoc->GetFtnIdxs().Count() ) - return FALSE; + return sal_False; if( pDoc->GetFtnInfo().ePos == FTNPOS_CHAPTER && ( !IsInSct() || !FindSctFrm()->IsFtnAtEnd() ) ) - return TRUE; + return sal_True; if ( !pNewBoss ) - pNewBoss = FindFtnBossFrm( TRUE ); + pNewBoss = FindFtnBossFrm( sal_True ); if ( pNewBoss == pOldBoss ) - return FALSE; + return sal_False; - BOOL bMoved = FALSE; + sal_Bool bMoved = sal_False; if( !pStart ) pStart = ContainsCntnt(); @@ -3060,8 +3060,8 @@ BOOL SwLayoutFrm::MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss, != ( pNewChief = pNewBoss->FindSctFrm() ) ) { pFtnArr = new SvPtrarr( 5, 5 ); - pOldChief = pOldBoss->FindFtnBossFrm( TRUE ); - pNewChief = pNewBoss->FindFtnBossFrm( TRUE ); + pOldChief = pOldBoss->FindFtnBossFrm( sal_True ); + pNewChief = pNewBoss->FindFtnBossFrm( sal_True ); while( pOldChief->IsAnLower( pStart ) ) { if ( ((SwTxtFrm*)pStart)->HasFtn() ) @@ -3081,13 +3081,13 @@ BOOL SwLayoutFrm::MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss, if ( aFtnArr.Count() || pFtnArr ) { if( aFtnArr.Count() ) - pNewBoss->_MoveFtns( aFtnArr, TRUE ); + pNewBoss->_MoveFtns( aFtnArr, sal_True ); if( pFtnArr ) { - ((SwFtnBossFrm*)pNewChief)->_MoveFtns( *pFtnArr, TRUE ); + ((SwFtnBossFrm*)pNewChief)->_MoveFtns( *pFtnArr, sal_True ); delete pFtnArr; } - bMoved = TRUE; + bMoved = sal_True; // Nur bei einem Seitenwechsel muss die FtnNum neu berechnet werden if ( bFtnNums ) @@ -3114,7 +3114,7 @@ BOOL SwLayoutFrm::MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss, |*************************************************************************/ -BOOL SwCntntFrm::MoveFtnCntFwd( BOOL bMakePage, SwFtnBossFrm *pOldBoss ) +sal_Bool SwCntntFrm::MoveFtnCntFwd( sal_Bool bMakePage, SwFtnBossFrm *pOldBoss ) { ASSERT( IsInFtn(), "Keine Ftn." ); SwLayoutFrm *pFtn = FindFtnFrm(); @@ -3127,7 +3127,7 @@ BOOL SwCntntFrm::MoveFtnCntFwd( BOOL bMakePage, SwFtnBossFrm *pOldBoss ) { SwLayoutFrm* pBody = pOldBoss->FindBodyCont(); if( !pBody || !pBody->Lower() ) - return TRUE; + return sal_True; } //fix(9538): Wenn die Ftn noch Nachbarn hinter sich hat, so muessen @@ -3144,21 +3144,21 @@ BOOL SwCntntFrm::MoveFtnCntFwd( BOOL bMakePage, SwFtnBossFrm *pOldBoss ) { pLst = pNxt; SwCntntFrm *pCnt = pNxt->ContainsCntnt(); if( pCnt ) - pCnt->MoveFtnCntFwd( TRUE, pOldBoss ); + pCnt->MoveFtnCntFwd( sal_True, pOldBoss ); pNxt = (SwLayoutFrm*)pFtn->GetNext(); } } - BOOL bSamePage = TRUE; + sal_Bool bSamePage = sal_True; SwLayoutFrm *pNewUpper = - GetLeaf( bMakePage ? MAKEPAGE_INSERT : MAKEPAGE_NONE, TRUE ); + GetLeaf( bMakePage ? MAKEPAGE_INSERT : MAKEPAGE_NONE, sal_True ); if ( pNewUpper ) { - BOOL bSameBoss = TRUE; + sal_Bool bSameBoss = sal_True; SwFtnBossFrm * const pNewBoss = pNewUpper->FindFtnBossFrm(); //Wechseln wir die Spalte/Seite? - if ( FALSE == ( bSameBoss = pNewBoss == pOldBoss ) ) + if ( sal_False == ( bSameBoss = pNewBoss == pOldBoss ) ) { bSamePage = pOldBoss->FindPageFrm() == pNewBoss->FindPageFrm(); // Seitenwechsel? pNewUpper->Calc(); @@ -3211,7 +3211,7 @@ BOOL SwCntntFrm::MoveFtnCntFwd( BOOL bMakePage, SwFtnBossFrm *pOldBoss ) pNewUp = (SwSectionFrm*)pTmpFtn->Lower(); else { - pNewUp = new SwSectionFrm( *pSect, FALSE ); + pNewUp = new SwSectionFrm( *pSect, sal_False ); pNewUp->InsertBefore( pTmpFtn, pTmpFtn->Lower() ); static_cast<SwSectionFrm*>(pNewUp)->Init(); pNewUp->Frm().Pos() = pTmpFtn->Frm().Pos(); @@ -3315,7 +3315,7 @@ SwCntntFrm* SwFtnFrm::GetRefFromAttr() ASSERT( pAttr, "invalid Attribute" ); SwTxtNode& rTNd = (SwTxtNode&)pAttr->GetTxtNode(); SwPosition aPos( rTNd, SwIndex( &rTNd, *pAttr->GetStart() )); - SwCntntFrm* pCFrm = rTNd.GetFrm( 0, &aPos, FALSE ); + SwCntntFrm* pCFrm = rTNd.GetFrm( 0, &aPos, sal_False ); return pCFrm; } diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx index 79348f01d1e2..57790fbb3eb3 100644 --- a/sw/source/core/layout/hffrm.cxx +++ b/sw/source/core/layout/hffrm.cxx @@ -50,7 +50,7 @@ #include <objectformatter.hxx> // <-- -extern BOOL bObjsDirect; //frmtool.cxx +extern sal_Bool bObjsDirect; //frmtool.cxx static SwTwips lcl_GetFrmMinHeight(const SwLayoutFrm & rFrm) { @@ -78,7 +78,7 @@ static SwTwips lcl_CalcContentHeight(SwLayoutFrm & frm) SwFrm* pFrm = frm.Lower(); SwTwips nRemaining = 0; - USHORT nNum = 0; + sal_uInt16 nNum = 0; pFrm = frm.Lower(); while ( pFrm ) { @@ -117,20 +117,20 @@ static void lcl_LayoutFrmEnsureMinHeight(SwLayoutFrm & rFrm, } } -SwHeadFootFrm::SwHeadFootFrm( SwFrmFmt * pFmt, USHORT nTypeIn) +SwHeadFootFrm::SwHeadFootFrm( SwFrmFmt * pFmt, sal_uInt16 nTypeIn) : SwLayoutFrm(pFmt) { nType = nTypeIn; - SetDerivedVert( FALSE ); + SetDerivedVert( sal_False ); const SwFmtCntnt &rCnt = pFmt->GetCntnt(); ASSERT( rCnt.GetCntntIdx(), "Kein Inhalt fuer Header." ); //Fuer Header Footer die Objekte gleich erzeugen lassen. - BOOL bOld = bObjsDirect; - bObjsDirect = TRUE; - ULONG nIndex = rCnt.GetCntntIdx()->GetIndex(); + sal_Bool bOld = bObjsDirect; + bObjsDirect = sal_True; + sal_uLong nIndex = rCnt.GetCntntIdx()->GetIndex(); ::_InsertCnt( this, pFmt->GetDoc(), ++nIndex ); bObjsDirect = bOld; } @@ -232,7 +232,7 @@ void SwHeadFootFrm::FormatPrt(SwTwips & nUL, const SwBorderAttrs * pAttrs) } - bValidPrtArea = TRUE; + bValidPrtArea = sal_True; } void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs) @@ -241,7 +241,7 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs) { if( !IsColLocked() ) { - bValidSize = bValidPrtArea = TRUE; + bValidSize = bValidPrtArea = sal_True; const SwTwips nBorder = nUL; SwTwips nMinHeight = lcl_GetFrmMinHeight(*this); @@ -397,11 +397,11 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs) Prt().SSize().Height() = Frm().Height() - nBorder; } } - bValidSize = bValidPrtArea = TRUE; + bValidSize = bValidPrtArea = sal_True; } while( nRemaining<=nMaxHeight && nOldHeight!=Prt().Height() ); ColUnlock(); } - bValidSize = bValidPrtArea = TRUE; + bValidSize = bValidPrtArea = sal_True; } else //if ( GetType() & 0x0018 ) { @@ -409,7 +409,7 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs) { if ( Frm().Height() != pAttrs->GetSize().Height() ) ChgSize( Size( Frm().Width(), pAttrs->GetSize().Height())); - bValidSize = TRUE; + bValidSize = sal_True; MakePos(); } while ( !bValidSize ); } @@ -440,7 +440,7 @@ void SwHeadFootFrm::Format(const SwBorderAttrs * pAttrs) } } -SwTwips SwHeadFootFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) +SwTwips SwHeadFootFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) { SwTwips nResult; @@ -542,7 +542,7 @@ SwTwips SwHeadFootFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) return nResult; } -SwTwips SwHeadFootFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) +SwTwips SwHeadFootFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) { SwTwips nResult; @@ -658,15 +658,15 @@ SwTwips SwHeadFootFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) return nResult; } -BOOL SwHeadFootFrm::GetEatSpacing() const +sal_Bool SwHeadFootFrm::GetEatSpacing() const { const SwFrmFmt * pFmt = GetFmt(); ASSERT(pFmt, "SwHeadFootFrm: no format?"); if (pFmt->GetHeaderAndFooterEatSpacing().GetValue()) - return TRUE; + return sal_True; - return FALSE; + return sal_False; } @@ -710,7 +710,7 @@ void SwPageFrm::PrepareHeader() const SwFmtHeader &rH = ((SwFrmFmt*)pRegisteredIn)->GetHeader(); - const BOOL bOn = !((SwFrmFmt*)pRegisteredIn)->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); + const sal_Bool bOn = !((SwFrmFmt*)pRegisteredIn)->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); if ( bOn && rH.IsActive() ) { //Header einsetzen, vorher entfernen falls vorhanden. @@ -760,7 +760,7 @@ void SwPageFrm::PrepareFooter() while ( pLay->GetNext() ) pLay = (SwLayoutFrm*)pLay->GetNext(); - const BOOL bOn = !((SwFrmFmt*)pRegisteredIn)->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); + const sal_Bool bOn = !((SwFrmFmt*)pRegisteredIn)->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); if ( bOn && rF.IsActive() ) { //Footer einsetzen, vorher entfernen falls vorhanden. diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index ac20d8a4f86b..762c1caa3d84 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -160,7 +160,7 @@ static void BreakPoint() } \ } -inline ULONG Ticks() +inline sal_uLong Ticks() { return 1000 * clock() / CLOCKS_PER_SEC; } @@ -171,7 +171,7 @@ void SwLayAction::CheckWaitCrsr() if ( !IsWait() && IsWaitAllowed() && IsPaint() && ((Ticks() - GetStartTicks()) >= CLOCKS_PER_SEC/2) ) { - pWait = new SwWait( *pRoot->GetFmt()->GetDoc()->GetDocShell(), TRUE ); + pWait = new SwWait( *pRoot->GetFmt()->GetDoc()->GetDocShell(), sal_True ); } } @@ -198,7 +198,7 @@ inline void SwLayAction::CheckIdleEnd() |* Letzte Aenderung MA 06. Aug. 95 |* |*************************************************************************/ -void SwLayAction::SetStatBar( BOOL bNew ) +void SwLayAction::SetStatBar( sal_Bool bNew ) { if ( bNew ) { @@ -221,13 +221,13 @@ void SwLayAction::SetStatBar( BOOL bNew ) |* Letzte Aenderung MA 10. Sep. 96 |* |*************************************************************************/ -BOOL SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwCntntFrm *pCnt, +sal_Bool SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwCntntFrm *pCnt, const SwPageFrm *pPage ) { SwRegionRects aTmp( rRect ); const SwSortedObjs &rObjs = *pPage->GetSortedObjs(); const SwFlyFrm *pSelfFly = pCnt->FindFlyFrm(); - USHORT i; + sal_uInt16 i; for ( i = 0; i < rObjs.Count() && aTmp.Count(); ++i ) { @@ -264,7 +264,7 @@ BOOL SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwCntntFrm *pCnt, } else { - const BOOL bLowerOfSelf = pFly->IsLowerOf( pSelfFly ); + const sal_Bool bLowerOfSelf = pFly->IsLowerOf( pSelfFly ); if ( !bLowerOfSelf && !pFly->GetFmt()->GetOpaque().GetValue() ) //Aus anderem Layer interessieren uns nur nicht transparente //oder innenliegende @@ -297,14 +297,14 @@ BOOL SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwCntntFrm *pCnt, aTmp -= pFly->Frm(); } - BOOL bRetPaint = FALSE; + sal_Bool bRetPaint = sal_False; const SwRect *pData = aTmp.GetData(); for ( i = 0; i < aTmp.Count(); ++pData, ++i ) bRetPaint |= pImp->GetShell()->AddPaintRect( *pData ); return bRetPaint; } -inline BOOL SwLayAction::_PaintCntnt( const SwCntntFrm *pCntnt, +inline sal_Bool SwLayAction::_PaintCntnt( const SwCntntFrm *pCntnt, const SwPageFrm *pPage, const SwRect &rRect ) { @@ -315,7 +315,7 @@ inline BOOL SwLayAction::_PaintCntnt( const SwCntntFrm *pCntnt, else return pImp->GetShell()->AddPaintRect( rRect ); } - return FALSE; + return sal_False; } void SwLayAction::PaintCntnt( const SwCntntFrm *pCnt, @@ -341,7 +341,7 @@ void SwLayAction::PaintCntnt( const SwCntntFrm *pCnt, if( bHeightDiff ) { // OD 05.11.2002 #94454# - consider whole potential paint area. - //SwRect aDrawRect( pCnt->UnionFrm( TRUE ) ); + //SwRect aDrawRect( pCnt->UnionFrm( sal_True ) ); SwRect aDrawRect( pCnt->PaintArea() ); if( nOldHeight > nNewHeight ) nOldBottom = (pCnt->*fnRect->fnGetPrtBottom)(); @@ -390,9 +390,9 @@ SwLayAction::SwLayAction( SwRootFrm *pRt, SwViewImp *pI ) : nCheckPageNum( USHRT_MAX ) { bPaintExtraData = ::IsExtraData( pImp->GetShell()->GetDoc() ); - bPaint = bComplete = bWaitAllowed = bCheckPages = TRUE; + bPaint = bComplete = bWaitAllowed = bCheckPages = sal_True; bInput = bAgain = bNextCycle = bCalcLayout = bIdle = bReschedule = - bUpdateExpFlds = bBrowseActionStop = bActionInProgress = FALSE; + bUpdateExpFlds = bBrowseActionStop = bActionInProgress = sal_False; // OD 14.04.2003 #106346# - init new flag <mbFormatCntntOnInterrupt>. mbFormatCntntOnInterrupt = sal_False; @@ -419,9 +419,9 @@ void SwLayAction::Reset() nStartTicks = Ticks(); nInputType = 0; nEndPage = nPreInvaPage = nCheckPageNum = USHRT_MAX; - bPaint = bComplete = bWaitAllowed = bCheckPages = TRUE; + bPaint = bComplete = bWaitAllowed = bCheckPages = sal_True; bInput = bAgain = bNextCycle = bCalcLayout = bIdle = bReschedule = - bUpdateExpFlds = bBrowseActionStop = FALSE; + bUpdateExpFlds = bBrowseActionStop = sal_False; } /************************************************************************* @@ -433,11 +433,11 @@ void SwLayAction::Reset() |* |*************************************************************************/ -BOOL SwLayAction::RemoveEmptyBrowserPages() +sal_Bool SwLayAction::RemoveEmptyBrowserPages() { //Beim umschalten vom normalen in den Browsermodus bleiben u.U. einige //unangenehm lange stehen. Diese beseiten wir mal schnell. - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if ( pRoot->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) ) { SwPageFrm *pPage = (SwPageFrm*)pRoot->Lower(); @@ -448,7 +448,7 @@ BOOL SwLayAction::RemoveEmptyBrowserPages() pPage = (SwPageFrm*)pPage->GetNext(); else { - bRet = TRUE; + bRet = sal_True; SwPageFrm *pDel = pPage; pPage = (SwPageFrm*)pPage->GetNext(); pDel->Cut(); @@ -470,14 +470,14 @@ BOOL SwLayAction::RemoveEmptyBrowserPages() |*************************************************************************/ void SwLayAction::Action() { - bActionInProgress = TRUE; + bActionInProgress = sal_True; //TurboMode? Disqualifiziert fuer Idle-Format. if ( IsPaint() && !IsIdle() && TurboAction() ) { delete pWait, pWait = 0; pRoot->ResetTurboFlag(); - bActionInProgress = FALSE; + bActionInProgress = sal_False; pRoot->DeleteEmptySct(); return; } @@ -491,13 +491,13 @@ void SwLayAction::Action() pRoot->DisallowTurbo(); if ( IsCalcLayout() ) - SetCheckPages( FALSE ); + SetCheckPages( sal_False ); InternalAction(); bAgain |= RemoveEmptyBrowserPages(); while ( IsAgain() ) { - bAgain = bNextCycle = FALSE; + bAgain = bNextCycle = sal_False; InternalAction(); bAgain |= RemoveEmptyBrowserPages(); } @@ -509,20 +509,20 @@ void SwLayAction::Action() pRoot->ResetTurboFlag(); pRoot->ResetTurbo(); - SetCheckPages( TRUE ); + SetCheckPages( sal_True ); - bActionInProgress = FALSE; + bActionInProgress = sal_False; } SwPageFrm* SwLayAction::CheckFirstVisPage( SwPageFrm *pPage ) { SwCntntFrm *pCnt = pPage->FindFirstBodyCntnt(); SwCntntFrm *pChk = pCnt; - BOOL bPageChgd = FALSE; + sal_Bool bPageChgd = sal_False; while ( pCnt && pCnt->IsFollow() ) pCnt = static_cast<SwCntntFrm*>(pCnt)->FindMaster(); if ( pCnt && pChk != pCnt ) - { bPageChgd = TRUE; + { bPageChgd = sal_True; pPage = pCnt->FindPageFrm(); } @@ -609,14 +609,14 @@ void SwLayAction::InternalAction() //Cntnt's if ( !IsComplete() ) pPage = CheckFirstVisPage( pPage ); - USHORT nFirstPageNum = pPage->GetPhyPageNum(); + sal_uInt16 nFirstPageNum = pPage->GetPhyPageNum(); while ( pPage && !pPage->IsInvalid() && !pPage->IsInvalidFly() ) pPage = (SwPageFrm*)pPage->GetNext(); IDocumentLayoutAccess *pLayoutAccess = pRoot->GetFmt()->getIDocumentLayoutAccess(); - BOOL bNoLoop = pPage ? SwLayouter::StartLoopControl( pRoot->GetFmt()->GetDoc(), pPage ) : FALSE; - USHORT nPercentPageNum = 0; + sal_Bool bNoLoop = pPage ? SwLayouter::StartLoopControl( pRoot->GetFmt()->GetDoc(), pPage ) : sal_False; + sal_uInt16 nPercentPageNum = 0; while ( (pPage && !IsInterrupt()) || nCheckPageNum != USHRT_MAX ) { if ( !pPage && nCheckPageNum != USHRT_MAX && @@ -634,9 +634,9 @@ void SwLayAction::InternalAction() } SwPageFrm *pTmp = pPage->GetPrev() ? (SwPageFrm*)pPage->GetPrev() : pPage; - SetCheckPages( TRUE ); + SetCheckPages( sal_True ); SwFrm::CheckPageDescs( pPage ); - SetCheckPages( FALSE ); + SetCheckPages( sal_False ); nCheckPageNum = USHRT_MAX; pPage = pTmp; continue; @@ -660,7 +660,7 @@ void SwLayAction::InternalAction() pRoot->AssertFlyPages(); if ( pRoot->IsSuperfluous() ) { - BOOL bOld = IsAgain(); + sal_Bool bOld = IsAgain(); pRoot->RemoveSuperfluous(); bAgain = bOld; } @@ -711,8 +711,8 @@ void SwLayAction::InternalAction() XCHECKPAGE; // FME 2007-08-30 #i81146# new loop control - USHORT nLoopControlRuns_1 = 0; - const USHORT nLoopControlMax = 20; + sal_uInt16 nLoopControlRuns_1 = 0; + const sal_uInt16 nLoopControlMax = 20; while ( !IsNextCycle() && pPage->IsInvalidLayout() ) { @@ -750,7 +750,7 @@ void SwLayAction::InternalAction() pPage->InvalidateFlyCntnt(); // <-- if ( IsBrowseActionStop() ) - bInput = TRUE; + bInput = sal_True; } } if( bNoLoop ) @@ -771,7 +771,7 @@ void SwLayAction::InternalAction() } if ( !IsInterrupt() ) { - SetNextCycle( FALSE ); + SetNextCycle( sal_False ); if ( nPreInvaPage != USHRT_MAX ) { @@ -819,7 +819,7 @@ void SwLayAction::InternalAction() pRoot->AssertFlyPages(); if ( pRoot->IsSuperfluous() ) { - BOOL bOld = IsAgain(); + sal_Bool bOld = IsAgain(); pRoot->RemoveSuperfluous(); bAgain = bOld; } @@ -879,8 +879,8 @@ void SwLayAction::InternalAction() XCHECKPAGE; // FME 2007-08-30 #i81146# new loop control - USHORT nLoopControlRuns_2 = 0; - const USHORT nLoopControlMax = 20; + sal_uInt16 nLoopControlRuns_2 = 0; + const sal_uInt16 nLoopControlMax = 20; // OD 14.04.2003 #106346# - special case: interrupt content formatting // --> OD 2004-07-08 #i28701# - conditions, introduced by #106346#, @@ -906,7 +906,7 @@ void SwLayAction::InternalAction() // <-- // FME 2007-08-30 #i81146# new loop control - USHORT nLoopControlRuns_3 = 0; + sal_uInt16 nLoopControlRuns_3 = 0; while ( pPg->IsInvalidLayout() ) { @@ -982,13 +982,13 @@ void SwLayAction::InternalAction() |* Letzte Aenderung MA 15. Aug. 93 |* |*************************************************************************/ -BOOL SwLayAction::_TurboAction( const SwCntntFrm *pCnt ) +sal_Bool SwLayAction::_TurboAction( const SwCntntFrm *pCnt ) { const SwPageFrm *pPage = 0; if ( !pCnt->IsValid() || pCnt->IsCompletePaint() || pCnt->IsRetouche() ) { - const SwRect aOldRect( pCnt->UnionFrm( TRUE ) ); + const SwRect aOldRect( pCnt->UnionFrm( sal_True ) ); const long nOldBottom = pCnt->Frm().Top() + pCnt->Prt().Bottom(); pCnt->Calc(); if ( pCnt->Frm().Bottom() < aOldRect.Bottom() ) @@ -999,7 +999,7 @@ BOOL SwLayAction::_TurboAction( const SwCntntFrm *pCnt ) if ( !pCnt->GetValidLineNumFlag() && pCnt->IsTxtFrm() ) { - const ULONG nAllLines = ((SwTxtFrm*)pCnt)->GetAllLines(); + const sal_uLong nAllLines = ((SwTxtFrm*)pCnt)->GetAllLines(); ((SwTxtFrm*)pCnt)->RecalcAllLines(); if ( nAllLines != ((SwTxtFrm*)pCnt)->GetAllLines() ) { @@ -1017,11 +1017,11 @@ BOOL SwLayAction::_TurboAction( const SwCntntFrm *pCnt ) if ( pNxt ) pNxt->InvalidatePage(); } - return FALSE; + return sal_False; } if ( pPage->IsInvalidLayout() || (IS_FLYS && IS_INVAFLY) ) - return FALSE; + return sal_False; } if ( !pPage ) pPage = pCnt->FindPageFrm(); @@ -1031,29 +1031,29 @@ BOOL SwLayAction::_TurboAction( const SwCntntFrm *pCnt ) !SwObjectFormatter::FormatObjsAtFrm( *(const_cast<SwCntntFrm*>(pCnt)), *pPage, this ) ) { - return FALSE; + return sal_False; } if ( pPage->IsInvalidCntnt() ) - return FALSE; - return TRUE; + return sal_False; + return sal_True; } -BOOL SwLayAction::TurboAction() +sal_Bool SwLayAction::TurboAction() { - BOOL bRet = TRUE; + sal_Bool bRet = sal_True; if ( pRoot->GetTurbo() ) { if ( !_TurboAction( pRoot->GetTurbo() ) ) { CheckIdleEnd(); - bRet = FALSE; + bRet = sal_False; } pRoot->ResetTurbo(); } else - bRet = FALSE; + bRet = sal_False; return bRet; } /************************************************************************* @@ -1077,7 +1077,7 @@ static bool lcl_IsInvaLay( const SwFrm *pFrm, long nBottom ) { if ( !pFrm->IsValid() || - (pFrm->IsCompletePaint() && pFrm->Frm().Top() < nBottom) + (pFrm->IsCompletePaint() && ( pFrm->Frm().Top() < nBottom ) ) ) { return true; @@ -1123,7 +1123,7 @@ static const SwFrm *lcl_FindFirstInvaCntnt( const SwLayoutFrm *pLay, long nBotto if ( pCnt->GetDrawObjs() ) { const SwSortedObjs &rObjs = *pCnt->GetDrawObjs(); - for ( USHORT i = 0; i < rObjs.Count(); ++i ) + for ( sal_uInt16 i = 0; i < rObjs.Count(); ++i ) { const SwAnchoredObject* pObj = rObjs[i]; if ( pObj->ISA(SwFlyFrm) ) @@ -1159,7 +1159,7 @@ static const SwAnchoredObject* lcl_FindFirstInvaObj( const SwPageFrm* _pPage, { ASSERT( _pPage->GetSortedObjs(), "FindFirstInvaObj, no Objs" ) - for ( USHORT i = 0; i < _pPage->GetSortedObjs()->Count(); ++i ) + for ( sal_uInt16 i = 0; i < _pPage->GetSortedObjs()->Count(); ++i ) { const SwAnchoredObject* pObj = (*_pPage->GetSortedObjs())[i]; if ( pObj->ISA(SwFlyFrm) ) @@ -1188,10 +1188,10 @@ static const SwAnchoredObject* lcl_FindFirstInvaObj( const SwPageFrm* _pPage, } // <-- -BOOL SwLayAction::IsShortCut( SwPageFrm *&prPage ) +sal_Bool SwLayAction::IsShortCut( SwPageFrm *&prPage ) { - BOOL bRet = FALSE; - const BOOL bBrowse = pRoot->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); + sal_Bool bRet = sal_False; + const sal_Bool bBrowse = pRoot->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); //Wenn die Seite nicht Gueltig ist wird sie schnell formatiert, sonst //gibts nix als Aerger. @@ -1202,7 +1202,7 @@ BOOL SwLayAction::IsShortCut( SwPageFrm *&prPage ) /// OD 15.10.2002 #103517# - format complete page /// Thus, loop on all lowers of the page <prPage>, instead of only /// format its first lower. - /// NOTE: In online layout (bBrowse == TRUE) a page can contain + /// NOTE: In online layout (bBrowse == sal_True) a page can contain /// a header frame and/or a footer frame beside the body frame. prPage->Calc(); SwFrm* pPageLowerFrm = prPage->Lower(); @@ -1215,7 +1215,7 @@ BOOL SwLayAction::IsShortCut( SwPageFrm *&prPage ) else FormatLayout( prPage ); if ( IsAgain() ) - return FALSE; + return sal_False; } @@ -1223,7 +1223,7 @@ BOOL SwLayAction::IsShortCut( SwPageFrm *&prPage ) if ( (prPage->Frm().Top() >= rVis.Bottom()) || (prPage->Frm().Left()>= rVis.Right()) ) { - bRet = TRUE; + bRet = sal_True; //Jetzt wird es ein bischen unangenehm: Der erste CntntFrm dieser Seite //im Bodytext muss Formatiert werden, wenn er dabei die Seite @@ -1256,7 +1256,7 @@ BOOL SwLayAction::IsShortCut( SwPageFrm *&prPage ) } if ( pCntnt ) { - BOOL bTstCnt = TRUE; + sal_Bool bTstCnt = sal_True; if ( bBrowse ) { //Der Cnt davor schon nicht mehr sichtbar? @@ -1270,7 +1270,7 @@ BOOL SwLayAction::IsShortCut( SwPageFrm *&prPage ) (pLst->Frm().Top() >= rVis.Bottom() || pLst->Frm().Left()>= rVis.Right()) ) { - bTstCnt = FALSE; + bTstCnt = sal_False; } } @@ -1289,7 +1289,7 @@ BOOL SwLayAction::IsShortCut( SwPageFrm *&prPage ) pSct->Calc(); pSct->SetCompletePaint(); if ( IsAgain() ) - return FALSE; + return sal_False; // --> OD 2004-06-04 #i27756# bPageChg = pCntnt->FindPageFrm() != p2ndPage && prPage->GetPrev(); @@ -1301,7 +1301,7 @@ BOOL SwLayAction::IsShortCut( SwPageFrm *&prPage ) pCntnt->Calc(); pCntnt->SetCompletePaint(); if ( IsAgain() ) - return FALSE; + return sal_False; // --> OD 2004-06-04 #i27756# bPageChg = pCntnt->FindPageFrm() != p2ndPage && prPage->GetPrev(); @@ -1315,7 +1315,7 @@ BOOL SwLayAction::IsShortCut( SwPageFrm *&prPage ) pTab->Calc(); pTab->SetCompletePaint(); if ( IsAgain() ) - return FALSE; + return sal_False; // --> OD 2004-06-04 #i27756# bPageChg = pCntnt->FindPageFrm() != p2ndPage && prPage->GetPrev(); @@ -1330,7 +1330,7 @@ BOOL SwLayAction::IsShortCut( SwPageFrm *&prPage ) pSct->Calc(); pSct->SetCompletePaint(); if ( IsAgain() ) - return FALSE; + return sal_False; // --> OD 2004-06-04 #i27756# bPageChg = pCntnt->FindPageFrm() != p2ndPage && prPage->GetPrev(); @@ -1340,7 +1340,7 @@ BOOL SwLayAction::IsShortCut( SwPageFrm *&prPage ) // --> OD 2004-06-04 #i27756# if ( bPageChg ) { - bRet = FALSE; + bRet = sal_False; const SwPageFrm* pTmp = pCntnt->FindPageFrm(); if ( pTmp->GetPhyPageNum() < prPage->GetPhyPageNum() && pTmp->IsInvalid() ) @@ -1367,7 +1367,7 @@ BOOL SwLayAction::IsShortCut( SwPageFrm *&prPage ) SwAnchoredObject* pObj = (*pObjs)[i]; if ( pObj->GetAnchorFrmContainingAnchPos() == pCntnt ) { - bRet = FALSE; + bRet = sal_False; break; } } @@ -1387,22 +1387,22 @@ BOOL SwLayAction::IsShortCut( SwPageFrm *&prPage ) 0 != (pObj = lcl_FindFirstInvaObj( prPage, nBottom )) && pObj->GetObjRect().Top() <= nBottom ) { - return FALSE; + return sal_False; } const SwFrm* pFrm( 0L ); if ( prPage->IsInvalidLayout() && 0 != (pFrm = lcl_FindFirstInvaLay( prPage, nBottom )) && pFrm->Frm().Top() <= nBottom ) { - return FALSE; + return sal_False; } if ( (prPage->IsInvalidCntnt() || prPage->IsInvalidFlyInCnt()) && 0 != (pFrm = lcl_FindFirstInvaCntnt( prPage, nBottom, 0 )) && pFrm->Frm().Top() <= nBottom ) { - return FALSE; + return sal_False; } - bRet = TRUE; + bRet = sal_True; } return bRet; } @@ -1416,14 +1416,14 @@ BOOL SwLayAction::IsShortCut( SwPageFrm *&prPage ) |* |*************************************************************************/ // OD 15.11.2002 #105155# - introduce support for vertical layout -BOOL SwLayAction::FormatLayout( SwLayoutFrm *pLay, BOOL bAddRect ) +sal_Bool SwLayAction::FormatLayout( SwLayoutFrm *pLay, sal_Bool bAddRect ) { ASSERT( !IsAgain(), "Ungueltige Seite beachten." ); if ( IsAgain() ) - return FALSE; + return sal_False; - BOOL bChanged = FALSE; - BOOL bAlreadyPainted = FALSE; + sal_Bool bChanged = sal_False; + sal_Bool bAlreadyPainted = sal_False; // OD 11.11.2002 #104414# - remember frame at complete paint SwRect aFrmAtCompletePaint; @@ -1435,9 +1435,9 @@ BOOL SwLayAction::FormatLayout( SwLayoutFrm *pLay, BOOL bAddRect ) SwRect aOldRect( pLay->Frm() ); pLay->Calc(); if ( aOldRect != pLay->Frm() ) - bChanged = TRUE; + bChanged = sal_True; - BOOL bNoPaint = FALSE; + sal_Bool bNoPaint = sal_False; if ( pLay->IsPageBodyFrm() && pLay->Frm().Pos() == aOldRect.Pos() && pLay->Lower() && @@ -1450,7 +1450,7 @@ BOOL SwLayAction::FormatLayout( SwLayoutFrm *pLay, BOOL bAddRect ) if ( !( pLay->IsCompletePaint() && pLay->FindPageFrm()->FindFtnCont() ) ) { - bNoPaint = TRUE; + bNoPaint = sal_True; } } @@ -1500,11 +1500,11 @@ BOOL SwLayAction::FormatLayout( SwLayoutFrm *pLay, BOOL bAddRect ) if ( pLay->IsCompletePaint() ) { pImp->GetShell()->AddPaintRect( aPaint ); - bAddRect = FALSE; + bAddRect = sal_False; } else { - USHORT i; + sal_uInt16 i; SwRegionRects aRegion( aOldRect ); aRegion -= aPaint; @@ -1522,7 +1522,7 @@ BOOL SwLayAction::FormatLayout( SwLayoutFrm *pLay, BOOL bAddRect ) else { pImp->GetShell()->AddPaintRect( aPaint ); - bAlreadyPainted = TRUE; + bAlreadyPainted = sal_True; // OD 11.11.2002 #104414# - remember frame at complete paint aFrmAtCompletePaint = pLay->Frm(); } @@ -1585,12 +1585,12 @@ BOOL SwLayAction::FormatLayout( SwLayoutFrm *pLay, BOOL bAddRect ) } if( bAlreadyPainted ) - bAddRect = FALSE; + bAddRect = sal_False; CheckWaitCrsr(); if ( IsAgain() ) - return FALSE; + return sal_False; //Jetzt noch diejenigen Lowers versorgen die LayoutFrm's sind @@ -1598,7 +1598,7 @@ BOOL SwLayAction::FormatLayout( SwLayoutFrm *pLay, BOOL bAddRect ) return bChanged; SwFrm *pLow = pLay->Lower(); - BOOL bTabChanged = FALSE; + sal_Bool bTabChanged = sal_False; while ( pLow && pLow->GetUpper() == pLay ) { if ( pLow->IsLayoutFrm() ) @@ -1615,7 +1615,7 @@ BOOL SwLayAction::FormatLayout( SwLayoutFrm *pLay, BOOL bAddRect ) pLow->OptCalc(); if ( IsAgain() ) - return FALSE; + return sal_False; pLow = pLow->GetNext(); } // OD 11.11.2002 #104414# - add complete frame area as paint area, if frame @@ -1631,14 +1631,14 @@ BOOL SwLayAction::FormatLayout( SwLayoutFrm *pLay, BOOL bAddRect ) return bChanged || bTabChanged; } -BOOL SwLayAction::FormatLayoutFly( SwFlyFrm* pFly ) +sal_Bool SwLayAction::FormatLayoutFly( SwFlyFrm* pFly ) { ASSERT( !IsAgain(), "Ungueltige Seite beachten." ); if ( IsAgain() ) - return FALSE; + return sal_False; - BOOL bChanged = false; - BOOL bAddRect = true; + sal_Bool bChanged = false; + sal_Bool bAddRect = true; if ( !pFly->IsValid() || pFly->IsCompletePaint() || pFly->IsInvalid() ) { @@ -1660,10 +1660,10 @@ BOOL SwLayAction::FormatLayoutFly( SwFlyFrm* pFly ) } if ( IsAgain() ) - return FALSE; + return sal_False; //Jetzt noch diejenigen Lowers versorgen die LayoutFrm's sind - BOOL bTabChanged = false; + sal_Bool bTabChanged = false; SwFrm *pLow = pFly->Lower(); while ( pLow ) { @@ -1681,17 +1681,17 @@ BOOL SwLayAction::FormatLayoutFly( SwFlyFrm* pFly ) // OD 31.10.2002 #104100# // Implement vertical layout support -BOOL SwLayAction::FormatLayoutTab( SwTabFrm *pTab, BOOL bAddRect ) +sal_Bool SwLayAction::FormatLayoutTab( SwTabFrm *pTab, sal_Bool bAddRect ) { ASSERT( !IsAgain(), "8-) Ungueltige Seite beachten." ); if ( IsAgain() || !pTab->Lower() ) - return FALSE; + return sal_False; IDocumentTimerAccess *pTimerAccess = pRoot->GetFmt()->getIDocumentTimerAccess(); pTimerAccess->BlockIdling(); - BOOL bChanged = FALSE; - BOOL bPainted = FALSE; + sal_Bool bChanged = sal_False; + sal_Bool bPainted = sal_False; const SwPageFrm *pOldPage = pTab->FindPageFrm(); @@ -1708,11 +1708,11 @@ BOOL SwLayAction::FormatLayoutTab( SwTabFrm *pTab, BOOL bAddRect ) } const SwRect aOldRect( pTab->Frm() ); - pTab->SetLowersFormatted( FALSE ); + pTab->SetLowersFormatted( sal_False ); pTab->Calc(); if ( aOldRect != pTab->Frm() ) { - bChanged = TRUE; + bChanged = sal_True; } const SwRect aPaintFrm = pTab->PaintArea(); @@ -1763,8 +1763,8 @@ BOOL SwLayAction::FormatLayoutTab( SwTabFrm *pTab, BOOL bAddRect ) else if ( pTab->IsCompletePaint() ) { pImp->GetShell()->AddPaintRect( aPaintFrm ); - bAddRect = FALSE; - bPainted = TRUE; + bAddRect = sal_False; + bPainted = sal_True; } if ( pTab->IsRetouche() && !pTab->GetNext() ) @@ -1777,7 +1777,7 @@ BOOL SwLayAction::FormatLayoutTab( SwTabFrm *pTab, BOOL bAddRect ) } } else - bAddRect = FALSE; + bAddRect = sal_False; if ( pTab->IsCompletePaint() && !pOptTab ) pOptTab = pTab; @@ -1802,16 +1802,16 @@ BOOL SwLayAction::FormatLayoutTab( SwTabFrm *pTab, BOOL bAddRect ) //Heftige Abkuerzung! if ( pTab->IsLowersFormatted() && (bPainted || !pImp->GetShell()->VisArea().IsOver( pTab->Frm())) ) - return FALSE; + return sal_False; //Jetzt noch die Lowers versorgen if ( IsAgain() ) - return FALSE; + return sal_False; // OD 20.10.2003 #112464# - for savety reasons: // check page number before formatting lowers. if ( pOldPage->GetPhyPageNum() > (pTab->FindPageFrm()->GetPhyPageNum() + 1) ) - SetNextCycle( TRUE ); + SetNextCycle( sal_True ); // OD 20.10.2003 #112464# - format lowers, only if table frame is valid if ( pTab->IsValid() ) @@ -1821,7 +1821,7 @@ BOOL SwLayAction::FormatLayoutTab( SwTabFrm *pTab, BOOL bAddRect ) { bChanged |= FormatLayout( (SwLayoutFrm*)pLow, bAddRect ); if ( IsAgain() ) - return FALSE; + return sal_False; pLow = (SwLayoutFrm*)pLow->GetNext(); } } @@ -1837,28 +1837,28 @@ BOOL SwLayAction::FormatLayoutTab( SwTabFrm *pTab, BOOL bAddRect ) |* Letzte Aenderung MA 16. Nov. 95 |* |*************************************************************************/ -BOOL SwLayAction::FormatCntnt( const SwPageFrm *pPage ) +sal_Bool SwLayAction::FormatCntnt( const SwPageFrm *pPage ) { const SwCntntFrm *pCntnt = pPage->ContainsCntnt(); - const BOOL bBrowse = pRoot->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); + const sal_Bool bBrowse = pRoot->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); while ( pCntnt && pPage->IsAnLower( pCntnt ) ) { //Wenn der Cntnt sich eh nicht veraendert koennen wir ein paar //Abkuerzungen nutzen. - const BOOL bFull = !pCntnt->IsValid() || pCntnt->IsCompletePaint() || + const sal_Bool bFull = !pCntnt->IsValid() || pCntnt->IsCompletePaint() || pCntnt->IsRetouche() || pCntnt->GetDrawObjs(); if ( bFull ) { //Damit wir nacher nicht suchen muessen. - const BOOL bNxtCnt = IsCalcLayout() && !pCntnt->GetFollow(); + const sal_Bool bNxtCnt = IsCalcLayout() && !pCntnt->GetFollow(); const SwCntntFrm *pCntntNext = bNxtCnt ? pCntnt->GetNextCntntFrm() : 0; const SwCntntFrm *pCntntPrev = pCntnt->GetPrev() ? pCntnt->GetPrevCntntFrm() : 0; const SwLayoutFrm*pOldUpper = pCntnt->GetUpper(); const SwTabFrm *pTab = pCntnt->FindTabFrm(); - const BOOL bInValid = !pCntnt->IsValid() || pCntnt->IsCompletePaint(); - const BOOL bOldPaint = IsPaint(); + const sal_Bool bInValid = !pCntnt->IsValid() || pCntnt->IsCompletePaint(); + const sal_Bool bOldPaint = IsPaint(); bPaint = bOldPaint && !(pTab && pTab == pOptTab); _FormatCntnt( pCntnt, pPage ); // --> OD 2004-11-05 #i26945# - reset <bPaint> before format objects @@ -1878,12 +1878,12 @@ BOOL SwLayAction::FormatCntnt( const SwPageFrm *pPage ) *(pCntnt->FindPageFrm()), this ) ) // <-- { - return FALSE; + return sal_False; } if ( !pCntnt->GetValidLineNumFlag() && pCntnt->IsTxtFrm() ) { - const ULONG nAllLines = ((SwTxtFrm*)pCntnt)->GetAllLines(); + const sal_uLong nAllLines = ((SwTxtFrm*)pCntnt)->GetAllLines(); ((SwTxtFrm*)pCntnt)->RecalcAllLines(); if ( IsPaintExtraData() && IsPaint() && nAllLines != ((SwTxtFrm*)pCntnt)->GetAllLines() ) @@ -1891,7 +1891,7 @@ BOOL SwLayAction::FormatCntnt( const SwPageFrm *pPage ) } if ( IsAgain() ) - return FALSE; + return sal_False; //Wenn Layout oder Flys wieder Invalid sind breche ich die Verarbeitung //vorlaeufig ab - allerdings nicht fuer die BrowseView, denn dort wird @@ -1907,11 +1907,11 @@ BOOL SwLayAction::FormatCntnt( const SwPageFrm *pPage ) // OD 07.05.2003 #109435# - consider interrupt formatting ( IS_FLYS && IS_INVAFLY && !mbFormatCntntOnInterrupt ) ) - return FALSE; + return sal_False; } if ( pOldUpper != pCntnt->GetUpper() ) { - const USHORT nCurNum = pCntnt->FindPageFrm()->GetPhyPageNum(); + const sal_uInt16 nCurNum = pCntnt->FindPageFrm()->GetPhyPageNum(); if ( nCurNum < pPage->GetPhyPageNum() ) nPreInvaPage = nCurNum; @@ -1919,11 +1919,11 @@ BOOL SwLayAction::FormatCntnt( const SwPageFrm *pPage ) //fangen wir nocheinmal von vorn an damit wir nichts auslassen. if ( !IsCalcLayout() && pPage->GetPhyPageNum() > nCurNum+1 ) { - SetNextCycle( TRUE ); + SetNextCycle( sal_True ); // OD 07.05.2003 #109435# - consider interrupt formatting if ( !mbFormatCntntOnInterrupt ) { - return FALSE; + return sal_False; } } } @@ -1932,7 +1932,7 @@ BOOL SwLayAction::FormatCntnt( const SwPageFrm *pPage ) //So werden einerseits Vorgaenger erwischt, die jetzt f?r Retouche //verantwortlich sind, andererseits werden die Fusszeilen //auch angefasst. - BOOL bSetCntnt = TRUE; + sal_Bool bSetCntnt = sal_True; if ( pCntntPrev ) { if ( !pCntntPrev->IsValid() && pPage->IsAnLower( pCntntPrev ) ) @@ -1941,7 +1941,7 @@ BOOL SwLayAction::FormatCntnt( const SwPageFrm *pPage ) pPage->GetPhyPageNum() < pCntnt->FindPageFrm()->GetPhyPageNum() ) { pCntnt = pCntntPrev; - bSetCntnt = FALSE; + bSetCntnt = sal_False; } } if ( bSetCntnt ) @@ -1958,11 +1958,11 @@ BOOL SwLayAction::FormatCntnt( const SwPageFrm *pPage ) !lcl_FindFirstInvaObj( pPage, nBottom )) && (!pPage->IsInvalidLayout() || !lcl_FindFirstInvaLay( pPage, nBottom ))) - SetBrowseActionStop( TRUE ); + SetBrowseActionStop( sal_True ); // OD 14.04.2003 #106346# - consider interrupt formatting. if ( !mbFormatCntntOnInterrupt ) { - return FALSE; + return sal_False; } } } @@ -1975,7 +1975,7 @@ BOOL SwLayAction::FormatCntnt( const SwPageFrm *pPage ) { if ( !pCntnt->GetValidLineNumFlag() && pCntnt->IsTxtFrm() ) { - const ULONG nAllLines = ((SwTxtFrm*)pCntnt)->GetAllLines(); + const sal_uLong nAllLines = ((SwTxtFrm*)pCntnt)->GetAllLines(); ((SwTxtFrm*)pCntnt)->RecalcAllLines(); if ( IsPaintExtraData() && IsPaint() && nAllLines != ((SwTxtFrm*)pCntnt)->GetAllLines() ) @@ -1991,7 +1991,7 @@ BOOL SwLayAction::FormatCntnt( const SwPageFrm *pPage ) CheckIdleEnd(); // OD 14.04.2003 #106346# - consider interrupt formatting. if ( IsInterrupt() && !mbFormatCntntOnInterrupt ) - return FALSE; + return sal_False; } if ( bBrowse && !IsIdle() && !IsCalcLayout() && !IsComplete() && pCntnt->Frm().Top() > pImp->GetShell()->VisArea().Bottom()) @@ -2005,11 +2005,11 @@ BOOL SwLayAction::FormatCntnt( const SwPageFrm *pPage ) !lcl_FindFirstInvaObj( pPage, nBottom )) && (!pPage->IsInvalidLayout() || !lcl_FindFirstInvaLay( pPage, nBottom ))) - SetBrowseActionStop( TRUE ); + SetBrowseActionStop( sal_True ); // OD 14.04.2003 #106346# - consider interrupt formatting. if ( !mbFormatCntntOnInterrupt ) { - return FALSE; + return sal_False; } } } @@ -2024,8 +2024,8 @@ BOOL SwLayAction::FormatCntnt( const SwPageFrm *pPage ) |* |* SwLayAction::_FormatCntnt() |* -|* Beschreibung Returnt TRUE wenn der Absatz verarbeitet wurde, -|* FALSE wenn es nichts zu verarbeiten gab. +|* Beschreibung Returnt sal_True wenn der Absatz verarbeitet wurde, +|* sal_False wenn es nichts zu verarbeiten gab. |* Ersterstellung MA 07. Dec. 92 |* Letzte Aenderung MA 11. Mar. 98 |* @@ -2034,7 +2034,7 @@ void SwLayAction::_FormatCntnt( const SwCntntFrm *pCntnt, const SwPageFrm *pPage ) { //wird sind hier evtl. nur angekommen, weil der Cntnt DrawObjekte haelt. - const BOOL bDrawObjsOnly = pCntnt->IsValid() && !pCntnt->IsCompletePaint() && + const sal_Bool bDrawObjsOnly = pCntnt->IsValid() && !pCntnt->IsCompletePaint() && !pCntnt->IsRetouche(); SWRECTFN( pCntnt ) if ( !bDrawObjsOnly && IsPaint() ) @@ -2065,13 +2065,13 @@ void SwLayAction::_FormatCntnt( const SwCntntFrm *pCntnt, |* SwLayAction::_FormatFlyCntnt() |* |* Beschreibung: -|* - Returnt TRUE wenn alle Cntnts des Flys vollstaendig verarbeitet -|* wurden. FALSE wenn vorzeitig unterbrochen wurde. +|* - Returnt sal_True wenn alle Cntnts des Flys vollstaendig verarbeitet +|* wurden. sal_False wenn vorzeitig unterbrochen wurde. |* Ersterstellung MA 02. Dec. 92 |* Letzte Aenderung MA 24. Jun. 96 |* |*************************************************************************/ -BOOL SwLayAction::_FormatFlyCntnt( const SwFlyFrm *pFly ) +sal_Bool SwLayAction::_FormatFlyCntnt( const SwFlyFrm *pFly ) { const SwCntntFrm *pCntnt = pFly->ContainsCntnt(); @@ -2098,7 +2098,7 @@ BOOL SwLayAction::_FormatFlyCntnt( const SwFlyFrm *pFly ) if ( !pCntnt->GetValidLineNumFlag() && pCntnt->IsTxtFrm() ) { - const ULONG nAllLines = ((SwTxtFrm*)pCntnt)->GetAllLines(); + const sal_uLong nAllLines = ((SwTxtFrm*)pCntnt)->GetAllLines(); ((SwTxtFrm*)pCntnt)->RecalcAllLines(); if ( IsPaintExtraData() && IsPaint() && nAllLines != ((SwTxtFrm*)pCntnt)->GetAllLines() ) @@ -2106,7 +2106,7 @@ BOOL SwLayAction::_FormatFlyCntnt( const SwFlyFrm *pFly ) } if ( IsAgain() ) - return FALSE; + return sal_False; //wenn eine Eingabe anliegt breche ich die Verarbeitung ab. if ( !pFly->IsFlyInCntFrm() ) @@ -2114,7 +2114,7 @@ BOOL SwLayAction::_FormatFlyCntnt( const SwFlyFrm *pFly ) CheckIdleEnd(); // OD 14.04.2003 #106346# - consider interrupt formatting. if ( IsInterrupt() && !mbFormatCntntOnInterrupt ) - return FALSE; + return sal_False; } pCntnt = pCntnt->GetNextCntntFrm(); } @@ -2123,9 +2123,9 @@ BOOL SwLayAction::_FormatFlyCntnt( const SwFlyFrm *pFly ) return !(IsInterrupt() && !mbFormatCntntOnInterrupt); } -BOOL SwLayAction::IsStopPrt() const +sal_Bool SwLayAction::IsStopPrt() const { - BOOL bResult = FALSE; + sal_Bool bResult = sal_False; if (pImp != NULL && pProgress != NULL) bResult = pImp->IsStopPrt(); @@ -2141,12 +2141,12 @@ BOOL SwLayAction::IsStopPrt() const |* Letzte Aenderung AMA 01. Feb. 96 |* |*************************************************************************/ -BOOL SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob ) +sal_Bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob ) { ASSERT( pCnt->IsTxtFrm(), "NoTxt neighbour of Txt" ); // robust against misuse by e.g. #i52542# if( !pCnt->IsTxtFrm() ) - return FALSE; + return sal_False; const SwTxtNode* pTxtNode = pCnt->GetNode()->GetTxtNode(); @@ -2187,17 +2187,17 @@ BOOL SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob ) SwRect aRepaint( ((SwTxtFrm*)pCnt)->_AutoSpell( pCntntNode, *pSh->GetViewOptions(), nTxtPos ) ); bPageValid = bPageValid && !pTxtNode->IsWrongDirty(); if( !bPageValid ) - bAllValid = FALSE; + bAllValid = sal_False; if ( aRepaint.HasArea() ) pImp->GetShell()->InvalidateWindows( aRepaint ); if ( Application::AnyInput( INPUT_MOUSEANDKEYBOARD|INPUT_OTHER|INPUT_PAINT ) ) - return TRUE; + return sal_True; break; } case AUTOCOMPLETE_WORDS : ((SwTxtFrm*)pCnt)->CollectAutoCmplWrds( pCntntNode, nTxtPos ); if ( Application::AnyInput( INPUT_ANY ) ) - return TRUE; + return sal_True; break; case WORD_COUNT : { @@ -2205,7 +2205,7 @@ BOOL SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob ) SwDocStat aStat; pTxtNode->CountWords( aStat, 0, nEnd ); if ( Application::AnyInput( INPUT_ANY ) ) - return TRUE; + return sal_True; break; } case SMART_TAGS : // SMARTTAGS @@ -2213,11 +2213,11 @@ BOOL SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob ) const SwRect aRepaint( ((SwTxtFrm*)pCnt)->SmartTagScan( pCntntNode, nTxtPos ) ); bPageValid = bPageValid && !pTxtNode->IsSmartTagDirty(); if( !bPageValid ) - bAllValid = FALSE; + bAllValid = sal_False; if ( aRepaint.HasArea() ) pImp->GetShell()->InvalidateWindows( aRepaint ); if ( Application::AnyInput( INPUT_MOUSEANDKEYBOARD|INPUT_OTHER|INPUT_PAINT ) ) - return TRUE; + return sal_True; break; } } @@ -2227,7 +2227,7 @@ BOOL SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob ) if ( pCnt->GetDrawObjs() ) { const SwSortedObjs &rObjs = *pCnt->GetDrawObjs(); - for ( USHORT i = 0; i < rObjs.Count(); ++i ) + for ( sal_uInt16 i = 0; i < rObjs.Count(); ++i ) { SwAnchoredObject* pObj = rObjs[i]; if ( pObj->ISA(SwFlyFrm) ) @@ -2241,7 +2241,7 @@ BOOL SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob ) if ( pC->IsTxtFrm() ) { if ( _DoIdleJob( pC, eJob ) ) - return TRUE; + return sal_True; } pC = pC->GetNextCntntFrm(); } @@ -2249,10 +2249,10 @@ BOOL SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob ) } } } - return FALSE; + return sal_False; } -BOOL SwLayIdle::DoIdleJob( IdleJobType eJob, BOOL bVisAreaOnly ) +sal_Bool SwLayIdle::DoIdleJob( IdleJobType eJob, sal_Bool bVisAreaOnly ) { //Spellchecken aller Inhalte der Seiten. Entweder nur der sichtbaren //Seiten oder eben aller. @@ -2264,22 +2264,22 @@ BOOL SwLayIdle::DoIdleJob( IdleJobType eJob, BOOL bVisAreaOnly ) { case ONLINE_SPELLING : if( !pViewOptions->IsOnlineSpell() ) - return FALSE; + return sal_False; break; case AUTOCOMPLETE_WORDS : if( !pViewOptions->IsAutoCompleteWords() || pDoc->GetAutoCompleteWords().IsLockWordLstLocked()) - return FALSE; + return sal_False; break; case WORD_COUNT : if ( !pViewShell->getIDocumentStatistics()->GetDocStat().bModified ) - return FALSE; + return sal_False; break; case SMART_TAGS : if ( pDoc->GetDocShell()->IsHelpDocument() || pDoc->isXForms() || !SwSmartTagMgr::Get().IsSmartTagsEnabled() ) - return FALSE; + return sal_False; break; default: ASSERT( false, "Unknown idle job type" ) } @@ -2295,17 +2295,17 @@ BOOL SwLayIdle::DoIdleJob( IdleJobType eJob, BOOL bVisAreaOnly ) while ( pPage ) { - bPageValid = TRUE; + bPageValid = sal_True; const SwCntntFrm *pCnt = pPage->ContainsCntnt(); while( pCnt && pPage->IsAnLower( pCnt ) ) { if ( _DoIdleJob( pCnt, eJob ) ) - return TRUE; + return sal_True; pCnt = pCnt->GetNextCntntFrm(); } if ( pPage->GetSortedObjs() ) { - for ( USHORT i = 0; pPage->GetSortedObjs() && + for ( sal_uInt16 i = 0; pPage->GetSortedObjs() && i < pPage->GetSortedObjs()->Count(); ++i ) { const SwAnchoredObject* pObj = (*pPage->GetSortedObjs())[i]; @@ -2318,7 +2318,7 @@ BOOL SwLayIdle::DoIdleJob( IdleJobType eJob, BOOL bVisAreaOnly ) if ( pC->IsTxtFrm() ) { if ( _DoIdleJob( pC, eJob ) ) - return TRUE; + return sal_True; } pC = pC->GetNextCntntFrm(); } @@ -2342,7 +2342,7 @@ BOOL SwLayIdle::DoIdleJob( IdleJobType eJob, BOOL bVisAreaOnly ) !pPage->Frm().IsOver( pImp->GetShell()->VisArea())) break; } - return FALSE; + return sal_False; } @@ -2361,7 +2361,7 @@ void SwLayIdle::ShowIdle( ColorData eColorData ) { if ( !bIndicator ) { - bIndicator = TRUE; + bIndicator = sal_True; Window *pWin = pImp->GetShell()->GetWin(); if ( pWin ) { @@ -2397,7 +2397,7 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) : pImp( pI ) #ifdef DBG_UTIL #if OSL_DEBUG_LEVEL > 1 - , bIndicator( FALSE ) + , bIndicator( sal_False ) #endif #endif { @@ -2405,13 +2405,13 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) : SHOW_IDLE( COL_LIGHTRED ); - pImp->GetShell()->EnableSmooth( FALSE ); + pImp->GetShell()->EnableSmooth( sal_False ); //Zuerst den Sichtbaren Bereich Spellchecken, nur wenn dort nichts //zu tun war wird das IdleFormat angestossen. - if ( !DoIdleJob( SMART_TAGS, TRUE ) && - !DoIdleJob( ONLINE_SPELLING, TRUE ) && - !DoIdleJob( AUTOCOMPLETE_WORDS, TRUE ) ) // SMARTTAGS + if ( !DoIdleJob( SMART_TAGS, sal_True ) && + !DoIdleJob( ONLINE_SPELLING, sal_True ) && + !DoIdleJob( AUTOCOMPLETE_WORDS, sal_True ) ) // SMARTTAGS { //Formatieren und ggf. Repaint-Rechtecke an der ViewShell vormerken. //Dabei muessen kuenstliche Actions laufen, damit es z.B. bei @@ -2422,11 +2422,11 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) : ViewShell *pSh = pImp->GetShell(); do { ++pSh->nStartAction; - BOOL bVis = FALSE; + sal_Bool bVis = sal_False; if ( pSh->ISA(SwCrsrShell) ) { #ifdef SW_CRSR_TIMER - ((SwCrsrShell*)pSh)->ChgCrsrTimerFlag( FALSE ); + ((SwCrsrShell*)pSh)->ChgCrsrTimerFlag( sal_False ); #endif bVis = ((SwCrsrShell*)pSh)->GetCharRect().IsOver(pSh->VisArea()); } @@ -2436,20 +2436,20 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) : SwLayAction aAction( pRoot, pImp ); aAction.SetInputType( INPUT_ANY ); - aAction.SetIdle( TRUE ); - aAction.SetWaitAllowed( FALSE ); + aAction.SetIdle( sal_True ); + aAction.SetWaitAllowed( sal_False ); aAction.Action(); //Weitere Start-/EndActions nur auf wenn irgendwo Paints aufgelaufen //sind oder wenn sich die Sichtbarkeit des CharRects veraendert hat. - BOOL bActions = FALSE; - USHORT nBoolIdx = 0; + sal_Bool bActions = sal_False; + sal_uInt16 nBoolIdx = 0; do { --pSh->nStartAction; if ( pSh->Imp()->GetRegion() ) - bActions = TRUE; + bActions = sal_True; else { SwRect aTmp( pSh->VisArea() ); @@ -2481,7 +2481,7 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) : nBoolIdx = 0; do { - BOOL bCrsrShell = pSh->IsA( TYPE(SwCrsrShell) ); + sal_Bool bCrsrShell = pSh->IsA( TYPE(SwCrsrShell) ); if ( bCrsrShell ) ((SwCrsrShell*)pSh)->SttCrsrMove(); @@ -2493,20 +2493,20 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) : //deren Loesung unverhaeltnissmaessig aufwendig waere. //fix(18176): SwViewImp *pViewImp = pSh->Imp(); - BOOL bUnlock = FALSE; + sal_Bool bUnlock = sal_False; if ( pViewImp->GetRegion() ) { pViewImp->DelRegion(); //Fuer Repaint mit virtuellem Device sorgen. pSh->LockPaint(); - bUnlock = TRUE; + bUnlock = sal_True; } if ( bCrsrShell ) //Wenn der Crsr sichbar war wieder sichbar machen, sonst - //EndCrsrMove mit TRUE fuer IdleEnd. - ((SwCrsrShell*)pSh)->EndCrsrMove( TRUE^aBools[nBoolIdx] ); + //EndCrsrMove mit sal_True fuer IdleEnd. + ((SwCrsrShell*)pSh)->EndCrsrMove( sal_True^aBools[nBoolIdx] ); // else // pSh->EndAction(); if( bUnlock ) @@ -2519,11 +2519,11 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) : // paint the selection! -> Set the focus flag at // CrsrShell and it dont paint the selection. ((SwCrsrShell*)pSh)->ShLooseFcs(); - pSh->UnlockPaint( TRUE ); - ((SwCrsrShell*)pSh)->ShGetFcs( FALSE ); + pSh->UnlockPaint( sal_True ); + ((SwCrsrShell*)pSh)->ShGetFcs( sal_False ); } else - pSh->UnlockPaint( TRUE ); + pSh->UnlockPaint( sal_True ); } pSh = (ViewShell*)pSh->GetNext(); @@ -2534,20 +2534,20 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) : if ( !aAction.IsInterrupt() ) { - if ( !DoIdleJob( WORD_COUNT, FALSE ) ) - if ( !DoIdleJob( SMART_TAGS, FALSE ) ) - if ( !DoIdleJob( ONLINE_SPELLING, FALSE ) ) - DoIdleJob( AUTOCOMPLETE_WORDS, FALSE ); // SMARTTAGS + if ( !DoIdleJob( WORD_COUNT, sal_False ) ) + if ( !DoIdleJob( SMART_TAGS, sal_False ) ) + if ( !DoIdleJob( ONLINE_SPELLING, sal_False ) ) + DoIdleJob( AUTOCOMPLETE_WORDS, sal_False ); // SMARTTAGS } bool bInValid = false; const SwViewOption& rVOpt = *pImp->GetShell()->GetViewOptions(); const ViewShell* pViewShell = pImp->GetShell(); // See conditions in DoIdleJob() - const BOOL bSpell = rVOpt.IsOnlineSpell(); - const BOOL bACmplWrd = rVOpt.IsAutoCompleteWords(); - const BOOL bWordCount = pViewShell->getIDocumentStatistics()->GetDocStat().bModified; - const BOOL bSmartTags = !pViewShell->GetDoc()->GetDocShell()->IsHelpDocument() && + const sal_Bool bSpell = rVOpt.IsOnlineSpell(); + const sal_Bool bACmplWrd = rVOpt.IsAutoCompleteWords(); + const sal_Bool bWordCount = pViewShell->getIDocumentStatistics()->GetDocStat().bModified; + const sal_Bool bSmartTags = !pViewShell->GetDoc()->GetDocShell()->IsHelpDocument() && !pViewShell->GetDoc()->isXForms() && SwSmartTagMgr::Get().IsSmartTagsEnabled(); // SMARTTAGS @@ -2574,7 +2574,7 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) : } } - pImp->GetShell()->EnableSmooth( TRUE ); + pImp->GetShell()->EnableSmooth( sal_True ); if( pImp->IsAccessible() ) pImp->FireAccessibleEvents(); diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index a85ee7091ff1..bab2154bc7a9 100644 --- a/sw/source/core/layout/laycache.cxx +++ b/sw/source/core/layout/laycache.cxx @@ -98,18 +98,18 @@ void SwLayoutCache::Read( SvStream &rStream ) //----------------------------------------------------------------------------- -void SwLayCacheImpl::Insert( USHORT nType, ULONG nIndex, xub_StrLen nOffset ) +void SwLayCacheImpl::Insert( sal_uInt16 nType, sal_uLong nIndex, xub_StrLen nOffset ) { aType.Insert( nType, aType.Count() ); SvULongs::Insert( nIndex, SvULongs::Count() ); aOffset.push_back( nOffset ); } -BOOL SwLayCacheImpl::Read( SvStream& rStream ) +sal_Bool SwLayCacheImpl::Read( SvStream& rStream ) { - SwLayCacheIoImpl aIo( rStream, FALSE ); + SwLayCacheIoImpl aIo( rStream, sal_False ); if( aIo.GetMajorVersion() > SW_LAYCACHE_IO_VERSION_MAJOR ) - return FALSE; + return sal_False; // Due to an evil bug in the layout cache (#102759#), we cannot trust the // sizes of fly frames which have been written using the "old" layout cache. @@ -117,8 +117,8 @@ BOOL SwLayCacheImpl::Read( SvStream& rStream ) // height of fly frames bUseFlyCache = aIo.GetMinorVersion() >= 1; - BYTE cFlags; - UINT32 nIndex, nOffset; + sal_uInt8 cFlags; + sal_uInt32 nIndex, nOffset; aIo.OpenRec( SW_LAYCACHE_IO_REC_PAGES ); aIo.OpenFlagRec(); @@ -154,7 +154,7 @@ BOOL SwLayCacheImpl::Read( SvStream& rStream ) aIo.OpenFlagRec(); aIo.CloseFlagRec(); long nX, nY, nW, nH; - USHORT nPgNum; + sal_uInt16 nPgNum; aIo.GetStream() >> nPgNum >> nIndex >> nX >> nY >> nW >> nH; SwFlyCache* pFly = new SwFlyCache( nPgNum, nIndex, nX, nY, nW, nH ); @@ -188,10 +188,10 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc ) { if( rDoc.GetRootFrm() ) // the layout itself .. { - SwLayCacheIoImpl aIo( rStream, TRUE ); + SwLayCacheIoImpl aIo( rStream, sal_True ); // We want to save the relative index, so we need the index // of the first content - ULONG nStartOfContent = rDoc.GetNodes().GetEndOfContent(). + sal_uLong nStartOfContent = rDoc.GetNodes().GetEndOfContent(). StartOfSectionNode()->GetIndex(); // The first page.. SwPageFrm* pPage = (SwPageFrm*)rDoc.GetRootFrm()->Lower(); @@ -214,12 +214,12 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc ) { if( pTmp->IsTxtFrm() ) { - ULONG nNdIdx = ((SwTxtFrm*)pTmp)->GetNode()->GetIndex(); + sal_uLong nNdIdx = ((SwTxtFrm*)pTmp)->GetNode()->GetIndex(); if( nNdIdx > nStartOfContent ) { /* Open Paragraph Record */ aIo.OpenRec( SW_LAYCACHE_IO_REC_PARA ); - BOOL bFollow = ((SwTxtFrm*)pTmp)->IsFollow(); + sal_Bool bFollow = ((SwTxtFrm*)pTmp)->IsFollow(); aIo.OpenFlagRec( bFollow ? 0x01 : 0x00, bFollow ? 8 : 4 ); nNdIdx -= nStartOfContent; @@ -234,7 +234,7 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc ) else if( pTmp->IsTabFrm() ) { SwTabFrm* pTab = (SwTabFrm*)pTmp; - ULONG nOfst = STRING_LEN; + sal_uLong nOfst = STRING_LEN; if( pTab->IsFollow() ) { // If the table is a follow, we have to look for the @@ -256,7 +256,7 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc ) } do { - ULONG nNdIdx = + sal_uLong nNdIdx = pTab->GetTable()->GetTableNode()->GetIndex(); if( nNdIdx > nStartOfContent ) { @@ -306,7 +306,7 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc ) if( pPage->GetSortedObjs() ) { SwSortedObjs &rObjs = *pPage->GetSortedObjs(); - for ( USHORT i = 0; i < rObjs.Count(); ++i ) + for ( sal_uInt16 i = 0; i < rObjs.Count(); ++i ) { SwAnchoredObject* pAnchoredObj = rObjs[i]; if ( pAnchoredObj->ISA(SwFlyFrm) ) @@ -320,7 +320,7 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc ) if( pC ) { sal_uInt32 nOrdNum = pAnchoredObj->GetDrawObj()->GetOrdNum(); - USHORT nPageNum = pPage->GetPhyPageNum(); + sal_uInt16 nPageNum = pPage->GetPhyPageNum(); /* Open Fly Record */ aIo.OpenRec( SW_LAYCACHE_IO_REC_FLY ); aIo.OpenFlagRec( 0, 0 ); @@ -350,8 +350,8 @@ sal_Bool SwLayoutCache::CompareLayout( const SwDoc& rDoc ) const sal_Bool bRet = sal_True; if( pImpl && rDoc.GetRootFrm() ) { - USHORT nIndex = 0; - ULONG nStartOfContent = rDoc.GetNodes().GetEndOfContent(). + sal_uInt16 nIndex = 0; + sal_uLong nStartOfContent = rDoc.GetNodes().GetEndOfContent(). StartOfSectionNode()->GetIndex(); SwPageFrm* pPage = (SwPageFrm*)rDoc.GetRootFrm()->Lower(); if( pPage ) @@ -372,10 +372,10 @@ sal_Bool SwLayoutCache::CompareLayout( const SwDoc& rDoc ) const { if( pTmp->IsTxtFrm() ) { - ULONG nNdIdx = ((SwTxtFrm*)pTmp)->GetNode()->GetIndex(); + sal_uLong nNdIdx = ((SwTxtFrm*)pTmp)->GetNode()->GetIndex(); if( nNdIdx > nStartOfContent ) { - BOOL bFollow = ((SwTxtFrm*)pTmp)->IsFollow(); + sal_Bool bFollow = ((SwTxtFrm*)pTmp)->IsFollow(); nNdIdx -= nStartOfContent; if( pImpl->GetBreakIndex( nIndex ) != nNdIdx || SW_LAYCACHE_IO_REC_PARA != @@ -392,7 +392,7 @@ sal_Bool SwLayoutCache::CompareLayout( const SwDoc& rDoc ) const else if( pTmp->IsTabFrm() ) { SwTabFrm* pTab = (SwTabFrm*)pTmp; - ULONG nOfst = STRING_LEN; + sal_uLong nOfst = STRING_LEN; if( pTab->IsFollow() ) { nOfst = 0; @@ -411,7 +411,7 @@ sal_Bool SwLayoutCache::CompareLayout( const SwDoc& rDoc ) const } do { - ULONG nNdIdx = + sal_uLong nNdIdx = pTab->GetTable()->GetTableNode()->GetIndex(); if( nNdIdx > nStartOfContent ) { @@ -491,8 +491,7 @@ SwActualSection::SwActualSection( SwActualSection *pUp, if ( !pSectNode ) { const SwNodeIndex *pIndex = pSect->GetFmt()->GetCntnt().GetCntntIdx(); - pSectNode = pSect->GetFmt()->GetDoc()->GetNodes()[*pIndex]-> - FindSectionNode(); + pSectNode = pIndex->GetNode().FindSectionNode(); } } @@ -506,8 +505,8 @@ SwActualSection::SwActualSection( SwActualSection *pUp, * --------------------------------------------------*/ SwLayHelper::SwLayHelper( SwDoc *pD, SwFrm* &rpF, SwFrm* &rpP, SwPageFrm* &rpPg, - SwLayoutFrm* &rpL, SwActualSection* &rpA, BOOL &rB, - ULONG nNodeIndex, BOOL bCache ) + SwLayoutFrm* &rpL, SwActualSection* &rpA, sal_Bool &rB, + sal_uLong nNodeIndex, sal_Bool bCache ) : rpFrm( rpF ), rpPrv( rpP ), rpPage( rpPg ), rpLay( rpL ), rpActualSection( rpA ), rbBreakAfter(rB), pDoc(pD), nMaxParaPerPage( 25 ), nParagraphCnt( bCache ? 0 : USHRT_MAX ), bFirst( bCache ) @@ -551,9 +550,9 @@ SwLayHelper::~SwLayHelper() * otherwise it estimates the page count. * --------------------------------------------------*/ -ULONG SwLayHelper::CalcPageCount() +sal_uLong SwLayHelper::CalcPageCount() { - ULONG nPgCount; + sal_uLong nPgCount; SwLayCacheImpl *pCache = pDoc->GetLayoutCache() ? pDoc->GetLayoutCache()->LockImpl() : NULL; if( pCache ) @@ -566,11 +565,11 @@ ULONG SwLayHelper::CalcPageCount() nPgCount = pDoc->GetDocStat().nPage; if ( nPgCount <= 10 ) // no page insertion for less than 10 pages nPgCount = 0; - ULONG nNdCount = pDoc->GetDocStat().nPara; + sal_uLong nNdCount = pDoc->GetDocStat().nPara; if ( nNdCount <= 1 ) { //Estimates the number of paragraphs. - ULONG nTmp = pDoc->GetNodes().GetEndOfContent().GetIndex() - + sal_uLong nTmp = pDoc->GetNodes().GetEndOfContent().GetIndex() - pDoc->GetNodes().GetEndOfExtras().GetIndex(); //Tables have a little overhead.. nTmp -= pDoc->GetTblFrmFmts()->Count() * 25; @@ -586,12 +585,12 @@ ULONG SwLayHelper::CalcPageCount() nMaxParaPerPage = nNdCount / nPgCount; else { - nMaxParaPerPage = Max( ULONG(20), - ULONG(20 + nNdCount / 1000 * 3) ); + nMaxParaPerPage = Max( sal_uLong(20), + sal_uLong(20 + nNdCount / 1000 * 3) ); #ifdef PM2 - const ULONG nMax = 49; + const sal_uLong nMax = 49; #else - const ULONG nMax = 53; + const sal_uLong nMax = 53; #endif nMaxParaPerPage = Min( nMaxParaPerPage, nMax ); nPgCount = nNdCount / nMaxParaPerPage; @@ -607,7 +606,7 @@ ULONG SwLayHelper::CalcPageCount() /*-----------------23.5.2001 16:44------------------ * SwLayHelper::CheckInsertPage() - * inserts a page and return TRUE, if + * inserts a page and return sal_True, if * - the break after flag is set * - the actual content wants a break before * - the maximum count of paragraph/rows is reached @@ -616,9 +615,9 @@ ULONG SwLayHelper::CalcPageCount() * wants a break after. * --------------------------------------------------*/ -BOOL SwLayHelper::CheckInsertPage() +sal_Bool SwLayHelper::CheckInsertPage() { - BOOL bEnd = 0 == rpPage->GetNext(); + sal_Bool bEnd = 0 == rpPage->GetNext(); const SwAttrSet* pAttr = rpFrm->GetAttrSet(); const SvxFmtBreakItem& rBrk = pAttr->GetBreak(); const SwFmtPageDesc& rDesc = pAttr->GetPageDesc(); @@ -630,7 +629,7 @@ BOOL SwLayHelper::CheckInsertPage() rDesc.GetPageDesc(); // <-- - BOOL bBrk = nParagraphCnt > nMaxParaPerPage || rbBreakAfter; + sal_Bool bBrk = nParagraphCnt > nMaxParaPerPage || rbBreakAfter; rbBreakAfter = rBrk.GetBreak() == SVX_BREAK_PAGE_AFTER || rBrk.GetBreak() == SVX_BREAK_PAGE_BOTH; if ( !bBrk ) @@ -639,23 +638,23 @@ BOOL SwLayHelper::CheckInsertPage() if ( bBrk || pDesc ) { - USHORT nPgNum = 0; + sal_uInt16 nPgNum = 0; if ( !pDesc ) pDesc = rpPage->GetPageDesc()->GetFollow(); else { if ( 0 != (nPgNum = rDesc.GetNumOffset()) ) - ((SwRootFrm*)rpPage->GetUpper())->SetVirtPageNum(TRUE); + ((SwRootFrm*)rpPage->GetUpper())->SetVirtPageNum(sal_True); } - BOOL bNextPageOdd = !rpPage->OnRightPage(); - BOOL bInsertEmpty = FALSE; + sal_Bool bNextPageOdd = !rpPage->OnRightPage(); + sal_Bool bInsertEmpty = sal_False; if( nPgNum && bNextPageOdd != ( ( nPgNum % 2 ) != 0 ) ) { bNextPageOdd = !bNextPageOdd; - bInsertEmpty = TRUE; + bInsertEmpty = sal_True; } ::InsertNewPage( (SwPageDesc&)*pDesc, rpPage->GetUpper(), - bNextPageOdd, bInsertEmpty, FALSE, rpPage->GetNext() ); + bNextPageOdd, bInsertEmpty, sal_False, rpPage->GetNext() ); if ( bEnd ) { ASSERT( rpPage->GetNext(), "Keine neue Seite?" ); @@ -676,9 +675,9 @@ BOOL SwLayHelper::CheckInsertPage() rpLay = rpPage->FindBodyCont(); while( rpLay->Lower() ) rpLay = (SwLayoutFrm*)rpLay->Lower(); - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } // --> OD 2006-03-22 #b6375613# @@ -687,7 +686,7 @@ bool lcl_HasTextFrmAnchoredObjs( SwTxtFrm* p_pTxtFrm ) bool bHasTextFrmAnchoredObjs( false ); const SwSpzFrmFmts* pSpzFrmFmts = p_pTxtFrm->GetTxtNode()->GetDoc()->GetSpzFrmFmts(); - for ( USHORT i = 0; i < pSpzFrmFmts->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pSpzFrmFmts->Count(); ++i ) { SwFrmFmt *pFmt = (SwFrmFmt*)(*pSpzFrmFmts)[i]; const SwFmtAnchor &rAnch = pFmt->GetAnchor(); @@ -755,13 +754,13 @@ void lcl_ApplyWorkaroundForB6375613( SwFrm* p_pFirstFrmOnNewPage ) * one page, in this case the needed count of pages will inserted. * --------------------------------------------------*/ -BOOL SwLayHelper::CheckInsert( ULONG nNodeIndex ) +sal_Bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex ) { - BOOL bRet = FALSE; - BOOL bLongTab = FALSE; - ULONG nMaxRowPerPage( 0 ); + sal_Bool bRet = sal_False; + sal_Bool bLongTab = sal_False; + sal_uLong nMaxRowPerPage( 0 ); nNodeIndex -= nStartOfContent; - USHORT nRows( 0 ); + sal_uInt16 nRows( 0 ); if( rpFrm->IsTabFrm() ) { //Inside a table counts every row as a paragraph @@ -790,15 +789,15 @@ BOOL SwLayHelper::CheckInsert( ULONG nNodeIndex ) if( pTmp->GetNext() ) pTmp = pTmp->GetNext(); pTmp = ((SwRowFrm*)pTmp)->Lower(); - USHORT nCnt = 0; + sal_uInt16 nCnt = 0; do { ++nCnt; pTmp = pTmp->GetNext(); } while( pTmp ); - nMaxRowPerPage = Max( ULONG(2), nMaxParaPerPage / nCnt ); + nMaxRowPerPage = Max( sal_uLong(2), nMaxParaPerPage / nCnt ); } - bLongTab = TRUE; + bLongTab = sal_True; } } else @@ -808,9 +807,9 @@ BOOL SwLayHelper::CheckInsert( ULONG nNodeIndex ) ( pImpl->GetBreakOfst( nIndex ) < STRING_LEN || ( ++nIndex < pImpl->Count() && pImpl->GetBreakIndex( nIndex ) == nNodeIndex ) ) ) - bFirst = FALSE; + bFirst = sal_False; #if OSL_DEBUG_LEVEL > 1 - ULONG nBreakIndex = ( pImpl && nIndex < pImpl->Count() ) ? + sal_uLong nBreakIndex = ( pImpl && nIndex < pImpl->Count() ) ? pImpl->GetBreakIndex(nIndex) : 0xffff; (void)nBreakIndex; #endif @@ -819,18 +818,18 @@ BOOL SwLayHelper::CheckInsert( ULONG nNodeIndex ) ( rpFrm->IsTabFrm() && bLongTab ) ) { - ULONG nRowCount = 0; + sal_uLong nRowCount = 0; do { if( pImpl || bLongTab ) { #if OSL_DEBUG_LEVEL > 1 - ULONG nBrkIndex = ( pImpl && nIndex < pImpl->Count() ) ? + sal_uLong nBrkIndex = ( pImpl && nIndex < pImpl->Count() ) ? pImpl->GetBreakIndex(nIndex) : 0xffff; (void)nBrkIndex; #endif xub_StrLen nOfst = STRING_LEN; - USHORT nType = SW_LAYCACHE_IO_REC_PAGES; + sal_uInt16 nType = SW_LAYCACHE_IO_REC_PAGES; if( bLongTab ) { rbBreakAfter = sal_True; @@ -853,7 +852,7 @@ BOOL SwLayHelper::CheckInsert( ULONG nNodeIndex ) if( nOfst < STRING_LEN ) { sal_Bool bSplit = sal_False; - USHORT nRepeat( 0 ); + sal_uInt16 nRepeat( 0 ); if( !bLongTab && rpFrm->IsTxtFrm() && SW_LAYCACHE_IO_REC_PARA == nType && nOfst<((SwTxtFrm*)rpFrm)->GetTxtNode()->GetTxt().Len() ) @@ -884,10 +883,10 @@ BOOL SwLayHelper::CheckInsert( ULONG nNodeIndex ) SwFrm *pPrv; if( nRepeat > 0 ) { - bDontCreateObjects = TRUE; //frmtool + bDontCreateObjects = sal_True; //frmtool // Insert new headlines: - USHORT nRowIdx = 0; + sal_uInt16 nRowIdx = 0; SwRowFrm* pHeadline = 0; while( nRowIdx < nRepeat ) { @@ -901,7 +900,7 @@ BOOL SwLayHelper::CheckInsert( ULONG nNodeIndex ) ++nRowIdx; } - bDontCreateObjects = FALSE; + bDontCreateObjects = sal_False; pPrv = pHeadline; nRows = nRows + nRepeat; } @@ -949,7 +948,7 @@ BOOL SwLayHelper::CheckInsert( ULONG nNodeIndex ) if( rpPrv && rpPrv->IsTxtFrm() && !rpPrv->GetValidSizeFlag() ) rpPrv->Frm().Height( rpPrv->GetUpper()->Prt().Height() ); - bRet = TRUE; + bRet = sal_True; rpPrv = 0; nParagraphCnt = 0; @@ -967,7 +966,7 @@ BOOL SwLayHelper::CheckInsert( ULONG nNodeIndex ) else { pSct = new SwSectionFrm( - *rpActualSection->GetSectionFrm(), FALSE ); + *rpActualSection->GetSectionFrm(), sal_False ); rpActualSection->GetSectionFrm()->SimpleFormat(); bInit = true; } @@ -986,7 +985,7 @@ BOOL SwLayHelper::CheckInsert( ULONG nNodeIndex ) } while( bLongTab || ( pImpl && nIndex < pImpl->Count() && (*pImpl)[ nIndex ] == nNodeIndex ) ); } - bFirst = FALSE; + bFirst = sal_False; return bRet; } @@ -1017,12 +1016,12 @@ void SwLayHelper::_CheckFlyCache( SwPageFrm* pPage ) { if( !pImpl || !pPage ) return; - USHORT nFlyCount = pImpl->GetFlyCount(); + sal_uInt16 nFlyCount = pImpl->GetFlyCount(); // Any text frames at the page, fly cache avaiable? if( pPage->GetSortedObjs() && nFlyIdx < nFlyCount ) { SwSortedObjs &rObjs = *pPage->GetSortedObjs(); - USHORT nPgNum = pPage->GetPhyPageNum(); + sal_uInt16 nPgNum = pPage->GetPhyPageNum(); /* @@ -1035,7 +1034,7 @@ void SwLayHelper::_CheckFlyCache( SwPageFrm* pPage ) // be used to identify the objects. // - for ( USHORT i = 0; i < rObjs.Count(); ++i ) // check objects + for ( sal_uInt16 i = 0; i < rObjs.Count(); ++i ) // check objects { SdrObject *pO = rObjs[i]; if ( pO->ISA(SwVirtFlyDrawObj) ) // a text frame? @@ -1047,7 +1046,7 @@ void SwLayHelper::_CheckFlyCache( SwPageFrm* pPage ) const SwContact *pC = (SwContact*)GetUserCall(pO); if( pC ) { - ULONG nOrdNum = pO->GetOrdNum(); // the Id + sal_uLong nOrdNum = pO->GetOrdNum(); // the Id SwFlyCache* pFlyC; while( nFlyIdx < nFlyCount && ( pFlyC = pImpl-> GetFlyCache(nFlyIdx) )->nPageNum < nPgNum) @@ -1055,7 +1054,7 @@ void SwLayHelper::_CheckFlyCache( SwPageFrm* pPage ) if( nFlyIdx < nFlyCount && pFlyC->nPageNum == nPgNum ) { - USHORT nIdx = nFlyIdx; + sal_uInt16 nIdx = nFlyIdx; while( nIdx < nFlyCount && ( pFlyC = pImpl-> GetFlyCache( nIdx ) )->nPageNum == nPgNum && pFlyC->nOrdNum != nOrdNum ) @@ -1089,7 +1088,7 @@ void SwLayHelper::_CheckFlyCache( SwPageFrm* pPage ) // sort cached objects on this page by ordnum std::set< const SwFlyCache*, FlyCacheCompare > aFlyCacheSet; - USHORT nIdx = nFlyIdx; + sal_uInt16 nIdx = nFlyIdx; while( nIdx < nFlyCount && ( pFlyC = pImpl-> GetFlyCache( nIdx ) )->nPageNum == nPgNum ) @@ -1100,7 +1099,7 @@ void SwLayHelper::_CheckFlyCache( SwPageFrm* pPage ) // sort objects on this page by ordnum std::set< const SdrObject*, SdrObjectCompare > aFlySet; - for ( USHORT i = 0; i < rObjs.Count(); ++i ) + for ( sal_uInt16 i = 0; i < rObjs.Count(); ++i ) { SwAnchoredObject* pAnchoredObj = rObjs[i]; if ( pAnchoredObj->ISA(SwFlyFrm) ) // a text frame? @@ -1160,21 +1159,21 @@ void SwLayHelper::_CheckFlyCache( SwPageFrm* pPage ) * the rpPage parameter to the right page, if possible. * --------------------------------------------------*/ -BOOL SwLayHelper::CheckPageFlyCache( SwPageFrm* &rpPage, SwFlyFrm* pFly ) +sal_Bool SwLayHelper::CheckPageFlyCache( SwPageFrm* &rpPage, SwFlyFrm* pFly ) { if( !pFly->GetAnchorFrm() || !pFly->GetVirtDrawObj() || pFly->GetAnchorFrm()->FindFooterOrHeader() ) - return FALSE; - BOOL bRet = FALSE; + return sal_False; + sal_Bool bRet = sal_False; SwDoc* pDoc = rpPage->GetFmt()->GetDoc(); SwLayCacheImpl *pCache = pDoc->GetLayoutCache() ? pDoc->GetLayoutCache()->LockImpl() : NULL; if( pCache ) { - USHORT nPgNum = rpPage->GetPhyPageNum(); - USHORT nIdx = 0; - USHORT nCnt = pCache->GetFlyCount(); - ULONG nOrdNum = pFly->GetVirtDrawObj()->GetOrdNum(); + sal_uInt16 nPgNum = rpPage->GetPhyPageNum(); + sal_uInt16 nIdx = 0; + sal_uInt16 nCnt = pCache->GetFlyCount(); + sal_uLong nOrdNum = pFly->GetVirtDrawObj()->GetOrdNum(); SwFlyCache* pFlyC = 0; // skip fly frames from pages before the current page @@ -1209,7 +1208,7 @@ BOOL SwLayHelper::CheckPageFlyCache( SwPageFrm* &rpPage, SwFlyFrm* pFly ) pFly->Frm().Width( pFlyC->Width() ); pFly->Frm().Height( pFlyC->Height() ); } - bRet = TRUE; + bRet = sal_True; } } pDoc->GetLayoutCache()->UnlockImpl(); @@ -1219,12 +1218,12 @@ BOOL SwLayHelper::CheckPageFlyCache( SwPageFrm* &rpPage, SwFlyFrm* pFly ) // ----------------------------------------------------------------------------- -SwLayCacheIoImpl::SwLayCacheIoImpl( SvStream& rStrm, BOOL bWrtMd ) : +SwLayCacheIoImpl::SwLayCacheIoImpl( SvStream& rStrm, sal_Bool bWrtMd ) : pStream( &rStrm ), nMajorVersion(SW_LAYCACHE_IO_VERSION_MAJOR), nMinorVersion(SW_LAYCACHE_IO_VERSION_MINOR), bWriteMode( bWrtMd ), - bError( FALSE ) + bError( sal_False ) { if( bWriteMode ) *pStream << nMajorVersion @@ -1235,23 +1234,23 @@ SwLayCacheIoImpl::SwLayCacheIoImpl( SvStream& rStrm, BOOL bWrtMd ) : >> nMinorVersion; } -BOOL SwLayCacheIoImpl::OpenRec( BYTE cType ) +sal_Bool SwLayCacheIoImpl::OpenRec( sal_uInt8 cType ) { - BOOL bRes = TRUE; + sal_Bool bRes = sal_True; size_t nLvl = aRecTypes.size(); ASSERT( nLvl == aRecSizes.Count(), "OpenRec: Level" ); - UINT32 nPos = pStream->Tell(); + sal_uInt32 nPos = pStream->Tell(); if( bWriteMode ) { aRecTypes.push_back( cType ); aRecSizes.Insert( nPos, nLvl ); - *pStream << (UINT32) 0; + *pStream << (sal_uInt32) 0; } else { - UINT32 nVal; + sal_uInt32 nVal; *pStream >> nVal; - BYTE cRecTyp = (BYTE)nVal; + sal_uInt8 cRecTyp = (sal_uInt8)nVal; aRecTypes.push_back( cRecTyp ); sal_uInt32 nSize = nVal >> 8; aRecSizes.Insert( nPos + nSize, nLvl ); @@ -1264,7 +1263,7 @@ BOOL SwLayCacheIoImpl::OpenRec( BYTE cType ) aRecTypes.back() = 0; aRecSizes[nLvl] = pStream->Tell(); bRes = sal_False; - bError = TRUE; + bError = sal_True; } } return bRes; @@ -1272,39 +1271,39 @@ BOOL SwLayCacheIoImpl::OpenRec( BYTE cType ) // Close record -BOOL SwLayCacheIoImpl::CloseRec( BYTE ) +sal_Bool SwLayCacheIoImpl::CloseRec( sal_uInt8 ) { - BOOL bRes = TRUE; + sal_Bool bRes = sal_True; size_t nLvl = aRecTypes.size(); ASSERT( nLvl == aRecSizes.Count(), "CloseRec: wrong Level" ); ASSERT( nLvl, "CloseRec: no levels" ); if( nLvl ) { nLvl--; - UINT32 nPos = pStream->Tell(); + sal_uInt32 nPos = pStream->Tell(); if( bWriteMode ) { - UINT32 nBgn = aRecSizes[nLvl]; + sal_uInt32 nBgn = aRecSizes[nLvl]; pStream->Seek( nBgn ); - UINT32 nSize = nPos - nBgn; - UINT32 nVal = ( nSize << 8 ) | aRecTypes.back(); + sal_uInt32 nSize = nPos - nBgn; + sal_uInt32 nVal = ( nSize << 8 ) | aRecTypes.back(); *pStream << nVal; pStream->Seek( nPos ); if( pStream->GetError() != SVSTREAM_OK ) - bRes = FALSE; + bRes = sal_False; } else { - UINT32 n = aRecSizes[nLvl]; + sal_uInt32 n = aRecSizes[nLvl]; ASSERT( n >= nPos, "CloseRec: to much data read" ); if( n != nPos ) { pStream->Seek( n ); if( n < nPos ) - bRes = FALSE; + bRes = sal_False; } if( pStream->GetErrorCode() != SVSTREAM_OK ) - bRes = FALSE; + bRes = sal_False; } aRecTypes.pop_back(); @@ -1312,19 +1311,19 @@ BOOL SwLayCacheIoImpl::CloseRec( BYTE ) } if( !bRes ) - bError = TRUE; + bError = sal_True; return bRes; } -UINT32 SwLayCacheIoImpl::BytesLeft() +sal_uInt32 SwLayCacheIoImpl::BytesLeft() { - UINT16 nLvl = aRecSizes.Count(); - UINT32 n = 0; + sal_uInt16 nLvl = aRecSizes.Count(); + sal_uInt32 n = 0; if( !bError && nLvl ) { - UINT32 nEndPos = aRecSizes[ nLvl-1 ]; - UINT32 nPos = pStream->Tell(); + sal_uInt32 nEndPos = aRecSizes[ nLvl-1 ]; + sal_uInt32 nPos = pStream->Tell(); if( nEndPos > nPos ) n = nEndPos - nPos; } @@ -1332,18 +1331,18 @@ UINT32 SwLayCacheIoImpl::BytesLeft() return n; } -BYTE SwLayCacheIoImpl::Peek() +sal_uInt8 SwLayCacheIoImpl::Peek() { - BYTE c = 0; + sal_uInt8 c = 0; if( !bError ) { - UINT32 nPos = pStream->Tell(); + sal_uInt32 nPos = pStream->Tell(); *pStream >> c; pStream->Seek( nPos ); if( pStream->GetErrorCode() != SVSTREAM_OK ) { c = 0; - bError = TRUE; + bError = sal_True; } } return c; @@ -1351,27 +1350,27 @@ BYTE SwLayCacheIoImpl::Peek() void SwLayCacheIoImpl::SkipRec() { - BYTE c = Peek(); + sal_uInt8 c = Peek(); OpenRec( c ); pStream->Seek( aRecSizes[aRecSizes.Count()-1] ); CloseRec( c ); } -BYTE SwLayCacheIoImpl::OpenFlagRec() +sal_uInt8 SwLayCacheIoImpl::OpenFlagRec() { ASSERT( !bWriteMode, "OpenFlagRec illegal in write mode" ); - BYTE cFlags; + sal_uInt8 cFlags; *pStream >> cFlags; nFlagRecEnd = pStream->Tell() + ( cFlags & 0x0F ); return (cFlags >> 4); } -void SwLayCacheIoImpl::OpenFlagRec( BYTE nFlags, BYTE nLen ) +void SwLayCacheIoImpl::OpenFlagRec( sal_uInt8 nFlags, sal_uInt8 nLen ) { ASSERT( bWriteMode, "OpenFlagRec illegal in read mode" ); ASSERT( (nFlags & 0xF0) == 0, "illegal flags set" ); ASSERT( nLen < 16, "wrong flag record length" ); - BYTE cFlags = (nFlags << 4) + nLen; + sal_uInt8 cFlags = (nFlags << 4) + nLen; *pStream << cFlags; nFlagRecEnd = pStream->Tell() + nLen; } diff --git a/sw/source/core/layout/layhelp.hxx b/sw/source/core/layout/layhelp.hxx index 8eb958f5bfae..48aeefa68e1f 100644 --- a/sw/source/core/layout/layhelp.hxx +++ b/sw/source/core/layout/layhelp.hxx @@ -68,18 +68,18 @@ class SwLayCacheImpl : public SvULongs SvUShorts aType; SwPageFlyCache aFlyCache; sal_Bool bUseFlyCache; - void Insert( USHORT nType, ULONG nIndex, xub_StrLen nOffset ); + void Insert( sal_uInt16 nType, sal_uLong nIndex, xub_StrLen nOffset ); public: SwLayCacheImpl() : SvULongs( 20, 10 ), aType( 20, 10 ) {} - BOOL Read( SvStream& rStream ); + sal_Bool Read( SvStream& rStream ); - ULONG GetBreakIndex( USHORT nIdx ) const { return GetObject( nIdx ); } + sal_uLong GetBreakIndex( sal_uInt16 nIdx ) const { return GetObject( nIdx ); } xub_StrLen GetBreakOfst( size_t nIdx ) const { return aOffset[ nIdx ]; } - USHORT GetBreakType( USHORT nIdx ) const { return aType[ nIdx ]; } + sal_uInt16 GetBreakType( sal_uInt16 nIdx ) const { return aType[ nIdx ]; } - USHORT GetFlyCount() const { return aFlyCache.Count(); } - SwFlyCache *GetFlyCache( USHORT nIdx ) const { return aFlyCache[ nIdx ]; } + sal_uInt16 GetFlyCount() const { return aFlyCache.Count(); } + SwFlyCache *GetFlyCache( sal_uInt16 nIdx ) const { return aFlyCache[ nIdx ]; } sal_Bool IsUseFlyCache() const { return bUseFlyCache; } }; @@ -119,26 +119,26 @@ class SwLayHelper SwPageFrm* &rpPage; SwLayoutFrm* &rpLay; SwActualSection* &rpActualSection; - BOOL &rbBreakAfter; + sal_Bool &rbBreakAfter; SwDoc* pDoc; SwLayCacheImpl* pImpl; - ULONG nMaxParaPerPage; - ULONG nParagraphCnt; - ULONG nStartOfContent; - USHORT nIndex; // the index in the page break array - USHORT nFlyIdx; // the index in the fly cache array - BOOL bFirst : 1; + sal_uLong nMaxParaPerPage; + sal_uLong nParagraphCnt; + sal_uLong nStartOfContent; + sal_uInt16 nIndex; // the index in the page break array + sal_uInt16 nFlyIdx; // the index in the fly cache array + sal_Bool bFirst : 1; void _CheckFlyCache( SwPageFrm* pPage ); public: SwLayHelper( SwDoc *pD, SwFrm* &rpF, SwFrm* &rpP, SwPageFrm* &rpPg, - SwLayoutFrm* &rpL, SwActualSection* &rpA, BOOL &rBrk, - ULONG nNodeIndex, BOOL bCache ); + SwLayoutFrm* &rpL, SwActualSection* &rpA, sal_Bool &rBrk, + sal_uLong nNodeIndex, sal_Bool bCache ); ~SwLayHelper(); - ULONG CalcPageCount(); - BOOL CheckInsert( ULONG nNodeIndex ); + sal_uLong CalcPageCount(); + sal_Bool CheckInsert( sal_uLong nNodeIndex ); - BOOL BreakPage( xub_StrLen& rOffs, ULONG nNodeIndex ); - BOOL CheckInsertPage(); + sal_Bool BreakPage( xub_StrLen& rOffs, sal_uLong nNodeIndex ); + sal_Bool CheckInsertPage(); // Look for fresh text frames at this (new) page and set them to the right // position, if they are in the fly cache. @@ -147,7 +147,7 @@ public: // Look for this text frame and set it to the right position, // if it's in the fly cache. - static BOOL CheckPageFlyCache( SwPageFrm* &rpPage, SwFlyFrm* pFly ); + static sal_Bool CheckPageFlyCache( SwPageFrm* &rpPage, SwFlyFrm* pFly ); }; /************************************************************************* @@ -171,33 +171,33 @@ class SwLayCacheIoImpl SvStream *pStream; - ULONG nFlagRecEnd; + sal_uLong nFlagRecEnd; - USHORT nMajorVersion; - USHORT nMinorVersion; + sal_uInt16 nMajorVersion; + sal_uInt16 nMinorVersion; - BOOL bWriteMode : 1; - BOOL bError : 1; + sal_Bool bWriteMode : 1; + sal_Bool bError : 1; public: - SwLayCacheIoImpl( SvStream& rStrm, BOOL bWrtMd ); + SwLayCacheIoImpl( SvStream& rStrm, sal_Bool bWrtMd ); // Get input or output stream SvStream& GetStream() const { return *pStream; } // Open a record of type "nType" - BOOL OpenRec( BYTE nType ); + sal_Bool OpenRec( sal_uInt8 nType ); // Close a record of type "nType". This skips any unread data that // remains in the record. - BOOL CloseRec( BYTE nType ); + sal_Bool CloseRec( sal_uInt8 nType ); // Return the number of bytes contained in the current record that // haven't been read by now. - UINT32 BytesLeft(); + sal_uInt32 BytesLeft(); // Return the current record's type - BYTE Peek(); + sal_uInt8 Peek(); // Skip the current record void SkipRec(); @@ -205,27 +205,27 @@ public: // Open a flag record for reading. The uppermost four bits are flags, // while the lowermost are the flag record's size. Flag records cannot // be nested. - BYTE OpenFlagRec(); + sal_uInt8 OpenFlagRec(); // Open flag record for writing; - void OpenFlagRec( BYTE nFlags, BYTE nLen ); + void OpenFlagRec( sal_uInt8 nFlags, sal_uInt8 nLen ); // Close a flag record. Any bytes left are skipped. void CloseFlagRec(); - BOOL HasError() const { return bError; } + sal_Bool HasError() const { return bError; } - USHORT GetMajorVersion() const { return nMajorVersion; } - USHORT GetMinorVersion() const { return nMinorVersion; } + sal_uInt16 GetMajorVersion() const { return nMajorVersion; } + sal_uInt16 GetMinorVersion() const { return nMinorVersion; } }; // Stored information about text frames: class SwFlyCache : public SwRect // position and size { public: - ULONG nOrdNum; // Id to recognize text frames - USHORT nPageNum; // page number - SwFlyCache( USHORT nP, ULONG nO, long nXL, long nYL, long nWL, long nHL ) : + sal_uLong nOrdNum; // Id to recognize text frames + sal_uInt16 nPageNum; // page number + SwFlyCache( sal_uInt16 nP, sal_uLong nO, long nXL, long nYL, long nWL, long nHL ) : SwRect( nXL, nYL, nWL, nHL ), nOrdNum( nO ), nPageNum( nP ){} }; diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx index 036e14db3f71..17d0dd4356bc 100644 --- a/sw/source/core/layout/layouter.cxx +++ b/sw/source/core/layout/layouter.cxx @@ -50,10 +50,10 @@ class SwLooping { - USHORT nMinPage; - USHORT nMaxPage; - USHORT nCount; - USHORT mnLoopControlStage; + sal_uInt16 nMinPage; + sal_uInt16 nMaxPage; + sal_uInt16 nCount; + sal_uInt16 mnLoopControlStage; public: SwLooping( SwPageFrm* pPage ); void Control( SwPageFrm* pPage ); @@ -74,7 +74,7 @@ public: void CollectEndnote( SwFtnFrm* pFtn ); const SwSectionFrm* GetSect() { return pSect; } void InsertEndnotes(); - BOOL HasEndnotes() const { return pEndArr && pEndArr->Count(); } + sal_Bool HasEndnotes() const { return pEndArr && pEndArr->Count(); } }; void SwEndnoter::CollectEndnotes( SwSectionFrm* pSct ) @@ -122,7 +122,7 @@ void SwEndnoter::CollectEndnote( SwFtnFrm* pFtn ) } else if( pEndArr ) { - for ( USHORT i = 0; i < pEndArr->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pEndArr->Count(); ++i ) { SwFtnFrm *pEndFtn = (SwFtnFrm*)((*pEndArr)[i]); if( pEndFtn->GetAttr() == pFtn->GetAttr() ) @@ -179,7 +179,7 @@ void SwLooping::Control( SwPageFrm* pPage ) { if( !pPage ) return; - USHORT nNew = pPage->GetPhyPageNum(); + sal_uInt16 nNew = pPage->GetPhyPageNum(); if( nNew > nMaxPage ) nMaxPage = nNew; if( nNew < nMinPage ) @@ -200,7 +200,7 @@ void SwLooping::Control( SwPageFrm* pPage ) { #ifdef DBG_UTIL #if OSL_DEBUG_LEVEL > 1 - static BOOL bNoLouie = FALSE; + static sal_Bool bNoLouie = sal_False; if( bNoLouie ) return; #endif @@ -266,7 +266,7 @@ void SwLayouter::_CollectEndnotes( SwSectionFrm* pSect ) pEndnoter->CollectEndnotes( pSect ); } -BOOL SwLayouter::HasEndnotes() const +sal_Bool SwLayouter::HasEndnotes() const { return pEndnoter->HasEndnotes(); } @@ -283,7 +283,7 @@ void SwLayouter::InsertEndnotes( SwSectionFrm* pSect ) pEndnoter->InsertEndnotes(); } -void SwLayouter::LoopControl( SwPageFrm* pPage, BYTE ) +void SwLayouter::LoopControl( SwPageFrm* pPage, sal_uInt8 ) { ASSERT( pLooping, "Looping: Lost control" ); pLooping->Control( pPage ); @@ -300,12 +300,12 @@ void SwLayouter::LoopingLouieLight( const SwDoc& rDoc, const SwTxtFrm& rFrm ) } } -BOOL SwLayouter::StartLooping( SwPageFrm* pPage ) +sal_Bool SwLayouter::StartLooping( SwPageFrm* pPage ) { if( pLooping ) - return FALSE; + return sal_False; pLooping = new SwLooping( pPage ); - return TRUE; + return sal_True; } void SwLayouter::EndLoopControl() @@ -322,10 +322,10 @@ void SwLayouter::CollectEndnotes( SwDoc* pDoc, SwSectionFrm* pSect ) pDoc->GetLayouter()->_CollectEndnotes( pSect ); } -BOOL SwLayouter::Collecting( SwDoc* pDoc, SwSectionFrm* pSect, SwFtnFrm* pFtn ) +sal_Bool SwLayouter::Collecting( SwDoc* pDoc, SwSectionFrm* pSect, SwFtnFrm* pFtn ) { if( !pDoc->GetLayouter() ) - return FALSE; + return sal_False; SwLayouter *pLayouter = pDoc->GetLayouter(); if( pLayouter->pEndnoter && pLayouter->pEndnoter->GetSect() && pSect && ( pLayouter->pEndnoter->GetSect()->IsAnFollow( pSect ) || @@ -333,12 +333,12 @@ BOOL SwLayouter::Collecting( SwDoc* pDoc, SwSectionFrm* pSect, SwFtnFrm* pFtn ) { if( pFtn ) pLayouter->CollectEndnote( pFtn ); - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } -BOOL SwLayouter::StartLoopControl( SwDoc* pDoc, SwPageFrm *pPage ) +sal_Bool SwLayouter::StartLoopControl( SwDoc* pDoc, SwPageFrm *pPage ) { ASSERT( pDoc, "No doc, no fun" ); if( !pDoc->GetLayouter() ) diff --git a/sw/source/core/layout/makefile.mk b/sw/source/core/layout/makefile.mk deleted file mode 100644 index 076069b51339..000000000000 --- a/sw/source/core/layout/makefile.mk +++ /dev/null @@ -1,114 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=sw -TARGET=layout - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -.IF "$(mydebug)" != "" -CDEFS+=-Dmydebug -.ENDIF - -.IF "$(madebug)" != "" -CDEFS+=-DDEBUG -.ENDIF - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES = \ - $(SLO)$/anchoreddrawobject.obj \ - $(SLO)$/flycnt.obj \ - $(SLO)$/layact.obj \ - $(SLO)$/laycache.obj \ - $(SLO)$/layouter.obj \ - $(SLO)$/movedfwdfrmsbyobjpos.obj \ - $(SLO)$/newfrm.obj \ - $(SLO)$/objectformatter.obj \ - $(SLO)$/objstmpconsiderwrapinfl.obj \ - $(SLO)$/paintfrm.obj \ - $(SLO)$/softpagebreak.obj \ - $(SLO)$/sortedobjsimpl.obj \ - $(SLO)$/pagechg.obj - - -SLOFILES = \ - $(SLO)$/atrfrm.obj \ - $(SLO)$/anchoredobject.obj \ - $(SLO)$/anchoreddrawobject.obj \ - $(SLO)$/calcmove.obj \ - $(SLO)$/colfrm.obj \ - $(SLO)$/findfrm.obj \ - $(SLO)$/flowfrm.obj \ - $(SLO)$/fly.obj \ - $(SLO)$/flycnt.obj \ - $(SLO)$/flyincnt.obj \ - $(SLO)$/flylay.obj \ - $(SLO)$/flypos.obj \ - $(SLO)$/frmtool.obj \ - $(SLO)$/ftnfrm.obj \ - $(SLO)$/hffrm.obj \ - $(SLO)$/layact.obj \ - $(SLO)$/laycache.obj \ - $(SLO)$/layouter.obj \ - $(SLO)$/movedfwdfrmsbyobjpos.obj \ - $(SLO)$/newfrm.obj \ - $(SLO)$/objectformatter.obj \ - $(SLO)$/objectformattertxtfrm.obj \ - $(SLO)$/objectformatterlayfrm.obj \ - $(SLO)$/objstmpconsiderwrapinfl.obj \ - $(SLO)$/pagechg.obj \ - $(SLO)$/pagedesc.obj \ - $(SLO)$/paintfrm.obj \ - $(SLO)$/sectfrm.obj \ - $(SLO)$/softpagebreak.obj \ - $(SLO)$/sortedobjs.obj \ - $(SLO)$/sortedobjsimpl.obj \ - $(SLO)$/ssfrm.obj \ - $(SLO)$/swselectionlist.obj \ - $(SLO)$/tabfrm.obj \ - $(SLO)$/trvlfrm.obj \ - $(SLO)$/unusedf.obj \ - $(SLO)$/virtoutp.obj \ - $(SLO)$/wsfrm.obj - -.IF "$(dbgutil)"!="" -SLOFILES += \ - $(SLO)$/dbg_lay.obj -.ENDIF - - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx index 1f9c92220bfa..512998248fe1 100644 --- a/sw/source/core/layout/newfrm.cxx +++ b/sw/source/core/layout/newfrm.cxx @@ -57,8 +57,8 @@ #include <viewopt.hxx> SwLayVout *SwRootFrm::pVout = 0; -BOOL SwRootFrm::bInPaint = FALSE; -BOOL SwRootFrm::bNoVirDev = FALSE; +sal_Bool SwRootFrm::bInPaint = sal_False; +sal_Bool SwRootFrm::bNoVirDev = sal_False; SwCache *SwFrm::pCache = 0; @@ -321,7 +321,7 @@ void _FrmFinit() { #ifdef DBG_UTIL // im Chache duerfen nur noch 0-Pointer stehen - for( USHORT n = SwFrm::GetCachePtr()->Count(); n; ) + for( sal_uInt16 n = SwFrm::GetCachePtr()->Count(); n; ) if( (*SwFrm::GetCachePtr())[ --n ] ) { SwCacheObj* pObj = (*SwFrm::GetCachePtr())[ n ]; @@ -394,7 +394,7 @@ void SwRootFrm::DeRegisterShell( ViewShell *pSh ) pWaitingCurrShell = 0; //Referenzen entfernen. - for ( USHORT i = 0; i < pCurrShells->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pCurrShells->Count(); ++i ) { CurrShell *pC = (*pCurrShells)[i]; if (pC->pPrev == pSh) @@ -444,8 +444,8 @@ SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, ViewShell * pSh ) : nAccessibleShells( 0 ) { nType = FRMC_ROOT; - bIdleFormat = bTurboAllowed = bAssertFlyPages = bIsNewLayout = TRUE; - bCheckSuperfluous = bBrowseWidthValid = FALSE; + bIdleFormat = bTurboAllowed = bAssertFlyPages = bIsNewLayout = sal_True; + bCheckSuperfluous = bBrowseWidthValid = sal_False; InitCurrShells( this ); @@ -455,7 +455,7 @@ SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, ViewShell * pSh ) : const IDocumentSettingAccess *pSettingAccess = pFmt->getIDocumentSettingAccess(); pTimerAccess->StopIdling(); pLayoutAccess->SetRootFrm( this ); //Fuer das Erzeugen der Flys durch MakeFrms() - bCallbackActionEnabled = FALSE; //vor Verlassen auf TRUE setzen! + bCallbackActionEnabled = sal_False; //vor Verlassen auf sal_True setzen! SdrModel *pMd = pFmt->getIDocumentDrawModelAccess()->GetDrawModel(); @@ -472,7 +472,7 @@ SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, ViewShell * pSh ) : SwDoc* pDoc = pFmt->GetDoc(); SwNodeIndex aIndex( *pDoc->GetNodes().GetEndOfContent().StartOfSectionNode() ); - SwCntntNode *pNode = pDoc->GetNodes().GoNextSection( &aIndex, TRUE, FALSE ); + SwCntntNode *pNode = pDoc->GetNodes().GoNextSection( &aIndex, sal_True, sal_False ); // --> FME 2005-05-25 #123067# pNode = 0 can really happen: SwTableNode *pTblNd= pNode ? pNode->FindTableNode() : 0; // <-- @@ -480,7 +480,7 @@ SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, ViewShell * pSh ) : //PageDesc besorgen (entweder vom FrmFmt des ersten Node oder den //initialen.) SwPageDesc *pDesc = 0; - USHORT nPgNum = 1; + sal_uInt16 nPgNum = 1; if ( pTblNd ) { @@ -497,14 +497,14 @@ SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, ViewShell * pSh ) : bIsVirtPageNum = 0 != ( nPgNum = rDesc.GetNumOffset() ); } else - bIsVirtPageNum = FALSE; + bIsVirtPageNum = sal_False; if ( !pDesc ) pDesc = (SwPageDesc*) &const_cast<const SwDoc *>(pDoc)->GetPageDesc( 0 ); - const BOOL bOdd = !nPgNum || 0 != ( nPgNum % 2 ); + const sal_Bool bOdd = !nPgNum || 0 != ( nPgNum % 2 ); //Eine Seite erzeugen und in das Layout stellen - SwPageFrm *pPage = ::InsertNewPage( *pDesc, this, bOdd, FALSE, FALSE, 0 ); + SwPageFrm *pPage = ::InsertNewPage( *pDesc, this, bOdd, sal_False, sal_False, 0 ); //Erstes Blatt im Bodytext-Bereich suchen. SwLayoutFrm *pLay = pPage->FindBodyCont(); @@ -512,7 +512,7 @@ SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, ViewShell * pSh ) : pLay = (SwLayoutFrm*)pLay->Lower(); SwNodeIndex aTmp( *pDoc->GetNodes().GetEndOfContent().StartOfSectionNode(), 1 ); - ::_InsertCnt( pLay, pDoc, aTmp.GetIndex(), TRUE ); + ::_InsertCnt( pLay, pDoc, aTmp.GetIndex(), sal_True ); //Noch nicht ersetzte Master aus der Liste entfernen. RemoveMasterObjs( pDrawPage ); if( pSettingAccess->get(IDocumentSettingAccess::GLOBAL_DOCUMENT) ) @@ -527,7 +527,7 @@ SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, ViewShell * pSh ) : // <--- pTimerAccess->StartIdling(); - bCallbackActionEnabled = TRUE; + bCallbackActionEnabled = sal_True; ViewShell *pViewSh = GetCurrShell(); if (pViewSh) @@ -547,7 +547,7 @@ SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, ViewShell * pSh ) : SwRootFrm::~SwRootFrm() { - bTurboAllowed = FALSE; + bTurboAllowed = sal_False; pTurbo = 0; if(pBlink) pBlink->FrmDelete( this ); @@ -555,7 +555,7 @@ SwRootFrm::~SwRootFrm() delete pDestroy; //Referenzen entfernen. - for ( USHORT i = 0; i < pCurrShells->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pCurrShells->Count(); ++i ) (*pCurrShells)[i]->pRoot = 0; delete pCurrShells; @@ -576,7 +576,7 @@ SwRootFrm::~SwRootFrm() void SwRootFrm::RemoveMasterObjs( SdrPage *pPg ) { //Alle Masterobjekte aus der Page entfernen. Nicht loeschen!! - for( ULONG i = pPg ? pPg->GetObjCount() : 0; i; ) + for( sal_uLong i = pPg ? pPg->GetObjCount() : 0; i; ) { SdrObject* pObj = pPg->GetObj( --i ); if( pObj->ISA(SwFlyDrawObj ) ) diff --git a/sw/source/core/layout/objectformatter.cxx b/sw/source/core/layout/objectformatter.cxx index a8b7503c6042..36b3c186d68a 100644 --- a/sw/source/core/layout/objectformatter.cxx +++ b/sw/source/core/layout/objectformatter.cxx @@ -357,8 +357,8 @@ void SwObjectFormatter::_FormatObj( SwAnchoredObject& _rAnchoredObj ) // <-- // FME 2007-08-30 #i81146# new loop control - USHORT nLoopControlRuns = 0; - const USHORT nLoopControlMax = 15; + sal_uInt16 nLoopControlRuns = 0; + const sal_uInt16 nLoopControlMax = 15; do { if ( mpLayAction ) diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 626627a3c993..d17940a1fec3 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -136,13 +136,13 @@ void SwBodyFrm::Format( const SwBorderAttrs * ) Frm().Width( nWidth ); } - BOOL bNoGrid = TRUE; + sal_Bool bNoGrid = sal_True; if( GetUpper()->IsPageFrm() && ((SwPageFrm*)GetUpper())->HasGrid() ) { GETGRID( ((SwPageFrm*)GetUpper()) ) if( pGrid ) { - bNoGrid = FALSE; + bNoGrid = sal_False; long nSum = pGrid->GetBaseHeight() + pGrid->GetRubyHeight(); SWRECTFN( this ) long nSize = (Frm().*fnRect->fnGetWidth)(); @@ -185,7 +185,7 @@ void SwBodyFrm::Format( const SwBorderAttrs * ) Prt().Height( Frm().Height() ); Prt().Width( Frm().Width() ); } - bValidSize = bValidPrtArea = TRUE; + bValidSize = bValidPrtArea = sal_True; } /************************************************************************* @@ -204,22 +204,22 @@ SwPageFrm::SwPageFrm( SwFrmFmt *pFmt, SwPageDesc *pPgDsc ) : // OD 2004-05-17 #i28701# mbLayoutInProgress( false ) { - SetDerivedVert( FALSE ); - SetDerivedR2L( FALSE ); + SetDerivedVert( sal_False ); + SetDerivedR2L( sal_False ); if( pDesc ) { - bHasGrid = TRUE; + bHasGrid = sal_True; GETGRID( this ) if( !pGrid ) - bHasGrid = FALSE; + bHasGrid = sal_False; } else - bHasGrid = FALSE; + bHasGrid = sal_False; SetMaxFtnHeight( pPgDsc->GetFtnInfo().GetHeight() ? pPgDsc->GetFtnInfo().GetHeight() : LONG_MAX ), nType = FRMC_PAGE; - bInvalidLayout = bInvalidCntnt = bInvalidSpelling = bInvalidSmartTags = bInvalidAutoCmplWrds = bInvalidWordCount = TRUE; - bInvalidFlyLayout = bInvalidFlyCntnt = bInvalidFlyInCnt = bFtnPage = bEndNotePage = FALSE; + bInvalidLayout = bInvalidCntnt = bInvalidSpelling = bInvalidSmartTags = bInvalidAutoCmplWrds = bInvalidWordCount = sal_True; + bInvalidFlyLayout = bInvalidFlyCntnt = bInvalidFlyInCnt = bFtnPage = bEndNotePage = sal_False; const bool bBrowseMode = pFmt->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); if ( bBrowseMode ) @@ -237,9 +237,9 @@ SwPageFrm::SwPageFrm( SwFrmFmt *pFmt, SwPageDesc *pPgDsc ) : //Body-Bereich erzeugen und einsetzen, aber nur wenn ich nicht gerade //eine Leerseite bin. SwDoc *pDoc = pFmt->GetDoc(); - if ( FALSE == (bEmptyPage = pFmt == pDoc->GetEmptyPageFmt()) ) + if ( sal_False == (bEmptyPage = pFmt == pDoc->GetEmptyPageFmt()) ) { - bEmptyPage = FALSE; + bEmptyPage = sal_False; Calc(); //Damit die PrtArea stimmt. SwBodyFrm *pBodyFrm = new SwBodyFrm( pDoc->GetDfltFrmFmt() ); pBodyFrm->ChgSize( Prt().SSize() ); @@ -276,7 +276,7 @@ SwPageFrm::~SwPageFrm() //Objekte koennen (warum auch immer) auch an Seiten verankert sein, //die vor Ihren Ankern stehen. Dann wuerde auf bereits freigegebenen //Speicher zugegriffen. - for ( USHORT i = 0; i < pSortedObjs->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pSortedObjs->Count(); ++i ) { SwAnchoredObject* pAnchoredObj = (*pSortedObjs)[i]; pAnchoredObj->SetPageFrm( 0L ); @@ -310,10 +310,10 @@ SwPageFrm::~SwPageFrm() } -void SwPageFrm::CheckGrid( BOOL bInvalidate ) +void SwPageFrm::CheckGrid( sal_Bool bInvalidate ) { - BOOL bOld = bHasGrid; - bHasGrid = TRUE; + sal_Bool bOld = bHasGrid; + bHasGrid = sal_True; GETGRID( this ) bHasGrid = 0 != pGrid; if( bInvalidate || bOld != bHasGrid ) @@ -334,9 +334,9 @@ void SwPageFrm::CheckGrid( BOOL bInvalidate ) } -void SwPageFrm::CheckDirection( BOOL bVert ) +void SwPageFrm::CheckDirection( sal_Bool bVert ) { - UINT16 nDir = + sal_uInt16 nDir = ((SvxFrameDirectionItem&)GetFmt()->GetFmtAttr( RES_FRAMEDIR )).GetValue(); if( bVert ) { @@ -394,7 +394,7 @@ void MA_FASTCALL lcl_MakeObjs( const SwSpzFrmFmts &rTbl, SwPageFrm *pPage ) //Die Formate stehen in der SpzTbl (vom Dokument). //Flys werden angelegt, DrawObjekte werden bei der Seite angemeldet. - for ( USHORT i = 0; i < rTbl.Count(); ++i ) + for ( sal_uInt16 i = 0; i < rTbl.Count(); ++i ) { SdrObject *pSdrObj; SwFrmFmt *pFmt = rTbl[i]; @@ -414,11 +414,11 @@ void MA_FASTCALL lcl_MakeObjs( const SwSpzFrmFmts &rTbl, SwPageFrm *pPage ) } //Wird ein Rahmen oder ein SdrObject beschrieben? - BOOL bSdrObj = RES_DRAWFRMFMT == pFmt->Which(); + sal_Bool bSdrObj = RES_DRAWFRMFMT == pFmt->Which(); pSdrObj = 0; if ( bSdrObj && 0 == (pSdrObj = pFmt->FindSdrObject()) ) { - ASSERT( FALSE, "DrawObject not found." ); + ASSERT( sal_False, "DrawObject not found." ); pFmt->GetDoc()->DelFrmFmt( pFmt ); --i; continue; @@ -473,7 +473,7 @@ void MA_FASTCALL lcl_MakeObjs( const SwSpzFrmFmts &rTbl, SwPageFrm *pPage ) } } -void SwPageFrm::PreparePage( BOOL bFtn ) +void SwPageFrm::PreparePage( sal_Bool bFtn ) { SetFtnPage( bFtn ); @@ -535,7 +535,7 @@ void SwPageFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) ViewShell *pSh = GetShell(); if ( pSh ) pSh->SetFirstVisPageInvalid(); - BYTE nInvFlags = 0; + sal_uInt8 nInvFlags = 0; if( pNew && RES_ATTRSET_CHG == pNew->Which() ) { @@ -543,7 +543,7 @@ void SwPageFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) SfxItemIter aOIter( *((SwAttrSetChg*)pOld)->GetChgSet() ); SwAttrSetChg aOldSet( *(SwAttrSetChg*)pOld ); SwAttrSetChg aNewSet( *(SwAttrSetChg*)pNew ); - while( TRUE ) + while( sal_True ) { _UpdateAttr( (SfxPoolItem*)aOIter.GetCurItem(), (SfxPoolItem*)aNIter.GetCurItem(), nInvFlags, @@ -578,11 +578,11 @@ void SwPageFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) } void SwPageFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, - BYTE &rInvFlags, + sal_uInt8 &rInvFlags, SwAttrSetChg *pOldSet, SwAttrSetChg *pNewSet ) { - BOOL bClear = TRUE; - const USHORT nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0; + sal_Bool bClear = sal_True; + const sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0; switch( nWhich ) { case RES_FMT_CHG: @@ -624,7 +624,7 @@ void SwPageFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, const SwRect aOldPageFrmRect( Frm() ); if ( GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) ) { - bValidSize = FALSE; + bValidSize = sal_False; // OD 28.10.2002 #97265# - Don't call <SwPageFrm::MakeAll()> // Calculation of the page is not necessary, because its size is // is invalidated here and further invalidation is done in the @@ -694,14 +694,14 @@ void SwPageFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, SetMaxFtnHeight( LONG_MAX ); SetColMaxFtnHeight(); //Hier wird die Seite ggf. zerstoert! - ((SwRootFrm*)GetUpper())->RemoveFtns( 0, FALSE, TRUE ); + ((SwRootFrm*)GetUpper())->RemoveFtns( 0, sal_False, sal_True ); break; case RES_FRAMEDIR : CheckDirChange(); break; default: - bClear = FALSE; + bClear = sal_False; } if ( bClear ) { @@ -727,14 +727,14 @@ void SwPageFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, |* *************************************************************************/ // erfrage vom Modify Informationen -BOOL SwPageFrm::GetInfo( SfxPoolItem & rInfo ) const +sal_Bool SwPageFrm::GetInfo( SfxPoolItem & rInfo ) const { if( RES_AUTOFMT_DOCNODE == rInfo.Which() ) { // es gibt einen PageFrm also wird er benutzt - return FALSE; + return sal_False; } - return TRUE; // weiter suchen + return sal_True; // weiter suchen } /************************************************************************* @@ -842,8 +842,8 @@ SwPageDesc *SwPageFrm::FindPageDesc() //Wenn der RootFrm seine Groesse aendert muss benachrichtigt werden. void AdjustSizeChgNotify( SwRootFrm *pRoot ) { - const BOOL bOld = pRoot->IsSuperfluous(); - pRoot->bCheckSuperfluous = FALSE; + const sal_Bool bOld = pRoot->IsSuperfluous(); + pRoot->bCheckSuperfluous = sal_False; ViewShell *pSh = pRoot->GetCurrShell(); if ( pSh ) { @@ -887,7 +887,7 @@ void SwPageFrm::Cut() if ( GetSortedObjs() ) { for ( int i = 0; GetSortedObjs() && - (USHORT)i < GetSortedObjs()->Count(); ++i ) + (sal_uInt16)i < GetSortedObjs()->Count(); ++i ) { // --> OD 2004-06-29 #i28701# SwAnchoredObject* pAnchoredObj = (*GetSortedObjs())[i]; @@ -1000,7 +1000,7 @@ void lcl_PrepFlyInCntRegister( SwCntntFrm *pFrm ) pFrm->Prepare( PREP_REGISTER ); if( pFrm->GetDrawObjs() ) { - for( USHORT i = 0; i < pFrm->GetDrawObjs()->Count(); ++i ) + for( sal_uInt16 i = 0; i < pFrm->GetDrawObjs()->Count(); ++i ) { // --> OD 2004-06-29 #i28701# SwAnchoredObject* pAnchoredObj = (*pFrm->GetDrawObjs())[i]; @@ -1031,7 +1031,7 @@ void SwPageFrm::PrepareRegisterChg() } if( GetSortedObjs() ) { - for( USHORT i = 0; i < GetSortedObjs()->Count(); ++i ) + for( sal_uInt16 i = 0; i < GetSortedObjs()->Count(); ++i ) { // --> OD 2004-06-29 #i28701# SwAnchoredObject* pAnchoredObj = (*GetSortedObjs())[i]; @@ -1062,7 +1062,7 @@ void SwPageFrm::PrepareRegisterChg() |* Letzte Aenderung MA 18. Apr. 96 |* |*************************************************************************/ -void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields ) +void SwFrm::CheckPageDescs( SwPageFrm *pStart, sal_Bool bNotifyFields ) { ASSERT( pStart, "Keine Startpage." ); @@ -1081,7 +1081,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields ) SwRootFrm *pRoot = (SwRootFrm*)pStart->GetUpper(); SwDoc* pDoc = pStart->GetFmt()->GetDoc(); - const BOOL bFtns = 0 != pDoc->GetFtnIdxs().Count(); + const sal_Bool bFtns = 0 != pDoc->GetFtnIdxs().Count(); SwPageFrm *pPage = pStart; if( pPage->GetPrev() && ((SwPageFrm*)pPage->GetPrev())->IsEmptyPage() ) @@ -1090,9 +1090,9 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields ) { //gewuenschten PageDesc und FrmFmt festellen. SwPageDesc *pDesc = pPage->FindPageDesc(); - BOOL bCheckEmpty = pPage->IsEmptyPage(); - BOOL bActOdd = pPage->OnRightPage(); - BOOL bOdd = pPage->WannaRightPage(); + sal_Bool bCheckEmpty = pPage->IsEmptyPage(); + sal_Bool bActOdd = pPage->OnRightPage(); + sal_Bool bOdd = pPage->WannaRightPage(); SwFrmFmt *pFmtWish = bOdd ? pDesc->GetRightFmt() : pDesc->GetLeftFmt(); @@ -1159,7 +1159,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields ) pDesc = ((SwPageFrm*)pPage->GetPrev())->GetPageDesc(); SwPageFrm *pTmp = new SwPageFrm( pDoc->GetEmptyPageFmt(),pDesc); pTmp->Paste( pRoot, pPage ); - pTmp->PreparePage( FALSE ); + pTmp->PreparePage( sal_False ); pPage = pTmp; } else if ( pPage->GetPageDesc() != pDesc ) //4. @@ -1194,7 +1194,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields ) #ifdef DBG_UTIL else { - ASSERT( FALSE, "CheckPageDescs, missing solution" ); + ASSERT( sal_False, "CheckPageDescs, missing solution" ); } #endif } @@ -1239,7 +1239,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields ) //1. Keine zwei EmptyPages hintereinander. //2. Alle PageDescs richtig? - BOOL bEmpty = FALSE; + sal_Bool bEmpty = sal_False; SwPageFrm *pPg = pStart; while ( pPg ) { @@ -1247,13 +1247,13 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields ) { if ( bEmpty ) { - ASSERT( FALSE, "Doppelte Leerseiten." ); + ASSERT( sal_False, "Doppelte Leerseiten." ); break; //Einmal reicht. } - bEmpty = TRUE; + bEmpty = sal_True; } else - bEmpty = FALSE; + bEmpty = sal_False; //MA 21. Jun. 95: Kann zu testzwecken 'rein, ist aber bei zyklen durchaus //moeglich: Ein paar Seiten, auf der ersten 'erste Seite' anwenden, @@ -1276,7 +1276,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields ) |* Letzte Aenderung MA 27. Jul. 93 |* |*************************************************************************/ -SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, BOOL bFtn ) +SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, sal_Bool bFtn ) { SwRootFrm *pRoot = (SwRootFrm*)pPrevPage->GetUpper(); SwPageFrm *pSibling = (SwPageFrm*)pRoot->GetLower(); @@ -1284,8 +1284,8 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, BOOL bFtn ) pSibling = (SwPageFrm*)pPrevPage->GetNext(); //Rechte (ungerade) oder linke (gerade) Seite einfuegen? - BOOL bNextOdd = !pPrevPage->OnRightPage(); - BOOL bWishedOdd = bNextOdd; + sal_Bool bNextOdd = !pPrevPage->OnRightPage(); + sal_Bool bWishedOdd = bNextOdd; //Welcher PageDesc gilt? //Bei CntntFrm der aus dem Format wenn einer angegeben ist, @@ -1296,9 +1296,9 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, BOOL bFtn ) pDesc = rDesc.GetPageDesc(); if ( rDesc.GetNumOffset() ) { - bWishedOdd = rDesc.GetNumOffset() % 2 ? TRUE : FALSE; + bWishedOdd = rDesc.GetNumOffset() % 2 ? sal_True : sal_False; //Die Gelegenheit nutzen wir um das Flag an der Root zu pflegen. - pRoot->SetVirtPageNum( TRUE ); + pRoot->SetVirtPageNum( sal_True ); } } if ( !pDesc ) @@ -1310,7 +1310,7 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, BOOL bFtn ) SwDoc *pDoc = pPrevPage->GetFmt()->GetDoc(); SwFrmFmt *pFmt; - BOOL bCheckPages = FALSE; + sal_Bool bCheckPages = sal_False; //Wenn ich kein FrmFmt fuer die Seite gefunden habe, muss ich eben eine //Leerseite einfuegen. if( bWishedOdd != bNextOdd ) @@ -1327,12 +1327,12 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, BOOL bFtn ) SwPageFrm *pDel = pSibling; pSibling = (SwPageFrm*)pSibling->GetNext(); if ( pDoc->GetFtnIdxs().Count() ) - pRoot->RemoveFtns( pDel, TRUE ); + pRoot->RemoveFtns( pDel, sal_True ); pDel->Cut(); delete pDel; } else - bCheckPages = TRUE; + bCheckPages = sal_True; } pFmt = bWishedOdd ? pDesc->GetRightFmt() : pDesc->GetLeftFmt(); ASSERT( pFmt, "Descriptor without format." ); @@ -1347,23 +1347,23 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, BOOL bFtn ) SwPageFrm *pDel = pSibling; pSibling = (SwPageFrm*)pSibling->GetNext(); if ( pDoc->GetFtnIdxs().Count() ) - pRoot->RemoveFtns( pDel, TRUE ); + pRoot->RemoveFtns( pDel, sal_True ); pDel->Cut(); delete pDel; } else - bCheckPages = TRUE; + bCheckPages = sal_True; if ( pSibling ) { if ( bCheckPages ) { - CheckPageDescs( pSibling, FALSE ); + CheckPageDescs( pSibling, sal_False ); ViewShell *pSh = GetShell(); SwViewImp *pImp = pSh ? pSh->Imp() : 0; if ( pImp && pImp->IsAction() && !pImp->GetLayAction().IsCheckPages() ) { - const USHORT nNum = pImp->GetLayAction().GetCheckPageNum(); + const sal_uInt16 nNum = pImp->GetLayAction().GetCheckPageNum(); if ( nNum == pPrevPage->GetPhyPageNum() + 1 ) pImp->GetLayAction().SetCheckPageNumDirect( pSibling->GetPhyPageNum() ); @@ -1415,7 +1415,7 @@ sw::sidebarwindows::SidebarPosition SwPageFrm::SidebarPosition() const |* |*************************************************************************/ -SwTwips SwRootFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL ) +SwTwips SwRootFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool ) { if ( !bTst ) Frm().SSize().Height() += nDist; @@ -1429,7 +1429,7 @@ SwTwips SwRootFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL ) |* Letzte Aenderung MA 05. May. 94 |* |*************************************************************************/ -SwTwips SwRootFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL ) +SwTwips SwRootFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool ) { ASSERT( nDist >= 0, "nDist < 0." ); ASSERT( nDist <= Frm().Height(), "nDist > als aktuelle Groesse." ); @@ -1462,7 +1462,7 @@ void SwRootFrm::RemoveSuperfluous() { if ( !IsSuperfluous() ) return; - bCheckSuperfluous = FALSE; + bCheckSuperfluous = sal_False; SwPageFrm *pPage = GetLastPage(); long nDocPos = LONG_MAX; @@ -1481,7 +1481,7 @@ void SwRootFrm::RemoveSuperfluous() // header/footer are supported now. bool bOnlySuperfluosObjs = true; SwSortedObjs &rObjs = *pPage->GetSortedObjs(); - for ( USHORT i = 0; bOnlySuperfluosObjs && i < rObjs.Count(); ++i ) + for ( sal_uInt16 i = 0; bOnlySuperfluosObjs && i < rObjs.Count(); ++i ) { // --> OD 2004-06-29 #i28701# SwAnchoredObject* pAnchoredObj = rObjs[i]; @@ -1531,7 +1531,7 @@ void SwRootFrm::RemoveSuperfluous() SwPageFrm *pEmpty = pPage; pPage = (SwPageFrm*)pPage->GetPrev(); if ( GetFmt()->GetDoc()->GetFtnIdxs().Count() ) - RemoveFtns( pEmpty, TRUE ); + RemoveFtns( pEmpty, sal_True ); pEmpty->Cut(); delete pEmpty; nDocPos = pPage ? pPage->Frm().Top() : 0; @@ -1563,14 +1563,14 @@ void SwRootFrm::AssertFlyPages() { if ( !IsAssertFlyPages() ) return; - bAssertFlyPages = FALSE; + bAssertFlyPages = sal_False; SwDoc *pDoc = GetFmt()->GetDoc(); const SwSpzFrmFmts *pTbl = pDoc->GetSpzFrmFmts(); //Auf welche Seite will der 'letzte' Fly? - USHORT nMaxPg = 0; - USHORT i; + sal_uInt16 nMaxPg = 0; + sal_uInt16 i; for ( i = 0; i < pTbl->Count(); ++i ) { @@ -1590,7 +1590,7 @@ void SwRootFrm::AssertFlyPages() { //Die Seiten werden ausgehend von der letzten Seite konsequent //nach den Regeln der PageDescs weitergefuehrt. - BOOL bOdd = pPage->GetPhyPageNum() % 2 ? TRUE : FALSE; + sal_Bool bOdd = pPage->GetPhyPageNum() % 2 ? sal_True : sal_False; SwPageDesc *pDesc = pPage->GetPageDesc(); SwFrm *pSibling = pPage->GetNext(); for ( i = pPage->GetPhyPageNum(); i < nMaxPg; ++i ) @@ -1601,16 +1601,16 @@ void SwRootFrm::AssertFlyPages() //der naechsten Seite aufgenommen! pPage = new SwPageFrm( pDoc->GetEmptyPageFmt(), pDesc ); pPage->Paste( this, pSibling ); - pPage->PreparePage( FALSE ); - bOdd = bOdd ? FALSE : TRUE; + pPage->PreparePage( sal_False ); + bOdd = bOdd ? sal_False : sal_True; ++i; } pPage = new SwPageFrm( (bOdd ? pDesc->GetRightFmt() : pDesc->GetLeftFmt()), pDesc ); pPage->Paste( this, pSibling ); - pPage->PreparePage( FALSE ); - bOdd = bOdd ? FALSE : TRUE; + pPage->PreparePage( sal_False ); + bOdd = bOdd ? sal_False : sal_True; pDesc = pDesc->GetFollow(); } //Jetzt koennen die Endnotenseiten natuerlich wieder krumm sein; @@ -1627,7 +1627,7 @@ void SwRootFrm::AssertFlyPages() bOdd = pPage->OnRightPage(); if ( pPage->GetFmt() != (bOdd ? pTmpDesc->GetRightFmt() : pTmpDesc->GetLeftFmt()) ) - RemoveFtns( pPage, FALSE, TRUE ); + RemoveFtns( pPage, sal_False, sal_True ); } } } @@ -1653,13 +1653,13 @@ void SwRootFrm::AssertPageFlys( SwPageFrm *pPage ) { pPage->GetSortedObjs(); for ( int i = 0; - pPage->GetSortedObjs() && USHORT(i) < pPage->GetSortedObjs()->Count(); + pPage->GetSortedObjs() && sal_uInt16(i) < pPage->GetSortedObjs()->Count(); ++i) { // --> OD 2004-06-29 #i28701# SwFrmFmt& rFmt = (*pPage->GetSortedObjs())[i]->GetFrmFmt(); const SwFmtAnchor &rAnch = rFmt.GetAnchor(); - const USHORT nPg = rAnch.GetPageNum(); + const sal_uInt16 nPg = rAnch.GetPageNum(); if ((rAnch.GetAnchorId() == FLY_AT_PAGE) && nPg != pPage->GetPhyPageNum() ) { @@ -1701,7 +1701,7 @@ Size SwRootFrm::ChgSize( const Size& aNewSize ) { Frm().SSize() = aNewSize; _InvalidatePrt(); - bFixSize = FALSE; + bFixSize = sal_False; return Frm().SSize(); } @@ -1716,17 +1716,17 @@ Size SwRootFrm::ChgSize( const Size& aNewSize ) void SwRootFrm::MakeAll() { if ( !bValidPos ) - { bValidPos = TRUE; + { bValidPos = sal_True; aFrm.Pos().X() = aFrm.Pos().Y() = DOCUMENTBORDER; } if ( !bValidPrtArea ) - { bValidPrtArea = TRUE; + { bValidPrtArea = sal_True; aPrt.Pos().X() = aPrt.Pos().Y() = 0; aPrt.SSize( aFrm.SSize() ); } if ( !bValidSize ) //SSize wird von den Seiten (Cut/Paste) eingestellt. - bValidSize = TRUE; + bValidSize = sal_True; } /************************************************************************* @@ -1739,7 +1739,7 @@ void SwRootFrm::MakeAll() |*************************************************************************/ void SwRootFrm::ImplInvalidateBrowseWidth() { - bBrowseWidthValid = FALSE; + bBrowseWidthValid = sal_False; SwFrm *pPg = Lower(); while ( pPg ) { @@ -1775,7 +1775,7 @@ void SwRootFrm::ImplCalcBrowseWidth() if ( !pFrm ) return; - bBrowseWidthValid = TRUE; + bBrowseWidthValid = sal_True; ViewShell *pSh = GetShell(); nBrowseWidth = pSh ? MINLAY + 2 * pSh->GetOut()-> @@ -1821,12 +1821,12 @@ void SwRootFrm::ImplCalcBrowseWidth() } else if ( pFrm->GetDrawObjs() ) { - for ( USHORT i = 0; i < pFrm->GetDrawObjs()->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pFrm->GetDrawObjs()->Count(); ++i ) { // --> OD 2004-06-29 #i28701# SwAnchoredObject* pAnchoredObj = (*pFrm->GetDrawObjs())[i]; const SwFrmFmt& rFmt = pAnchoredObj->GetFrmFmt(); - const BOOL bFly = pAnchoredObj->ISA(SwFlyFrm); + const sal_Bool bFly = pAnchoredObj->ISA(SwFlyFrm); if ((bFly && (WEIT_WECH == pAnchoredObj->GetObjRect().Width())) || rFmt.GetFrmSize().GetWidthPercent()) { @@ -1906,13 +1906,13 @@ void SwRootFrm::StartAllAction() } while ( pSh != GetCurrShell() ); } -void SwRootFrm::EndAllAction( BOOL bVirDev ) +void SwRootFrm::EndAllAction( sal_Bool bVirDev ) { ViewShell *pSh = GetCurrShell(); if ( pSh ) do { - const BOOL bOldEndActionByVirDev = pSh->IsEndActionByVirDev(); + const sal_Bool bOldEndActionByVirDev = pSh->IsEndActionByVirDev(); pSh->SetEndActionByVirDev( bVirDev ); if ( pSh->ISA( SwCrsrShell ) ) { @@ -1941,9 +1941,9 @@ void SwRootFrm::UnoRemoveAllActions() if ( !pSh->IsInEndAction() ) { DBG_ASSERT(!pSh->GetRestoreActions(), "Restore action count is already set!"); - BOOL bCrsr = pSh->ISA( SwCrsrShell ); - BOOL bFE = pSh->ISA( SwFEShell ); - USHORT nRestore = 0; + sal_Bool bCrsr = pSh->ISA( SwCrsrShell ); + sal_Bool bFE = pSh->ISA( SwFEShell ); + sal_uInt16 nRestore = 0; while( pSh->ActionCount() ) { if( bCrsr ) @@ -1960,7 +1960,7 @@ void SwRootFrm::UnoRemoveAllActions() pSh->SetRestoreActions(nRestore); } // <-- - pSh->LockView(TRUE); + pSh->LockView(sal_True); pSh = (ViewShell*)pSh->GetNext(); } while ( pSh != GetCurrShell() ); @@ -1972,7 +1972,7 @@ void SwRootFrm::UnoRestoreAllActions() if ( pSh ) do { - USHORT nActions = pSh->GetRestoreActions(); + sal_uInt16 nActions = pSh->GetRestoreActions(); while( nActions-- ) { if ( pSh->ISA( SwCrsrShell ) ) @@ -1981,7 +1981,7 @@ void SwRootFrm::UnoRestoreAllActions() pSh->StartAction(); } pSh->SetRestoreActions(0); - pSh->LockView(FALSE); + pSh->LockView(sal_False); pSh = (ViewShell*)pSh->GetNext(); } while ( pSh != GetCurrShell() ); @@ -2000,7 +2000,7 @@ void lcl_MoveAllLowerObjs( SwFrm* pFrm, const Point& rOffset ) else pSortedObj = pFrm->GetDrawObjs(); - for ( USHORT i = 0; pSortedObj && i < pSortedObj->Count(); ++i) + for ( sal_uInt16 i = 0; pSortedObj && i < pSortedObj->Count(); ++i) { SwAnchoredObject* pAnchoredObj = (*pSortedObj)[i]; @@ -2128,7 +2128,7 @@ void SwRootFrm::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVi { ASSERT( pViewOpt, "CheckViewLayout required ViewOptions" ) - const USHORT nColumns = pViewOpt->GetViewLayoutColumns(); + const sal_uInt16 nColumns = pViewOpt->GetViewLayoutColumns(); const bool bBookMode = pViewOpt->IsViewLayoutBookMode(); if ( nColumns == mnColumns && bBookMode == mbBookMode && pVisArea->Width() == mnViewWidth && !mbSidebarChanged ) @@ -2148,8 +2148,8 @@ void SwRootFrm::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVi Calc(); - const BOOL bOldCallbackActionEnabled = IsCallbackActionEnabled(); - SetCallbackActionEnabled( FALSE ); + const sal_Bool bOldCallbackActionEnabled = IsCallbackActionEnabled(); + SetCallbackActionEnabled( sal_False ); maPageRects.clear(); @@ -2175,7 +2175,7 @@ void SwRootFrm::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVi SwTwips nMinPageLeft = TWIPS_MAX; SwTwips nMaxPageRight = 0; SwPageFrm* pStartOfRow = pPageFrm; - USHORT nNumberOfPagesInRow = mbBookMode ? 1 : 0; // in book view, start with right page + sal_uInt16 nNumberOfPagesInRow = mbBookMode ? 1 : 0; // in book view, start with right page bool bFirstRow = true; bool bPageChanged = false; @@ -2254,8 +2254,8 @@ void SwRootFrm::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVi pLastPageInCurrentRow = static_cast<const SwPageFrm*>(pLastPageInCurrentRow->GetPrev()); // check how many times the last page would still fit into the remaining space: - USHORT nNumberOfVirtualPages = 0; - const USHORT nMaxNumberOfVirtualPages = mnColumns > 0 ? mnColumns - nNumberOfPagesInRow : USHRT_MAX; + sal_uInt16 nNumberOfVirtualPages = 0; + const sal_uInt16 nMaxNumberOfVirtualPages = mnColumns > 0 ? mnColumns - nNumberOfPagesInRow : USHRT_MAX; SwTwips nRemain = nWidthRemain; SwTwips nVirtualPagesWidth = 0; SwTwips nLastPageWidth = pLastPageInCurrentRow->Frm().Width() + nSidebarWidth; @@ -2454,7 +2454,7 @@ bool SwRootFrm::IsLeftToRightViewLayout() const // <-- } -/*const SwRect SwRootFrm::GetExtendedPageArea( USHORT nPageNumber ) const +/*const SwRect SwRootFrm::GetExtendedPageArea( sal_uInt16 nPageNumber ) const { SwRect aRet; ASSERT( nPageNumber < maPageRects.size(), "No extended page area available" ) diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx index b838c8163837..71eaebf14893 100644 --- a/sw/source/core/layout/pagedesc.cxx +++ b/sw/source/core/layout/pagedesc.cxx @@ -72,7 +72,7 @@ SwPageDesc::SwPageDesc( const String& rName, SwFrmFmt *pFmt, SwDoc *pDc ) : nRegHeight( 0 ), nRegAscent( 0 ), eUse( (UseOnPage)(nsUseOnPage::PD_ALL | nsUseOnPage::PD_HEADERSHARE | nsUseOnPage::PD_FOOTERSHARE) ), - bLandscape( FALSE ), + bLandscape( sal_False ), aFtnInfo() { } @@ -174,16 +174,16 @@ void SwPageDesc::ResetAllAttr( sal_Bool bLeft ) // erfrage vom Modify Informationen -BOOL SwPageDesc::GetInfo( SfxPoolItem & rInfo ) const +sal_Bool SwPageDesc::GetInfo( SfxPoolItem & rInfo ) const { // if( RES_AUTOFMT_DOCNODE == rInfo.Which() ) // { // dann weiter zum Format if( !aMaster.GetInfo( rInfo ) ) - return FALSE; // gefunden + return sal_False; // gefunden return aLeft.GetInfo( rInfo ); // } -// return TRUE; // weiter suchen +// return sal_True; // weiter suchen } /************************************************************************* @@ -290,7 +290,7 @@ void SwPageDesc::RegisterChange() void SwPageDesc::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ) { - const USHORT nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0; + const sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0; SwModify::Modify( pOld, pNew ); if ( (RES_ATTRSET_CHG == nWhich) || (RES_FMT_CHG == nWhich) @@ -303,7 +303,7 @@ void SwPageDesc::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ) static const SwFrm* lcl_GetFrmOfNode( const SwNode& rNd ) { SwModify* pMod; - USHORT nFrmType = FRM_CNTNT; + sal_uInt16 nFrmType = FRM_CNTNT; if( rNd.IsCntntNode() ) { @@ -318,7 +318,7 @@ static const SwFrm* lcl_GetFrmOfNode( const SwNode& rNd ) pMod = 0; Point aNullPt; - return pMod ? ::GetFrmOfModify( *pMod, nFrmType, &aNullPt, 0, FALSE ) + return pMod ? ::GetFrmOfModify( *pMod, nFrmType, &aNullPt, 0, sal_False ) : 0; } @@ -332,7 +332,7 @@ const SwPageDesc* SwPageDesc::GetPageDescOfNode(const SwNode& rNd) } const SwFrmFmt* SwPageDesc::GetPageFmtOfNode( const SwNode& rNd, - BOOL bCheckForThisPgDc ) const + sal_Bool bCheckForThisPgDc ) const { // welches PageDescFormat ist fuer diesen Node gueltig? const SwFrmFmt* pRet; @@ -358,9 +358,9 @@ const SwFrmFmt* SwPageDesc::GetPageFmtOfNode( const SwNode& rNd, return pRet; } -BOOL SwPageDesc::IsFollowNextPageOfNode( const SwNode& rNd ) const +sal_Bool SwPageDesc::IsFollowNextPageOfNode( const SwNode& rNd ) const { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( GetFollow() && this != GetFollow() ) { const SwFrm* pChkFrm = lcl_GetFrmOfNode( rNd ); @@ -369,7 +369,7 @@ BOOL SwPageDesc::IsFollowNextPageOfNode( const SwNode& rNd ) const ( !pChkFrm->GetNext() || GetFollow() == ((SwPageFrm*)pChkFrm->GetNext())->GetPageDesc() )) // die Seite gefunden, auf die der Follow verweist - bRet = TRUE; + bRet = sal_True; } return bRet; } @@ -445,7 +445,7 @@ SwPageFtnInfo &SwPageFtnInfo::operator=( const SwPageFtnInfo& rCpy ) -BOOL SwPageFtnInfo::operator==( const SwPageFtnInfo& rCmp ) const +sal_Bool SwPageFtnInfo::operator==( const SwPageFtnInfo& rCmp ) const { return ( nMaxHeight == rCmp.GetHeight() && nLineWidth == rCmp.nLineWidth && diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 9f518285bd30..fa767ec36958 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -148,43 +148,43 @@ class SwLineRect : public SwRect { const Color *pColor; const SwTabFrm *pTab; - BYTE nSubColor; //Hilfslinien einfaerben - BOOL bPainted; //schon gepaintet? - BYTE nLock; //Um die Linien zum Hell-Layer abzugrenzen. + sal_uInt8 nSubColor; //Hilfslinien einfaerben + sal_Bool bPainted; //schon gepaintet? + sal_uInt8 nLock; //Um die Linien zum Hell-Layer abzugrenzen. public: SwLineRect( const SwRect &rRect, const Color *pCol, - const SwTabFrm *pT , const BYTE nSCol ); + const SwTabFrm *pT , const sal_uInt8 nSCol ); const Color *GetColor() const { return pColor;} const SwTabFrm *GetTab() const { return pTab; } - void SetPainted() { bPainted = TRUE; } - void Lock( BOOL bLock ) { if ( bLock ) + void SetPainted() { bPainted = sal_True; } + void Lock( sal_Bool bLock ) { if ( bLock ) ++nLock; else if ( nLock ) --nLock; } - BOOL IsPainted() const { return bPainted; } - BOOL IsLocked() const { return nLock != 0; } - BYTE GetSubColor() const { return nSubColor;} + sal_Bool IsPainted() const { return bPainted; } + sal_Bool IsLocked() const { return nLock != 0; } + sal_uInt8 GetSubColor() const { return nSubColor;} - BOOL MakeUnion( const SwRect &rRect ); + sal_Bool MakeUnion( const SwRect &rRect ); }; SV_DECL_VARARR( SwLRects, SwLineRect, 100, 100 ) class SwLineRects : public SwLRects { - USHORT nLastCount; //unuetze Durchlaeufe im PaintLines verhindern. + sal_uInt16 nLastCount; //unuetze Durchlaeufe im PaintLines verhindern. public: SwLineRects() : nLastCount( 0 ) {} void AddLineRect( const SwRect& rRect, const Color *pColor, - const SwTabFrm *pTab, const BYTE nSCol ); + const SwTabFrm *pTab, const sal_uInt8 nSCol ); void ConnectEdges( OutputDevice *pOut ); void PaintLines ( OutputDevice *pOut ); - void LockLines( BOOL bLock ); + void LockLines( sal_Bool bLock ); /// OD 13.08.2002 - correct type of function - USHORT Free() const { return nFree; } + sal_uInt16 Free() const { return nFree; } }; class SwSubsRects : public SwLineRects @@ -193,7 +193,7 @@ class SwSubsRects : public SwLineRects public: void PaintSubsidiary( OutputDevice *pOut, const SwLineRects *pRects ); - inline void Ins( const SwRect &rRect, const BYTE nSCol ); + inline void Ins( const SwRect &rRect, const sal_uInt8 nSCol ); }; //----------------- End Klassen Umrandungen ---------------------- @@ -202,11 +202,11 @@ static ViewShell *pGlobalShell = 0; //Wenn durchsichtige FlyInCnts im PaintBackground gepainted werden so soll der //Hintergrund nicht mehr retouchiert werden. -//static BOOL bLockFlyBackground = FALSE; +//static sal_Bool bLockFlyBackground = sal_False; //Wenn vom Fly ein Metafile abgezogen wird, so soll nur der FlyInhalt und vor //nur hintergrund vom FlyInhalt gepaintet werden. -static BOOL bFlyMetafile = FALSE; +static sal_Bool bFlyMetafile = sal_False; static OutputDevice *pFlyMetafileOut = 0; //Die Retouche fuer Durchsichtige Flys wird vom Hintergrund der Flys @@ -233,7 +233,7 @@ static double aEdgeScale = 0.5; //In pSubsLines werden Hilfslinien gesammelt und zusammengefasst. Diese //werden vor der Ausgabe mit pLines abgeglichen, so dass moeglichst keine //Umrandungen von den Hilfslinen verdeckt werden. -//bTablines ist waerend des Paints einer Tabelle TRUE. +//bTablines ist waerend des Paints einer Tabelle sal_True. static SwLineRects *pLines = 0; static SwSubsRects *pSubsLines = 0; // OD 18.11.2002 #99672# - global variable for sub-lines of body, header, footer, @@ -245,7 +245,7 @@ static SfxProgress *pProgress = 0; static SwFlyFrm *pFlyOnlyDraw = 0; //Damit die Flys auch fuer den Hack richtig gepaintet werden koennen. -static BOOL bTableHack = FALSE; +static sal_Bool bTableHack = sal_False; //Um das teure Ermitteln der RetoucheColor zu optimieren Color aGlobalRetoucheColor; @@ -310,7 +310,7 @@ void SwCalcPixStatics( OutputDevice *pOut ) //Zum Sichern der statics, damit das Paint (quasi) reentrant wird. class SwSavePaintStatics { - BOOL bSFlyMetafile, + sal_Bool bSFlyMetafile, bSPageOnly; ViewShell *pSGlobalShell; OutputDevice *pSFlyMetafileOut; @@ -360,7 +360,7 @@ SwSavePaintStatics::SwSavePaintStatics() : aSScaleX ( aScaleX ), aSScaleY ( aScaleY ) { - bFlyMetafile = FALSE; + bFlyMetafile = sal_False; pFlyMetafileOut = 0; pRetoucheFly = 0; pRetoucheFly2 = 0; @@ -409,17 +409,17 @@ SV_IMPL_VARARR( SwLRects, SwLineRect ); SwLineRect::SwLineRect( const SwRect &rRect, const Color *pCol, - const SwTabFrm *pT, const BYTE nSCol ) : + const SwTabFrm *pT, const sal_uInt8 nSCol ) : SwRect( rRect ), pColor( pCol ), pTab( pT ), nSubColor( nSCol ), - bPainted( FALSE ), + bPainted( sal_False ), nLock( 0 ) { } -BOOL SwLineRect::MakeUnion( const SwRect &rRect ) +sal_Bool SwLineRect::MakeUnion( const SwRect &rRect ) { //Es wurde bereits ausserhalb geprueft, ob die Rechtecke die gleiche //Ausrichtung (horizontal bzw. vertikal), Farbe usw. besitzen. @@ -434,7 +434,7 @@ BOOL SwLineRect::MakeUnion( const SwRect &rRect ) { Bottom( Max( Bottom(), rRect.Bottom() ) ); Top ( Min( Top(), rRect.Top() ) ); - return TRUE; + return sal_True; } } } @@ -449,19 +449,19 @@ BOOL SwLineRect::MakeUnion( const SwRect &rRect ) { Right( Max( Right(), rRect.Right() ) ); Left ( Min( Left(), rRect.Left() ) ); - return TRUE; + return sal_True; } } } - return FALSE; + return sal_False; } void SwLineRects::AddLineRect( const SwRect &rRect, const Color *pCol, - const SwTabFrm *pTab, const BYTE nSCol ) + const SwTabFrm *pTab, const sal_uInt8 nSCol ) { //Rueckwaerts durch, weil Linien die zusammengefasst werden koennen i.d.R. //im gleichen Kontext gepaintet werden. - for ( USHORT i = Count(); i ; ) + for ( sal_uInt16 i = Count(); i ; ) { SwLineRect &rLRect = operator[](--i); //Pruefen von Ausrichtung, Farbe, Tabelle. @@ -493,13 +493,13 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut ) for ( int i = 0; i < (int)Count(); ++i ) { - SwLineRect &rL1 = operator[](USHORT(i)); + SwLineRect &rL1 = operator[](sal_uInt16(i)); if ( !rL1.GetTab() || rL1.IsPainted() || rL1.IsLocked() ) continue; aCheck.Remove( 0, aCheck.Count() ); - const BOOL bVert = rL1.Height() > rL1.Width(); + const sal_Bool bVert = rL1.Height() > rL1.Width(); long nL1a, nL1b, nL1c, nL1d; if ( bVert ) @@ -514,13 +514,13 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut ) } //Alle moeglicherweise mit i1 zu verbindenden Linien einsammeln. - for ( USHORT i2 = 0; i2 < Count(); ++i2 ) + for ( sal_uInt16 i2 = 0; i2 < Count(); ++i2 ) { SwLineRect &rL2 = operator[](i2); if ( rL2.GetTab() != rL1.GetTab() || rL2.IsPainted() || rL2.IsLocked() || - bVert == rL2.Height() > rL2.Width() ) + (bVert == (rL2.Height() > rL2.Width())) ) continue; long nL2a, nL2b, nL2c, nL2d; @@ -547,14 +547,14 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut ) if ( aCheck.Count() < 2 ) continue; - BOOL bRemove = FALSE; + sal_Bool bRemove = sal_False; //Fuer jede Linie jede alle folgenden checken. - for ( USHORT k = 0; !bRemove && k < aCheck.Count(); ++k ) + for ( sal_uInt16 k = 0; !bRemove && k < aCheck.Count(); ++k ) { SwLineRect &rR1 = (SwLineRect&)*(SwLineRect*)aCheck[k]; - for ( USHORT k2 = k+1; !bRemove && k2 < aCheck.Count(); ++k2 ) + for ( sal_uInt16 k2 = k+1; !bRemove && k2 < aCheck.Count(); ++k2 ) { SwLineRect &rR2 = (SwLineRect&)*(SwLineRect*)aCheck[k2]; if ( bVert ) @@ -581,7 +581,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut ) aIns.Bottom( pLA->Bottom() ); if ( !rL1.IsInside( aIns ) ) continue; - const USHORT nTmpFree = Free(); + const sal_uInt16 nTmpFree = Free(); Insert( SwLineRect( aIns, rL1.GetColor(), rL1.GetTab(), SUBCOL_TAB ), Count() ); if ( !nTmpFree ) @@ -595,7 +595,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut ) if ( rL1.Bottom() > pLB->Bottom() ) rL1.Top( pLB->Top() ); //i1 nach oben verlaengern else - bRemove = TRUE; //abbrechen, i1 entfernen + bRemove = sal_True; //abbrechen, i1 entfernen } } else @@ -622,7 +622,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut ) aIns.Right( pLA->Right() ); if ( !rL1.IsInside( aIns ) ) continue; - const USHORT nTmpFree = Free(); + const sal_uInt16 nTmpFree = Free(); Insert( SwLineRect( aIns, rL1.GetColor(), rL1.GetTab(), SUBCOL_TAB ), Count() ); if ( !nTmpFree ) @@ -635,20 +635,20 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut ) if ( rL1.Right() > pLB->Right() ) rL1.Left( pLB->Left() ); else - bRemove = TRUE; + bRemove = sal_True; } } } } if ( bRemove ) { - Remove( static_cast<USHORT>(i), 1 ); + Remove( static_cast<sal_uInt16>(i), 1 ); --i; //keinen auslassen! } } } -inline void SwSubsRects::Ins( const SwRect &rRect, const BYTE nSCol ) +inline void SwSubsRects::Ins( const SwRect &rRect, const sal_uInt8 nSCol ) { //Linien die kuerzer als die breiteste Linienbreite sind werden //nicht aufgenommen. @@ -660,7 +660,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects ) { //Alle Hilfslinien, die sich mit irgendwelchen Umrandungen decken werden //entfernt bzw. zerstueckelt.. - for ( USHORT i = 0; i < Count(); ++i ) + for ( sal_uInt16 i = 0; i < Count(); ++i ) { // OD 18.11.2002 #99672# - get a copy instead of a reference, because // an <insert> may destroy the object due to a necessary array resize. @@ -684,7 +684,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects ) aSubsRect.Top ( aSubsRect.Top() - (nPixelSzH+nHalfPixelSzH) ); aSubsRect.Bottom( aSubsRect.Bottom() + (nPixelSzH+nHalfPixelSzH) ); } - for ( USHORT k = 0; k < rRects.Count(); ++k ) + for ( sal_uInt16 k = 0; k < rRects.Count(); ++k ) { SwLineRect &rLine = rRects[k]; @@ -694,7 +694,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects ) if ( rLine.IsLocked () ) continue; - if ( !bVerticalSubs == rLine.Height() > rLine.Width() ) //gleiche Ausrichtung? + if ( (!bVerticalSubs == (rLine.Height() > rLine.Width())) ) //gleiche Ausrichtung? continue; if ( aSubsRect.IsOver( rLine ) ) @@ -756,9 +756,9 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects ) } } -void SwLineRects::LockLines( BOOL bLock ) +void SwLineRects::LockLines( sal_Bool bLock ) { - for ( USHORT i = 0; i < Count(); ++i ) + for ( sal_uInt16 i = 0; i < Count(); ++i ) operator[](i).Lock( bLock ); } @@ -779,9 +779,9 @@ void SwLineRects::PaintLines( OutputDevice *pOut ) ConnectEdges( pOut ); const Color *pLast = 0; - BOOL bPaint2nd = FALSE; - USHORT nMinCount = Count(); - USHORT i; + sal_Bool bPaint2nd = sal_False; + sal_uInt16 nMinCount = Count(); + sal_uInt16 i; for ( i = 0; i < Count(); ++i ) { @@ -797,7 +797,7 @@ void SwLineRects::PaintLines( OutputDevice *pOut ) } //Jetzt malen oder erst in der zweiten Runde? - BOOL bPaint = TRUE; + sal_Bool bPaint = sal_True; if ( rLRect.GetTab() ) { if ( rLRect.Height() > rLRect.Width() ) @@ -809,7 +809,7 @@ void SwLineRects::PaintLines( OutputDevice *pOut ) nTRight = rLRect.GetTab()->Frm().Left() + rLRect.GetTab()->Prt().Right(); if ( (nTLeft >= nLLeft && nTLeft <= nLRight) || (nTRight>= nLLeft && nTRight<= nLRight) ) - bPaint = FALSE; + bPaint = sal_False; } else { //Waagerechte Kante, ueberlappt sie mit der Tabellenkante? @@ -819,7 +819,7 @@ void SwLineRects::PaintLines( OutputDevice *pOut ) nTBottom = rLRect.GetTab()->Frm().Top() + rLRect.GetTab()->Prt().Bottom(); if ( (nTTop >= nLTop && nTTop <= nLBottom) || (nTBottom >= nLTop && nTBottom <= nLBottom) ) - bPaint = FALSE; + bPaint = sal_False; } } if ( bPaint ) @@ -828,7 +828,7 @@ void SwLineRects::PaintLines( OutputDevice *pOut ) { pLast = rLRect.GetColor(); - ULONG nOldDrawMode = pOut->GetDrawMode(); + sal_uLong nOldDrawMode = pOut->GetDrawMode(); if( pGlobalShell->GetWin() && Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) pOut->SetDrawMode( 0 ); @@ -841,7 +841,7 @@ void SwLineRects::PaintLines( OutputDevice *pOut ) rLRect.SetPainted(); } else - bPaint2nd = TRUE; + bPaint2nd = sal_True; } if ( bPaint2nd ) for ( i = 0; i < Count(); ++i ) @@ -860,7 +860,7 @@ void SwLineRects::PaintLines( OutputDevice *pOut ) { pLast = rLRect.GetColor(); - ULONG nOldDrawMode = pOut->GetDrawMode(); + sal_uLong nOldDrawMode = pOut->GetDrawMode(); if( pGlobalShell->GetWin() && Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) { @@ -889,17 +889,17 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut, // <-- //Alle Hilfslinien, die sich fast decken entfernen (Tabellen) - for ( USHORT i = 0; i < Count(); ++i ) + for ( sal_uInt16 i = 0; i < Count(); ++i ) { SwLineRect &rLi = operator[](i); const bool bVerticalSubs = rLi.Height() > rLi.Width(); - for ( USHORT k = i+1; k < Count(); ++k ) + for ( sal_uInt16 k = i+1; k < Count(); ++k ) { SwLineRect &rLk = operator[](k); if ( rLi.SSize() == rLk.SSize() ) { - if ( bVerticalSubs == rLk.Height() > rLk.Width() ) + if ( (bVerticalSubs == (rLk.Height() > rLk.Width())) ) { if ( bVerticalSubs ) { @@ -946,14 +946,14 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut, // mode in order to get fill color set at output device. // Recover draw mode after draw of lines. // Necessary for the subsidiary lines painted by the fly frames. - ULONG nOldDrawMode = pOut->GetDrawMode(); + sal_uLong nOldDrawMode = pOut->GetDrawMode(); if( pGlobalShell->GetWin() && Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) { pOut->SetDrawMode( 0 ); } - for ( USHORT i = 0; i < Count(); ++i ) + for ( sal_uInt16 i = 0; i < Count(); ++i ) { SwLineRect &rLRect = operator[](i); // OD 19.12.2002 #106318# - add condition <!rLRect.IsLocked()> @@ -1190,7 +1190,7 @@ long MA_FASTCALL lcl_MinWidthDist( const long nDist ) //Ermittelt PrtArea plus Umrandung plus Schatten. void MA_FASTCALL lcl_CalcBorderRect( SwRect &rRect, const SwFrm *pFrm, const SwBorderAttrs &rAttrs, - const BOOL bShadow ) + const sal_Bool bShadow ) { // OD 23.01.2003 #106386# - special handling for cell frames. // The printing area of a cell frame is completely enclosed in the frame area @@ -1216,7 +1216,7 @@ void MA_FASTCALL lcl_CalcBorderRect( SwRect &rRect, const SwFrm *pFrm, { SwRectFn fnRect = pFrm->IsVertical() ? fnRectVert : fnRectHori; const SvxBoxItem &rBox = rAttrs.GetBox(); - const BOOL bTop = 0 != (pFrm->*fnRect->fnGetTopMargin)(); + const sal_Bool bTop = 0 != (pFrm->*fnRect->fnGetTopMargin)(); if ( bTop ) { SwTwips nDiff = rBox.GetTop() ? @@ -1229,7 +1229,7 @@ void MA_FASTCALL lcl_CalcBorderRect( SwRect &rRect, const SwFrm *pFrm, (rRect.*fnRect->fnSubTop)( nDiff ); } - const BOOL bBottom = 0 != (pFrm->*fnRect->fnGetBottomMargin)(); + const sal_Bool bBottom = 0 != (pFrm->*fnRect->fnGetBottomMargin)(); if ( bBottom ) { SwTwips nDiff = 0; @@ -1313,7 +1313,7 @@ void MA_FASTCALL lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage, if ( !pRetoucheFly ) pRetoucheFly = pRetoucheFly2; - for ( USHORT j = 0; (j < rObjs.Count()) && rRegion.Count(); ++j ) + for ( sal_uInt16 j = 0; (j < rObjs.Count()) && rRegion.Count(); ++j ) { const SwAnchoredObject* pAnchoredObj = rObjs[j]; const SdrObject* pSdrObj = pAnchoredObj->GetDrawObj(); @@ -1335,8 +1335,8 @@ void MA_FASTCALL lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage, pGlobalShell->IsPreView())) continue; - const BOOL bLowerOfSelf = pSelfFly && pFly->IsLowerOf( pSelfFly ) ? - TRUE : FALSE; + const sal_Bool bLowerOfSelf = pSelfFly && pFly->IsLowerOf( pSelfFly ) ? + sal_True : sal_False; //Bei zeichengebundenem Fly nur diejenigen betrachten, in denen er //nicht selbst verankert ist. @@ -1361,7 +1361,7 @@ void MA_FASTCALL lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage, } #endif - BOOL bStopOnHell = TRUE; + sal_Bool bStopOnHell = sal_True; if ( pSelfFly ) { const SdrObject *pTmp = pSelfFly->GetVirtDrawObj(); @@ -1377,7 +1377,7 @@ void MA_FASTCALL lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage, //Aus anderem Layer interessieren uns nur nicht transparente //oder innenliegende continue; - bStopOnHell = FALSE; + bStopOnHell = sal_False; } } if ( pRetoucheFly ) @@ -1395,14 +1395,14 @@ void MA_FASTCALL lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage, //Aus anderem Layer interessieren uns nur nicht transparente //oder innenliegende continue; - bStopOnHell = FALSE; + bStopOnHell = sal_False; } } //Wenn der Inhalt des Fly Transparent ist, wird er nicht abgezogen, es sei denn //er steht im Hell-Layer (#31941#) const IDocumentDrawModelAccess* pIDDMA = pFly->GetFmt()->getIDocumentDrawModelAccess(); - BOOL bHell = pSdrObj->GetLayer() == pIDDMA->GetHellId(); + sal_Bool bHell = pSdrObj->GetLayer() == pIDDMA->GetHellId(); if ( (bStopOnHell && bHell) || /// OD 05.08.2002 - change internal order of condition /// first check "!bHell", then "..->Lower()" and "..->IsNoTxtFrm()" @@ -1440,7 +1440,7 @@ void MA_FASTCALL lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage, SwRect aRect; SwBorderAttrAccess aAccess( SwFrm::GetCache(), (SwFrm*)pFly ); const SwBorderAttrs &rAttrs = *aAccess.Get(); - ::lcl_CalcBorderRect( aRect, pFly, rAttrs, TRUE ); + ::lcl_CalcBorderRect( aRect, pFly, rAttrs, sal_True ); rRegion -= aRect; continue; } @@ -1461,7 +1461,7 @@ void MA_FASTCALL lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage, SwRect aRect; SwBorderAttrAccess aAccess( SwFrm::GetCache(), (SwFrm*)pFly ); const SwBorderAttrs &rAttrs = *aAccess.Get(); - ::lcl_CalcBorderRect( aRect, pFly, rAttrs, TRUE ); + ::lcl_CalcBorderRect( aRect, pFly, rAttrs, sal_True ); rRegion -= aRect; } else @@ -1476,7 +1476,7 @@ void MA_FASTCALL lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage, } // --> OD 2008-05-16 #i84659# - no longer needed -//inline BOOL IsShortCut( const SwRect &rRect, const SwRect &rFrmRect ) +//inline sal_Bool IsShortCut( const SwRect &rRect, const SwRect &rFrmRect ) //{ // //Wenn der Frm vollstaendig rechts neben bzw. unter dem // //Rect sitzt ist's genug mit Painten. @@ -1599,7 +1599,7 @@ inline void lcl_DrawGraphicBackgrd( const SvxBrushItem& _rBackgrdBrush, /// OD 25.09.2002 #99739# - pixel-align coordinations for drawing graphic. /// OD 17.10.2002 #103876# - outsource code for drawing background of the graphic /// with a background color in method <lcl_DrawGraphicBackgrd> -/// Also, change type of <bGrfNum> and <bClip> from <BOOL> to <bool>. +/// Also, change type of <bGrfNum> and <bClip> from <sal_Bool> to <bool>. void lcl_DrawGraphic( const SvxBrushItem& rBrush, OutputDevice *pOut, ViewShell &rSh, const SwRect &rGrf, const SwRect &rOut, bool bClip, bool bGrfNum, @@ -1613,7 +1613,7 @@ void lcl_DrawGraphic( const SvxBrushItem& rBrush, OutputDevice *pOut, SwRect aAlignedGrfRect = rGrf; ::SwAlignRect( aAlignedGrfRect, &rSh ); - /// OD 17.10.2002 #103876# - change type from <BOOL> to <bool>. + /// OD 17.10.2002 #103876# - change type from <sal_Bool> to <bool>. const bool bNotInside = bClip && !rOut.IsInside( aAlignedGrfRect ); if ( bNotInside ) { @@ -1642,13 +1642,13 @@ void MA_FASTCALL DrawGraphic( const SvxBrushItem *pBrush, OutputDevice *pOutDev, const SwRect &rOrg, const SwRect &rOut, - const BYTE nGrfNum, + const sal_uInt8 nGrfNum, const sal_Bool bConsiderBackgroundTransparency ) /// OD 05.08.2002 #99657# - add 6th parameter to indicate that method should /// consider background transparency, saved in the color of the brush item { ViewShell &rSh = *pGlobalShell; - /// OD 17.10.2002 #103876# - change type from <BOOL> to <bool> + /// OD 17.10.2002 #103876# - change type from <sal_Bool> to <bool> bool bReplaceGrfNum = GRFNUM_REPLACE == nGrfNum; bool bGrfNum = GRFNUM_NO != nGrfNum; Size aGrfSize; @@ -1685,8 +1685,8 @@ void MA_FASTCALL DrawGraphic( const SvxBrushItem *pBrush, SwRect aGrf; aGrf.SSize( aGrfSize ); - BOOL bDraw = TRUE; - BOOL bRetouche = TRUE; + sal_Bool bDraw = sal_True; + sal_Bool bRetouche = sal_True; switch ( ePos ) { case GPOS_LT: @@ -1805,12 +1805,12 @@ void MA_FASTCALL DrawGraphic( const SvxBrushItem *pBrush, pOutDev->Pop(); // set <bDraw> and <bRetouche> to false, indicating that background // graphic and background are already drawn. - bDraw = bRetouche = FALSE; + bDraw = bRetouche = sal_False; } break; case GPOS_NONE: - bDraw = FALSE; + bDraw = sal_False; break; default: ASSERT( !pOutDev, "new Graphic position?" ); @@ -1881,7 +1881,7 @@ void MA_FASTCALL DrawGraphic( const SvxBrushItem *pBrush, // --> OD 2008-06-02 #i75614# // reset draw mode in high contrast mode in order to get fill color set - const ULONG nOldDrawMode = pOutDev->GetDrawMode(); + const sal_uLong nOldDrawMode = pOutDev->GetDrawMode(); if ( pGlobalShell->GetWin() && Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) { @@ -1952,7 +1952,7 @@ void MA_FASTCALL DrawGraphic( const SvxBrushItem *pBrush, else bGrfBackgrdAlreadyDrawn = true; /// loop rectangles of background region, which has to be drawn - for( USHORT i = 0; i < aRegion.Count(); ++i ) + for( sal_uInt16 i = 0; i < aRegion.Count(); ++i ) { pOutDev->DrawRect( aRegion[i].SVRect() ); } @@ -2242,7 +2242,7 @@ void SwTabFrmPainter::PaintLines( OutputDevice& rDev, const SwRect& rRect ) cons // high contrast mode: // overrides the color of non-subsidiary lines. const Color* pHCColor = 0; - ULONG nOldDrawMode = rDev.GetDrawMode(); + sal_uLong nOldDrawMode = rDev.GetDrawMode(); if( pGlobalShell->GetWin() && Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) { @@ -2729,7 +2729,7 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const PROTOCOL( this, PROT_FILE_INIT, 0, 0) - BOOL bResetRootPaint = FALSE; + sal_Bool bResetRootPaint = sal_False; ViewShell *pSh = pCurrShell; if ( pSh->GetWin() ) @@ -2745,7 +2745,7 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const } } else - SwRootFrm::bInPaint = bResetRootPaint = TRUE; + SwRootFrm::bInPaint = bResetRootPaint = sal_True; SwSavePaintStatics *pStatics = 0; if ( pGlobalShell ) @@ -2786,9 +2786,9 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const { ((SwRootFrm*)this)->ResetTurbo(); SwLayAction aAction( (SwRootFrm*)this, pSh->Imp() ); - aAction.SetPaint( FALSE ); - aAction.SetComplete( FALSE ); - aAction.SetReschedule( pProgress ? TRUE : FALSE ); + aAction.SetPaint( sal_False ); + aAction.SetComplete( sal_False ); + aAction.SetReschedule( pProgress ? sal_True : sal_False ); aAction.Action(); ((SwRootFrm*)this)->ResetTurboFlag(); if ( !pSh->ActionPend() ) @@ -2798,7 +2798,7 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const SwRect aRect( rRect ); aRect.Intersection( pSh->VisArea() ); - const BOOL bExtraData = ::IsExtraData( GetFmt()->GetDoc() ); + const sal_Bool bExtraData = ::IsExtraData( GetFmt()->GetDoc() ); pLines = new SwLineRects; //Sammler fuer Umrandungen. @@ -2807,7 +2807,7 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const // of the document. Dangerous! We better set this flag to // avoid the reformat. const sal_Bool bOldAction = IsCallbackActionEnabled(); - ((SwRootFrm*)this)->SetCallbackActionEnabled( FALSE ); + ((SwRootFrm*)this)->SetCallbackActionEnabled( sal_False ); const SwPageFrm *pPage = pSh->Imp()->GetFirstVisPage(); @@ -2914,18 +2914,18 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const /// calls, paint <hell> or <heaven> const Color aPageBackgrdColor = pPage->GetDrawBackgrdColor(); - pPage->PaintBaBo( aPaintRect, pPage, TRUE ); + pPage->PaintBaBo( aPaintRect, pPage, sal_True ); if ( pSh->Imp()->HasDrawView() ) { - pLines->LockLines( TRUE ); + pLines->LockLines( sal_True ); // OD 29.08.2002 #102450# - add 3rd parameter // OD 09.12.2002 #103045# - add 4th parameter for horizontal text direction. const IDocumentDrawModelAccess* pIDDMA = pSh->getIDocumentDrawModelAccess(); pSh->Imp()->PaintLayer( pIDDMA->GetHellId(), pPrintData, aPaintRect, &aPageBackgrdColor, (pPage->IsRightToLeft() ? true : false) ); pLines->PaintLines( pSh->GetOut() ); - pLines->LockLines( FALSE ); + pLines->LockLines( sal_False ); } if( pSh->GetWin() ) @@ -3066,7 +3066,7 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const #endif if ( bResetRootPaint ) - SwRootFrm::bInPaint = FALSE; + SwRootFrm::bInPaint = sal_False; if ( pStatics ) delete pStatics; else @@ -3097,16 +3097,16 @@ void SwRootFrm::HackPrepareLongTblPaint( int nMode ) pLines = new SwLineRects; ASSERT( !pGlobalShell, "old GlobalShell lost" ); pGlobalShell = GetShell(); - bTableHack = TRUE; + bTableHack = sal_True; break; - case HACK_TABLEMODE_LOCKLINES : pLines->LockLines( TRUE ); break; + case HACK_TABLEMODE_LOCKLINES : pLines->LockLines( sal_True ); break; case HACK_TABLEMODE_PAINTLINES : pLines->PaintLines( GetShell()->GetOut() ); break; - case HACK_TABLEMODE_UNLOCKLINES: pLines->LockLines( FALSE ); break; + case HACK_TABLEMODE_UNLOCKLINES: pLines->LockLines( sal_False ); break; case HACK_TABLEMODE_EXIT : pLines->PaintLines( GetShell()->GetOut() ); DELETEZ( pLines ); pGlobalShell = 0; - bTableHack = FALSE; + bTableHack = sal_False; break; } } @@ -3140,14 +3140,14 @@ class SwShortCut long nLimit; public: SwShortCut( const SwFrm& rFrm, const SwRect& rRect ); - BOOL Stop( const SwRect& rRect ) const + sal_Bool Stop( const SwRect& rRect ) const { return (rRect.*fnCheck)( nLimit ) > 0; } }; SwShortCut::SwShortCut( const SwFrm& rFrm, const SwRect& rRect ) { - BOOL bVert = rFrm.IsVertical(); - BOOL bR2L = rFrm.IsRightToLeft(); + sal_Bool bVert = rFrm.IsVertical(); + sal_Bool bR2L = rFrm.IsRightToLeft(); if( rFrm.IsNeighbourFrm() && bVert == bR2L ) { if( bVert ) @@ -3187,8 +3187,8 @@ void SwLayoutFrm::Paint(SwRect const& rRect, SwPrintData const*const) const return; SwShortCut aShortCut( *pFrm, rRect ); - BOOL bCnt; - if ( TRUE == (bCnt = pFrm->IsCntntFrm()) ) + sal_Bool bCnt; + if ( sal_True == (bCnt = pFrm->IsCntntFrm()) ) pFrm->Calc(); if ( pFrm->IsFtnContFrm() ) @@ -3198,7 +3198,7 @@ void SwLayoutFrm::Paint(SwRect const& rRect, SwPrintData const*const) const } const SwPageFrm *pPage = 0; - const BOOL bWin = pGlobalShell->GetWin() ? TRUE : FALSE; + const sal_Bool bWin = pGlobalShell->GetWin() ? sal_True : sal_False; while ( IsAnLower( pFrm ) ) { @@ -3251,7 +3251,7 @@ void SwLayoutFrm::Paint(SwRect const& rRect, SwPrintData const*const) const { pGlobalShell->InvalidateWindows( aPaintRect ); pFrm = pFrm->GetNext(); - if ( pFrm && (TRUE == (bCnt = pFrm->IsCntntFrm())) ) + if ( pFrm && (sal_True == (bCnt = pFrm->IsCntntFrm())) ) pFrm->Calc(); continue; } @@ -3282,7 +3282,7 @@ void SwLayoutFrm::Paint(SwRect const& rRect, SwPrintData const*const) const ::lcl_EmergencyFormatFtnCont( (SwFtnContFrm*)pFrm->GetNext() ); pFrm = pFrm->GetNext(); - if ( pFrm && (TRUE == (bCnt = pFrm->IsCntntFrm())) ) + if ( pFrm && (sal_True == (bCnt = pFrm->IsCntntFrm())) ) pFrm->Calc(); } } @@ -3367,15 +3367,15 @@ sal_Bool SwFlyFrm::IsShadowTransparent() const |* |*************************************************************************/ -BOOL SwFlyFrm::IsPaint( SdrObject *pObj, const ViewShell *pSh ) +sal_Bool SwFlyFrm::IsPaint( SdrObject *pObj, const ViewShell *pSh ) { SdrObjUserCall *pUserCall; if ( 0 == ( pUserCall = GetUserCall(pObj) ) ) - return TRUE; + return sal_True; //Attributabhaengig nicht fuer Drucker oder PreView painten - BOOL bPaint = pFlyOnlyDraw || + sal_Bool bPaint = pFlyOnlyDraw || ((SwContact*)pUserCall)->GetFmt()->GetPrint().GetValue(); if ( !bPaint ) bPaint = pSh->GetWin() && !pSh->IsPreView(); @@ -3388,7 +3388,7 @@ BOOL SwFlyFrm::IsPaint( SdrObject *pObj, const ViewShell *pSh ) { SwFlyFrm *pFly = ((SwVirtFlyDrawObj*)pObj)->GetFlyFrm(); if ( pFlyOnlyDraw && pFlyOnlyDraw == pFly ) - return TRUE; + return sal_True; //Die Anzeige eines Zwischenstadiums vermeiden, Flys die nicht mit //der Seite auf der sie verankert sind ueberlappen werden auch @@ -3450,10 +3450,10 @@ BOOL SwFlyFrm::IsPaint( SdrObject *pObj, const ViewShell *pSh ) bPaint = SwFlyFrm::IsPaint( pAnch->FindFlyFrm()->GetVirtDrawObj(), pSh ); else if ( pFlyOnlyDraw ) - bPaint = FALSE; + bPaint = sal_False; } else - bPaint = FALSE; + bPaint = sal_False; } return bPaint; } @@ -3485,7 +3485,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const //wegen der Ueberlappung von Rahmen und Zeichenobjekten muessen die //Flys ihre Umrandung (und die der Innenliegenden) direkt ausgeben. //z.B. #33066# - pLines->LockLines(TRUE); + pLines->LockLines(sal_True); SwRect aRect( rRect ); aRect._Intersection( Frm() ); @@ -3566,7 +3566,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const const SwBorderAttrs &rAttrs = *aAccess.Get(); SwRect aPaintRect( aRect ); aPaintRect._Intersection( pParentFlyFrm->Frm() ); - pParentFlyFrm->PaintBackground( aPaintRect, pPage, rAttrs, FALSE, FALSE ); + pParentFlyFrm->PaintBackground( aPaintRect, pPage, rAttrs, sal_False, sal_False ); pRetoucheFly2 = pOldRet; } @@ -3624,13 +3624,13 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const { pOut->SetClipRegion( aPoly ); } - for ( USHORT i = 0; i < aRegion.Count(); ++i ) - PaintBackground( aRegion[i], pPage, rAttrs, FALSE, TRUE ); + for ( sal_uInt16 i = 0; i < aRegion.Count(); ++i ) + PaintBackground( aRegion[i], pPage, rAttrs, sal_False, sal_True ); pOut->Pop(); } else - for ( USHORT i = 0; i < aRegion.Count(); ++i ) - PaintBackground( aRegion[i], pPage, rAttrs, FALSE, TRUE ); + for ( sal_uInt16 i = 0; i < aRegion.Count(); ++i ) + PaintBackground( aRegion[i], pPage, rAttrs, sal_False, sal_True ); } pOut->Pop(); @@ -3647,7 +3647,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const if ( pSubsLines ) { // Lock already existing subsidiary lines - pSubsLines->LockLines( TRUE ); + pSubsLines->LockLines( sal_True ); bSubsLineRectsCreated = false; } else @@ -3661,7 +3661,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const if ( pSpecSubsLines ) { // Lock already existing special subsidiary lines - pSpecSubsLines->LockLines( TRUE ); + pSpecSubsLines->LockLines( sal_True ); bSpecSubsLineRectsCreated = false; } else @@ -3677,14 +3677,14 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const pSubsLines->PaintSubsidiary( pOut, pLines ); if ( !bSubsLineRectsCreated ) // unlock subsidiary lines - pSubsLines->LockLines( FALSE ); + pSubsLines->LockLines( sal_False ); else // delete created subsidiary lines container DELETEZ( pSubsLines ); if ( !bSpecSubsLineRectsCreated ) // unlock special subsidiary lines - pSpecSubsLines->LockLines( FALSE ); + pSpecSubsLines->LockLines( sal_False ); else { // delete created special subsidiary lines container @@ -3699,7 +3699,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const // OD 19.12.2002 #106318# - first paint lines added by fly frame paint // and then unlock other lines. pLines->PaintLines( pOut ); - pLines->LockLines( FALSE ); + pLines->LockLines( sal_False ); pOut->Pop(); @@ -3729,7 +3729,7 @@ void SwTabFrm::Paint(SwRect const& rRect, SwPrintData const*const) const if ( rAttrs.GetShadow().GetLocation() != SVX_SHADOW_NONE ) { SwRect aRect; - ::lcl_CalcBorderRect( aRect, this, rAttrs, TRUE ); + ::lcl_CalcBorderRect( aRect, this, rAttrs, sal_True ); PaintShadow( rRect, aRect, rAttrs ); } @@ -3779,9 +3779,9 @@ void SwFrm::PaintShadow( const SwRect& rRect, SwRect& rOutRect, SwRects aRegion( 2, 2 ); SwRect aOut( rOutRect ); - const BOOL bCnt = IsCntntFrm(); - const BOOL bTop = !bCnt || rAttrs.GetTopLine ( *(this) ) ? TRUE : FALSE; - const BOOL bBottom = !bCnt || rAttrs.GetBottomLine( *(this) ) ? TRUE : FALSE; + const sal_Bool bCnt = IsCntntFrm(); + const sal_Bool bTop = !bCnt || rAttrs.GetTopLine ( *(this) ) ? sal_True : sal_False; + const sal_Bool bBottom = !bCnt || rAttrs.GetBottomLine( *(this) ) ? sal_True : sal_False; SvxShadowLocation eLoc = rShadow.GetLocation(); @@ -3929,7 +3929,7 @@ void SwFrm::PaintShadow( const SwRect& rRect, SwRect& rOutRect, OutputDevice *pOut = pGlobalShell->GetOut(); - ULONG nOldDrawMode = pOut->GetDrawMode(); + sal_uLong nOldDrawMode = pOut->GetDrawMode(); Color aShadowColor( rShadow.GetColor() ); if( aRegion.Count() && pGlobalShell->GetWin() && Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) @@ -3947,7 +3947,7 @@ void SwFrm::PaintShadow( const SwRect& rRect, SwRect& rOutRect, pOut->SetDrawMode( nOldDrawMode ); - for ( USHORT i = 0; i < aRegion.Count(); ++i ) + for ( sal_uInt16 i = 0; i < aRegion.Count(); ++i ) { SwRect &rOut = aRegion[i]; aOut = rOut; @@ -3989,7 +3989,7 @@ void SwFrm::PaintBorderLine( const SwRect& rRect, aOut._Intersection( rRect ); const SwTabFrm *pTab = IsCellFrm() ? FindTabFrm() : 0; - BYTE nSubCol = ( IsCellFrm() || IsRowFrm() ) ? SUBCOL_TAB : + sal_uInt8 nSubCol = ( IsCellFrm() || IsRowFrm() ) ? SUBCOL_TAB : ( IsInSct() ? SUBCOL_SECT : ( IsInFly() ? SUBCOL_FLY : SUBCOL_PAGE ) ); if( pColor && pGlobalShell->GetWin() && @@ -4002,7 +4002,7 @@ void SwFrm::PaintBorderLine( const SwRect& rRect, { SwRegionRects aRegion( aOut, 4, 1 ); ::lcl_SubtractFlys( this, pPage, aOut, aRegion ); - for ( USHORT i = 0; i < aRegion.Count(); ++i ) + for ( sal_uInt16 i = 0; i < aRegion.Count(); ++i ) pLines->AddLineRect( aRegion[i], pColor, pTab, nSubCol ); } else @@ -4032,7 +4032,7 @@ void MA_FASTCALL lcl_SubTopBottom( SwRect& _iorRect, const SwRectFn& _rRectFn, const sal_Bool _bPrtOutputDev ) { - const BOOL bCnt = _rFrm.IsCntntFrm(); + const sal_Bool bCnt = _rFrm.IsCntntFrm(); if ( _rBox.GetTop() && _rBox.GetTop()->GetInWidth() && ( !bCnt || _rAttrs.GetTopLine( _rFrm ) ) ) @@ -4196,7 +4196,7 @@ void lcl_PaintLeftRightLine( const sal_Bool _bLeft, (aRect.*_rRectFn->fnGetWidth)() ); } - const BOOL bCnt = _rFrm.IsCntntFrm(); + const sal_Bool bCnt = _rFrm.IsCntntFrm(); if ( bCnt ) { @@ -4729,8 +4729,8 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage, if ( !pPage ) pPage = FindPageFrm(); - ::lcl_CalcBorderRect( aRect, this, rAttrs, TRUE ); - rAttrs.SetGetCacheLine( TRUE ); + ::lcl_CalcBorderRect( aRect, this, rAttrs, sal_True ); + rAttrs.SetGetCacheLine( sal_True ); if ( bShadow ) PaintShadow( rRect, aRect, rAttrs ); // OD 27.09.2002 #103636# - suspend drawing of border @@ -4790,7 +4790,7 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage, } } } - rAttrs.SetGetCacheLine( FALSE ); + rAttrs.SetGetCacheLine( sal_False ); } } /************************************************************************* @@ -4943,8 +4943,8 @@ void SwPageFrm::PaintGrid( OutputDevice* pOut, SwRect &rRect ) const aInter.Intersection( rRect ); if( aInter.HasArea() ) { - BOOL bGrid = pGrid->GetRubyTextBelow(); - BOOL bCell = GRID_LINES_CHARS == pGrid->GetGridType(); + sal_Bool bGrid = pGrid->GetRubyTextBelow(); + sal_Bool bCell = GRID_LINES_CHARS == pGrid->GetGridType(); long nGrid = pGrid->GetBaseHeight(); const SwDoc* pDoc = GetFmt()->GetDoc(); long nGridWidth = GETGRIDWIDTH(pGrid,pDoc); //for textgrid refactor @@ -4966,9 +4966,9 @@ void SwPageFrm::PaintGrid( OutputDevice* pOut, SwRect &rRect ) const if( nX < aInter.Top() ) nX += nGrid; SwTwips nGridBottom = aGrid.Top() + aGrid.Height(); - BOOL bLeft = aGrid.Top() >= aInter.Top(); - BOOL bRight = nGridBottom <= nBottom; - BOOL bBorder = bLeft || bRight; + sal_Bool bLeft = aGrid.Top() >= aInter.Top(); + sal_Bool bRight = nGridBottom <= nBottom; + sal_Bool bBorder = bLeft || bRight; while( nY > nRight ) { aTmp.Pos().X() = nY; @@ -5097,9 +5097,9 @@ void SwPageFrm::PaintGrid( OutputDevice* pOut, SwRect &rRect ) const if( nX < aInter.Left() ) nX += nGridWidth; SwTwips nGridRight = aGrid.Left() + aGrid.Width(); - BOOL bLeft = aGrid.Left() >= aInter.Left(); - BOOL bRight = nGridRight <= nRight; - BOOL bBorder = bLeft || bRight; + sal_Bool bLeft = aGrid.Left() >= aInter.Left(); + sal_Bool bRight = nGridRight <= nRight; + sal_Bool bBorder = bLeft || bRight; while( nY < aInter.Top() ) { aTmp.Pos().Y() = nY; @@ -5258,7 +5258,7 @@ void SwPageFrm::PaintMarginArea( const SwRect& _rOutputRect, OutputDevice *pOut = _pViewShell->GetOut(); if ( pOut->GetFillColor() != aGlobalRetoucheColor ) pOut->SetFillColor( aGlobalRetoucheColor ); - for ( USHORT i = 0; i < aPgRegion.Count(); ++i ) + for ( sal_uInt16 i = 0; i < aPgRegion.Count(); ++i ) { if ( 1 < aPgRegion.Count() ) { @@ -5419,7 +5419,7 @@ const sal_Int8 SwPageFrm::mnShadowPxWidth = 2; //mod #i6193# paint sidebar for notes //IMPORTANT: if you change the rects here, also change SwPostItMgr::ScrollbarHit -/*static*/void SwPageFrm::PaintNotesSidebar(const SwRect& _rPageRect, ViewShell* _pViewShell, USHORT nPageNum, bool bRight) +/*static*/void SwPageFrm::PaintNotesSidebar(const SwRect& _rPageRect, ViewShell* _pViewShell, sal_uInt16 nPageNum, bool bRight) { //TOOD: cut out scrollbar area and arrows out of sidepane rect, otherwise it could flicker when pressing arrow buttons if (!_pViewShell ) @@ -5596,7 +5596,7 @@ const sal_Int8 SwPageFrm::mnShadowPxWidth = 2; |*************************************************************************/ void SwFrm::PaintBaBo( const SwRect& rRect, const SwPageFrm *pPage, - const BOOL bLowerBorder ) const + const sal_Bool bLowerBorder ) const { if ( !pPage ) pPage = FindPageFrm(); @@ -5633,7 +5633,7 @@ void SwFrm::PaintBaBo( const SwRect& rRect, const SwPageFrm *pPage, // paint background { - PaintBackground( rRect, pPage, rAttrs, FALSE, bLowerBorder ); + PaintBackground( rRect, pPage, rAttrs, sal_False, bLowerBorder ); } pOut->Pop(); @@ -5652,8 +5652,8 @@ void SwFrm::PaintBaBo( const SwRect& rRect, const SwPageFrm *pPage, /// calling <PaintBaBo> at the page or at the fly frame its anchored void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage, const SwBorderAttrs & rAttrs, - const BOOL bLowerMode, - const BOOL bLowerBorder ) const + const sal_Bool bLowerMode, + const sal_Bool bLowerBorder ) const { // OD 20.01.2003 #i1837# - no paint of table background, if corresponding // option is *not* set. @@ -5679,10 +5679,10 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage, SvxBrushItem* pTmpBackBrush = 0; const Color* pCol; SwRect aOrigBackRect; - const BOOL bPageFrm = IsPageFrm(); - BOOL bLowMode = TRUE; + const sal_Bool bPageFrm = IsPageFrm(); + sal_Bool bLowMode = sal_True; - BOOL bBack = GetBackgroundBrush( pItem, pCol, aOrigBackRect, bLowerMode ); + sal_Bool bBack = GetBackgroundBrush( pItem, pCol, aOrigBackRect, bLowerMode ); //- Ausgabe wenn ein eigener Hintergrund mitgebracht wird. bool bNoFlyBackground = !bFlyMetafile && !bBack && IsFlyFrm(); if ( bNoFlyBackground ) @@ -5696,7 +5696,7 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage, } // If still no background found for the fly frame, initialize the // background brush <pItem> with global retouche color and set <bBack> - // to TRUE, that fly frame will paint its background using this color. + // to sal_True, that fly frame will paint its background using this color. if ( !bBack ) { // OD 10.01.2003 #i6467# - on print output, pdf output and @@ -5722,13 +5722,13 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage, SwRect aPaintRect( Frm() ); if( IsTxtFrm() || IsSctFrm() ) - aPaintRect = UnionFrm( TRUE ); + aPaintRect = UnionFrm( sal_True ); if ( aPaintRect.IsOver( rRect ) ) { if ( bBack || bPageFrm || !bLowerMode ) { - const BOOL bBrowse = pSh->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); + const sal_Bool bBrowse = pSh->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); SwRect aRect; if ( (bPageFrm && bBrowse) || @@ -5739,7 +5739,7 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage, } else { - ::lcl_CalcBorderRect( aRect, this, rAttrs, FALSE ); + ::lcl_CalcBorderRect( aRect, this, rAttrs, sal_False ); if ( (IsTxtFrm() || IsTabFrm()) && GetPrev() ) { if ( GetPrev()->GetAttrSet()->GetBackground() == @@ -5771,7 +5771,7 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage, /// --> Status Quo: background transparency have to be /// considered for fly frames const sal_Bool bConsiderBackgroundTransparency = IsFlyFrm(); - for ( USHORT i = 0; i < aRegion.Count(); ++i ) + for ( sal_uInt16 i = 0; i < aRegion.Count(); ++i ) { if ( 1 < aRegion.Count() ) { @@ -5792,7 +5792,7 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage, } } else - bLowMode = bLowerMode ? TRUE : FALSE; + bLowMode = bLowerMode ? sal_True : sal_False; } /// OD 05.09.2002 #102912# @@ -5855,13 +5855,13 @@ void SwPageFrm::RefreshSubsidiary( const SwRect &rRect ) const { //Beim Paint ueber die Root wird das Array von dort gesteuert. //Anderfalls kuemmern wir uns selbst darum. - BOOL bDelSubs = FALSE; + sal_Bool bDelSubs = sal_False; if ( !pSubsLines ) { pSubsLines = new SwSubsRects; // OD 20.12.2002 #106318# - create container for special subsidiary lines pSpecSubsLines = new SwSubsRects; - bDelSubs = TRUE; + bDelSubs = sal_True; } RefreshLaySubsidiary( this, aRect ); @@ -5891,19 +5891,19 @@ void SwPageFrm::RefreshSubsidiary( const SwRect &rRect ) const void SwLayoutFrm::RefreshLaySubsidiary( const SwPageFrm *pPage, const SwRect &rRect ) const { - const BOOL bNoLowerColumn = !Lower() || !Lower()->IsColumnFrm(); - const BOOL bSubsOpt = IS_SUBS; - const BOOL bSubsTable = ((GetType() & (FRM_ROW | FRM_CELL)) && IS_SUBS_TABLE); - const BOOL bSubsOther = (GetType() & (FRM_HEADER | FRM_FOOTER | FRM_FTN )) && bSubsOpt; - const BOOL bSubsSect = IsSctFrm() && + const sal_Bool bNoLowerColumn = !Lower() || !Lower()->IsColumnFrm(); + const sal_Bool bSubsOpt = IS_SUBS; + const sal_Bool bSubsTable = ((GetType() & (FRM_ROW | FRM_CELL)) && IS_SUBS_TABLE); + const sal_Bool bSubsOther = (GetType() & (FRM_HEADER | FRM_FOOTER | FRM_FTN )) && bSubsOpt; + const sal_Bool bSubsSect = IsSctFrm() && bNoLowerColumn && IS_SUBS_SECTION; - const BOOL bSubsFly = IS_SUBS_FLYS && + const sal_Bool bSubsFly = IS_SUBS_FLYS && (GetType() & FRM_FLY) && bNoLowerColumn && (!Lower() || !Lower()->IsNoTxtFrm() || !((SwNoTxtFrm*)Lower())->HasAnimation()); - BOOL bSubsBody = FALSE; + sal_Bool bSubsBody = sal_False; if ( GetType() & FRM_BODY ) { if ( IsPageBodyFrm() ) @@ -5982,7 +5982,7 @@ void MA_FASTCALL lcl_RefreshLine( const SwLayoutFrm *pLay, const SwPageFrm *pPage, const Point &rP1, const Point &rP2, - const BYTE nSubColor, + const sal_uInt8 nSubColor, SwLineRects* _pSubsLines ) { //In welche Richtung gehts? Kann nur Horizontal oder Vertikal sein. @@ -6144,20 +6144,20 @@ void SwLayoutFrm::PaintSubsidiaryLines( const SwPageFrm *pPage, const Point aRB( nRight, nBottom ); const Point aLB( aOut.Left(), nBottom ); - BYTE nSubColor = ( bCell || IsRowFrm() ) ? SUBCOL_TAB : + sal_uInt8 nSubColor = ( bCell || IsRowFrm() ) ? SUBCOL_TAB : ( IsInSct() ? SUBCOL_SECT : ( IsInFly() ? SUBCOL_FLY : SUBCOL_PAGE ) ); // OD 05.11.2002 #102406# - body frames are responsible for page/column breaks. - BOOL bBreak = FALSE; + sal_Bool bBreak = sal_False; if ( IsBodyFrm() ) { const SwCntntFrm *pCnt = ContainsCntnt(); if ( pCnt ) { // OD 05.11.2002 #102406# - adjust setting of <bBreak>. - bBreak = pCnt->IsPageBreak( TRUE ) || - ( IsColBodyFrm() && pCnt->IsColBreak( TRUE ) ); + bBreak = pCnt->IsPageBreak( sal_True ) || + ( IsColBodyFrm() && pCnt->IsColBreak( sal_True ) ); } } @@ -6251,7 +6251,7 @@ void SwLayoutFrm::PaintSubsidiaryLines( const SwPageFrm *pPage, void SwPageFrm::RefreshExtraData( const SwRect &rRect ) const { const SwLineNumberInfo &rInfo = GetFmt()->GetDoc()->GetLineNumberInfo(); - BOOL bLineInFly = rInfo.IsPaintLineNumbers() && rInfo.IsCountInFlys() + sal_Bool bLineInFly = (rInfo.IsPaintLineNumbers() && rInfo.IsCountInFlys()) || (sal_Int16)SW_MOD()->GetRedlineMarkPos() != text::HoriOrientation::NONE; SwRect aRect( rRect ); @@ -6261,7 +6261,7 @@ void SwPageFrm::RefreshExtraData( const SwRect &rRect ) const SwLayoutFrm::RefreshExtraData( aRect ); if ( bLineInFly && GetSortedObjs() ) - for ( USHORT i = 0; i < GetSortedObjs()->Count(); ++i ) + for ( sal_uInt16 i = 0; i < GetSortedObjs()->Count(); ++i ) { const SwAnchoredObject* pAnchoredObj = (*GetSortedObjs())[i]; if ( pAnchoredObj->ISA(SwFlyFrm) ) @@ -6279,7 +6279,7 @@ void SwLayoutFrm::RefreshExtraData( const SwRect &rRect ) const { const SwLineNumberInfo &rInfo = GetFmt()->GetDoc()->GetLineNumberInfo(); - BOOL bLineInBody = rInfo.IsPaintLineNumbers(), + sal_Bool bLineInBody = rInfo.IsPaintLineNumbers(), bLineInFly = bLineInBody && rInfo.IsCountInFlys(), bRedLine = (sal_Int16)SW_MOD()->GetRedlineMarkPos()!=text::HoriOrientation::NONE; @@ -6355,7 +6355,7 @@ const Font& SwPageFrm::GetEmptyPageFont() pEmptyPgFont->SetName( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "Helvetica" )) ); pEmptyPgFont->SetFamily( FAMILY_SWISS ); - pEmptyPgFont->SetTransparent( TRUE ); + pEmptyPgFont->SetTransparent( sal_True ); pEmptyPgFont->SetColor( COL_GRAY ); } @@ -6399,11 +6399,11 @@ void SwFrm::Retouche( const SwPageFrm * pPage, const SwRect &rRect ) const SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *pSh->GetOut() ); // <-- - for ( USHORT i = 0; i < aRegion.Count(); ++i ) + for ( sal_uInt16 i = 0; i < aRegion.Count(); ++i ) { SwRect &rRetouche = aRegion[i]; - GetUpper()->PaintBaBo( rRetouche, pPage, TRUE ); + GetUpper()->PaintBaBo( rRetouche, pPage, sal_True ); //Hoelle und Himmel muessen auch refreshed werden. //Um Rekursionen zu vermeiden muss mein Retouche Flag zuerst @@ -6457,7 +6457,7 @@ void SwFrm::Retouche( const SwPageFrm * pPage, const SwRect &rRect ) const Beschreibung Liefert die Backgroundbrush fuer den Bereich des des Frm. Die Brush wird entweder von ihm selbst oder von einem Upper vorgegeben, die erste Brush wird benutzt. - Ist fuer keinen Frm eine Brush angegeben, so wird FALSE zurueck- + Ist fuer keinen Frm eine Brush angegeben, so wird sal_False zurueck- geliefert. Ersterstellung MA 23. Dec. 92 Letzte Aenderung MA 04. Feb. 97 @@ -6484,10 +6484,10 @@ void SwFrm::Retouche( const SwPageFrm * pPage, const SwRect &rRect ) const @return true, if a background brush for the frame is found */ -BOOL SwFrm::GetBackgroundBrush( const SvxBrushItem* & rpBrush, +sal_Bool SwFrm::GetBackgroundBrush( const SvxBrushItem* & rpBrush, const Color*& rpCol, SwRect &rOrigRect, - BOOL bLowerMode ) const + sal_Bool bLowerMode ) const { const SwFrm *pFrm = this; ViewShell *pSh = GetShell(); @@ -6496,7 +6496,7 @@ BOOL SwFrm::GetBackgroundBrush( const SvxBrushItem* & rpBrush, rpCol = NULL; do { if ( pFrm->IsPageFrm() && !pOpt->IsPageBack() ) - return FALSE; + return sal_False; const SvxBrushItem &rBack = pFrm->GetAttrSet()->GetBackground(); if( pFrm->IsSctFrm() ) @@ -6554,7 +6554,7 @@ BOOL SwFrm::GetBackgroundBrush( const SvxBrushItem* & rpBrush, { SwBorderAttrAccess aAccess( SwFrm::GetCache(), pFrm ); const SwBorderAttrs &rAttrs = *aAccess.Get(); - ::lcl_CalcBorderRect( rOrigRect, pFrm, rAttrs, FALSE ); + ::lcl_CalcBorderRect( rOrigRect, pFrm, rAttrs, sal_False ); } else { @@ -6562,12 +6562,12 @@ BOOL SwFrm::GetBackgroundBrush( const SvxBrushItem* & rpBrush, rOrigRect += pFrm->Frm().Pos(); } } - return TRUE; + return sal_True; } if ( bLowerMode ) /// Do not try to get background brush from parent (anchor/upper) - return FALSE; + return sal_False; /// get parent frame - anchor or upper - for next loop if ( pFrm->IsFlyFrm() ) @@ -6579,7 +6579,7 @@ BOOL SwFrm::GetBackgroundBrush( const SvxBrushItem* & rpBrush, } while ( pFrm ); - return FALSE; + return sal_False; } /************************************************************************* @@ -6592,7 +6592,7 @@ BOOL SwFrm::GetBackgroundBrush( const SvxBrushItem* & rpBrush, |*************************************************************************/ void SetOutDevAndWin( ViewShell *pSh, OutputDevice *pO, - Window *pW, USHORT nZoom ) + Window *pW, sal_uInt16 nZoom ) { pSh->pOut = pO; pSh->pWin = pW; @@ -6616,8 +6616,8 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap ) ViewShell *pOldGlobal = pGlobalShell; pGlobalShell = pSh; - BOOL bNoteURL = pMap && - SFX_ITEM_SET != GetAttrSet().GetItemState( RES_URL, TRUE ); + sal_Bool bNoteURL = pMap && + SFX_ITEM_SET != GetAttrSet().GetItemState( RES_URL, sal_True ); if( bNoteURL ) { ASSERT( !pNoteURL, "MakeGraphic: pNoteURL already used? " ); @@ -6627,7 +6627,7 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap ) OutputDevice *pOld = pSh->GetOut(); VirtualDevice aDev( *pOld ); - aDev.EnableOutput( FALSE ); + aDev.EnableOutput( sal_False ); GDIMetaFile aMet; MapMode aMap( pOld->GetMapMode().GetMapUnit() ); @@ -6656,9 +6656,9 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap ) pSh->DLPrePaint2(aRepaintRegion); Window *pWin = pSh->GetWin(); - USHORT nZoom = pSh->GetViewOptions()->GetZoom(); + sal_uInt16 nZoom = pSh->GetViewOptions()->GetZoom(); ::SetOutDevAndWin( pSh, &aDev, 0, 100 ); - bFlyMetafile = TRUE; + bFlyMetafile = sal_True; pFlyMetafileOut = pWin; SwViewImp *pImp = pSh->Imp(); @@ -6688,7 +6688,7 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap ) pFlyOnlyDraw = 0; pFlyMetafileOut = 0; - bFlyMetafile = FALSE; + bFlyMetafile = sal_False; ::SetOutDevAndWin( pSh, pOld, pWin, nZoom ); // #i92711# end Pre/PostPaint encapsulation when pOut is back and content is painted diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index 7a1a51deb8eb..da6ed20bf45d 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -85,14 +85,14 @@ SwSectionFrm::SwSectionFrm( SwSection &rSect ) : CalcEndAtEndFlag(); } -SwSectionFrm::SwSectionFrm( SwSectionFrm &rSect, BOOL bMaster ) : +SwSectionFrm::SwSectionFrm( SwSectionFrm &rSect, sal_Bool bMaster ) : SwLayoutFrm( rSect.GetFmt() ), SwFlowFrm( (SwFrm&)*this ), pSection( rSect.GetSection() ) { bFtnAtEnd = rSect.IsFtnAtEnd(); bEndnAtEnd = rSect.IsEndnAtEnd(); - bLockJoin = FALSE; + bLockJoin = sal_False; nType = FRMC_SECTION; PROTOCOL( this, PROT_SECTION, bMaster ? ACT_CREATE_MASTER : ACT_CREATE_FOLLOW, &rSect ) @@ -103,15 +103,15 @@ SwSectionFrm::SwSectionFrm( SwSectionFrm &rSect, BOOL bMaster ) : { SwSectionFrm* pMaster = rSect.FindMaster(); pMaster->SetFollow( this ); - bIsFollow = TRUE; + bIsFollow = sal_True; } else - rSect.bIsFollow = TRUE; + rSect.bIsFollow = sal_True; SetFollow( &rSect ); } else { - bIsFollow = TRUE; + bIsFollow = sal_True; SetFollow( rSect.GetFollow() ); rSect.SetFollow( this ); if( !GetFollow() ) @@ -172,7 +172,7 @@ SwSectionFrm::~SwSectionFrm() else if( HasFollow() ) { PROTOCOL( this, PROT_SECTION, ACT_DEL_MASTER, GetFollow() ) - GetFollow()->bIsFollow = FALSE; + GetFollow()->bIsFollow = sal_False; } } } @@ -186,7 +186,7 @@ SwSectionFrm::~SwSectionFrm() |* Letzte Aenderung AMA 17. Dec. 97 |* |*************************************************************************/ -void SwSectionFrm::DelEmpty( BOOL bRemove ) +void SwSectionFrm::DelEmpty( sal_Bool bRemove ) { if( IsColLocked() ) { @@ -223,10 +223,10 @@ void SwSectionFrm::DelEmpty( BOOL bRemove ) // freigeben, deshalb wird die Size des Masters invalidiert. if( !GetFollow() && !pMaster->IsColLocked() ) pMaster->InvalidateSize(); - bIsFollow = FALSE; + bIsFollow = sal_False; } else if( HasFollow() ) - GetFollow()->bIsFollow = FALSE; + GetFollow()->bIsFollow = sal_False; pFollow = NULL; if( pUp ) { @@ -256,10 +256,10 @@ void SwSectionFrm::DelEmpty( BOOL bRemove ) |*************************************************************************/ void SwSectionFrm::Cut() { - _Cut( TRUE ); + _Cut( sal_True ); } -void SwSectionFrm::_Cut( BOOL bRemove ) +void SwSectionFrm::_Cut( sal_Bool bRemove ) { ASSERT( GetUpper(), "Cut ohne Upper()." ); @@ -408,10 +408,10 @@ void SwSectionFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) InsertGroupBefore( pParent, pSibling, pSect ); pSect->Init(); - (pSect->*fnRect->fnMakePos)( pSect->GetUpper(), pSect->GetPrev(), TRUE); + (pSect->*fnRect->fnMakePos)( pSect->GetUpper(), pSect->GetPrev(), sal_True); if( !((SwLayoutFrm*)pParent)->Lower() ) { - SwSectionFrm::MoveCntntAndDelete( (SwSectionFrm*)pParent, FALSE ); + SwSectionFrm::MoveCntntAndDelete( (SwSectionFrm*)pParent, sal_False ); pParent = this; } } @@ -460,24 +460,24 @@ void SwSectionFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) |* |*************************************************************************/ -BOOL SwSectionFrm::HasToBreak( const SwFrm* pFrm ) const +sal_Bool SwSectionFrm::HasToBreak( const SwFrm* pFrm ) const { if( !pFrm->IsSctFrm() ) - return FALSE; + return sal_False; SwSectionFmt *pTmp = (SwSectionFmt*)GetFmt(); // if( !pTmp->GetSect().GetValue() ) -// return FALSE; +// return sal_False; const SwFrmFmt *pOtherFmt = ((SwSectionFrm*)pFrm)->GetFmt(); do { pTmp = pTmp->GetParent(); if( !pTmp ) - return FALSE; + return sal_False; if( pTmp == pOtherFmt ) - return TRUE; - } while( TRUE ); // ( pTmp->GetSect().GetValue() ); + return sal_True; + } while( sal_True ); // ( pTmp->GetSect().GetValue() ); } /************************************************************************* @@ -522,7 +522,7 @@ void SwSectionFrm::MergeNext( SwSectionFrm* pNxt ) } SetFollow( pNxt->GetFollow() ); pNxt->SetFollow( NULL ); - pNxt->bIsFollow = FALSE; + pNxt->bIsFollow = sal_False; pNxt->Cut(); delete pNxt; InvalidateSize(); @@ -544,15 +544,15 @@ void SwSectionFrm::MergeNext( SwSectionFrm* pNxt ) |* |*************************************************************************/ -BOOL SwSectionFrm::SplitSect( SwFrm* pFrm, BOOL bApres ) +sal_Bool SwSectionFrm::SplitSect( SwFrm* pFrm, sal_Bool bApres ) { ASSERT( pFrm, "SplitSect: Why?" ); SwFrm* pOther = bApres ? pFrm->FindNext() : pFrm->FindPrev(); if( !pOther ) - return FALSE; + return sal_False; SwSectionFrm* pSect = pOther->FindSctFrm(); if( pSect != this ) - return FALSE; + return sal_False; // Den Inhalt zur Seite stellen SwFrm* pSav = ::SaveCntnt( this, bApres ? pOther : pFrm ); ASSERT( pSav, "SplitSect: What's on?" ); @@ -562,7 +562,7 @@ BOOL SwSectionFrm::SplitSect( SwFrm* pFrm, BOOL bApres ) pNew->InsertBehind( pSect->GetUpper(), pSect ); pNew->Init(); SWRECTFN( this ) - (pNew->*fnRect->fnMakePos)( NULL, pSect, TRUE ); + (pNew->*fnRect->fnMakePos)( NULL, pSect, sal_True ); // OD 25.03.2003 #108339# - restore content: // determine layout frame for restoring content after the initialization // of the section frame. In the section initialization the columns are @@ -580,9 +580,9 @@ BOOL SwSectionFrm::SplitSect( SwFrm* pFrm, BOOL bApres ) pNew->SetFollow( GetFollow() ); SetFollow( NULL ); } - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } /************************************************************************* @@ -602,7 +602,7 @@ BOOL SwSectionFrm::SplitSect( SwFrm* pFrm, BOOL bApres ) // Wenn ein mehrspaltiger Bereich aufgehoben wird, muessen die ContentFrms // invalidiert werden -void lcl_InvalidateInfFlags( SwFrm* pFrm, BOOL bInva ) +void lcl_InvalidateInfFlags( SwFrm* pFrm, sal_Bool bInva ) { while ( pFrm ) { @@ -614,7 +614,7 @@ void lcl_InvalidateInfFlags( SwFrm* pFrm, BOOL bInva ) pFrm->_InvalidatePrt(); } if( pFrm->IsLayoutFrm() ) - lcl_InvalidateInfFlags( ((SwLayoutFrm*)pFrm)->GetLower(), FALSE ); + lcl_InvalidateInfFlags( ((SwLayoutFrm*)pFrm)->GetLower(), sal_False ); pFrm = pFrm->GetNext(); } } @@ -639,10 +639,10 @@ SwCntntFrm* lcl_GetNextCntntFrm( const SwLayoutFrm* pLay, bool bFwd ) // #100926# const SwFrm* pFrm = pLay; SwCntntFrm *pCntntFrm = 0; - BOOL bGoingUp = TRUE; + sal_Bool bGoingUp = sal_True; do { const SwFrm *p = 0; - BOOL bGoingFwdOrBwd = FALSE, bGoingDown = FALSE; + sal_Bool bGoingFwdOrBwd = sal_False, bGoingDown = sal_False; bGoingDown = !bGoingUp && ( 0 != ( p = pFrm->IsLayoutFrm() ? ((SwLayoutFrm*)pFrm)->Lower() : 0 ) ); if ( !bGoingDown ) @@ -674,9 +674,9 @@ SwCntntFrm* lcl_GetNextCntntFrm( const SwLayoutFrm* pLay, bool bFwd ) ? pLayFrm->GetNextLayoutLeaf() \ : pLayFrm ) -void SwSectionFrm::MoveCntntAndDelete( SwSectionFrm* pDel, BOOL bSave ) +void SwSectionFrm::MoveCntntAndDelete( SwSectionFrm* pDel, sal_Bool bSave ) { - BOOL bSize = pDel->Lower() && pDel->Lower()->IsColumnFrm(); + sal_Bool bSize = pDel->Lower() && pDel->Lower()->IsColumnFrm(); SwFrm* pPrv = pDel->GetPrev(); SwLayoutFrm* pUp = pDel->GetUpper(); // OD 27.03.2003 #i12711# - initialize local pointer variables. @@ -713,13 +713,13 @@ void SwSectionFrm::MoveCntntAndDelete( SwSectionFrm* pDel, BOOL bSave ) // Jetzt wird der Inhalt beseite gestellt und der Frame zerstoert SwFrm *pSave = bSave ? ::SaveCntnt( pDel ) : NULL; - BOOL bOldFtn = TRUE; + sal_Bool bOldFtn = sal_True; if( pSave && pUp->IsFtnFrm() ) { bOldFtn = ((SwFtnFrm*)pUp)->IsColLocked(); ((SwFtnFrm*)pUp)->ColLock(); } - pDel->DelEmpty( TRUE ); + pDel->DelEmpty( sal_True ); delete pDel; if( pParent ) { // Hier wird die geeignete Einfuegeposition gesucht @@ -756,7 +756,7 @@ void SwSectionFrm::MoveCntntAndDelete( SwSectionFrm* pDel, BOOL bSave ) pPrvSct->InsertBehind( pUp, pPrv ); pPrvSct->Init(); SWRECTFN( pUp ) - (pPrvSct->*fnRect->fnMakePos)( pUp, pPrv, TRUE ); + (pPrvSct->*fnRect->fnMakePos)( pUp, pPrv, sal_True ); pUp = FIRSTLEAF( pPrvSct ); pPrv = NULL; } @@ -792,10 +792,10 @@ void SwSectionFrm::MakeAll() if( GetUpper() ) { SWRECTFN( GetUpper() ) - (this->*fnRect->fnMakePos)( GetUpper(), GetPrev(), FALSE ); + (this->*fnRect->fnMakePos)( GetUpper(), GetPrev(), sal_False ); } } - bValidSize = bValidPos = bValidPrtArea = TRUE; + bValidSize = bValidPos = bValidPrtArea = sal_True; return; } LockJoin(); //Ich lass mich nicht unterwegs vernichten. @@ -824,8 +824,8 @@ void SwSectionFrm::MakeAll() // Ein Bereich mit Follow nimmt allen Platz bis zur Unterkante des Uppers // in Anspruch. Bewegt er sich, so kann seine Groesse zu- oder abnehmen... - if( !bValidPos && ToMaximize( FALSE ) ) - bValidSize = FALSE; + if( !bValidPos && ToMaximize( sal_False ) ) + bValidSize = sal_False; #if OSL_DEBUG_LEVEL > 1 const SwFmtCol &rCol = GetFmt()->GetCol(); @@ -834,13 +834,13 @@ void SwSectionFrm::MakeAll() SwLayoutFrm::MakeAll(); UnlockJoin(); if( pSection && IsSuperfluous() ) - DelEmpty( FALSE ); + DelEmpty( sal_False ); } -BOOL SwSectionFrm::ShouldBwdMoved( SwLayoutFrm *, BOOL , BOOL & ) +sal_Bool SwSectionFrm::ShouldBwdMoved( SwLayoutFrm *, sal_Bool , sal_Bool & ) { - ASSERT( FALSE, "Hups, wo ist meine Tarnkappe?" ); - return FALSE; + ASSERT( sal_False, "Hups, wo ist meine Tarnkappe?" ); + return sal_False; } const SwSectionFmt* SwSectionFrm::_GetEndSectFmt() const @@ -857,7 +857,7 @@ const SwSectionFmt* SwSectionFrm::_GetEndSectFmt() const } void lcl_FindCntntFrm( SwCntntFrm* &rpCntntFrm, SwFtnFrm* &rpFtnFrm, - SwFrm* pFrm, BOOL &rbChkFtn ) + SwFrm* pFrm, sal_Bool &rbChkFtn ) { if( pFrm ) { @@ -886,7 +886,7 @@ void lcl_FindCntntFrm( SwCntntFrm* &rpCntntFrm, SwFtnFrm* &rpFtnFrm, } } -SwCntntFrm *SwSectionFrm::FindLastCntnt( BYTE nMode ) +SwCntntFrm *SwSectionFrm::FindLastCntnt( sal_uInt8 nMode ) { SwCntntFrm *pRet = NULL; SwFtnFrm *pFtnFrm = NULL; @@ -907,9 +907,9 @@ SwCntntFrm *SwSectionFrm::FindLastCntnt( BYTE nMode ) pSect = (SwSectionFrm*)pTmp; else break; - } while( TRUE ); + } while( sal_True ); } - BOOL bFtnFound = nMode == FINDMODE_ENDNOTE; + sal_Bool bFtnFound = nMode == FINDMODE_ENDNOTE; do { lcl_FindCntntFrm( pRet, pFtnFrm, pSect->Lower(), bFtnFound ); @@ -923,16 +923,16 @@ SwCntntFrm *SwSectionFrm::FindLastCntnt( BYTE nMode ) return pRet; } -BOOL SwSectionFrm::CalcMinDiff( SwTwips& rMinDiff ) const +sal_Bool SwSectionFrm::CalcMinDiff( SwTwips& rMinDiff ) const { - if( ToMaximize( TRUE ) ) + if( ToMaximize( sal_True ) ) { SWRECTFN( this ) rMinDiff = (GetUpper()->*fnRect->fnGetPrtBottom)(); rMinDiff = (Frm().*fnRect->fnBottomDist)( rMinDiff ); - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } /************************************************************************* @@ -949,7 +949,7 @@ BOOL SwSectionFrm::CalcMinDiff( SwTwips& rMinDiff ) const * *************************************************************************/ -SwFtnFrm* lcl_FindEndnote( SwSectionFrm* &rpSect, BOOL &rbEmpty, +SwFtnFrm* lcl_FindEndnote( SwSectionFrm* &rpSect, sal_Bool &rbEmpty, SwLayouter *pLayouter ) { // if rEmpty is set, the rpSect is already searched @@ -991,16 +991,16 @@ SwFtnFrm* lcl_FindEndnote( SwSectionFrm* &rpSect, BOOL &rbEmpty, } rpSect = pSect; pSect = pLayouter ? pSect->GetFollow() : NULL; - rbEmpty = TRUE; + rbEmpty = sal_True; } return NULL; } -void lcl_ColumnRefresh( SwSectionFrm* pSect, BOOL bFollow ) +void lcl_ColumnRefresh( SwSectionFrm* pSect, sal_Bool bFollow ) { while( pSect ) { - BOOL bOldLock = pSect->IsColLocked(); + sal_Bool bOldLock = pSect->IsColLocked(); pSect->ColLock(); if( pSect->Lower() && pSect->Lower()->IsColumnFrm() ) { @@ -1031,19 +1031,19 @@ void SwSectionFrm::CollectEndnotes( SwLayouter* pLayouter ) SwSectionFrm* pSect = this; SwFtnFrm* pFtn; - BOOL bEmpty = FALSE; + sal_Bool bEmpty = sal_False; // pSect is the last sectionfrm without endnotes or the this-pointer // the first sectionfrm with endnotes may be destroyed, when the endnotes // is cutted while( 0 != (pFtn = lcl_FindEndnote( pSect, bEmpty, pLayouter )) ) pLayouter->CollectEndnote( pFtn ); if( pLayouter->HasEndnotes() ) - lcl_ColumnRefresh( this, TRUE ); + lcl_ColumnRefresh( this, sal_True ); } /************************************************************************* |* -|* SwSectionFrm::_CheckClipping( BOOL bGrow, BOOL bMaximize ) +|* SwSectionFrm::_CheckClipping( sal_Bool bGrow, sal_Bool bMaximize ) |* |* Beschreibung: Passt die Groesse an die Umgebung an. |* Wer einen Follow oder Fussnoten besitzt, soll bis zur Unterkante @@ -1056,7 +1056,7 @@ void SwSectionFrm::CollectEndnotes( SwLayouter* pLayouter ) /// OD 18.09.2002 #100522# /// perform calculation of content, only if height has changed. -void SwSectionFrm::_CheckClipping( BOOL bGrow, BOOL bMaximize ) +void SwSectionFrm::_CheckClipping( sal_Bool bGrow, sal_Bool bMaximize ) { SWRECTFN( this ) long nDiff; @@ -1087,7 +1087,7 @@ void SwSectionFrm::_CheckClipping( BOOL bGrow, BOOL bMaximize ) if( !bCalc && !bGrow && IsAnyNoteAtEnd() && !IsInFtn() ) { SwSectionFrm *pSect = this; - BOOL bEmpty = FALSE; + sal_Bool bEmpty = sal_False; SwLayoutFrm* pFtn = IsEndnAtEnd() ? lcl_FindEndnote( pSect, bEmpty, NULL ) : NULL; if( pFtn ) @@ -1135,7 +1135,7 @@ void SwSectionFrm::_CheckClipping( BOOL bGrow, BOOL bMaximize ) { if( Lower()->IsColumnFrm() ) { - lcl_ColumnRefresh( this, FALSE ); + lcl_ColumnRefresh( this, sal_False ); ::CalcCntnt( this ); } else @@ -1161,8 +1161,8 @@ void SwSectionFrm::SimpleFormat() // assure notifications on position changes. const SwLayNotify aNotify( this ); // <-- - (this->*fnRect->fnMakePos)( GetUpper(), GetPrev(), FALSE ); - bValidPos = TRUE; + (this->*fnRect->fnMakePos)( GetUpper(), GetPrev(), sal_False ); + bValidPos = sal_True; } SwTwips nDeadLine = (GetUpper()->*fnRect->fnGetPrtBottom)(); // OD 22.10.2002 #97265# - call always method <lcl_ColumnRefresh(..)>, in @@ -1176,7 +1176,7 @@ void SwSectionFrm::SimpleFormat() nTop = nHeight; (this->*fnRect->fnSetYMargins)( nTop, 0 ); } - lcl_ColumnRefresh( this, FALSE ); + lcl_ColumnRefresh( this, sal_False ); UnlockJoin(); } @@ -1334,14 +1334,14 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) { ASSERT( GetFmt()->GetDoc()->GetRootFrm()->IsInDelList( this ), "SectionFrm without Section" ); - bValidSize = bValidPos = bValidPrtArea = TRUE; + bValidSize = bValidPos = bValidPrtArea = sal_True; return; } SWRECTFN( this ) if ( !bValidPrtArea ) { PROTOCOL( this, PROT_PRTAREA, 0, 0 ) - bValidPrtArea = TRUE; + bValidPrtArea = sal_True; SwTwips nUpper = CalcUpperSpace(); // #109700# LRSpace for sections @@ -1350,7 +1350,7 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) if( nUpper != (this->*fnRect->fnGetTopMargin)() ) { - bValidSize = FALSE; + bValidSize = sal_False; SwFrm* pOwn = ContainsAny(); if( pOwn ) pOwn->_InvalidatePos(); @@ -1362,16 +1362,16 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) { PROTOCOL_ENTER( this, PROT_SIZE, 0, 0 ) const long nOldHeight = (Frm().*fnRect->fnGetHeight)(); - BOOL bOldLock = IsColLocked(); + sal_Bool bOldLock = IsColLocked(); ColLock(); - bValidSize = TRUE; + bValidSize = sal_True; //die Groesse wird nur dann vom Inhalt bestimmt, wenn der SectFrm //keinen Follow hat. Anderfalls fuellt er immer den Upper bis //zur Unterkante aus. Fuer den Textfluss ist nicht er, sondern sein //Inhalt selbst verantwortlich. - BOOL bMaximize = ToMaximize( FALSE ); + sal_Bool bMaximize = ToMaximize( sal_False ); // OD 2004-05-17 #i28701# - If the wrapping style has to be considered // on object positioning, an extra formatting has to be performed @@ -1394,7 +1394,7 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) // which still have a width of 0. const sal_Bool bHasColumns = Lower() && Lower()->IsColumnFrm(); if ( bHasColumns && Lower()->GetNext() ) - AdjustColumns( 0, FALSE ); + AdjustColumns( 0, sal_False ); if( GetUpper() ) { @@ -1410,8 +1410,8 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) // Thus, set <..IsBrowseMode()> as parameter <bGrow> on calling // method <_CheckClipping(..)>. _CheckClipping( GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE), bMaximize ); - bMaximize = ToMaximize( FALSE ); - bValidSize = TRUE; + bMaximize = ToMaximize( sal_False ); + bValidSize = sal_True; } //Breite der Spalten pruefen und ggf. einstellen. @@ -1440,11 +1440,11 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) // <-- { SwFrm* pOld = GetFollow(); - GetFollow()->DelEmpty( FALSE ); + GetFollow()->DelEmpty( sal_False ); if( pOld == GetFollow() ) break; } - bMaximize = ToMaximize( FALSE ); + bMaximize = ToMaximize( sal_False ); nRemaining += (pFrm->Frm().*fnRect->fnGetHeight)(); } else @@ -1478,7 +1478,7 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) long nTmpDiff = (*fnRect->fnYDiff)( nBottom, nDeadLine ); if( nTmpDiff > 0 ) { - nTmpDiff = GetUpper()->Grow( nTmpDiff, TRUE ); + nTmpDiff = GetUpper()->Grow( nTmpDiff, sal_True ); nDeadLine = (*fnRect->fnYInc)( nDeadLine, nTmpDiff ); nTmpDiff = (*fnRect->fnYDiff)( nBottom, nDeadLine ); if( nTmpDiff > 0 ) @@ -1512,13 +1512,13 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) pFrm = ((SwLayoutFrm*)pFrm)->Lower(); CalcFtnCntnt(); } - BOOL bUnderSz = FALSE; + sal_Bool bUnderSz = sal_False; while( pFrm ) { if( pFrm->IsTxtFrm() && ((SwTxtFrm*)pFrm)->IsUndersized() ) { pFrm->Prepare( PREP_ADJUST_FRM ); - bUnderSz = TRUE; + bUnderSz = sal_True; } pFrm = pFrm->GetNext(); } @@ -1531,7 +1531,7 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) //Unterkante des Uppers nicht ueberschreiten. Fuer Sections mit //Follows die Unterkante auch nicht unterschreiten. if ( GetUpper() ) - _CheckClipping( TRUE, bMaximize ); + _CheckClipping( sal_True, bMaximize ); if( !bOldLock ) ColUnlock(); long nDiff = nOldHeight - (Frm().*fnRect->fnGetHeight)(); @@ -1543,7 +1543,7 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) GetUpper()->Shrink( nDiff ); } if( IsUndersized() ) - bValidPrtArea = TRUE; + bValidPrtArea = sal_True; } } @@ -1553,7 +1553,7 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) |* |* Beschreibung Liefert das naechste Layoutblatt in das der Frame |* gemoved werden kann. -|* Neue Seiten werden nur dann erzeugt, wenn der Parameter TRUE ist. +|* Neue Seiten werden nur dann erzeugt, wenn der Parameter sal_True ist. |* Ersterstellung AMA 07. Jan. 98 |* Letzte Aenderung AMA 07. Jan. 98 |* @@ -1582,7 +1582,7 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage ) //GetLeaf gerufen wird. // SwSectionFrm *pSect = GetUpper()->FindSctFrm(); SwSectionFrm *pSect = FindSctFrm(); - BOOL bWrongPage = FALSE; + sal_Bool bWrongPage = sal_False; ASSERT( pSect, "GetNextSctLeaf: Missing SectionFrm" ); // Hier eine Abkuerzung fuer Bereiche mit Follows, @@ -1595,7 +1595,7 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage ) { SwPageFrm *pPg = pSect->GetFollow()->FindPageFrm(); if( WrongPageDesc( pPg ) ) - bWrongPage = TRUE; + bWrongPage = sal_True; else return FIRSTLEAF( pSect->GetFollow() ); } @@ -1623,7 +1623,7 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage ) SwPageFrm* pNxtPg = pUp->IsPageFrm() ? (SwPageFrm*)pUp : pUp->FindPageFrm(); if( WrongPageDesc( pNxtPg ) ) - bWrongPage = TRUE; + bWrongPage = sal_True; else return FIRSTLEAF( pSect->GetFollow() ); } @@ -1632,8 +1632,8 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage ) } // Immer im gleichen Bereich landen: Body wieder in Body etc. - const BOOL bBody = IsInDocBody(); - const BOOL bFtnPage = FindPageFrm()->IsFtnPage(); + const sal_Bool bBody = IsInDocBody(); + const sal_Bool bFtnPage = FindPageFrm()->IsFtnPage(); SwLayoutFrm *pLayLeaf; // Eine Abkuerzung fuer TabFrms, damit nicht alle Zellen abgehuehnert werden @@ -1658,7 +1658,7 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage ) //nicht wieder vom Anfang gesucht //wird. - while( TRUE ) + while( sal_True ) { if( pLayLeaf ) { @@ -1689,7 +1689,7 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage ) if( bWrongPage ) break; // there's a column between me and my right page pLayLeaf = 0; - bWrongPage = TRUE; + bWrongPage = sal_True; pOldLayLeaf = 0; continue; } @@ -1701,7 +1701,7 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage ) ( eMakePage == MAKEPAGE_APPEND || eMakePage == MAKEPAGE_INSERT ) ) { InsertPage(pOldLayLeaf ? pOldLayLeaf->FindPageFrm() : FindPageFrm(), - FALSE ); + sal_False ); //und nochmal das ganze pLayLeaf = pOldLayLeaf ? pOldLayLeaf : GetNextLayoutLeaf(); continue; @@ -1727,11 +1727,11 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage ) return pLayLeaf; else { - pNew = new SwSectionFrm( *pSect, FALSE ); + pNew = new SwSectionFrm( *pSect, sal_False ); pNew->InsertBefore( pLayLeaf, pLayLeaf->Lower() ); pNew->Init(); SWRECTFN( pNew ) - (pNew->*fnRect->fnMakePos)( pLayLeaf, NULL, TRUE ); + (pNew->*fnRect->fnMakePos)( pLayLeaf, NULL, sal_True ); // Wenn unser Bereichsframe einen Nachfolger hat, so muss dieser // umgehaengt werden hinter den neuen Follow der Bereichsframes. @@ -1765,13 +1765,13 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage ) } if( pNxtCntnt ) { - SwFtnBossFrm* pOldBoss = pSect->FindFtnBossFrm( TRUE ); - if( pOldBoss == pNxtCntnt->FindFtnBossFrm( TRUE ) ) + SwFtnBossFrm* pOldBoss = pSect->FindFtnBossFrm( sal_True ); + if( pOldBoss == pNxtCntnt->FindFtnBossFrm( sal_True ) ) { SwSaveFtnHeight aHeight( pOldBoss, pOldBoss->Frm().Top() + pOldBoss->Frm().Height() ); pSect->GetUpper()->MoveLowerFtns( pNxtCntnt, pOldBoss, - pLayLeaf->FindFtnBossFrm( TRUE ), FALSE ); + pLayLeaf->FindFtnBossFrm( sal_True ), sal_False ); } } ((SwFlowFrm*)pNxt)->MoveSubTree( pLayLeaf, pNew->GetNext() ); @@ -1809,7 +1809,7 @@ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType ) pCol = GetUpper()->GetUpper(); else pCol = NULL; - BOOL bJump = FALSE; + sal_Bool bJump = sal_False; if( pCol ) { if( pCol->GetPrev() ) @@ -1821,10 +1821,10 @@ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType ) if( ((SwLayoutFrm*)pCol->Lower())->Lower() ) { if( bJump ) // Haben wir eine leere Spalte uebersprungen? - SwFlowFrm::SetMoveBwdJump( TRUE ); + SwFlowFrm::SetMoveBwdJump( sal_True ); return (SwLayoutFrm*)pCol->Lower(); // Der Spaltenbody } - bJump = TRUE; + bJump = sal_True; } while( pCol->GetPrev() ); // Hier landen wir, wenn alle Spalten leer sind, @@ -1836,7 +1836,7 @@ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType ) } if( bJump ) // Haben wir eine leere Spalte uebersprungen? - SwFlowFrm::SetMoveBwdJump( TRUE ); + SwFlowFrm::SetMoveBwdJump( sal_True ); // Innerhalb von Bereichen in Tabellen oder Bereichen in Kopf/Fusszeilen kann // nur ein Spaltenwechsel erfolgen, eine der oberen Abkuerzungen haette @@ -1875,8 +1875,8 @@ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType ) } } - const BOOL bBody = IsInDocBody(); - const BOOL bFly = IsInFly(); + const sal_Bool bBody = IsInDocBody(); + const sal_Bool bFly = IsInFly(); SwLayoutFrm *pLayLeaf = GetPrevLayoutLeaf(); SwLayoutFrm *pPrevLeaf = 0; @@ -1914,7 +1914,7 @@ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType ) pPrevLeaf = pLayLeaf; pLayLeaf = pLayLeaf->GetPrevLayoutLeaf(); if ( pLayLeaf ) - SwFlowFrm::SetMoveBwdJump( TRUE ); + SwFlowFrm::SetMoveBwdJump( sal_True ); } else if ( bFly ) break; //Cntnts in Flys sollte jedes Layout-Blatt recht sein. Warum? @@ -1947,11 +1947,11 @@ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType ) } if( !pNew ) { - pNew = new SwSectionFrm( *pSect, TRUE ); + pNew = new SwSectionFrm( *pSect, sal_True ); pNew->InsertBefore( pLayLeaf, NULL ); pNew->Init(); SWRECTFN( pNew ) - (pNew->*fnRect->fnMakePos)( pLayLeaf, pNew->GetPrev(), TRUE ); + (pNew->*fnRect->fnMakePos)( pLayLeaf, pNew->GetPrev(), sal_True ); pLayLeaf = FIRSTLEAF( pNew ); if( !pNew->Lower() ) // einspaltige Bereiche formatieren @@ -1980,7 +1980,7 @@ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType ) if( pLayLeaf != pTmpLay ) { pLayLeaf = pTmpLay; - SwFlowFrm::SetMoveBwdJump( TRUE ); + SwFlowFrm::SetMoveBwdJump( sal_True ); } } } @@ -2008,14 +2008,14 @@ SwTwips lcl_DeadLine( const SwFrm* pFrm ) // SwSectionFrm::Growable(..) prueft, ob der SectionFrm noch wachsen kann, // ggf. muss die Umgebung gefragt werden -BOOL SwSectionFrm::Growable() const +sal_Bool SwSectionFrm::Growable() const { SWRECTFN( this ) if( (*fnRect->fnYDiff)( lcl_DeadLine( this ), (Frm().*fnRect->fnGetBottom)() ) > 0 ) - return TRUE; + return sal_True; - return ( GetUpper() && ((SwFrm*)GetUpper())->Grow( LONG_MAX, TRUE ) ); + return ( GetUpper() && ((SwFrm*)GetUpper())->Grow( LONG_MAX, sal_True ) ); } /************************************************************************* @@ -2027,7 +2027,7 @@ BOOL SwSectionFrm::Growable() const |* |*************************************************************************/ -SwTwips SwSectionFrm::_Grow( SwTwips nDist, BOOL bTst ) +SwTwips SwSectionFrm::_Grow( SwTwips nDist, sal_Bool bTst ) { if ( !IsColLocked() && !HasFixSize() ) { @@ -2039,7 +2039,7 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, BOOL bTst ) if ( nDist <= 0L ) return 0L; - BOOL bInCalcCntnt = GetUpper() && IsInFly() && FindFlyFrm()->IsLocked(); + sal_Bool bInCalcCntnt = GetUpper() && IsInFly() && FindFlyFrm()->IsLocked(); // OD 2004-03-15 #116561# - allow grow in online layout if ( !Lower() || !Lower()->IsColumnFrm() || !Lower()->GetNext() || GetSection()->GetFmt()->GetBalancedColumns().GetValue() || @@ -2056,7 +2056,7 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, BOOL bTst ) } SwTwips nSpace = nGrow; if( !bInCalcCntnt && nGrow < nDist && GetUpper() ) - nGrow += GetUpper()->Grow( LONG_MAX, TRUE ); + nGrow += GetUpper()->Grow( LONG_MAX, sal_True ); if( nGrow > nDist ) nGrow = nDist; @@ -2076,7 +2076,7 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, BOOL bTst ) if( bInCalcCntnt ) _InvalidateSize(); else if( nSpace < nGrow && nDist != nSpace + GetUpper()-> - Grow( nGrow - nSpace, FALSE ) ) + Grow( nGrow - nSpace, sal_False ) ) InvalidateSize(); else { @@ -2141,11 +2141,11 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, BOOL bTst ) return 0L; } -SwTwips SwSectionFrm::_Shrink( SwTwips nDist, BOOL bTst ) +SwTwips SwSectionFrm::_Shrink( SwTwips nDist, sal_Bool bTst ) { if ( Lower() && !IsColLocked() && !HasFixSize() ) { - if( ToMaximize( FALSE ) ) + if( ToMaximize( sal_False ) ) { if( !bTst ) InvalidateSize(); @@ -2245,12 +2245,12 @@ SwTwips SwSectionFrm::_Shrink( SwTwips nDist, BOOL bTst ) |* |*************************************************************************/ -BOOL SwSectionFrm::MoveAllowed( const SwFrm* pFrm) const +sal_Bool SwSectionFrm::MoveAllowed( const SwFrm* pFrm) const { // Gibt es einen Follow oder ist der Frame nicht in der letzten Spalte? if( HasFollow() || ( pFrm->GetUpper()->IsColBodyFrm() && pFrm->GetUpper()->GetUpper()->GetNext() ) ) - return TRUE; + return sal_True; if( pFrm->IsInFtn() ) { if( IsInFtn() ) @@ -2258,11 +2258,11 @@ BOOL SwSectionFrm::MoveAllowed( const SwFrm* pFrm) const if( GetUpper()->IsInSct() ) { if( Growable() ) - return FALSE; + return sal_False; return GetUpper()->FindSctFrm()->MoveAllowed( this ); } else - return TRUE; + return sal_True; } // The content of footnote inside a columned sectionfrm is moveable // except in the last column @@ -2272,30 +2272,30 @@ BOOL SwSectionFrm::MoveAllowed( const SwFrm* pFrm) const // The first paragraph in the first footnote in the first column // in the sectionfrm at the top of the page is not moveable, // if the columnbody is empty. - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( pLay->GetIndPrev() || pFrm->GetIndPrev() || pFrm->FindFtnFrm()->GetPrev() ) - bRet = TRUE; + bRet = sal_True; else { SwLayoutFrm* pBody = ((SwColumnFrm*)pLay)->FindBodyCont(); if( pBody && pBody->Lower() ) - bRet = TRUE; + bRet = sal_True; } if( bRet && ( IsFtnAtEnd() || !Growable() ) ) - return TRUE; + return sal_True; } } // Oder kann der Bereich noch wachsen? if( !IsColLocked() && Growable() ) - return FALSE; + return sal_False; // Jetzt muss untersucht werden, ob es ein Layoutblatt gibt, in dem // ein Bereichsfollow erzeugt werden kann. if( IsInTab() || ( !IsInDocBody() && FindFooterOrHeader() ) ) - return FALSE; // In Tabellen/Kopf/Fusszeilen geht es nicht + return sal_False; // In Tabellen/Kopf/Fusszeilen geht es nicht if( IsInFly() ) // Bei spaltigen oder verketteten Rahmen return 0 != ((SwFrm*)GetUpper())->GetNextLeaf( MAKEPAGE_NONE ); - return TRUE; + return sal_True; } /** Called for a frame inside a section with no direct previous frame (or only @@ -2369,25 +2369,25 @@ SwFrm* SwFrm::_GetIndNext() return NULL; } -BOOL SwSectionFrm::IsDescendantFrom( const SwSectionFmt* pFmt ) const +sal_Bool SwSectionFrm::IsDescendantFrom( const SwSectionFmt* pFmt ) const { if( !pSection || !pFmt ) - return FALSE; + return sal_False; const SwSectionFmt *pMyFmt = pSection->GetFmt(); while( pFmt != pMyFmt ) { if( pMyFmt->GetRegisteredIn()->ISA( SwSectionFmt ) ) pMyFmt = (SwSectionFmt*)pMyFmt->GetRegisteredIn(); else - return FALSE; + return sal_False; } - return TRUE; + return sal_True; } void SwSectionFrm::CalcFtnAtEndFlag() { SwSectionFmt *pFmt = GetSection()->GetFmt(); - USHORT nVal = pFmt->GetFtnAtTxtEnd( FALSE ).GetValue(); + sal_uInt16 nVal = pFmt->GetFtnAtTxtEnd( sal_False ).GetValue(); bFtnAtEnd = FTNEND_ATPGORDOCEND != nVal; bOwnFtnNum = FTNEND_ATTXTEND_OWNNUMSEQ == nVal || FTNEND_ATTXTEND_OWNNUMANDFMT == nVal; @@ -2397,32 +2397,32 @@ void SwSectionFrm::CalcFtnAtEndFlag() pFmt = (SwSectionFmt*)pFmt->GetRegisteredIn(); else break; - nVal = pFmt->GetFtnAtTxtEnd( FALSE ).GetValue(); + nVal = pFmt->GetFtnAtTxtEnd( sal_False ).GetValue(); if( FTNEND_ATPGORDOCEND != nVal ) { - bFtnAtEnd = TRUE; + bFtnAtEnd = sal_True; bOwnFtnNum = bOwnFtnNum ||FTNEND_ATTXTEND_OWNNUMSEQ == nVal || FTNEND_ATTXTEND_OWNNUMANDFMT == nVal; } } } -BOOL SwSectionFrm::IsEndnoteAtMyEnd() const +sal_Bool SwSectionFrm::IsEndnoteAtMyEnd() const { - return pSection->GetFmt()->GetEndAtTxtEnd( FALSE ).IsAtEnd(); + return pSection->GetFmt()->GetEndAtTxtEnd( sal_False ).IsAtEnd(); } void SwSectionFrm::CalcEndAtEndFlag() { SwSectionFmt *pFmt = GetSection()->GetFmt(); - bEndnAtEnd = pFmt->GetEndAtTxtEnd( FALSE ).IsAtEnd(); + bEndnAtEnd = pFmt->GetEndAtTxtEnd( sal_False ).IsAtEnd(); while( !bEndnAtEnd ) { if( pFmt->GetRegisteredIn()->ISA( SwSectionFmt ) ) pFmt = (SwSectionFmt*)pFmt->GetRegisteredIn(); else break; - bEndnAtEnd = pFmt->GetEndAtTxtEnd( FALSE ).IsAtEnd(); + bEndnAtEnd = pFmt->GetEndAtTxtEnd( sal_False ).IsAtEnd(); } } @@ -2437,7 +2437,7 @@ void SwSectionFrm::CalcEndAtEndFlag() void SwSectionFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) { - BYTE nInvFlags = 0; + sal_uInt8 nInvFlags = 0; if( pNew && RES_ATTRSET_CHG == pNew->Which() ) { @@ -2445,7 +2445,7 @@ void SwSectionFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) SfxItemIter aOIter( *((SwAttrSetChg*)pOld)->GetChgSet() ); SwAttrSetChg aOldSet( *(SwAttrSetChg*)pOld ); SwAttrSetChg aNewSet( *(SwAttrSetChg*)pNew ); - while( TRUE ) + while( sal_True ) { _UpdateAttr( (SfxPoolItem*)aOIter.GetCurItem(), (SfxPoolItem*)aNIter.GetCurItem(), nInvFlags, @@ -2471,11 +2471,11 @@ void SwSectionFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) } void SwSectionFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, - BYTE &rInvFlags, + sal_uInt8 &rInvFlags, SwAttrSetChg *pOldSet, SwAttrSetChg *pNewSet ) { - BOOL bClear = TRUE; - const USHORT nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0; + sal_Bool bClear = sal_True; + const sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0; switch( nWhich ) { // Mehrspaltigkeit in Fussnoten unterdruecken... case RES_FMT_CHG: @@ -2490,7 +2490,7 @@ void SwSectionFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, SwFmtCol aCol; if ( Lower() && Lower()->IsColumnFrm() ) { - USHORT nCol = 0; + sal_uInt16 nCol = 0; SwFrm *pTmp = Lower(); do { ++nCol; @@ -2498,9 +2498,9 @@ void SwSectionFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, } while ( pTmp ); aCol.Init( nCol, 0, 1000 ); } - BOOL bChgFtn = IsFtnAtEnd(); - BOOL bChgEndn = IsEndnAtEnd(); - BOOL bChgMyEndn = IsEndnoteAtMyEnd(); + sal_Bool bChgFtn = IsFtnAtEnd(); + sal_Bool bChgEndn = IsEndnAtEnd(); + sal_Bool bChgMyEndn = IsEndnoteAtMyEnd(); CalcFtnAtEndFlag(); CalcEndAtEndFlag(); bChgFtn = ( bChgFtn != IsFtnAtEnd() ) || @@ -2510,7 +2510,7 @@ void SwSectionFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, rInvFlags |= 0x10; } rInvFlags |= 0x01; - bClear = FALSE; + bClear = sal_False; } break; @@ -2525,12 +2525,12 @@ void SwSectionFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, case RES_FTN_AT_TXTEND: if( !IsInFtn() ) { - BOOL bOld = IsFtnAtEnd(); + sal_Bool bOld = IsFtnAtEnd(); CalcFtnAtEndFlag(); if( bOld != IsFtnAtEnd() ) { const SwFmtCol& rNewCol = GetFmt()->GetCol(); - ChgColumns( rNewCol, rNewCol, TRUE ); + ChgColumns( rNewCol, rNewCol, sal_True ); rInvFlags |= 0x01; } } @@ -2539,13 +2539,13 @@ void SwSectionFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, case RES_END_AT_TXTEND: if( !IsInFtn() ) { - BOOL bOld = IsEndnAtEnd(); - BOOL bMyOld = IsEndnoteAtMyEnd(); + sal_Bool bOld = IsEndnAtEnd(); + sal_Bool bMyOld = IsEndnoteAtMyEnd(); CalcEndAtEndFlag(); if( bOld != IsEndnAtEnd() || bMyOld != IsEndnoteAtMyEnd()) { const SwFmtCol& rNewCol = GetFmt()->GetCol(); - ChgColumns( rNewCol, rNewCol, TRUE ); + ChgColumns( rNewCol, rNewCol, sal_True ); rInvFlags |= 0x01; } } @@ -2568,7 +2568,7 @@ void SwSectionFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, break; default: - bClear = FALSE; + bClear = sal_False; } if ( bClear ) { @@ -2589,28 +2589,28 @@ void SwSectionFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, * page causes a maximal Size of the sectionframe. * --------------------------------------------------*/ -BOOL SwSectionFrm::ToMaximize( BOOL bCheckFollow ) const +sal_Bool SwSectionFrm::ToMaximize( sal_Bool bCheckFollow ) const { if( HasFollow() ) { if( !bCheckFollow ) // Don't check superfluous follows - return TRUE; + return sal_True; const SwSectionFrm* pFoll = GetFollow(); while( pFoll && pFoll->IsSuperfluous() ) pFoll = pFoll->GetFollow(); if( pFoll ) - return TRUE; + return sal_True; } if( IsFtnAtEnd() ) - return FALSE; + return sal_False; const SwFtnContFrm* pCont = ContainsFtnCont(); if( !IsEndnAtEnd() ) return 0 != pCont; - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; while( pCont && !bRet ) { if( pCont->FindFootNote() ) - bRet = TRUE; + bRet = sal_True; else pCont = ContainsFtnCont( pCont ); } @@ -2618,7 +2618,7 @@ BOOL SwSectionFrm::ToMaximize( BOOL bCheckFollow ) const } /*-----------------09.06.99 15:07------------------- - * BOOL SwSectionFrm::ContainsFtnCont() + * sal_Bool SwSectionFrm::ContainsFtnCont() * checks every Column for FtnContFrms. * --------------------------------------------------*/ @@ -2668,13 +2668,13 @@ void SwSectionFrm::InvalidateFtnPos() * Das Undersized-Flag wird ggf. korrigiert. * --------------------------------------------------*/ -long SwSectionFrm::Undersize( BOOL bOverSize ) +long SwSectionFrm::Undersize( sal_Bool bOverSize ) { - bUndersized = FALSE; + bUndersized = sal_False; SWRECTFN( this ) long nRet = InnerHeight() - (Prt().*fnRect->fnGetHeight)(); if( nRet > 0 ) - bUndersized = TRUE; + bUndersized = sal_True; else if( !bOverSize ) nRet = 0; return nRet; @@ -2733,7 +2733,7 @@ void SwRootFrm::InsertEmptySct( SwSectionFrm* pDel ) { if( !pDestroy ) pDestroy = new SwDestroyList; - USHORT nPos; + sal_uInt16 nPos; if( !pDestroy->Seek_Entry( pDel, &nPos ) ) pDestroy->Insert( pDel ); } @@ -2744,7 +2744,7 @@ void SwRootFrm::_DeleteEmptySct() while( pDestroy->Count() ) { SwSectionFrm* pSect = (*pDestroy)[0]; - pDestroy->Remove( USHORT(0) ); + pDestroy->Remove( sal_uInt16(0) ); ASSERT( !pSect->IsColLocked() && !pSect->IsJoinLocked(), "DeleteEmptySct: Locked SectionFrm" ); if( !pSect->Frm().HasArea() && !pSect->ContainsCntnt() ) @@ -2773,16 +2773,16 @@ void SwRootFrm::_DeleteEmptySct() void SwRootFrm::_RemoveFromList( SwSectionFrm* pSct ) { ASSERT( pDestroy, "Where's my list?" ); - USHORT nPos; + sal_uInt16 nPos; if( pDestroy->Seek_Entry( pSct, &nPos ) ) pDestroy->Remove( nPos ); } #ifdef DBG_UTIL -BOOL SwRootFrm::IsInDelList( SwSectionFrm* pSct ) const +sal_Bool SwRootFrm::IsInDelList( SwSectionFrm* pSct ) const { - USHORT nPos; + sal_uInt16 nPos; return ( pDestroy && pDestroy->Seek_Entry( pSct, &nPos ) ); } diff --git a/sw/source/core/layout/softpagebreak.cxx b/sw/source/core/layout/softpagebreak.cxx index 4d487a2506ad..898581d3d870 100644 --- a/sw/source/core/layout/softpagebreak.cxx +++ b/sw/source/core/layout/softpagebreak.cxx @@ -99,7 +99,7 @@ void SwTxtNode::fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const } } else // No soft page break if there's a "hard" page break attribute - if( pFirst2 == pFrm && !pFrm->IsPageBreak( TRUE ) ) + if( pFirst2 == pFrm && !pFrm->IsPageBreak( sal_True ) ) rBreak.insert( pFrm->GetOfst() ); } } @@ -125,7 +125,7 @@ bool SwTableLine::hasSoftPageBreak() const // master table frames with "hard" page break attribute if( pTab->GetIndPrev() || pTab->FindFooterOrHeader() || pTab->IsInFly() || pTab->GetUpper()->IsInTab() || - ( !pTab->IsFollow() && pTab->IsPageBreak( TRUE ) ) ) + ( !pTab->IsFollow() && pTab->IsPageBreak( sal_True ) ) ) return false; const SwPageFrm* pPage = pTab->FindPageFrm(); // No soft page break at the first page of the document diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx index c0cef39294b8..fd0a0ce1f838 100644 --- a/sw/source/core/layout/ssfrm.cxx +++ b/sw/source/core/layout/ssfrm.cxx @@ -76,55 +76,55 @@ long SwFrm::GetPrtRight() const long SwFrm::GetPrtTop() const { return Frm().Top() + Prt().Top(); } -BOOL SwFrm::SetMinLeft( long nDeadline ) +sal_Bool SwFrm::SetMinLeft( long nDeadline ) { SwTwips nDiff = nDeadline - Frm().Left(); if( nDiff > 0 ) { Frm().Left( nDeadline ); Prt().Width( Prt().Width() - nDiff ); - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } -BOOL SwFrm::SetMaxBottom( long nDeadline ) +sal_Bool SwFrm::SetMaxBottom( long nDeadline ) { SwTwips nDiff = Frm().Top() + Frm().Height() - nDeadline; if( nDiff > 0 ) { Frm().Height( Frm().Height() - nDiff ); Prt().Height( Prt().Height() - nDiff ); - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } -BOOL SwFrm::SetMinTop( long nDeadline ) +sal_Bool SwFrm::SetMinTop( long nDeadline ) { SwTwips nDiff = nDeadline - Frm().Top(); if( nDiff > 0 ) { Frm().Top( nDeadline ); Prt().Height( Prt().Height() - nDiff ); - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } -BOOL SwFrm::SetMaxRight( long nDeadline ) +sal_Bool SwFrm::SetMaxRight( long nDeadline ) { SwTwips nDiff = Frm().Left() + Frm().Width() - nDeadline; if( nDiff > 0 ) { Frm().Width( Frm().Width() - nDiff ); Prt().Width( Prt().Width() - nDiff ); - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } -void SwFrm::MakeBelowPos( const SwFrm* pUp, const SwFrm* pPrv, BOOL bNotify ) +void SwFrm::MakeBelowPos( const SwFrm* pUp, const SwFrm* pPrv, sal_Bool bNotify ) { if( pPrv ) { @@ -140,7 +140,7 @@ void SwFrm::MakeBelowPos( const SwFrm* pUp, const SwFrm* pPrv, BOOL bNotify ) aFrm.Pos().Y() += 1; } -void SwFrm::MakeUpperPos( const SwFrm* pUp, const SwFrm* pPrv, BOOL bNotify ) +void SwFrm::MakeUpperPos( const SwFrm* pUp, const SwFrm* pPrv, sal_Bool bNotify ) { if( pPrv ) { @@ -157,7 +157,7 @@ void SwFrm::MakeUpperPos( const SwFrm* pUp, const SwFrm* pPrv, BOOL bNotify ) aFrm.Pos().Y() -= 1; } -void SwFrm::MakeLeftPos( const SwFrm* pUp, const SwFrm* pPrv, BOOL bNotify ) +void SwFrm::MakeLeftPos( const SwFrm* pUp, const SwFrm* pPrv, sal_Bool bNotify ) { if( pPrv ) { @@ -174,7 +174,7 @@ void SwFrm::MakeLeftPos( const SwFrm* pUp, const SwFrm* pPrv, BOOL bNotify ) aFrm.Pos().X() -= 1; } -void SwFrm::MakeRightPos( const SwFrm* pUp, const SwFrm* pPrv, BOOL bNotify ) +void SwFrm::MakeRightPos( const SwFrm* pUp, const SwFrm* pPrv, sal_Bool bNotify ) { if( pPrv ) { @@ -214,7 +214,7 @@ void SwFrm::SetRightLeftMargins( long nRight, long nLeft) Prt().Width( Frm().Width() - nLeft - nRight ); } -const USHORT nMinVertCellHeight = 1135; +const sal_uInt16 nMinVertCellHeight = 1135; /*-----------------11.9.2001 11:11------------------ * SwFrm::CheckDirChange(..) @@ -224,12 +224,12 @@ const USHORT nMinVertCellHeight = 1135; void SwFrm::CheckDirChange() { - BOOL bOldVert = GetVerticalFlag(); - BOOL bOldRev = IsReverse(); - BOOL bOldR2L = GetRightToLeftFlag(); - SetInvalidVert( TRUE ); - SetInvalidR2L( TRUE ); - BOOL bChg = bOldR2L != IsRightToLeft(); + sal_Bool bOldVert = GetVerticalFlag(); + sal_Bool bOldRev = IsReverse(); + sal_Bool bOldR2L = GetRightToLeftFlag(); + SetInvalidVert( sal_True ); + SetInvalidR2L( sal_True ); + sal_Bool bChg = bOldR2L != IsRightToLeft(); if( ( IsVertical() != bOldVert ) || bChg || IsReverse() != bOldRev ) { InvalidateAll(); @@ -280,7 +280,7 @@ void SwFrm::CheckDirChange() pFrm = pFrm->GetNext(); } if( pCol ) - pBody->AdjustColumns( pCol, TRUE ); + pBody->AdjustColumns( pCol, sal_True ); } else if( IsTxtFrm() ) ((SwTxtFrm*)this)->Prepare( PREP_CLEAR ); @@ -476,8 +476,8 @@ SwCntntFrm::~SwCntntFrm() { SwTxtNode *pTxtNd = ((SwTxtFrm*)this)->GetTxtNode(); const SwFtnIdxs &rFtnIdxs = pCNd->GetDoc()->GetFtnIdxs(); - USHORT nPos; - ULONG nIndex = pCNd->GetIndex(); + sal_uInt16 nPos; + sal_uLong nIndex = pCNd->GetIndex(); rFtnIdxs.SeekEntry( *pTxtNd, &nPos ); SwTxtFtn* pTxtFtn; if( nPos < rFtnIdxs.Count() ) @@ -611,13 +611,13 @@ const SwRect SwFrm::PaintArea() const // NEW TABLES // Cell frames may not leave their upper: SwRect aRect = IsRowFrm() ? GetUpper()->Frm() : Frm(); - const BOOL bVert = IsVertical(); + const sal_Bool bVert = IsVertical(); SwRectFn fnRect = bVert ? fnRectVert : fnRectHori; long nRight = (aRect.*fnRect->fnGetRight)(); long nLeft = (aRect.*fnRect->fnGetLeft)(); const SwFrm* pTmp = this; - BOOL bLeft = TRUE; - BOOL bRight = TRUE; + sal_Bool bLeft = sal_True; + sal_Bool bRight = sal_True; long nRowSpan = 0; while( pTmp ) { @@ -647,25 +647,25 @@ const SwRect SwFrm::PaintArea() const nRight = nTmpRight; if( pTmp->IsPageFrm() || pTmp->IsFlyFrm() || pTmp->IsRootFrm() ) break; - bLeft = FALSE; - bRight = FALSE; + bLeft = sal_False; + bRight = sal_False; } else if( pTmp->IsColumnFrm() ) // nobody enters neightbour columns { - BOOL bR2L = pTmp->IsRightToLeft(); + sal_Bool bR2L = pTmp->IsRightToLeft(); // the first column has _no_ influence to the left range if( bR2L ? pTmp->GetNext() : pTmp->GetPrev() ) { if( bLeft || nLeft < nTmpLeft ) nLeft = nTmpLeft; - bLeft = FALSE; + bLeft = sal_False; } // the last column has _no_ influence to the right range if( bR2L ? pTmp->GetPrev() : pTmp->GetNext() ) { if( bRight || nTmpRight < nRight ) nRight = nTmpRight; - bRight = FALSE; + bRight = sal_False; } } else if( bVert && pTmp->IsBodyFrm() ) @@ -679,14 +679,14 @@ const SwRect SwFrm::PaintArea() const if( pTmp->GetPrev() && ( bLeft || nLeft < nTmpLeft ) ) { nLeft = nTmpLeft; - bLeft = FALSE; + bLeft = sal_False; } if( pTmp->GetNext() && ( pTmp->GetNext()->IsFooterFrm() || pTmp->GetNext()->GetNext() ) && ( bRight || nTmpRight < nRight ) ) { nRight = nTmpRight; - bRight = FALSE; + bRight = sal_False; } } pTmp = pTmp->GetUpper(); @@ -708,9 +708,9 @@ const SwRect SwFrm::PaintArea() const |* |*************************************************************************/ -const SwRect SwFrm::UnionFrm( BOOL bBorder ) const +const SwRect SwFrm::UnionFrm( sal_Bool bBorder ) const { - BOOL bVert = IsVertical(); + sal_Bool bVert = IsVertical(); SwRectFn fnRect = bVert ? fnRectVert : fnRectHori; long nLeft = (Frm().*fnRect->fnGetLeft)(); long nWidth = (Frm().*fnRect->fnGetWidth)(); diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index b747c4e7aaff..f0d67a191ded 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -81,7 +81,7 @@ #include <layouter.hxx> // <-- -extern void AppendObjs( const SwSpzFrmFmts *pTbl, ULONG nIndex, +extern void AppendObjs( const SwSpzFrmFmts *pTbl, sal_uLong nIndex, SwFrm *pFrm, SwPageFrm *pPage ); using namespace ::com::sun::star; @@ -102,18 +102,18 @@ SwTabFrm::SwTabFrm( SwTable &rTab ): { bComplete = bCalcLowers = bONECalcLowers = bLowersFormatted = bLockBackMove = bResizeHTMLTable = bHasFollowFlowLine = bIsRebuildLastLine = - bRestrictTableGrowth = bRemoveFollowFlowLinePending = FALSE; + bRestrictTableGrowth = bRemoveFollowFlowLinePending = sal_False; // --> OD 2004-10-04 #i26945# - bConsiderObjsForMinCellHeight = TRUE; - bObjsDoesFit = TRUE; + bConsiderObjsForMinCellHeight = sal_True; + bObjsDoesFit = sal_True; // <-- - bFixSize = FALSE; //Nicht nochmal auf die Importfilter hereinfallen. + bFixSize = sal_False; //Nicht nochmal auf die Importfilter hereinfallen. nType = FRMC_TAB; //Gleich die Zeilen erzeugen und einfuegen. const SwTableLines &rLines = rTab.GetTabLines(); SwFrm *pTmpPrev = 0; - for ( USHORT i = 0; i < rLines.Count(); ++i ) + for ( sal_uInt16 i = 0; i < rLines.Count(); ++i ) { SwRowFrm *pNew = new SwRowFrm( *rLines[i] ); if( pNew->Lower() ) @@ -132,15 +132,15 @@ SwTabFrm::SwTabFrm( SwTabFrm &rTab ) : SwFlowFrm( (SwFrm&)*this ), pTable( rTab.GetTable() ) { - bIsFollow = TRUE; + bIsFollow = sal_True; bLockJoin = bComplete = bONECalcLowers = bCalcLowers = bLowersFormatted = bLockBackMove = bResizeHTMLTable = bHasFollowFlowLine = bIsRebuildLastLine = - bRestrictTableGrowth = bRemoveFollowFlowLinePending = FALSE; + bRestrictTableGrowth = bRemoveFollowFlowLinePending = sal_False; // --> OD 2004-10-04 #i26945# - bConsiderObjsForMinCellHeight = TRUE; - bObjsDoesFit = TRUE; + bConsiderObjsForMinCellHeight = sal_True; + bObjsDoesFit = sal_True; // <-- - bFixSize = FALSE; //Nicht nochmal auf die Importfilter hereinfallen. + bFixSize = sal_False; //Nicht nochmal auf die Importfilter hereinfallen. nType = FRMC_TAB; SetFollow( rTab.GetFollow() ); @@ -220,10 +220,10 @@ void MA_FASTCALL SwInvalidateAll( SwFrm *pFrm, long nBottom ); bool MA_FASTCALL lcl_CalcLowers( SwLayoutFrm *pLay, const SwLayoutFrm* pDontLeave, long nBottom, bool bSkipRowSpanCells ); void MA_FASTCALL lcl_RecalcRow( SwRowFrm& rRow, long nBottom ); -BOOL lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, BOOL bInva ); +sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ); // --> OD 2004-10-15 #i26945# - add parameter <_bOnlyRowsAndCells> to control // that only row and cell frames are formatted. -BOOL MA_FASTCALL lcl_InnerCalcLayout( SwFrm *pFrm, +sal_Bool MA_FASTCALL lcl_InnerCalcLayout( SwFrm *pFrm, long nBottom, bool _bOnlyRowsAndCells = false ); // <-- @@ -232,7 +232,7 @@ BOOL MA_FASTCALL lcl_InnerCalcLayout( SwFrm *pFrm, // control, if floating screen objects have to be considered for the minimal // cell height. SwTwips MA_FASTCALL lcl_CalcMinRowHeight( const SwRowFrm *pRow, - const BOOL _bConsiderObjs ); + const sal_Bool _bConsiderObjs ); // <-- SwTwips lcl_CalcTopAndBottomMargin( const SwLayoutFrm&, const SwBorderAttrs& ); @@ -273,7 +273,7 @@ SwRowFrm* lcl_InsertNewFollowFlowLine( SwTabFrm& rTab, const SwFrm& rTmpRow, boo ASSERT( rTmpRow.IsRowFrm(), "No row frame to copy for FollowFlowLine" ) const SwRowFrm& rRow = (SwRowFrm&)rTmpRow; - rTab.SetFollowFlowLine( TRUE ); + rTab.SetFollowFlowLine( sal_True ); SwRowFrm *pFollowFlowLine = new SwRowFrm(*rRow.GetTabLine(), false ); pFollowFlowLine->SetRowSpanLine( bRowSpanLine ); SwFrm* pFirstRow = rTab.GetFollow()->GetFirstNonHeadlineRow(); @@ -311,7 +311,7 @@ void lcl_InvalidateLowerObjs( SwLayoutFrm& _rLayoutFrm, } if ( pLowerFrm->GetDrawObjs() ) { - for ( USHORT i = 0; i < pLowerFrm->GetDrawObjs()->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pLowerFrm->GetDrawObjs()->Count(); ++i ) { SwAnchoredObject* pAnchoredObj = (*pLowerFrm->GetDrawObjs())[i]; @@ -504,9 +504,9 @@ void lcl_MoveFootnotes( SwTabFrm& rSource, SwTabFrm& rDest, SwLayoutFrm& rRowFrm { if ( 0 != rSource.GetFmt()->GetDoc()->GetFtnIdxs().Count() ) { - SwFtnBossFrm* pOldBoss = rSource.FindFtnBossFrm( TRUE ); - SwFtnBossFrm* pNewBoss = rDest.FindFtnBossFrm( TRUE ); - rRowFrm.MoveLowerFtns( 0, pOldBoss, pNewBoss, TRUE ); + SwFtnBossFrm* pOldBoss = rSource.FindFtnBossFrm( sal_True ); + SwFtnBossFrm* pNewBoss = rDest.FindFtnBossFrm( sal_True ); + rRowFrm.MoveLowerFtns( 0, pOldBoss, pNewBoss, sal_True ); } } @@ -690,9 +690,9 @@ bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine, // // Here the recalculation process starts: // - rTab.SetRebuildLastLine( TRUE ); + rTab.SetRebuildLastLine( sal_True ); // --> OD 2004-10-15 #i26945# - rTab.SetDoesObjsFit( TRUE ); + rTab.SetDoesObjsFit( sal_True ); // <-- SWRECTFN( rTab.GetUpper() ) @@ -705,9 +705,9 @@ bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine, // // --> OD 2004-10-04 #i26945# - Do *not* consider floating screen objects // for the minimal cell height. - rTab.SetConsiderObjsForMinCellHeight( FALSE ); + rTab.SetConsiderObjsForMinCellHeight( sal_False ); ::lcl_ShrinkCellsAndAllContent( rLastLine ); - rTab.SetConsiderObjsForMinCellHeight( TRUE ); + rTab.SetConsiderObjsForMinCellHeight( sal_True ); // <-- // @@ -863,9 +863,9 @@ bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine, ::SwInvalidateAll( &rLastLine, LONG_MAX ); } - rTab.SetRebuildLastLine( FALSE ); + rTab.SetRebuildLastLine( sal_False ); // --> OD 2004-10-15 #i26945# - rTab.SetDoesObjsFit( TRUE ); + rTab.SetDoesObjsFit( sal_True ); // <-- return bRet; @@ -950,7 +950,7 @@ bool SwTabFrm::RemoveFollowFlowLine() // We have to reset the flag here, because lcl_MoveRowContent // calls a GrowFrm(), which has a different bahavior if // this flag is set. - SetFollowFlowLine( FALSE ); + SetFollowFlowLine( sal_False ); // --> FME 2007-07-19 #140081# Make code robust. if ( !pFollowFlowLine || !pLastLine ) @@ -1073,8 +1073,8 @@ bool SwTabFrm::Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKee if( !pRow ) return bRet; - const USHORT nRepeat = GetTable()->GetRowsToRepeat(); - USHORT nRowCount = 0; // pRow currently points to the first row + const sal_uInt16 nRepeat = GetTable()->GetRowsToRepeat(); + sal_uInt16 nRowCount = 0; // pRow currently points to the first row SwTwips nRemainingSpaceForLastRow = (*fnRect->fnYDiff)( nCutPos, (Frm().*fnRect->fnGetTop)() ); @@ -1245,16 +1245,16 @@ bool SwTabFrm::Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKee // // Build follow table if not already done: // - BOOL bNewFollow; + sal_Bool bNewFollow; SwTabFrm *pFoll; if ( GetFollow() ) { pFoll = GetFollow(); - bNewFollow = FALSE; + bNewFollow = sal_False; } else { - bNewFollow = TRUE; + bNewFollow = sal_True; pFoll = new SwTabFrm( *this ); // @@ -1275,18 +1275,18 @@ bool SwTabFrm::Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKee for ( nRowCount = 0; nRowCount < nRepeat; ++nRowCount ) { // Insert new headlines: - bDontCreateObjects = TRUE; //frmtool + bDontCreateObjects = sal_True; //frmtool SwRowFrm* pHeadline = new SwRowFrm( *GetTable()->GetTabLines()[ nRowCount ] ); pHeadline->SetRepeatedHeadline( true ); - bDontCreateObjects = FALSE; + bDontCreateObjects = sal_False; pHeadline->InsertBefore( pFoll, 0 ); SwPageFrm *pPage = pHeadline->FindPageFrm(); const SwSpzFrmFmts *pTbl = GetFmt()->GetDoc()->GetSpzFrmFmts(); if( pTbl->Count() ) { - ULONG nIndex; + sal_uLong nIndex; SwCntntFrm* pFrm = pHeadline->ContainsCntnt(); while( pFrm ) { @@ -1458,7 +1458,7 @@ bool SwTabFrm::Join() void MA_FASTCALL SwInvalidatePositions( SwFrm *pFrm, long nBottom ) { // LONG_MAX == nBottom means we have to calculate all - BOOL bAll = LONG_MAX == nBottom; + sal_Bool bAll = LONG_MAX == nBottom; SWRECTFN( pFrm ) do { pFrm->_InvalidatePos(); @@ -1484,7 +1484,7 @@ void MA_FASTCALL SwInvalidatePositions( SwFrm *pFrm, long nBottom ) void MA_FASTCALL SwInvalidateAll( SwFrm *pFrm, long nBottom ) { // LONG_MAX == nBottom means we have to calculate all - BOOL bAll = LONG_MAX == nBottom; + sal_Bool bAll = LONG_MAX == nBottom; SWRECTFN( pFrm ) do { @@ -1545,17 +1545,17 @@ bool MA_FASTCALL lcl_CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeav long nBottom, bool bSkipRowSpanCells ) { if ( !pLay ) - return TRUE; + return sal_True; // LONG_MAX == nBottom means we have to calculate all bool bAll = LONG_MAX == nBottom; - bool bRet = FALSE; + bool bRet = sal_False; SwCntntFrm *pCnt = pLay->ContainsCntnt(); SWRECTFN( pLay ) // FME 2007-08-30 #i81146# new loop control - USHORT nLoopControlRuns = 0; - const USHORT nLoopControlMax = 10; + sal_uInt16 nLoopControlRuns = 0; + const sal_uInt16 nLoopControlMax = 10; const SwModify* pLoopControlCond = 0; while ( pCnt && pDontLeave->IsAnLower( pCnt ) ) @@ -1635,13 +1635,13 @@ bool MA_FASTCALL lcl_CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeav // --> OD 2004-10-15 #i26945# - add parameter <_bOnlyRowsAndCells> to control // that only row and cell frames are formatted. -BOOL MA_FASTCALL lcl_InnerCalcLayout( SwFrm *pFrm, +sal_Bool MA_FASTCALL lcl_InnerCalcLayout( SwFrm *pFrm, long nBottom, bool _bOnlyRowsAndCells ) { // LONG_MAX == nBottom means we have to calculate all - BOOL bAll = LONG_MAX == nBottom; - BOOL bRet = FALSE; + sal_Bool bAll = LONG_MAX == nBottom; + sal_Bool bRet = sal_False; const SwFrm* pOldUp = pFrm->GetUpper(); SWRECTFN( pFrm ) do @@ -1693,16 +1693,16 @@ void MA_FASTCALL lcl_RecalcRow( SwRowFrm& rRow, long nBottom ) // <-- // FME 2007-08-30 #i81146# new loop control - USHORT nLoopControlRuns_1 = 0; - USHORT nLoopControlStage_1 = 0; - const USHORT nLoopControlMax = 10; + sal_uInt16 nLoopControlRuns_1 = 0; + sal_uInt16 nLoopControlStage_1 = 0; + const sal_uInt16 nLoopControlMax = 10; bool bCheck = true; do { // FME 2007-08-30 #i81146# new loop control - USHORT nLoopControlRuns_2 = 0; - USHORT nLoopControlStage_2 = 0; + sal_uInt16 nLoopControlRuns_2 = 0; + sal_uInt16 nLoopControlStage_2 = 0; while( lcl_InnerCalcLayout( &rRow, nBottom ) ) { @@ -1789,7 +1789,7 @@ void MA_FASTCALL lcl_RecalcTable( SwTabFrm& rTab, if ( !pFirstRow ) { pFirstRow = (SwLayoutFrm*)rTab.Lower(); - rNotify.SetLowersComplete( TRUE ); + rNotify.SetLowersComplete( sal_True ); } ::SwInvalidatePositions( pFirstRow, LONG_MAX ); lcl_RecalcRow( static_cast<SwRowFrm&>(*pFirstRow), LONG_MAX ); @@ -1907,7 +1907,7 @@ void SwTabFrm::MakeAll() SwLayNotify aNotify( this ); //uebernimmt im DTor die Benachrichtigung // If pos is invalid, we have to call a SetInvaKeep at aNotify. // Otherwise the keep atribute would not work in front of a table. - const BOOL bOldValidPos = GetValidPosFlag(); + const sal_Bool bOldValidPos = GetValidPosFlag(); //Wenn mein direkter Nachbar gleichzeitig mein Follow ist //verleibe ich mir das Teil ein. @@ -1931,29 +1931,29 @@ void SwTabFrm::MakeAll() { if ( RemoveFollowFlowLine() ) Join(); - SetRemoveFollowFlowLinePending( FALSE ); + SetRemoveFollowFlowLinePending( sal_False ); } if ( bResizeHTMLTable ) //Optimiertes Zusammenspiel mit Grow/Shrink des Inhaltes { - bResizeHTMLTable = FALSE; + bResizeHTMLTable = sal_False; SwHTMLTableLayout *pLayout = GetTable()->GetHTMLTableLayout(); if ( pLayout ) bCalcLowers = pLayout->Resize( - pLayout->GetBrowseWidthByTabFrm( *this ), FALSE ); + pLayout->GetBrowseWidthByTabFrm( *this ), sal_False ); } - BOOL bMakePage = TRUE; //solange TRUE kann eine neue Seite + sal_Bool bMakePage = sal_True; //solange sal_True kann eine neue Seite //angelegt werden (genau einmal) - BOOL bMovedBwd = FALSE; //Wird TRUE wenn der Frame zurueckfliesst - BOOL bMovedFwd = FALSE; //solange FALSE kann der Frm zurueck- + sal_Bool bMovedBwd = sal_False; //Wird sal_True wenn der Frame zurueckfliesst + sal_Bool bMovedFwd = sal_False; //solange sal_False kann der Frm zurueck- //fliessen (solange, bis er einmal //vorwaerts ge'moved wurde). - BOOL bSplit = FALSE; //Wird TRUE wenn der Frm gesplittet wurde. - const BOOL bFtnsInDoc = 0 != GetFmt()->GetDoc()->GetFtnIdxs().Count(); - BOOL bMoveable; - const BOOL bFly = IsInFly(); + sal_Bool bSplit = sal_False; //Wird sal_True wenn der Frm gesplittet wurde. + const sal_Bool bFtnsInDoc = 0 != GetFmt()->GetDoc()->GetFtnIdxs().Count(); + sal_Bool bMoveable; + const sal_Bool bFly = IsInFly(); SwBorderAttrAccess *pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this ); const SwBorderAttrs *pAttrs = pAccess->Get(); @@ -1967,7 +1967,7 @@ void SwTabFrm::MakeAll() ( !GetFmt()->GetLayoutSplit().GetValue() || bKeep ); // The number of repeated headlines - const USHORT nRepeat = GetTable()->GetRowsToRepeat(); + const sal_uInt16 nRepeat = GetTable()->GetRowsToRepeat(); // This flag indicates that we are allowed to try to split the // table rows. @@ -2027,9 +2027,9 @@ void SwTabFrm::MakeAll() SwFrm *pPre = GetPrev(); if ( pPre && pPre->IsTabFrm() && ((SwTabFrm*)pPre)->GetFollow() == this) { - if ( !MoveFwd( bMakePage, FALSE ) ) - bMakePage = FALSE; - bMovedFwd = TRUE; + if ( !MoveFwd( bMakePage, sal_False ) ) + bMakePage = sal_False; + bMovedFwd = sal_True; } } @@ -2037,15 +2037,15 @@ void SwTabFrm::MakeAll() SWRECTFN( this ) while ( !bValidPos || !bValidSize || !bValidPrtArea ) { - if ( TRUE == (bMoveable = IsMoveable()) ) + if ( sal_True == (bMoveable = IsMoveable()) ) if ( CheckMoveFwd( bMakePage, bKeep && KEEPTAB, bMovedBwd ) ) { - bMovedFwd = TRUE; - bCalcLowers = TRUE; + bMovedFwd = sal_True; + bCalcLowers = sal_True; // --> OD 2009-08-12 #i99267# // reset <bSplit> after forward move to assure that follows // can be joined, if further space is available. - bSplit = FALSE; + bSplit = sal_False; // <-- } @@ -2061,19 +2061,19 @@ void SwTabFrm::MakeAll() { delete pAccess; bCalcLowers |= pLayout->Resize( - pLayout->GetBrowseWidthByTabFrm( *this ), FALSE ); + pLayout->GetBrowseWidthByTabFrm( *this ), sal_False ); pAccess = new SwBorderAttrAccess( SwFrm::GetCache(), this ); pAttrs = pAccess->Get(); } - bValidPrtArea = FALSE; - aNotify.SetLowersComplete( FALSE ); + bValidPrtArea = sal_False; + aNotify.SetLowersComplete( sal_False ); } SwFrm *pPre; if ( bKeep || (0 != (pPre = FindPrev()) && pPre->GetAttrSet()->GetKeep().GetValue()) ) { - bCalcLowers = TRUE; + bCalcLowers = sal_True; } } @@ -2102,13 +2102,13 @@ void SwTabFrm::MakeAll() { delete pAccess; bCalcLowers |= pLayout->Resize( - pLayout->GetBrowseWidthByTabFrm( *this ), FALSE ); -// GetFmt()->GetDoc()->GetDocShell()->IsReadOnly() ? FALSE : TRUE ); + pLayout->GetBrowseWidthByTabFrm( *this ), sal_False ); +// GetFmt()->GetDoc()->GetDocShell()->IsReadOnly() ? sal_False : sal_True ); pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this ); pAttrs = pAccess->Get(); } if ( aOldPrtPos != (Prt().*fnRect->fnGetPos)() ) - aNotify.SetLowersComplete( FALSE ); + aNotify.SetLowersComplete( sal_False ); } //Wenn ich der erste einer Kette bin koennte ich mal sehen ob @@ -2127,20 +2127,20 @@ void SwTabFrm::MakeAll() if( pFrm && n1StLineHeight >(pFrm->Frm().*fnRect->fnGetHeight )() ) { SwTabFrm *pMaster = (SwTabFrm*)FindMaster(); - BOOL bDummy; - if ( ShouldBwdMoved( pMaster->GetUpper(), FALSE, bDummy ) ) + sal_Bool bDummy; + if ( ShouldBwdMoved( pMaster->GetUpper(), sal_False, bDummy ) ) pMaster->InvalidatePos(); } } - SwFtnBossFrm *pOldBoss = bFtnsInDoc ? FindFtnBossFrm( TRUE ) : 0; - BOOL bReformat; + SwFtnBossFrm *pOldBoss = bFtnsInDoc ? FindFtnBossFrm( sal_True ) : 0; + sal_Bool bReformat; if ( MoveBwd( bReformat ) ) { SWREFRESHFN( this ) - bMovedBwd = TRUE; - aNotify.SetLowersComplete( FALSE ); + bMovedBwd = sal_True; + aNotify.SetLowersComplete( sal_False ); if ( bFtnsInDoc ) - MoveLowerFtns( 0, pOldBoss, 0, TRUE ); + MoveLowerFtns( 0, pOldBoss, 0, sal_True ); if ( bReformat || bKeep ) { long nOldTop = (Frm().*fnRect->fnGetTop)(); @@ -2154,18 +2154,18 @@ void SwTabFrm::MakeAll() delete pAccess; bCalcLowers |= pHTMLLayout->Resize( pHTMLLayout->GetBrowseWidthByTabFrm( *this ), - FALSE ); + sal_False ); pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this ); pAttrs = pAccess->Get(); } - bValidPrtArea = FALSE; + bValidPrtArea = sal_False; Format( pAttrs ); } lcl_RecalcTable( *this, 0, aNotify ); - bLowersFormatted = TRUE; + bLowersFormatted = sal_True; if ( bKeep && KEEPTAB ) { // --> OD 2005-09-28 #b6329202# @@ -2182,11 +2182,11 @@ void SwTabFrm::MakeAll() // { // pNxt->Calc(); // if ( !GetNext() ) -// bValidPos = FALSE; +// bValidPos = sal_False; // } if ( 0 != lcl_FormatNextCntntForKeep( this ) && !GetNext() ) { - bValidPos = FALSE; + bValidPos = sal_False; } // <-- } @@ -2233,13 +2233,13 @@ void SwTabFrm::MakeAll() // at least one further row of an existing follow. if ( !bSplit && GetFollow() ) { - BOOL bDummy; - if ( GetFollow()->ShouldBwdMoved( GetUpper(), FALSE, bDummy ) ) + sal_Bool bDummy; + if ( GetFollow()->ShouldBwdMoved( GetUpper(), sal_False, bDummy ) ) { SwFrm *pTmp = GetUpper(); SwTwips nDeadLine = (pTmp->*fnRect->fnGetPrtBottom)(); if ( bBrowseMode ) - nDeadLine += pTmp->Grow( LONG_MAX, TRUE ); + nDeadLine += pTmp->Grow( LONG_MAX, sal_True ); if( (Frm().*fnRect->fnBottomDist)( nDeadLine ) > 0 ) { // @@ -2253,9 +2253,9 @@ void SwTabFrm::MakeAll() if ( pLastLine ) { ::SwInvalidateAll( pLastLine, LONG_MAX ); - SetRebuildLastLine( TRUE ); + SetRebuildLastLine( sal_True ); lcl_RecalcRow( static_cast<SwRowFrm&>(*pLastLine), LONG_MAX ); - SetRebuildLastLine( FALSE ); + SetRebuildLastLine( sal_False ); } SwFrm* pRow = GetFollow()->GetFirstNonHeadlineRow(); @@ -2286,11 +2286,11 @@ void SwTabFrm::MakeAll() while ( pRowToMove && nRowsToMove-- > 0 ) { - const BOOL bMoveFtns = bFtnsInDoc && !GetFollow()->IsJoinLocked(); + const sal_Bool bMoveFtns = bFtnsInDoc && !GetFollow()->IsJoinLocked(); SwFtnBossFrm *pOldBoss = 0; if ( bMoveFtns ) - pOldBoss = pRowToMove->FindFtnBossFrm( TRUE ); + pOldBoss = pRowToMove->FindFtnBossFrm( sal_True ); SwFrm* pNextRow = pRowToMove->GetNext(); @@ -2306,7 +2306,7 @@ void SwTabFrm::MakeAll() //Die Fussnoten verschieben! if ( bMoveFtns ) if ( ((SwLayoutFrm*)pRowToMove)->MoveLowerFtns( - 0, pOldBoss, FindFtnBossFrm( TRUE ), TRUE ) ) + 0, pOldBoss, FindFtnBossFrm( sal_True ), sal_True ) ) GetUpper()->Calc(); pRowToMove = pNextRow; @@ -2364,7 +2364,7 @@ void SwTabFrm::MakeAll() // In this case we do a magic trick: if ( !bKeep && !GetNext() && pTmpNxt && pTmpNxt->IsValid() ) { - bValidPos = FALSE; + bValidPos = sal_False; bLastRowHasToMoveToFollow = true; } } @@ -2375,13 +2375,13 @@ void SwTabFrm::MakeAll() if ( bCalcLowers ) { lcl_RecalcTable( *this, 0, aNotify ); - bLowersFormatted = TRUE; - bCalcLowers = FALSE; + bLowersFormatted = sal_True; + bCalcLowers = sal_False; } else if ( bONECalcLowers ) { lcl_RecalcRow( static_cast<SwRowFrm&>(*Lower()), LONG_MAX ); - bONECalcLowers = FALSE; + bONECalcLowers = sal_False; } } continue; @@ -2399,13 +2399,13 @@ void SwTabFrm::MakeAll() if ( bCalcLowers && IsValid() ) { lcl_RecalcTable( *this, 0, aNotify ); - bLowersFormatted = TRUE; - bCalcLowers = FALSE; + bLowersFormatted = sal_True; + bCalcLowers = sal_False; } else if ( bONECalcLowers ) { lcl_RecalcRow( static_cast<SwRowFrm&>(*Lower()), LONG_MAX ); - bONECalcLowers = FALSE; + bONECalcLowers = sal_False; } // It does not make sense to cut off the last line if we are @@ -2418,8 +2418,8 @@ void SwTabFrm::MakeAll() if ( bCalcLowers && IsValid() ) { lcl_RecalcTable( *this, 0, aNotify ); - bLowersFormatted = TRUE; - bCalcLowers = FALSE; + bLowersFormatted = sal_True; + bCalcLowers = sal_False; if( !IsValid() ) continue; } @@ -2458,11 +2458,11 @@ void SwTabFrm::MakeAll() SwTwips nDeadLine = (GetUpper()->*fnRect->fnGetPrtBottom)(); if( IsInSct() || GetUpper()->IsInTab() ) // TABLE IN TABLE) nDeadLine = (*fnRect->fnYInc)( nDeadLine, - GetUpper()->Grow( LONG_MAX, TRUE ) ); + GetUpper()->Grow( LONG_MAX, sal_True ) ); ::lcl_RecalcRow( static_cast<SwRowFrm&>(*Lower()), nDeadLine ); - bLowersFormatted = TRUE; - aNotify.SetLowersComplete( TRUE ); + bLowersFormatted = sal_True; + aNotify.SetLowersComplete( sal_True ); // One more check if its really necessary to split the table. // 1. The table either has to exceed the deadline or @@ -2489,7 +2489,7 @@ void SwTabFrm::MakeAll() } // <-- - USHORT nMinNumOfLines = nRepeat; + sal_uInt16 nMinNumOfLines = nRepeat; if ( bTableRowKeep ) { @@ -2519,8 +2519,8 @@ void SwTabFrm::MakeAll() // if we do not have an (in)direkt Prev, we split anyway. if( (*fnRect->fnYDiff)(nDeadLine, nBreakLine) >=0 || !pIndPrev ) { - aNotify.SetLowersComplete( FALSE ); - bSplit = TRUE; + aNotify.SetLowersComplete( sal_False ); + bSplit = sal_True; // // An existing follow flow line has to be removed. @@ -2556,7 +2556,7 @@ void SwTabFrm::MakeAll() if ( bSplitError && bTryToSplit ) // no restart if we did not try to split: i72847, i79426 { lcl_RecalcRow( static_cast<SwRowFrm&>(*Lower()), LONG_MAX ); - bValidPos = FALSE; + bValidPos = sal_False; bTryToSplit = false; continue; } @@ -2581,7 +2581,7 @@ void SwTabFrm::MakeAll() // <-- SWRECTFNX( GetFollow() ) - static BYTE nStack = 0; + static sal_uInt8 nStack = 0; if ( !StackHack::IsLocked() && nStack < 4 ) { ++nStack; @@ -2593,7 +2593,7 @@ void SwTabFrm::MakeAll() pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this ); pAttrs = pAccess->Get(); - ((SwTabFrm*)GetFollow())->SetLowersFormatted(FALSE); + ((SwTabFrm*)GetFollow())->SetLowersFormatted(sal_False); // --> OD 2005-03-30 #i43913# - lock follow table // to avoid its formatting during the format of // its content. @@ -2637,7 +2637,7 @@ void SwTabFrm::MakeAll() --nStack; } else if ( GetFollow() == GetNext() ) - ((SwTabFrm*)GetFollow())->MoveFwd( TRUE, FALSE ); + ((SwTabFrm*)GetFollow())->MoveFwd( sal_True, sal_False ); } continue; } @@ -2651,15 +2651,15 @@ void SwTabFrm::MakeAll() GetUpper()->GetUpper()->GetUpper()->IsSctFrm() && ( GetUpper()->GetUpper()->GetPrev() || GetIndPrev() ) && ((SwSectionFrm*)GetUpper()->GetUpper()->GetUpper())->MoveAllowed(this) ) - bMovedFwd = FALSE; + bMovedFwd = sal_False; // --> FME 2004-06-09 #i29771# Reset bTryToSplit flag on change of upper const SwFrm* pOldUpper = GetUpper(); // <-- //Mal sehen ob ich irgenwo Platz finde... - if ( !bMovedFwd && !MoveFwd( bMakePage, FALSE ) ) - bMakePage = FALSE; + if ( !bMovedFwd && !MoveFwd( bMakePage, sal_False ) ) + bMakePage = sal_False; // --> FME 2004-06-09 #i29771# Reset bSplitError flag on change of upper if ( GetUpper() != pOldUpper ) @@ -2670,8 +2670,8 @@ void SwTabFrm::MakeAll() // <-- SWREFRESHFN( this ) - bMovedFwd = bCalcLowers = TRUE; - aNotify.SetLowersComplete( FALSE ); + bMovedFwd = bCalcLowers = sal_True; + aNotify.SetLowersComplete( sal_False ); if ( IsFollow() ) { //Um Oszillationen zu vermeiden sollte kein ungueltiger Master //zurueckbleiben. @@ -2679,7 +2679,7 @@ void SwTabFrm::MakeAll() if ( pTab->GetUpper() ) pTab->GetUpper()->Calc(); pTab->Calc(); - pTab->SetLowersFormatted( FALSE ); + pTab->SetLowersFormatted( sal_False ); } //Wenn mein direkter Nachbar jetzt gleichzeitig mein Follow ist @@ -2708,8 +2708,8 @@ void SwTabFrm::MakeAll() if ( nDistToUpperPrtBottom >= 0 || bTryToSplit ) { lcl_RecalcTable( *this, 0, aNotify ); - bLowersFormatted = TRUE; - bCalcLowers = FALSE; + bLowersFormatted = sal_True; + bCalcLowers = sal_False; } #if OSL_DEBUG_LEVEL > 1 else @@ -2731,7 +2731,7 @@ void SwTabFrm::MakeAll() pPre->InvalidatePos(); } - bCalcLowers = bONECalcLowers = FALSE; + bCalcLowers = bONECalcLowers = sal_False; delete pAccess; UnlockJoin(); if ( bMovedFwd || bMovedBwd || !bOldValidPos ) @@ -2748,11 +2748,11 @@ void SwTabFrm::MakeAll() |* Letzte Aenderung |* |*************************************************************************/ -BOOL SwTabFrm::CalcFlyOffsets( SwTwips& rUpper, +sal_Bool SwTabFrm::CalcFlyOffsets( SwTwips& rUpper, long& rLeftOffset, long& rRightOffset ) const { - BOOL bInvalidatePrtArea = FALSE; + sal_Bool bInvalidatePrtArea = sal_False; const SwPageFrm *pPage = FindPageFrm(); const SwFlyFrm* pMyFly = FindFlyFrm(); @@ -2774,7 +2774,7 @@ BOOL SwTabFrm::CalcFlyOffsets( SwTwips& rUpper, long nYDiff = (*fnRect->fnYDiff)( (Prt().*fnRect->fnGetTop)(), rUpper ); if( nYDiff > 0 ) (aRect.*fnRect->fnAddBottom)( -nYDiff ); - for ( USHORT i = 0; i < pPage->GetSortedObjs()->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pPage->GetSortedObjs()->Count(); ++i ) { SwAnchoredObject* pAnchoredObj = (*pPage->GetSortedObjs())[i]; if ( pAnchoredObj->ISA(SwFlyFrm) ) @@ -2867,7 +2867,7 @@ BOOL SwTabFrm::CalcFlyOffsets( SwTwips& rUpper, long nBottom = (aFlyRect.*fnRect->fnGetBottom)(); if( (*fnRect->fnYDiff)( nPrtPos, nBottom ) < 0 ) nPrtPos = nBottom; - bInvalidatePrtArea = TRUE; + bInvalidatePrtArea = sal_True; } if ( (SURROUND_RIGHT == rSur.GetSurround() || SURROUND_PARALLEL == rSur.GetSurround())&& @@ -2877,7 +2877,7 @@ BOOL SwTabFrm::CalcFlyOffsets( SwTwips& rUpper, (aFlyRect.*fnRect->fnGetRight)(), (pFly->GetAnchorFrm()->Frm().*fnRect->fnGetLeft)() ); rLeftOffset = Max( rLeftOffset, nWidth ); - bInvalidatePrtArea = TRUE; + bInvalidatePrtArea = sal_True; } if ( (SURROUND_LEFT == rSur.GetSurround() || SURROUND_PARALLEL == rSur.GetSurround())&& @@ -2887,7 +2887,7 @@ BOOL SwTabFrm::CalcFlyOffsets( SwTwips& rUpper, (pFly->GetAnchorFrm()->Frm().*fnRect->fnGetRight)(), (aFlyRect.*fnRect->fnGetLeft)() ); rRightOffset = Max( rRightOffset, nWidth ); - bInvalidatePrtArea = TRUE; + bInvalidatePrtArea = sal_True; } } } @@ -2935,7 +2935,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) long nTmpRight = -1000000, nLeftOffset = 0; if( CalcFlyOffsets( nUpper, nLeftOffset, nTmpRight ) ) - bValidPrtArea = FALSE; + bValidPrtArea = sal_False; long nRightOffset = Max( 0L, nTmpRight ); SwTwips nLower = pAttrs->CalcBottomLine(); @@ -2945,7 +2945,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) // <-- collapsing if ( !bValidPrtArea ) - { bValidPrtArea = TRUE; + { bValidPrtArea = sal_True; //Die Breite der PrtArea wird vom FrmFmt vorgegeben, die Raender //sind entsprechend einzustellen. @@ -2967,9 +2967,9 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) //bezieht sie sich in der BrowseView auf die Bildschirmbreite. const SwFmtFrmSize &rSz = GetFmt()->GetFrmSize(); // OD 14.03.2003 #i9040# - adjust variable name. - const SwTwips nWishedTableWidth = CalcRel( rSz, TRUE ); + const SwTwips nWishedTableWidth = CalcRel( rSz, sal_True ); - BOOL bCheckBrowseWidth = FALSE; + sal_Bool bCheckBrowseWidth = sal_False; // OD 14.03.2003 #i9040# - insert new variables for left/right spacing. SwTwips nLeftSpacing = 0; @@ -3058,7 +3058,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) //Nur die fuer die Umrandung benoetigten Freiraeume //werden beruecksichtigt. //Die Attributwerte von LRSpace werden bewusst missachtet! - bCheckBrowseWidth = TRUE; + bCheckBrowseWidth = sal_True; nLeftSpacing = nLeftLine + nLeftOffset; nRightSpacing = nRightLine + nRightOffset; break; @@ -3095,7 +3095,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) { //Linker Rand und die Breite zaehlen (Word-Spezialitaet) // OD 10.03.2003 #i9040# - no width alignment in online mode. - //bCheckBrowseWidth = TRUE; + //bCheckBrowseWidth = sal_True; nLeftSpacing = pAttrs->CalcLeft( this ); if( nLeftOffset ) { @@ -3115,7 +3115,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) } break; default: - ASSERT( FALSE, "Ungueltige orientation fuer Table." ); + ASSERT( sal_False, "Ungueltige orientation fuer Table." ); } // --> OD 2004-07-15 #i26250# - extend bottom printing area, if table @@ -3148,12 +3148,12 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) } if ( nOldHeight != (Prt().*fnRect->fnGetHeight)() ) - bValidSize = FALSE; + bValidSize = sal_False; } if ( !bValidSize ) { - bValidSize = TRUE; + bValidSize = sal_True; //Die Groesse wird durch den Inhalt plus den Raendern bestimmt. SwTwips nRemaining = 0, nDiff; @@ -3181,7 +3181,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) |* Letzte Aenderung MA 23. Sep. 96 |* |*************************************************************************/ -SwTwips SwTabFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) +SwTwips SwTabFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) { SWRECTFN( this ) SwTwips nHeight =(Frm().*fnRect->fnGetHeight)(); @@ -3270,8 +3270,8 @@ SwTwips SwTabFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) |*************************************************************************/ void SwTabFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) { - BYTE nInvFlags = 0; - BOOL bAttrSetChg = pNew && RES_ATTRSET_CHG == pNew->Which(); + sal_uInt8 nInvFlags = 0; + sal_Bool bAttrSetChg = pNew && RES_ATTRSET_CHG == pNew->Which(); if( bAttrSetChg ) { @@ -3279,7 +3279,7 @@ void SwTabFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) SfxItemIter aOIter( *((SwAttrSetChg*)pOld)->GetChgSet() ); SwAttrSetChg aOldSet( *(SwAttrSetChg*)pOld ); SwAttrSetChg aNewSet( *(SwAttrSetChg*)pNew ); - while( TRUE ) + while( sal_True ) { _UpdateAttr( (SfxPoolItem*)aOIter.GetCurItem(), (SfxPoolItem*)aNIter.GetCurItem(), nInvFlags, @@ -3334,11 +3334,11 @@ void SwTabFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) } void SwTabFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, - BYTE &rInvFlags, + sal_uInt8 &rInvFlags, SwAttrSetChg *pOldSet, SwAttrSetChg *pNewSet ) { - BOOL bClear = TRUE; - const USHORT nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0; + sal_Bool bClear = sal_True; + const sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0; switch( nWhich ) { case RES_TBLHEADLINECHG: @@ -3353,13 +3353,13 @@ void SwTabFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, } // insert new headlines - const USHORT nNewRepeat = GetTable()->GetRowsToRepeat(); - for ( USHORT nIdx = 0; nIdx < nNewRepeat; ++nIdx ) + const sal_uInt16 nNewRepeat = GetTable()->GetRowsToRepeat(); + for ( sal_uInt16 nIdx = 0; nIdx < nNewRepeat; ++nIdx ) { - bDontCreateObjects = TRUE; //frmtool + bDontCreateObjects = sal_True; //frmtool SwRowFrm* pHeadline = new SwRowFrm( *GetTable()->GetTabLines()[ nIdx ] ); pHeadline->SetRepeatedHeadline( true ); - bDontCreateObjects = FALSE; + bDontCreateObjects = sal_False; pHeadline->Paste( this, pLowerRow ); } } @@ -3379,7 +3379,7 @@ void SwTabFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, if ( !GetPrev() ) CheckPageDescs( pPage ); if ( pPage && GetFmt()->GetPageDesc().GetNumOffset() ) - ((SwRootFrm*)pPage->GetUpper())->SetVirtPageNum( TRUE ); + ((SwRootFrm*)pPage->GetUpper())->SetVirtPageNum( sal_True ); SwDocPosUpdate aMsgHnt( pPage->Frm().Top() ); GetFmt()->GetDoc()->UpdatePageFlds( &aMsgHnt ); } @@ -3406,7 +3406,7 @@ void SwTabFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, /* kein Break hier */ default: - bClear = FALSE; + bClear = sal_False; } if ( bClear ) { @@ -3430,7 +3430,7 @@ void SwTabFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, |* Letzte Aenderung MA 26. Jun. 98 |* |*************************************************************************/ -BOOL SwTabFrm::GetInfo( SfxPoolItem &rHnt ) const +sal_Bool SwTabFrm::GetInfo( SfxPoolItem &rHnt ) const { if ( RES_VIRTPAGENUM_INFO == rHnt.Which() && IsInDocBody() && !IsFollow() ) { @@ -3443,7 +3443,7 @@ BOOL SwTabFrm::GetInfo( SfxPoolItem &rHnt ) const //Das sollte er sein (kann allenfalls temporaer anders sein, // sollte uns das beunruhigen?) rInfo.SetInfo( pPage, this ); - return FALSE; + return sal_False; } if ( pPage->GetPhyPageNum() < rInfo.GetOrigPage()->GetPhyPageNum() && (!rInfo.GetPage() || pPage->GetPhyPageNum() > rInfo.GetPage()->GetPhyPageNum())) @@ -3453,7 +3453,7 @@ BOOL SwTabFrm::GetInfo( SfxPoolItem &rHnt ) const } } } - return TRUE; + return sal_True; } /************************************************************************* @@ -3542,7 +3542,7 @@ SwCntntFrm *SwTabFrm::FindLastCntnt() |* Letzte Aenderung MA 25. Apr. 95 |* |*************************************************************************/ -SwLayoutFrm *SwTabFrm::GetLeaf( MakePageType eMakePage, BOOL bFwd ) +SwLayoutFrm *SwTabFrm::GetLeaf( MakePageType eMakePage, sal_Bool bFwd ) { SwLayoutFrm *pRet; if ( bFwd ) @@ -3567,9 +3567,9 @@ SwLayoutFrm *SwTabFrm::GetLeaf( MakePageType eMakePage, BOOL bFwd ) |* Letzte Aenderung MA 04. Mar. 97 |* |*************************************************************************/ -BOOL SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL, BOOL &rReformat ) +sal_Bool SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool &rReformat ) { - rReformat = FALSE; + rReformat = sal_False; if ( (SwFlowFrm::IsMoveBwdJump() || !IsPrevObjMove()) ) { //Das zurueckfliessen von Frm's ist leider etwas Zeitintensiv. @@ -3591,7 +3591,7 @@ BOOL SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL, BOOL &rReformat ) SwPageFrm *pOldPage = FindPageFrm(), *pNewPage = pNewUpper->FindPageFrm(); - BOOL bMoveAnyway = FALSE; + sal_Bool bMoveAnyway = sal_False; SwTwips nSpace = 0; SWRECTFN( this ) @@ -3603,7 +3603,7 @@ BOOL SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL, BOOL &rReformat ) long nNewWidth = (pNewUpper->Prt().*fnRectX->fnGetWidth)(); if( Abs( nNewWidth - nOldWidth ) < 2 ) { - if( FALSE == + if( sal_False == ( bMoveAnyway = BwdMoveNecessary( pOldPage, Frm() ) > 1 ) ) { SwRect aRect( pNewUpper->Prt() ); @@ -3630,17 +3630,17 @@ BOOL SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL, BOOL &rReformat ) // <-- if ( GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) ) - nSpace += pNewUpper->Grow( LONG_MAX, TRUE ); + nSpace += pNewUpper->Grow( LONG_MAX, sal_True ); } } else if( !bLockBackMove ) - bMoveAnyway = TRUE; + bMoveAnyway = sal_True; } else if( !bLockBackMove ) - bMoveAnyway = TRUE; + bMoveAnyway = sal_True; if ( bMoveAnyway ) - return rReformat = TRUE; + return rReformat = sal_True; else if ( !bLockBackMove && nSpace > 0 ) { // --> OD 2004-10-05 #i26945# - check, if follow flow line @@ -3652,7 +3652,7 @@ BOOL SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL, BOOL &rReformat ) *(pFirstRow->GetFmt()->GetDoc()), *(pFirstRow) ) ) { - return FALSE; + return sal_False; } // <-- SwTwips nTmpHeight = CalcHeightOfFirstContentLine(); @@ -3666,7 +3666,7 @@ BOOL SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL, BOOL &rReformat ) // <-- } } - return FALSE; + return sal_False; } /************************************************************************* @@ -3748,7 +3748,7 @@ void SwTabFrm::Cut() { if ( pUp->GetUpper() ) { - pSct->DelEmpty( FALSE ); + pSct->DelEmpty( sal_False ); pSct->_InvalidateSize(); } } @@ -3830,7 +3830,7 @@ void SwTabFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) (!pDesc && pPage->GetPageDesc() != &(const_cast<const SwDoc *>(GetFmt()->GetDoc()) ->GetPageDesc(0))) ) - CheckPageDescs( pPage, TRUE ); + CheckPageDescs( pPage, sal_True ); } } } @@ -3843,7 +3843,7 @@ void SwTabFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) |* Last Change AMA 01/10/02 |* |*************************************************************************/ -void SwTabFrm::Prepare( const PrepareHint eHint, const void *, BOOL ) +void SwTabFrm::Prepare( const PrepareHint eHint, const void *, sal_Bool ) { if( PREP_BOSS_CHGD == eHint ) CheckDirChange(); @@ -3877,7 +3877,7 @@ SwRowFrm::SwRowFrm( const SwTableLine &rLine, bool bInsertContent ): //Gleich die Boxen erzeugen und einfuegen. const SwTableBoxes &rBoxes = rLine.GetTabBoxes(); SwFrm *pTmpPrev = 0; - for ( USHORT i = 0; i < rBoxes.Count(); ++i ) + for ( sal_uInt16 i = 0; i < rBoxes.Count(); ++i ) { SwCellFrm *pNew = new SwCellFrm( *rBoxes[i], bInsertContent ); pNew->InsertBehind( this, pTmpPrev ); @@ -3919,15 +3919,15 @@ void SwRowFrm::RegistFlys( SwPageFrm *pPage ) |*************************************************************************/ void SwRowFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) { - BOOL bAttrSetChg = pNew && RES_ATTRSET_CHG == pNew->Which(); + sal_Bool bAttrSetChg = pNew && RES_ATTRSET_CHG == pNew->Which(); const SfxPoolItem *pItem = 0; if( bAttrSetChg ) { const SwAttrSet* pChgSet = ((SwAttrSetChg*)pNew)->GetChgSet(); - pChgSet->GetItemState( RES_FRM_SIZE, FALSE, &pItem); + pChgSet->GetItemState( RES_FRM_SIZE, sal_False, &pItem); if ( !pItem ) - pChgSet->GetItemState( RES_ROW_SPLIT, FALSE, &pItem); + pChgSet->GetItemState( RES_ROW_SPLIT, sal_False, &pItem); } else if ( RES_FRM_SIZE == pNew->Which() || RES_ROW_SPLIT == pNew->Which() ) pItem = pNew; @@ -3967,7 +3967,7 @@ void SwRowFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) void SwRowFrm::MakeAll() { if ( !GetNext() ) - bValidSize = FALSE; + bValidSize = sal_False; SwLayoutFrm::MakeAll(); } @@ -4017,7 +4017,7 @@ long MA_FASTCALL CalcHeightWidthFlys( const SwFrm *pFrm ) if ( pObjs ) // <-- { - for ( USHORT i = 0; i < pObjs->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pObjs->Count(); ++i ) { const SwAnchoredObject* pAnchoredObj = (*pObjs)[i]; // --> OD 2004-10-08 #i26945# - if <pTmp> is follow, the @@ -4120,7 +4120,7 @@ SwTwips lcl_CalcTopAndBottomMargin( const SwLayoutFrm& rCell, const SwBorderAttr // control, if floating screen objects have to be considered for the minimal // cell height. SwTwips MA_FASTCALL lcl_CalcMinCellHeight( const SwLayoutFrm *_pCell, - const BOOL _bConsiderObjs, + const sal_Bool _bConsiderObjs, const SwBorderAttrs *pAttrs = 0 ) { SWRECTFN( _pCell ) @@ -4179,7 +4179,7 @@ SwTwips MA_FASTCALL lcl_CalcMinCellHeight( const SwLayoutFrm *_pCell, // --> OD 2004-10-04 #i26945# - add parameter <_bConsiderObjs> in order to control, // if floating screen objects have to be considered for the minimal cell height SwTwips MA_FASTCALL lcl_CalcMinRowHeight( const SwRowFrm* _pRow, - const BOOL _bConsiderObjs ) + const sal_Bool _bConsiderObjs ) { SWRECTFN( _pRow ) @@ -4236,13 +4236,13 @@ SwTwips MA_FASTCALL lcl_CalcMinRowHeight( const SwRowFrm* _pRow, // --> collapsing borders FME 2005-05-27 #i29550# // Calculate the maximum of (TopLineSize + TopLineDist) over all lowers: -USHORT lcl_GetTopSpace( const SwRowFrm& rRow ) +sal_uInt16 lcl_GetTopSpace( const SwRowFrm& rRow ) { - USHORT nTopSpace = 0; + sal_uInt16 nTopSpace = 0; for ( SwCellFrm* pCurrLower = (SwCellFrm*)rRow.Lower(); pCurrLower; pCurrLower = (SwCellFrm*)pCurrLower->GetNext() ) { - USHORT nTmpTopSpace = 0; + sal_uInt16 nTmpTopSpace = 0; if ( pCurrLower->Lower() && pCurrLower->Lower()->IsRowFrm() ) nTmpTopSpace = lcl_GetTopSpace( *(SwRowFrm*)pCurrLower->Lower() ); else @@ -4257,13 +4257,13 @@ USHORT lcl_GetTopSpace( const SwRowFrm& rRow ) } // Calculate the maximum of TopLineDist over all lowers: -USHORT lcl_GetTopLineDist( const SwRowFrm& rRow ) +sal_uInt16 lcl_GetTopLineDist( const SwRowFrm& rRow ) { - USHORT nTopLineDist = 0; + sal_uInt16 nTopLineDist = 0; for ( SwCellFrm* pCurrLower = (SwCellFrm*)rRow.Lower(); pCurrLower; pCurrLower = (SwCellFrm*)pCurrLower->GetNext() ) { - USHORT nTmpTopLineDist = 0; + sal_uInt16 nTmpTopLineDist = 0; if ( pCurrLower->Lower() && pCurrLower->Lower()->IsRowFrm() ) nTmpTopLineDist = lcl_GetTopLineDist( *(SwRowFrm*)pCurrLower->Lower() ); else @@ -4278,13 +4278,13 @@ USHORT lcl_GetTopLineDist( const SwRowFrm& rRow ) } // Calculate the maximum of BottomLineSize over all lowers: -USHORT lcl_GetBottomLineSize( const SwRowFrm& rRow ) +sal_uInt16 lcl_GetBottomLineSize( const SwRowFrm& rRow ) { - USHORT nBottomLineSize = 0; + sal_uInt16 nBottomLineSize = 0; for ( SwCellFrm* pCurrLower = (SwCellFrm*)rRow.Lower(); pCurrLower; pCurrLower = (SwCellFrm*)pCurrLower->GetNext() ) { - USHORT nTmpBottomLineSize = 0; + sal_uInt16 nTmpBottomLineSize = 0; if ( pCurrLower->Lower() && pCurrLower->Lower()->IsRowFrm() ) { const SwFrm* pRow = pCurrLower->GetLastLower(); @@ -4303,13 +4303,13 @@ USHORT lcl_GetBottomLineSize( const SwRowFrm& rRow ) } // Calculate the maximum of BottomLineDist over all lowers: -USHORT lcl_GetBottomLineDist( const SwRowFrm& rRow ) +sal_uInt16 lcl_GetBottomLineDist( const SwRowFrm& rRow ) { - USHORT nBottomLineDist = 0; + sal_uInt16 nBottomLineDist = 0; for ( SwCellFrm* pCurrLower = (SwCellFrm*)rRow.Lower(); pCurrLower; pCurrLower = (SwCellFrm*)pCurrLower->GetNext() ) { - USHORT nTmpBottomLineDist = 0; + sal_uInt16 nTmpBottomLineDist = 0; if ( pCurrLower->Lower() && pCurrLower->Lower()->IsRowFrm() ) { const SwFrm* pRow = pCurrLower->GetLastLower(); @@ -4333,13 +4333,13 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs ) SWRECTFN( this ) ASSERT( pAttrs, "SwRowFrm::Format ohne Attrs." ); - const BOOL bFix = bFixSize; + const sal_Bool bFix = bFixSize; if ( !bValidPrtArea ) { //RowFrms haben keine Umrandung usw. also entspricht die PrtArea immer //dem Frm. - bValidPrtArea = TRUE; + bValidPrtArea = sal_True; aPrt.Left( 0 ); aPrt.Top( 0 ); aPrt.Width ( aFrm.Width() ); @@ -4350,10 +4350,10 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs ) SwTabFrm* pTabFrm = FindTabFrm(); if ( pTabFrm->IsCollapsingBorders() ) { - const USHORT nTopSpace = lcl_GetTopSpace( *this ); - const USHORT nTopLineDist = lcl_GetTopLineDist( *this ); - const USHORT nBottomLineSize = lcl_GetBottomLineSize( *this ); - const USHORT nBottomLineDist = lcl_GetBottomLineDist( *this ); + const sal_uInt16 nTopSpace = lcl_GetTopSpace( *this ); + const sal_uInt16 nTopLineDist = lcl_GetTopLineDist( *this ); + const sal_uInt16 nBottomLineSize = lcl_GetBottomLineSize( *this ); + const sal_uInt16 nBottomLineDist = lcl_GetBottomLineDist( *this ); const SwRowFrm* pPreviousRow = 0; @@ -4370,7 +4370,7 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs ) while ( pTmpRow && !pPrevTabLine ) { - USHORT nIdx = 0; + sal_uInt16 nIdx = 0; const SwTableLines& rLines = pTmpRow->GetTabLine()->GetUpper() ? pTmpRow->GetTabLine()->GetUpper()->GetTabLines() : pTable->GetTabLines(); @@ -4418,10 +4418,10 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs ) } // <-- - USHORT nTopPrtMargin = nTopSpace; + sal_uInt16 nTopPrtMargin = nTopSpace; if ( pPreviousRow ) { - const USHORT nTmpPrtMargin = pPreviousRow->GetBottomLineSize() + nTopLineDist; + const sal_uInt16 nTmpPrtMargin = pPreviousRow->GetBottomLineSize() + nTopLineDist; if ( nTmpPrtMargin > nTopPrtMargin ) nTopPrtMargin = nTmpPrtMargin; } @@ -4455,7 +4455,7 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs ) while ( !bValidSize ) { - bValidSize = TRUE; + bValidSize = sal_True; #ifdef DBG_UTIL if ( HasFixSize() ) @@ -4473,9 +4473,9 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs ) // <-- if ( nDiff ) { - bFixSize = FALSE; + bFixSize = sal_False; if ( nDiff > 0 ) - Shrink( nDiff, FALSE, TRUE ); + Shrink( nDiff, sal_False, sal_True ); else if ( nDiff < 0 ) Grow( -nDiff ); bFixSize = bFix; @@ -4494,10 +4494,10 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs ) } while ( pSibling ); if ( nDiff > 0 ) { - bFixSize = FALSE; + bFixSize = sal_False; Grow( nDiff ); bFixSize = bFix; - bValidSize = TRUE; + bValidSize = sal_True; } } } @@ -4510,7 +4510,7 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs ) |* Letzte Aenderung MA 16. Dec. 96 |* |*************************************************************************/ -void SwRowFrm::AdjustCells( const SwTwips nHeight, const BOOL bHeight ) +void SwRowFrm::AdjustCells( const SwTwips nHeight, const sal_Bool bHeight ) { SwFrm *pFrm = Lower(); if ( bHeight ) @@ -4658,7 +4658,7 @@ void SwRowFrm::Cut() |*************************************************************************/ -SwTwips SwRowFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) +SwTwips SwRowFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) { SwTwips nReal = 0; @@ -4695,7 +4695,7 @@ SwTwips SwRowFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) } if ( bRestrictTableGrowth ) - pTab->SetRestrictTableGrowth( TRUE ); + pTab->SetRestrictTableGrowth( sal_True ); else { // Ok, this looks like a hack, indeed, it is a hack. @@ -4704,19 +4704,19 @@ SwTwips SwRowFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) // be allowed to grow. In fact, setting bRestrictTableGrowth // to 'false' does not work, because the surrounding RowFrm // would set this to 'true'. - pTab->SetFollowFlowLine( FALSE ); + pTab->SetFollowFlowLine( sal_False ); } nReal += SwLayoutFrm::GrowFrm( nDist, bTst, bInfo); - pTab->SetRestrictTableGrowth( FALSE ); + pTab->SetRestrictTableGrowth( sal_False ); pTab->SetFollowFlowLine( bHasFollowFlowLine ); //Hoehe der Zellen auf den neuesten Stand bringen. if ( !bTst ) { SWRECTFNX( this ) - AdjustCells( (Prt().*fnRectX->fnGetHeight)() + nReal, TRUE ); + AdjustCells( (Prt().*fnRectX->fnGetHeight)() + nReal, sal_True ); if ( nReal ) SetCompletePaint(); } @@ -4732,18 +4732,18 @@ SwTwips SwRowFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) |* Letzte Aenderung MA 20. Jun. 96 |* |*************************************************************************/ -SwTwips SwRowFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) +SwTwips SwRowFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) { SWRECTFN( this ) if( HasFixSize() ) { - AdjustCells( (Prt().*fnRect->fnGetHeight)(), TRUE ); + AdjustCells( (Prt().*fnRect->fnGetHeight)(), sal_True ); return 0L; } - //bInfo wird ggf. vom SwRowFrm::Format auf TRUE gesetzt, hier muss dann + //bInfo wird ggf. vom SwRowFrm::Format auf sal_True gesetzt, hier muss dann //entsprechend reagiert werden - const BOOL bShrinkAnyway = bInfo; + const sal_Bool bShrinkAnyway = bInfo; //Nur soweit Shrinken, wie es der Inhalt der groessten Zelle zulaesst. SwTwips nRealDist = nDist; @@ -4818,7 +4818,7 @@ SwTwips SwRowFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) pMasterTab->InvalidatePos(); } } - AdjustCells( (Prt().*fnRect->fnGetHeight)() - nReal, TRUE ); + AdjustCells( (Prt().*fnRect->fnGetHeight)() - nReal, sal_True ); } return nReal; } @@ -4889,14 +4889,14 @@ SwCellFrm::SwCellFrm( const SwTableBox &rBox, bool bInsertContent ) : //angelegt. if ( rBox.GetSttIdx() ) { - ULONG nIndex = rBox.GetSttIdx(); + sal_uLong nIndex = rBox.GetSttIdx(); ::_InsertCnt( this, rBox.GetFrmFmt()->GetDoc(), ++nIndex ); } else { const SwTableLines &rLines = rBox.GetTabLines(); SwFrm *pTmpPrev = 0; - for ( USHORT i = 0; i < rLines.Count(); ++i ) + for ( sal_uInt16 i = 0; i < rLines.Count(); ++i ) { SwRowFrm *pNew = new SwRowFrm( *rLines[i], bInsertContent ); pNew->InsertBehind( this, pTmpPrev ); @@ -4933,9 +4933,9 @@ SwCellFrm::~SwCellFrm() |* Letzte Aenderung MA 29. Jan. 98 |* |*************************************************************************/ -BOOL lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, BOOL bInva ) +sal_Bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, sal_Bool bInva ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; SwFrm *pFrm = pLay->Lower(); SWRECTFN( pLay ) while ( pFrm ) @@ -4943,7 +4943,7 @@ BOOL lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, BOOL bInva ) long nFrmTop = (pFrm->Frm().*fnRect->fnGetTop)(); if( nFrmTop != lYStart ) { - bRet = TRUE; + bRet = sal_True; const long lDiff = (*fnRect->fnYDiff)( lYStart, nFrmTop ); const long lDiffX = lYStart - nFrmTop; (pFrm->Frm().*fnRect->fnSubTop)( -lDiff ); @@ -4959,7 +4959,7 @@ BOOL lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, BOOL bInva ) + lDiffX, bInva ); if ( pFrm->GetDrawObjs() ) { - for ( USHORT i = 0; i < pFrm->GetDrawObjs()->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pFrm->GetDrawObjs()->Count(); ++i ) { SwAnchoredObject* pAnchoredObj = (*pFrm->GetDrawObjs())[i]; // --> OD 2004-10-08 #i26945# - check, if anchored object @@ -5174,7 +5174,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) if ( !bValidPrtArea ) { - bValidPrtArea = TRUE; + bValidPrtArea = sal_True; //Position einstellen. if ( Lower() ) @@ -5209,7 +5209,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) // <-- if ( !bValidSize ) { - bValidSize = TRUE; + bValidSize = sal_True; //Die VarSize der CellFrms ist immer die Breite. //Tatsaechlich ist die Breite jedoch nicht Variabel, sie wird durch das @@ -5243,7 +5243,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) const SwTableBox* pTmpBox = 0; SwTwips nSumWidth = 0; - USHORT i = 0; + sal_uInt16 i = 0; do { pTmpBox = rBoxes[ i++ ]; @@ -5307,7 +5307,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) //Wieder validieren wenn kein Wachstum stattgefunden hat. //Invalidiert wird durch AdjustCells von der Row. if ( !Grow( nDiffHeight ) ) - bValidSize = bValidPrtArea = TRUE; + bValidSize = bValidPrtArea = sal_True; } else { @@ -5315,7 +5315,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) //geshrinkt wurde; das kann abgelehnt werden, weil alle //nebeneinanderliegenden Zellen gleichgross sein muessen. if ( !Shrink( -nDiffHeight ) ) - bValidSize = bValidPrtArea = TRUE; + bValidSize = bValidPrtArea = sal_True; } } } @@ -5342,7 +5342,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) ASSERT( !this, "VAlign an Zelle ohne Inhalt" ); return; } - BOOL bVertDir = TRUE; + sal_Bool bVertDir = sal_True; // --> OD 2005-03-30 #i43913# - no vertical alignment, if wrapping // style influence is considered on object positioning and // an object is anchored inside the cell. @@ -5352,7 +5352,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) if ( pPg->GetSortedObjs() ) { SwRect aRect( Prt() ); aRect += Frm().Pos(); - for ( USHORT i = 0; i < pPg->GetSortedObjs()->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pPg->GetSortedObjs()->Count(); ++i ) { const SwAnchoredObject* pAnchoredObj = (*pPg->GetSortedObjs())[i]; SwRect aTmp( pAnchoredObj->GetObjRect() ); @@ -5385,7 +5385,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) !rAnchoredObjFrmFmt.GetFollowTextFlow().GetValue() ) // <-- { - bVertDir = FALSE; + bVertDir = sal_False; break; } } @@ -5423,7 +5423,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) if ( Lower()->IsCntntFrm() ) { const long lYStart = (this->*fnRect->fnGetPrtTop)(); - lcl_ArrangeLowers( this, lYStart, TRUE ); + lcl_ArrangeLowers( this, lYStart, sal_True ); } } } @@ -5439,24 +5439,24 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) void SwCellFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) { - BOOL bAttrSetChg = pNew && RES_ATTRSET_CHG == pNew->Which(); + sal_Bool bAttrSetChg = pNew && RES_ATTRSET_CHG == pNew->Which(); const SfxPoolItem *pItem = 0; if( bAttrSetChg ) - ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_VERT_ORIENT, FALSE, &pItem); + ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_VERT_ORIENT, sal_False, &pItem); else if ( RES_VERT_ORIENT == pNew->Which() ) pItem = pNew; if ( pItem ) { - BOOL bInva = TRUE; + sal_Bool bInva = sal_True; if ( text::VertOrientation::NONE == ((SwFmtVertOrient*)pItem)->GetVertOrient() && // OD 04.11.2003 #112910# Lower() && Lower()->IsCntntFrm() ) { SWRECTFN( this ) const long lYStart = (this->*fnRect->fnGetPrtTop)(); - bInva = lcl_ArrangeLowers( this, lYStart, FALSE ); + bInva = lcl_ArrangeLowers( this, lYStart, sal_False ); } if ( bInva ) { @@ -5466,7 +5466,7 @@ void SwCellFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) } if ( ( bAttrSetChg && - SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_PROTECT, FALSE ) ) || + SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_PROTECT, sal_False ) ) || RES_PROTECT == pNew->Which() ) { ViewShell *pSh = GetShell(); @@ -5475,15 +5475,15 @@ void SwCellFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) } if ( bAttrSetChg && - SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_FRAMEDIR, FALSE, &pItem ) ) + SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_FRAMEDIR, sal_False, &pItem ) ) { - SetDerivedVert( FALSE ); + SetDerivedVert( sal_False ); CheckDirChange(); } // --> collapsing borders FME 2005-05-27 #i29550# if ( bAttrSetChg && - SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_BOX, FALSE, &pItem ) ) + SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_BOX, sal_False, &pItem ) ) { SwFrm* pTmpUpper = GetUpper(); while ( pTmpUpper->GetUpper() && !pTmpUpper->GetUpper()->IsTabFrm() ) @@ -5584,7 +5584,7 @@ SwRowFrm* SwTabFrm::GetFirstNonHeadlineRow() const } else { - USHORT nRepeat = GetTable()->GetRowsToRepeat(); + sal_uInt16 nRepeat = GetTable()->GetRowsToRepeat(); while ( pRet && nRepeat > 0 ) { pRet = (SwRowFrm*)pRet->GetNext(); @@ -5601,7 +5601,7 @@ SwRowFrm* SwTabFrm::GetFirstNonHeadlineRow() const */ bool SwTable::IsHeadline( const SwTableLine& rLine ) const { - for ( USHORT i = 0; i < GetRowsToRepeat(); ++i ) + for ( sal_uInt16 i = 0; i < GetRowsToRepeat(); ++i ) if ( GetTabLines()[ i ] == &rLine ) return true; @@ -5615,7 +5615,7 @@ bool SwTabFrm::IsLayoutSplitAllowed() const // --> collapsing borders FME 2005-05-27 #i29550# -USHORT SwTabFrm::GetBottomLineSize() const +sal_uInt16 SwTabFrm::GetBottomLineSize() const { ASSERT( IsCollapsingBorders(), "BottomLineSize only required for collapsing borders" ) @@ -5813,7 +5813,7 @@ SwTwips SwTabFrm::CalcHeightOfFirstContentLine() const pFirstRow = static_cast<SwRowFrm*>(pFirstRow->GetNext()); // Calculate the height of the headlines: - const USHORT nRepeat = GetTable()->GetRowsToRepeat(); + const sal_uInt16 nRepeat = GetTable()->GetRowsToRepeat(); SwTwips nRepeatHeight = nRepeat ? lcl_GetHeightOfRows( GetLower(), nRepeat ) : 0; // Calculate the height of the keeping lines @@ -5821,7 +5821,7 @@ SwTwips SwTabFrm::CalcHeightOfFirstContentLine() const SwTwips nKeepHeight = nRepeatHeight; if ( GetFmt()->GetDoc()->get(IDocumentSettingAccess::TABLE_ROW_KEEP) ) { - USHORT nKeepRows = nRepeat; + sal_uInt16 nKeepRows = nRepeat; // Check how many rows want to keep together while ( pFirstRow && pFirstRow->ShouldRowKeepWithNext() ) @@ -5870,7 +5870,7 @@ SwTwips SwTabFrm::CalcHeightOfFirstContentLine() const { if ( 1 == pLower2->GetTabBox()->getRowSpan() ) { - const SwTwips nCellHeight = lcl_CalcMinCellHeight( pLower2, TRUE ); + const SwTwips nCellHeight = lcl_CalcMinCellHeight( pLower2, sal_True ); nMaxHeight = Max( nCellHeight, nMaxHeight ); } pLower2 = static_cast<const SwCellFrm*>(pLower2->GetNext()); diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index ff0c6ec8f48f..c295e6d4542c 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -77,14 +77,14 @@ public: //public: // SwCrsrOszControl() : pStk1( 0 ), pStk2( 0 ) {}; // ; <- ???? - BOOL ChkOsz( const SwFlyFrm *pFly ) + sal_Bool ChkOsz( const SwFlyFrm *pFly ) { - BOOL bRet = TRUE; + sal_Bool bRet = sal_True; if ( pFly != pStk1 && pFly != pStk2 ) { pStk1 = pStk2; pStk2 = pFly; - bRet = FALSE; + bRet = sal_False; } return bRet; } @@ -112,10 +112,10 @@ static SwCrsrOszControl aOszCtrl = { 0, 0, 0 }; |* Letzte Aenderung MA 23. May. 95 |* |*************************************************************************/ -BOOL SwLayoutFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, +sal_Bool SwLayoutFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, SwCrsrMoveState* pCMS ) const { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; const SwFrm *pFrm = Lower(); while ( !bRet && pFrm ) { @@ -130,11 +130,11 @@ BOOL SwLayoutFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, if ( aPaintRect.IsInside( rPoint ) && ( bCntntCheck || pFrm->GetCrsrOfst( pPos, rPoint, pCMS ) ) ) - bRet = TRUE; + bRet = sal_True; else pFrm = pFrm->GetNext(); if ( pCMS && pCMS->bStop ) - return FALSE; + return sal_False; } return bRet; } @@ -150,10 +150,10 @@ BOOL SwLayoutFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, |* |*************************************************************************/ -BOOL SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, +sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, SwCrsrMoveState* pCMS ) const { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; Point aPoint( rPoint ); // check, if we have to adjust the point @@ -178,16 +178,16 @@ BOOL SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, static_cast<const SwVirtFlyDrawObj*>(aIter()); const SwFlyFrm* pFly = pObj ? pObj->GetFlyFrm() : 0; if ( pFly && - ( ( pCMS ? pCMS->bSetInReadOnly : FALSE ) || + ( ( pCMS ? pCMS->bSetInReadOnly : sal_False ) || !pFly->IsProtected() ) && pFly->GetCrsrOfst( pPos, aPoint, pCMS ) ) { - bRet = TRUE; + bRet = sal_True; break; } if ( pCMS && pCMS->bStop ) - return FALSE; + return sal_False; aIter.Prev(); } } @@ -198,17 +198,17 @@ BOOL SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, //wir den StartPoint und fangen nochmal eine Seite vor der //aktuellen an. Mit Flys ist es dann allerdings vorbei. if ( SwLayoutFrm::GetCrsrOfst( pPos, aPoint, pCMS ) ) - bRet = TRUE; + bRet = sal_True; else { if ( pCMS && (pCMS->bStop || pCMS->bExactOnly) ) { - ((SwCrsrMoveState*)pCMS)->bStop = TRUE; - return FALSE; + ((SwCrsrMoveState*)pCMS)->bStop = sal_True; + return sal_False; } - const SwCntntFrm *pCnt = GetCntntPos( aPoint, FALSE, FALSE, FALSE, pCMS, FALSE ); + const SwCntntFrm *pCnt = GetCntntPos( aPoint, sal_False, sal_False, sal_False, pCMS, sal_False ); if ( pCMS && pCMS->bStop ) - return FALSE; + return sal_False; ASSERT( pCnt, "Crsr is gone to a Black hole" ); if( pCMS && pCMS->pFill && pCnt->IsTxtFrm() ) @@ -221,7 +221,7 @@ BOOL SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, // Set point to pCnt, delete mark // this may happen, if pCnt is hidden *pPos = SwPosition( *pCnt->GetNode(), SwIndex( (SwTxtNode*)pCnt->GetNode(), 0 ) ); - bRet = TRUE; + bRet = sal_True; } } } @@ -256,7 +256,7 @@ bool SwPageFrm::FillSelection( SwSelectionList& rList, const SwRect& rRect ) con if( GetSortedObjs() ) { const SwSortedObjs &rObjs = *GetSortedObjs(); - for ( USHORT i = 0; i < rObjs.Count(); ++i ) + for ( sal_uInt16 i = 0; i < rObjs.Count(); ++i ) { const SwAnchoredObject* pAnchoredObj = rObjs[i]; if( !pAnchoredObj->ISA(SwFlyFrm) ) @@ -294,19 +294,19 @@ bool SwRootFrm::FillSelection( SwSelectionList& aSelList, const SwRect& rRect) c |* |* Beschreibung: Reicht Primaer den Aufruf an die erste Seite weiter. |* Wenn der 'reingereichte Point veraendert wird, -|* so wird FALSE zurueckgegeben. +|* so wird sal_False zurueckgegeben. |* Ersterstellung MA 01. Jun. 92 |* Letzte Aenderung MA 30. Nov. 94 |* |*************************************************************************/ -BOOL SwRootFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, +sal_Bool SwRootFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, SwCrsrMoveState* pCMS ) const { sal_Bool bOldAction = IsCallbackActionEnabled(); - ((SwRootFrm*)this)->SetCallbackActionEnabled( FALSE ); + ((SwRootFrm*)this)->SetCallbackActionEnabled( sal_False ); ASSERT( (Lower() && Lower()->IsPageFrm()), "Keinen PageFrm gefunden." ); if( pCMS && pCMS->pFill ) - ((SwCrsrMoveState*)pCMS)->bFillRet = FALSE; + ((SwCrsrMoveState*)pCMS)->bFillRet = sal_False; Point aOldPoint = rPoint; // PAGES01 @@ -335,7 +335,7 @@ BOOL SwRootFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, if( pCMS ) { if( pCMS->bStop ) - return FALSE; + return sal_False; if( pCMS->pFill ) return pCMS->bFillRet; } @@ -354,24 +354,24 @@ BOOL SwRootFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, |* Letzte Aenderung MA 23. May. 95 |* |*************************************************************************/ -BOOL SwCellFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, +sal_Bool SwCellFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, SwCrsrMoveState* pCMS ) const { // cell frame does not necessarily have a lower (split table cell) if ( !Lower() ) - return FALSE; + return sal_False; - if ( !(pCMS?pCMS->bSetInReadOnly:FALSE) && + if ( !(pCMS?pCMS->bSetInReadOnly:sal_False) && GetFmt()->GetProtect().IsCntntProtected() ) - return FALSE; + return sal_False; if ( pCMS && pCMS->eState == MV_TBLSEL ) { const SwTabFrm *pTab = FindTabFrm(); if ( pTab->IsFollow() && pTab->IsInHeadline( *this ) ) { - ((SwCrsrMoveState*)pCMS)->bStop = TRUE; - return FALSE; + ((SwCrsrMoveState*)pCMS)->bStop = sal_True; + return sal_False; } } @@ -382,7 +382,7 @@ BOOL SwCellFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, else { Calc(); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; const SwFrm *pFrm = Lower(); while ( pFrm && !bRet ) @@ -392,14 +392,14 @@ BOOL SwCellFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, { bRet = pFrm->GetCrsrOfst( pPos, rPoint, pCMS ); if ( pCMS && pCMS->bStop ) - return FALSE; + return sal_False; } pFrm = pFrm->GetNext(); } if ( !bRet ) { Point *pPoint = pCMS && pCMS->pFill ? new Point( rPoint ) : NULL; - const SwCntntFrm *pCnt = GetCntntPos( rPoint, TRUE ); + const SwCntntFrm *pCnt = GetCntntPos( rPoint, sal_True ); if( pPoint && pCnt->IsTxtFrm() ) { pCnt->GetCrsrOfst( pPos, *pPoint, pCMS ); @@ -409,11 +409,11 @@ BOOL SwCellFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, pCnt->GetCrsrOfst( pPos, rPoint, pCMS ); delete pPoint; } - return TRUE; + return sal_True; } } - return FALSE; + return sal_False; } /************************************************************************* @@ -434,7 +434,7 @@ BOOL SwCellFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, //GetCrsrOfst entscheidet sich bei einer Rekursion fuer denjenigen der //am weitesten oben liegt. -BOOL SwFlyFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, +sal_Bool SwFlyFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, SwCrsrMoveState* pCMS ) const { aOszCtrl.Entry( this ); @@ -445,14 +445,14 @@ BOOL SwFlyFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, //innerhalb des aktuellen befindet, so wird fuer diesen das //GetCrsrOfst gerufen. Calc(); - BOOL bInside = Frm().IsInside( rPoint ) && Lower(), - bRet = FALSE; + sal_Bool bInside = Frm().IsInside( rPoint ) && Lower(), + bRet = sal_False; //Wenn der Frm eine Grafik enthaelt, aber nur Text gewuenscht ist, so //nimmt er den Crsr grundsaetzlich nicht an. if ( bInside && pCMS && pCMS->eState == MV_SETONLYTEXT && (!Lower() || Lower()->IsNoTxtFrm()) ) - bInside = FALSE; + bInside = sal_False; const SwPageFrm *pPage = FindPageFrm(); if ( bInside && pPage && pPage->GetSortedObjs() ) @@ -467,10 +467,10 @@ BOOL SwFlyFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, Frm().IsInside( pFly->Frm() ) ) { if ( aOszCtrl.ChkOsz( pFly ) || - TRUE == (bRet = pFly->GetCrsrOfst( pPos, rPoint, pCMS ))) + sal_True == (bRet = pFly->GetCrsrOfst( pPos, rPoint, pCMS ))) break; if ( pCMS && pCMS->bStop ) - return FALSE; + return sal_False; } aIter.Next(); } @@ -486,7 +486,7 @@ BOOL SwFlyFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, { bRet = pFrm->GetCrsrOfst( pPos, rPoint, pCMS ); if ( pCMS && pCMS->bStop ) - return FALSE; + return sal_False; } pFrm = pFrm->GetNext(); } @@ -494,9 +494,9 @@ BOOL SwFlyFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, { Point *pPoint = pCMS && pCMS->pFill ? new Point( rPoint ) : NULL; const SwCntntFrm *pCnt = GetCntntPos( - rPoint, TRUE, FALSE, FALSE, pCMS ); + rPoint, sal_True, sal_False, sal_False, pCMS ); if ( pCMS && pCMS->bStop ) - return FALSE; + return sal_False; if( pPoint && pCnt->IsTxtFrm() ) { pCnt->GetCrsrOfst( pPos, *pPoint, pCMS ); @@ -505,7 +505,7 @@ BOOL SwFlyFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, else pCnt->GetCrsrOfst( pPos, rPoint, pCMS ); delete pPoint; - bRet = TRUE; + bRet = sal_True; } } aOszCtrl.Exit( this ); @@ -519,22 +519,22 @@ BOOL SwFlyFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, |* Letzte Aenderung MA 06. Sep. 93 |* |*************************************************************************/ -BOOL SwCntntFrm::LeftMargin(SwPaM *pPam) const +sal_Bool SwCntntFrm::LeftMargin(SwPaM *pPam) const { if( pPam->GetNode() != (SwCntntNode*)GetNode() ) - return FALSE; + return sal_False; ((SwCntntNode*)GetNode())-> MakeStartIndex((SwIndex *) &pPam->GetPoint()->nContent); - return TRUE; + return sal_True; } -BOOL SwCntntFrm::RightMargin(SwPaM *pPam, BOOL) const +sal_Bool SwCntntFrm::RightMargin(SwPaM *pPam, sal_Bool) const { if( pPam->GetNode() != (SwCntntNode*)GetNode() ) - return FALSE; + return sal_False; ((SwCntntNode*)GetNode())-> MakeEndIndex((SwIndex *) &pPam->GetPoint()->nContent); - return TRUE; + return sal_True; } const SwCntntFrm *lcl_GetNxtCnt( const SwCntntFrm* pCnt ) @@ -550,7 +550,7 @@ const SwCntntFrm *lcl_GetPrvCnt( const SwCntntFrm* pCnt ) typedef const SwCntntFrm *(*GetNxtPrvCnt)( const SwCntntFrm* ); //Frame in wiederholter Headline? -BOOL lcl_IsInRepeatedHeadline( const SwFrm *pFrm, +sal_Bool lcl_IsInRepeatedHeadline( const SwFrm *pFrm, const SwTabFrm** ppTFrm = 0 ) { const SwTabFrm *pTab = pFrm->FindTabFrm(); @@ -566,13 +566,13 @@ BOOL lcl_IsInRepeatedHeadline( const SwFrm *pFrm, // FME: Skip follow flow cells const SwCntntFrm * MA_FASTCALL lcl_MissProtectedFrames( const SwCntntFrm *pCnt, GetNxtPrvCnt fnNxtPrv, - BOOL bMissHeadline, - BOOL bInReadOnly, - BOOL bMissFollowFlowLine ) + sal_Bool bMissHeadline, + sal_Bool bInReadOnly, + sal_Bool bMissFollowFlowLine ) { if ( pCnt && pCnt->IsInTab() ) { - BOOL bProtect = TRUE; + sal_Bool bProtect = sal_True; while ( pCnt && bProtect ) { const SwLayoutFrm *pCell = pCnt->GetUpper(); @@ -581,9 +581,9 @@ const SwCntntFrm * MA_FASTCALL lcl_MissProtectedFrames( const SwCntntFrm *pCnt, if ( !pCell || ( ( bInReadOnly || !pCell->GetFmt()->GetProtect().IsCntntProtected() ) && ( !bMissHeadline || !lcl_IsInRepeatedHeadline( pCell ) ) && - ( !bMissFollowFlowLine || !pCell->IsInFollowFlowRow() ) ) && - !pCell->IsCoveredCell() ) - bProtect = FALSE; + ( !bMissFollowFlowLine || !pCell->IsInFollowFlowRow() ) && + !pCell->IsCoveredCell() ) ) + bProtect = sal_False; else pCnt = (*fnNxtPrv)( pCnt ); } @@ -595,8 +595,8 @@ const SwCntntFrm * MA_FASTCALL lcl_MissProtectedFrames( const SwCntntFrm *pCnt, return pCnt; } -BOOL MA_FASTCALL lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, - GetNxtPrvCnt fnNxtPrv, BOOL bInReadOnly ) +sal_Bool MA_FASTCALL lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, + GetNxtPrvCnt fnNxtPrv, sal_Bool bInReadOnly ) { ASSERT( pPam->GetNode() == (SwCntntNode*)pStart->GetNode(), "lcl_UpDown arbeitet nicht fuer andere." ); @@ -606,10 +606,10 @@ BOOL MA_FASTCALL lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, //Wenn gerade eine Tabellenselection laeuft muss ein bischen getricktst //werden: Beim hochlaufen an den Anfang der Zelle gehen, beim runterlaufen //an das Ende der Zelle gehen. - BOOL bTblSel = false; + sal_Bool bTblSel = false; if ( pStart->IsInTab() && - pPam->GetNode( TRUE )->StartOfSectionNode() != - pPam->GetNode( FALSE )->StartOfSectionNode() ) + pPam->GetNode( sal_True )->StartOfSectionNode() != + pPam->GetNode( sal_False )->StartOfSectionNode() ) { bTblSel = true; const SwLayoutFrm *pCell = pStart->GetUpper(); @@ -642,13 +642,13 @@ BOOL MA_FASTCALL lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, } pCnt = (*fnNxtPrv)( pCnt ? pCnt : pStart ); - pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, TRUE, bInReadOnly, bTblSel ); + pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, sal_True, bInReadOnly, bTblSel ); const SwTabFrm *pStTab = pStart->FindTabFrm(); const SwTabFrm *pTable = 0; - const BOOL bTab = pStTab || (pCnt && pCnt->IsInTab()) ? TRUE : FALSE; - BOOL bEnd = bTab ? FALSE : TRUE; + const sal_Bool bTab = pStTab || (pCnt && pCnt->IsInTab()) ? sal_True : sal_False; + sal_Bool bEnd = bTab ? sal_False : sal_True; const SwFrm* pVertRefFrm = pStart; if ( bTblSel && pStTab ) @@ -701,14 +701,14 @@ BOOL MA_FASTCALL lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, const long nPrtLeft = bRTL ? (pTable->*fnRect->fnGetPrtRight)() : (pTable->*fnRect->fnGetPrtLeft)(); - if ( bRTL != nX < nPrtLeft ) + if ( (bRTL != (nX < nPrtLeft)) ) nX = nPrtLeft; else { const long nPrtRight = bRTL ? (pTable->*fnRect->fnGetPrtLeft)() : (pTable->*fnRect->fnGetPrtRight)(); - if ( bRTL != nX > nPrtRight ) + if ( (bRTL != (nX > nPrtRight)) ) nX = nPrtRight; } } @@ -723,7 +723,7 @@ BOOL MA_FASTCALL lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, (pCnt->IsTxtFrm() && ((SwTxtFrm*)pCnt)->IsHiddenNow()))) { pCnt = (*fnNxtPrv)( pCnt ); - pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, TRUE, bInReadOnly, bTblSel ); + pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, sal_True, bInReadOnly, bTblSel ); } } @@ -735,7 +735,7 @@ BOOL MA_FASTCALL lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, (pCnt->IsTxtFrm() && ((SwTxtFrm*)pCnt)->IsHiddenNow()))) { pCnt = (*fnNxtPrv)( pCnt ); - pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, TRUE, bInReadOnly, bTblSel ); + pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, sal_True, bInReadOnly, bTblSel ); } } @@ -746,7 +746,7 @@ BOOL MA_FASTCALL lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, if ( pCnt && pCnt->IsTxtFrm() && ((SwTxtFrm*)pCnt)->IsHiddenNow() ) { pCnt = (*fnNxtPrv)( pCnt ); - pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, TRUE, bInReadOnly, bTblSel ); + pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, sal_True, bInReadOnly, bTblSel ); } } @@ -757,11 +757,11 @@ BOOL MA_FASTCALL lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, const SwFrm *pUp = pStart->GetUpper(); //Head/Foot while ( pUp && pUp->GetUpper() && !(pUp->GetType() & 0x0018 ) ) pUp = pUp->GetUpper(); - BOOL bSame = FALSE; + sal_Bool bSame = sal_False; const SwFrm *pCntUp = pCnt->GetUpper(); while ( pCntUp && !bSame ) { if ( pUp == pCntUp ) - bSame = TRUE; + bSame = sal_True; else pCntUp = pCntUp->GetUpper(); } @@ -770,18 +770,18 @@ BOOL MA_FASTCALL lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, else if ( pCnt && pCnt->IsTxtFrm() && ((SwTxtFrm*)pCnt)->IsHiddenNow() ) // i73332 { pCnt = (*fnNxtPrv)( pCnt ); - pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, TRUE, bInReadOnly, bTblSel ); + pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, sal_True, bInReadOnly, bTblSel ); } } if ( bTab ) { if ( !pCnt ) - bEnd = TRUE; + bEnd = sal_True; else { const SwTabFrm *pTab = pCnt->FindTabFrm(); if( !pTab ) - bEnd = TRUE; + bEnd = sal_True; else { if ( pTab != pTable ) @@ -828,7 +828,7 @@ BOOL MA_FASTCALL lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, if ( pCell && pCell->Frm().IsInside( aInsideCell ) ) { - bEnd = TRUE; + bEnd = sal_True; //Jetzt noch schnell den richtigen Cntnt in der Zelle //greifen. if ( !pCnt->Frm().IsInside( aInsideCnt ) ) @@ -840,13 +840,13 @@ BOOL MA_FASTCALL lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, } } else if ( pCnt->Frm().IsInside( aInsideCnt ) ) - bEnd = TRUE; + bEnd = sal_True; } } if ( !bEnd ) { pCnt = (*fnNxtPrv)( pCnt ); - pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, TRUE, bInReadOnly, bTblSel ); + pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, sal_True, bInReadOnly, bTblSel ); } } @@ -861,17 +861,17 @@ BOOL MA_FASTCALL lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, pCNd->MakeEndIndex( (SwIndex*)&pPam->GetPoint()->nContent ); else pCNd->MakeStartIndex( (SwIndex*)&pPam->GetPoint()->nContent ); - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } -BOOL SwCntntFrm::UnitUp( SwPaM* pPam, const SwTwips, BOOL bInReadOnly ) const +sal_Bool SwCntntFrm::UnitUp( SwPaM* pPam, const SwTwips, sal_Bool bInReadOnly ) const { return ::lcl_UpDown( pPam, this, lcl_GetPrvCnt, bInReadOnly ); } -BOOL SwCntntFrm::UnitDown( SwPaM* pPam, const SwTwips, BOOL bInReadOnly ) const +sal_Bool SwCntntFrm::UnitDown( SwPaM* pPam, const SwTwips, sal_Bool bInReadOnly ) const { return ::lcl_UpDown( pPam, this, lcl_GetNxtCnt, bInReadOnly ); } @@ -889,13 +889,13 @@ BOOL SwCntntFrm::UnitDown( SwPaM* pPam, const SwTwips, BOOL bInReadOnly ) const |* Letzte Aenderung MA 09. Oct. 97 |* |*************************************************************************/ -USHORT SwRootFrm::GetCurrPage( const SwPaM *pActualCrsr ) const +sal_uInt16 SwRootFrm::GetCurrPage( const SwPaM *pActualCrsr ) const { ASSERT( pActualCrsr, "Welche Seite soll's denn sein?" ); - const SwFrm *pActFrm = GetFmt()->GetDoc()->GetNodes()[pActualCrsr->GetPoint()->nNode]-> + SwFrm const*const pActFrm = pActualCrsr->GetPoint()->nNode.GetNode(). GetCntntNode()->GetFrm( 0, pActualCrsr->GetPoint(), - FALSE ); + sal_False ); return pActFrm->FindPageFrm()->GetPhyPageNum(); } @@ -913,12 +913,12 @@ USHORT SwRootFrm::GetCurrPage( const SwPaM *pActualCrsr ) const |* Letzte Aenderung MA 09. Oct. 97 |* |*************************************************************************/ -USHORT SwRootFrm::SetCurrPage( SwCursor* pToSet, USHORT nPageNum ) +sal_uInt16 SwRootFrm::SetCurrPage( SwCursor* pToSet, sal_uInt16 nPageNum ) { ASSERT( Lower() && Lower()->IsPageFrm(), "Keine Seite vorhanden." ); SwPageFrm *pPage = (SwPageFrm*)Lower(); - BOOL bEnd =FALSE; + sal_Bool bEnd =sal_False; while ( !bEnd && pPage->GetPhyPageNum() != nPageNum ) { if ( pPage->GetNext() ) pPage = (SwPageFrm*)pPage->GetNext(); @@ -937,7 +937,7 @@ USHORT SwRootFrm::SetCurrPage( SwCursor* pToSet, USHORT nPageNum ) if ( pPage->GetNext() ) pPage = (SwPageFrm*)pPage->GetNext(); else - bEnd = TRUE; + bEnd = sal_True; } } //pPage zeigt jetzt auf die 'gewuenschte' Seite. Jetzt muss noch der @@ -1036,18 +1036,18 @@ SwWhichPage fnPageNext = GetNextFrm; //den Parameter fnPosPage) in der //aktuellen/vorhergehenden/folgenden Seite (gesteuert durch den //Parameter fnWhichPage). -BOOL GetFrmInPage( const SwCntntFrm *pCnt, SwWhichPage fnWhichPage, +sal_Bool GetFrmInPage( const SwCntntFrm *pCnt, SwWhichPage fnWhichPage, SwPosPage fnPosPage, SwPaM *pPam ) { //Erstmal die gewuenschte Seite besorgen, anfangs die aktuelle, dann //die die per fnWichPage gewuenscht wurde const SwLayoutFrm *pLayoutFrm = pCnt->FindPageFrm(); if ( !pLayoutFrm || (0 == (pLayoutFrm = (*fnWhichPage)(pLayoutFrm))) ) - return FALSE; + return sal_False; //Jetzt den gewuenschen CntntFrm unterhalb der Seite if( 0 == (pCnt = (*fnPosPage)(pLayoutFrm)) ) - return FALSE; + return sal_False; else { // repeated headlines in tables @@ -1067,7 +1067,7 @@ BOOL GetFrmInPage( const SwCntntFrm *pCnt, SwWhichPage fnWhichPage, // of the next row pCnt = pRow->ContainsCntnt(); if ( ! pCnt ) - return FALSE; + return sal_False; } } } @@ -1082,7 +1082,7 @@ BOOL GetFrmInPage( const SwCntntFrm *pCnt, SwWhichPage fnWhichPage, nIdx = pCnt->GetFollow() ? ((SwTxtFrm*)pCnt)->GetFollow()->GetOfst()-1 : pCNd->Len(); pPam->GetPoint()->nContent.Assign( pCNd, nIdx ); - return TRUE; + return sal_True; } } @@ -1101,7 +1101,7 @@ BOOL GetFrmInPage( const SwCntntFrm *pCnt, SwWhichPage fnWhichPage, |* Letzte Aenderung MA 09. Jan. 97 |* |*************************************************************************/ -ULONG CalcDiff( const Point &rPt1, const Point &rPt2 ) +sal_uLong CalcDiff( const Point &rPt1, const Point &rPt2 ) { //Jetzt die Entfernung zwischen den beiden Punkten berechnen. //'Delta' X^2 + 'Delta'Y^2 = 'Entfernung'^2 @@ -1140,11 +1140,11 @@ const SwLayoutFrm* lcl_Inside( const SwCntntFrm *pCnt, Point& rPt ) } const SwCntntFrm *SwLayoutFrm::GetCntntPos( Point& rPoint, - const BOOL bDontLeave, - const BOOL bBodyOnly, - const BOOL bCalc, + const sal_Bool bDontLeave, + const sal_Bool bBodyOnly, + const sal_Bool bCalc, const SwCrsrMoveState *pCMS, - const BOOL bDefaultExpand ) const + const sal_Bool bDefaultExpand ) const { //Ersten CntntFrm ermitteln. const SwLayoutFrm *pStart = (!bDontLeave && bDefaultExpand && GetPrev()) ? @@ -1160,11 +1160,11 @@ const SwCntntFrm *SwLayoutFrm::GetCntntPos( Point& rPoint, const SwCntntFrm *pActual= pCntnt; const SwLayoutFrm *pInside = NULL; - USHORT nMaxPage = GetPhyPageNum() + (bDefaultExpand ? 1 : 0); + sal_uInt16 nMaxPage = GetPhyPageNum() + (bDefaultExpand ? 1 : 0); Point aPoint = rPoint; - ULONG nDistance = ULONG_MAX; + sal_uLong nDistance = ULONG_MAX; - while ( TRUE ) //Sicherheitsschleifchen, damit immer einer gefunden wird. + while ( sal_True ) //Sicherheitsschleifchen, damit immer einer gefunden wird. { while ( pCntnt && ((!bDontLeave || IsAnLower( pCntnt )) && @@ -1176,8 +1176,8 @@ const SwCntntFrm *SwLayoutFrm::GetCntntPos( Point& rPoint, //Wenn der Cntnt in einem geschuetzen Bereich (Zelle, Ftn, Section) //liegt, wird der nachste Cntnt der nicht geschuetzt ist gesucht. const SwCntntFrm *pComp = pCntnt; - pCntnt = ::lcl_MissProtectedFrames( pCntnt, lcl_GetNxtCnt, FALSE, - pCMS ? pCMS->bSetInReadOnly : FALSE, FALSE ); + pCntnt = ::lcl_MissProtectedFrames( pCntnt, lcl_GetNxtCnt, sal_False, + pCMS ? pCMS->bSetInReadOnly : sal_False, sal_False ); if ( pComp != pCntnt ) continue; @@ -1215,13 +1215,13 @@ const SwCntntFrm *SwLayoutFrm::GetCntntPos( Point& rPoint, if( !pInside || ( pInside->IsAnLower( pCntnt ) && ( !pCntnt->IsInFtn() || pInside->IsFtnContFrm() ) ) ) { - const ULONG nDiff = ::CalcDiff( aCntntPoint, rPoint ); - BOOL bBetter = nDiff < nDistance; // Dichter dran + const sal_uLong nDiff = ::CalcDiff( aCntntPoint, rPoint ); + sal_Bool bBetter = nDiff < nDistance; // Dichter dran if( !pInside ) { pInside = lcl_Inside( pCntnt, rPoint ); if( pInside ) // Im "richtigen" Seitenteil - bBetter = TRUE; + bBetter = sal_True; } if( bBetter ) { @@ -1296,7 +1296,7 @@ const SwCntntFrm *SwLayoutFrm::GetCntntPos( Point& rPoint, const SwTabFrm *pTab = pActual->FindTabFrm(); if ( pTab->IsFollow() && pTab->IsInHeadline( *pActual ) ) { - ((SwCrsrMoveState*)pCMS)->bStop = TRUE; + ((SwCrsrMoveState*)pCMS)->bStop = sal_True; return 0; } } @@ -1374,7 +1374,7 @@ void SwPageFrm::GetCntntPosition( const Point &rPt, SwPosition &rPos ) const const SwCntntFrm *pAct = pCntnt; Point aAct = rPt; - ULONG nDist = ULONG_MAX; + sal_uLong nDist = ULONG_MAX; while ( pCntnt ) { @@ -1401,7 +1401,7 @@ void SwPageFrm::GetCntntPosition( const Point &rPt, SwPosition &rPos ) const else if ( aCntFrm.Right() < rPt.X() ) aPoint.X() = aCntFrm.Right(); - const ULONG nDiff = ::CalcDiff( aPoint, rPt ); + const sal_uLong nDiff = ::CalcDiff( aPoint, rPt ); if ( nDiff < nDist ) { aAct = aPoint; @@ -1460,14 +1460,14 @@ class DisableCallbackAction { private: SwRootFrm& mrRootFrm; - BOOL mbOldCallbackActionState; + sal_Bool mbOldCallbackActionState; public: DisableCallbackAction( const SwRootFrm& _rRootFrm ) : mrRootFrm( const_cast<SwRootFrm&>(_rRootFrm) ), mbOldCallbackActionState( _rRootFrm.IsCallbackActionEnabled() ) { - mrRootFrm.SetCallbackActionEnabled( FALSE ); + mrRootFrm.SetCallbackActionEnabled( sal_False ); } ~DisableCallbackAction() @@ -1479,7 +1479,7 @@ class DisableCallbackAction //!!!!! Es wird nur der vertikal naechstliegende gesucht. //JP 11.10.2001: only in tables we try to find the right column - Bug 72294 -Point SwRootFrm::GetNextPrevCntntPos( const Point& rPoint, BOOL bNext ) const +Point SwRootFrm::GetNextPrevCntntPos( const Point& rPoint, sal_Bool bNext ) const { // --> OD 2005-05-25 #123110# - disable creation of an action by a callback // event during processing of this method. Needed because formatting is @@ -1567,7 +1567,7 @@ Point SwRootFrm::GetNextPrevCntntPos( const Point& rPoint, BOOL bNext ) const |* |* Beschreibung: Liefert die absolute Dokumentpositon der gewuenschten |* Seite. -|* Formatiert wird nur soweit notwendig und nur dann wenn bFormat=TRUE +|* Formatiert wird nur soweit notwendig und nur dann wenn bFormat=sal_True |* Liefert Null, wenn die Operation nicht moeglich ist. |* Die Pos ist die der letzten Seite, wenn die Seitenzahl zu gross |* gewaehlt wurde. @@ -1575,12 +1575,12 @@ Point SwRootFrm::GetNextPrevCntntPos( const Point& rPoint, BOOL bNext ) const |* Letzte Aenderung MA 09. Oct. 97 |* |*************************************************************************/ -Point SwRootFrm::GetPagePos( USHORT nPageNum ) const +Point SwRootFrm::GetPagePos( sal_uInt16 nPageNum ) const { ASSERT( Lower() && Lower()->IsPageFrm(), "Keine Seite vorhanden." ); const SwPageFrm *pPage = (const SwPageFrm*)Lower(); - while ( TRUE ) + while ( sal_True ) { if ( pPage->GetPhyPageNum() >= nPageNum || !pPage->GetNext() ) break; @@ -1615,20 +1615,20 @@ SwPageFrm* SwRootFrm::GetPageByPageNum( sal_uInt16 _nPageNum ) const /************************************************************************* |* -|* SwRootFrm::IsDummyPage(USHORT) +|* SwRootFrm::IsDummyPage(sal_uInt16) |* -|* Description: Returns TRUE, when the given physical pagenumber does't exist +|* Description: Returns sal_True, when the given physical pagenumber does't exist |* or this page is an empty page. |*************************************************************************/ -BOOL SwRootFrm::IsDummyPage( USHORT nPageNum ) const +sal_Bool SwRootFrm::IsDummyPage( sal_uInt16 nPageNum ) const { if( !Lower() || !nPageNum || nPageNum > GetPageNum() ) - return TRUE; + return sal_True; const SwPageFrm *pPage = (const SwPageFrm*)Lower(); while( pPage && nPageNum < pPage->GetPhyPageNum() ) pPage = (const SwPageFrm*)pPage->GetNext(); - return pPage ? pPage->IsEmptyPage() : TRUE; + return pPage ? pPage->IsEmptyPage() : sal_True; } @@ -1644,7 +1644,7 @@ BOOL SwRootFrm::IsDummyPage( USHORT nPageNum ) const |* Letzte Aenderung MA 06. Nov. 97 |* |*************************************************************************/ -BOOL SwFrm::IsProtected() const +sal_Bool SwFrm::IsProtected() const { if (this->IsCntntFrm() && ((SwCntntFrm*)this)->GetNode()) { @@ -1652,7 +1652,7 @@ BOOL SwFrm::IsProtected() const bool isFormProtected=pDoc->get(IDocumentSettingAccess::PROTECT_FORM ); if (isFormProtected) { - return FALSE; // TODO a hack for now, well deal with it laster, I we return true here we have a "double" locking + return sal_False; // TODO a hack for now, well deal with it laster, I we return true here we have a "double" locking } } //Der Frm kann in Rahmen, Zellen oder Bereichen geschuetzt sein. @@ -1664,16 +1664,16 @@ BOOL SwFrm::IsProtected() const { if ( ((SwCntntFrm*)pFrm)->GetNode() && ((SwCntntFrm*)pFrm)->GetNode()->IsInProtectSect() ) - return TRUE; + return sal_True; } else { if ( ((SwLayoutFrm*)pFrm)->GetFmt() && ((SwLayoutFrm*)pFrm)->GetFmt()-> GetProtect().IsCntntProtected() ) - return TRUE; + return sal_True; if ( pFrm->IsCoveredCell() ) - return TRUE; + return sal_True; } if ( pFrm->IsFlyFrm() ) { @@ -1686,7 +1686,7 @@ BOOL SwFrm::IsProtected() const { pMaster = pMaster->GetPrevLink(); } while ( pMaster->GetPrevLink() ); if ( pMaster->IsProtected() ) - return TRUE; + return sal_True; } pFrm = ((SwFlyFrm*)pFrm)->GetAnchorFrm(); } @@ -1697,7 +1697,7 @@ BOOL SwFrm::IsProtected() const } while ( pFrm ); - return FALSE; + return sal_False; } /************************************************************************* @@ -1709,7 +1709,7 @@ BOOL SwFrm::IsProtected() const |* Letzte Aenderung MA 30. Nov. 94 |* |*************************************************************************/ -USHORT SwFrm::GetPhyPageNum() const +sal_uInt16 SwFrm::GetPhyPageNum() const { const SwPageFrm *pPage = FindPageFrm(); return pPage ? pPage->GetPhyPageNum() : 0; @@ -1729,15 +1729,15 @@ USHORT SwFrm::GetPhyPageNum() const * but a previous empty page don't count. * --------------------------------------------------*/ -BOOL SwFrm::WannaRightPage() const +sal_Bool SwFrm::WannaRightPage() const { const SwPageFrm *pPage = FindPageFrm(); if ( !pPage || !pPage->GetUpper() ) - return TRUE; + return sal_True; const SwFrm *pFlow = pPage->FindFirstBodyCntnt(); SwPageDesc *pDesc = 0; - USHORT nPgNum = 0; + sal_uInt16 nPgNum = 0; if ( pFlow ) { if ( pFlow->IsInTab() ) @@ -1764,9 +1764,9 @@ BOOL SwFrm::WannaRightPage() const } } ASSERT( pDesc, "No pagedescriptor" ); - BOOL bOdd; + sal_Bool bOdd; if( nPgNum ) - bOdd = nPgNum % 2 ? TRUE : FALSE; + bOdd = nPgNum % 2 ? sal_True : sal_False; else { bOdd = pPage->OnRightPage(); @@ -1776,9 +1776,9 @@ BOOL SwFrm::WannaRightPage() const if( !pPage->IsEmptyPage() ) { if( !pDesc->GetRightFmt() ) - bOdd = FALSE; + bOdd = sal_False; else if( !pDesc->GetLeftFmt() ) - bOdd = TRUE; + bOdd = sal_True; } return bOdd; } @@ -1792,13 +1792,13 @@ BOOL SwFrm::WannaRightPage() const |* Letzte Aenderung MA 30. Nov. 94 |* |*************************************************************************/ -USHORT SwFrm::GetVirtPageNum() const +sal_uInt16 SwFrm::GetVirtPageNum() const { const SwPageFrm *pPage = FindPageFrm(); if ( !pPage || !pPage->GetUpper() ) return 0; - USHORT nPhyPage = pPage->GetPhyPageNum(); + sal_uInt16 nPhyPage = pPage->GetPhyPageNum(); if ( !((SwRootFrm*)pPage->GetUpper())->IsVirtPageNum() ) return nPhyPage; @@ -1854,7 +1854,7 @@ USHORT SwFrm::GetVirtPageNum() const bool SwRootFrm::MakeTblCrsrs( SwTableCursor& rTblCrsr ) { //Union-Rects und Tabellen (Follows) der Selektion besorgen. - ASSERT( rTblCrsr.GetCntntNode() && rTblCrsr.GetCntntNode( FALSE ), + ASSERT( rTblCrsr.GetCntntNode() && rTblCrsr.GetCntntNode( sal_False ), "Tabselection nicht auf Cnt." ); bool bRet = false; @@ -1876,10 +1876,10 @@ bool SwRootFrm::MakeTblCrsrs( SwTableCursor& rTblCrsr ) // --> FME 2008-01-14 #151012# Made code robust here: const SwCntntNode* pTmpStartNode = rTblCrsr.GetCntntNode(); - const SwCntntNode* pTmpEndNode = rTblCrsr.GetCntntNode(FALSE); + const SwCntntNode* pTmpEndNode = rTblCrsr.GetCntntNode(sal_False); - const SwFrm* pTmpStartFrm = pTmpStartNode ? pTmpStartNode->GetFrm( &aPtPt, 0, FALSE ) : 0; - const SwFrm* pTmpEndFrm = pTmpEndNode ? pTmpEndNode->GetFrm( &aMkPt, 0, FALSE ) : 0; + const SwFrm* pTmpStartFrm = pTmpStartNode ? pTmpStartNode->GetFrm( &aPtPt, 0, sal_False ) : 0; + const SwFrm* pTmpEndFrm = pTmpEndNode ? pTmpEndNode->GetFrm( &aMkPt, 0, sal_False ) : 0; const SwLayoutFrm* pStart = pTmpStartFrm ? pTmpStartFrm->GetUpper() : 0; const SwLayoutFrm* pEnd = pTmpEndFrm ? pTmpEndFrm->GetUpper() : 0; @@ -1897,9 +1897,9 @@ bool SwRootFrm::MakeTblCrsrs( SwTableCursor& rTblCrsr ) SwSelBoxes aNew; - const BOOL bReadOnlyAvailable = rTblCrsr.IsReadOnlyAvailable(); + const sal_Bool bReadOnlyAvailable = rTblCrsr.IsReadOnlyAvailable(); - for ( USHORT i = 0; i < aUnions.Count(); ++i ) + for ( sal_uInt16 i = 0; i < aUnions.Count(); ++i ) { SwSelUnion *pUnion = aUnions[i]; const SwTabFrm *pTable = pUnion->GetTable(); @@ -2009,9 +2009,8 @@ inline void Sub( SwRegionRects& rRegion, const SwRect& rRect ) rRegion -= rRect; } -void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) +void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, sal_Bool bIsTblMode ) { - const SwNodes &rNds = GetFmt()->GetDoc()->GetNodes(); SwPosition *pStartPos = rCrsr.Start(), *pEndPos = rCrsr.GetPoint() == pStartPos ? rCrsr.GetMark() : rCrsr.GetPoint(); @@ -2047,10 +2046,10 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) //Erstmal die CntntFrms zum Start und End besorgen, die brauch ich auf //jedenfall. - const SwCntntFrm *pStartFrm = rNds[ pStartPos->nNode ]-> + SwCntntFrm const* pStartFrm = pStartPos->nNode.GetNode(). GetCntntNode()->GetFrm( &rCrsr.GetSttPos(), pStartPos ); - const SwCntntFrm *pEndFrm = rNds[ pEndPos->nNode ]-> + SwCntntFrm const* pEndFrm = pEndPos->nNode.GetNode(). GetCntntNode()->GetFrm( &rCrsr.GetEndPos(), pEndPos ); ASSERT( (pStartFrm && pEndFrm), "Keine CntntFrms gefunden." ); @@ -2084,7 +2083,7 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) // nicht erlaubt ist Header/Footer/TableHeadline ueber 2 Seiten do { // middle check loop const SwLayoutFrm* pSttLFrm = pStartFrm->GetUpper(); - const USHORT cHdFtTblHd = FRM_HEADER | FRM_FOOTER | FRM_TAB; + const sal_uInt16 cHdFtTblHd = FRM_HEADER | FRM_FOOTER | FRM_TAB; while( pSttLFrm && ! (cHdFtTblHd & pSttLFrm->GetType() )) pSttLFrm = pSttLFrm->GetUpper(); @@ -2136,7 +2135,7 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) } break; } - } while( FALSE ); + } while( sal_False ); SwCrsrMoveState aTmpState( MV_NONE ); aTmpState.b2Lines = sal_True; @@ -2160,8 +2159,8 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) if( pStartFrm != pEndFrm ) aEndFrm.Intersection( pEndFrm->PaintArea() ); SWRECTFN( pStartFrm ) - const BOOL bR2L = pStartFrm->IsRightToLeft(); - const BOOL bEndR2L = pEndFrm->IsRightToLeft(); + const sal_Bool bR2L = pStartFrm->IsRightToLeft(); + const sal_Bool bEndR2L = pEndFrm->IsRightToLeft(); // If there's no doubleline portion involved or start and end are both // in the same doubleline portion, all works fine, but otherwise @@ -2308,12 +2307,14 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) (aTmp.*fnRectX->fnSetTop)( nTmp ); if( (aEndRect.*fnRectX->fnGetTop)() != (pEnd2Pos->aPortion.*fnRectX->fnGetTop)() ) - if( bPorR2L ) - (aTmp.*fnRectX->fnSetLeft)( - (pEnd2Pos->aPortion.*fnRectX->fnGetLeft)() ); - else - (aTmp.*fnRectX->fnSetRight)( - (pEnd2Pos->aPortion.*fnRectX->fnGetRight)() ); + { + if( bPorR2L ) + (aTmp.*fnRectX->fnSetLeft)( + (pEnd2Pos->aPortion.*fnRectX->fnGetLeft)() ); + else + (aTmp.*fnRectX->fnSetRight)( + (pEnd2Pos->aPortion.*fnRectX->fnGetRight)() ); + } aTmp.Intersection( aEndFrm ); Sub( aRegion, aTmp ); } @@ -2503,7 +2504,7 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) } //Now the frames between, if there are any - BOOL bBody = pStartFrm->IsInDocBody(); + sal_Bool bBody = pStartFrm->IsInDocBody(); const SwTableBox* pCellBox = pStartFrm->GetUpper()->IsCellFrm() ? ((SwCellFrm*)pStartFrm->GetUpper())->GetTabBox() : 0; const SwCntntFrm *pCntnt = pStartFrm->GetNextCntntFrm(); @@ -2580,7 +2581,7 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) Sub( aRegion, aSubRect ); } -// aRegion.Compress( FALSE ); +// aRegion.Compress( sal_False ); aRegion.Invert(); delete pSt2Pos; delete pEnd2Pos; @@ -2599,7 +2600,7 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) if ( pPage->GetSortedObjs() ) { const SwSortedObjs &rObjs = *pPage->GetSortedObjs(); - for ( USHORT i = 0; i < rObjs.Count(); ++i ) + for ( sal_uInt16 i = 0; i < rObjs.Count(); ++i ) { SwAnchoredObject* pAnchoredObj = rObjs[i]; if ( !pAnchoredObj->ISA(SwFlyFrm) ) @@ -2614,16 +2615,16 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) if ( aSortObjs.Contains( *pAnchoredObj ) ) continue; - BOOL bSub = TRUE; - const UINT32 nPos = pObj->GetOrdNum(); - for ( USHORT k = 0; bSub && k < aSortObjs.Count(); ++k ) + sal_Bool bSub = sal_True; + const sal_uInt32 nPos = pObj->GetOrdNum(); + for ( sal_uInt16 k = 0; bSub && k < aSortObjs.Count(); ++k ) { ASSERT( aSortObjs[k]->ISA(SwFlyFrm), "<SwRootFrm::CalcFrmRects(..)> - object in <aSortObjs> of unexcepted type" ); const SwFlyFrm* pTmp = static_cast<SwFlyFrm*>(aSortObjs[k]); do { if ( nPos < pTmp->GetVirtDrawObj()->GetOrdNumDirect() ) - bSub = FALSE; + bSub = sal_False; else pTmp = pTmp->GetAnchorFrm()->FindFlyFrm(); } while ( bSub && pTmp ); diff --git a/sw/source/core/layout/unusedf.cxx b/sw/source/core/layout/unusedf.cxx index 4b9a9417480a..1f6bd97479bd 100644 --- a/sw/source/core/layout/unusedf.cxx +++ b/sw/source/core/layout/unusedf.cxx @@ -36,18 +36,18 @@ void SwFrm::Format( const SwBorderAttrs * ) { - ASSERT( FALSE, "Format() der Basisklasse gerufen." ); + ASSERT( sal_False, "Format() der Basisklasse gerufen." ); } void SwFrm::Paint(SwRect const&, SwPrintData const*const) const { - ASSERT( FALSE, "Paint() der Basisklasse gerufen." ); + ASSERT( sal_False, "Paint() der Basisklasse gerufen." ); } sal_Bool SwCntntFrm::WouldFit( SwTwips &, sal_Bool&, sal_Bool ) { - ASSERT( FALSE, "WouldFit des CntntFrm gerufen." ); - return FALSE; + ASSERT( sal_False, "WouldFit des CntntFrm gerufen." ); + return sal_False; } bool SwFrm::FillSelection( SwSelectionList& , const SwRect& ) const @@ -56,36 +56,36 @@ bool SwFrm::FillSelection( SwSelectionList& , const SwRect& ) const return false; } -BOOL SwFrm::GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState* ) const +sal_Bool SwFrm::GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState* ) const { - ASSERT( FALSE, "GetCrsrOfst der Basisklasse, hi!" ); - return FALSE; + ASSERT( sal_False, "GetCrsrOfst der Basisklasse, hi!" ); + return sal_False; } #ifdef DBG_UTIL void SwRootFrm::Cut() { - ASSERT( FALSE, "Cut() des RootFrm gerufen." ); + ASSERT( sal_False, "Cut() des RootFrm gerufen." ); } void SwRootFrm::Paste( SwFrm *, SwFrm * ) { - ASSERT( FALSE, "Paste() des RootFrm gerufen." ); + ASSERT( sal_False, "Paste() des RootFrm gerufen." ); } void SwFlyFrm::Paste( SwFrm *, SwFrm * ) { - ASSERT( FALSE, "Paste() des FlyFrm gerufen." ); + ASSERT( sal_False, "Paste() des FlyFrm gerufen." ); } #endif -BOOL SwFrm::GetCharRect( SwRect&, const SwPosition&, +sal_Bool SwFrm::GetCharRect( SwRect&, const SwPosition&, SwCrsrMoveState* ) const { - ASSERT( FALSE, "GetCharRect() der Basis gerufen." ); - return FALSE; + ASSERT( sal_False, "GetCharRect() der Basis gerufen." ); + return sal_False; } diff --git a/sw/source/core/layout/virtoutp.cxx b/sw/source/core/layout/virtoutp.cxx index 1c8338c73a85..f1d909fd2f83 100644 --- a/sw/source/core/layout/virtoutp.cxx +++ b/sw/source/core/layout/virtoutp.cxx @@ -74,21 +74,21 @@ inline DbgRect::DbgRect( OutputDevice *pOutDev, const Rectangle &rRect, * dieser wird in _FrmInit angelegt und in _FrmFinit zerstoert. * */ -BOOL SwRootFrm::FlushVout() +sal_Bool SwRootFrm::FlushVout() { if( SwRootFrm::pVout->IsFlushable() ) { SwRootFrm::pVout->_Flush(); - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } -BOOL SwRootFrm::HasSameRect( const SwRect& rRect ) +sal_Bool SwRootFrm::HasSameRect( const SwRect& rRect ) { if( SwRootFrm::pVout->IsFlushable() ) return ( rRect == SwRootFrm::pVout->GetOrgRect() ); - return FALSE; + return sal_False; } /** method to set mapping/pixel offset for virtual output device @@ -138,14 +138,14 @@ void SetMappingForVirtDev( const Point& _rNewOrigin, *************************************************************************/ // rSize muss in Pixel-Koordinaten vorliegen! -BOOL SwLayVout::DoesFit( const Size &rNew ) +sal_Bool SwLayVout::DoesFit( const Size &rNew ) { if( rNew.Height() > VIRTUALHEIGHT ) - return FALSE; + return sal_False; if( rNew.Width() <= 0 || rNew.Height() <= 0 ) - return FALSE; + return sal_False; if( rNew.Width() <= aSize.Width() ) - return TRUE; + return sal_True; if( !pVirDev ) { pVirDev = new VirtualDevice(); @@ -165,10 +165,10 @@ BOOL SwLayVout::DoesFit( const Size &rNew ) delete pVirDev; pVirDev = NULL; aSize.Width() = 0; - return FALSE; + return sal_False; } } - return TRUE; + return sal_True; } /************************************************************************* @@ -179,7 +179,7 @@ BOOL SwLayVout::DoesFit( const Size &rNew ) /// output is used. /// <aRect> contains the rectangle that represents the area the virtual /// output device is used for and that is flushed at the end. -void SwLayVout::Enter( ViewShell *pShell, SwRect &rRect, BOOL bOn ) +void SwLayVout::Enter( ViewShell *pShell, SwRect &rRect, sal_Bool bOn ) { Flush(); diff --git a/sw/source/core/layout/virtoutp.hxx b/sw/source/core/layout/virtoutp.hxx index 8183b3edbe26..deb2b20538a1 100644 --- a/sw/source/core/layout/virtoutp.hxx +++ b/sw/source/core/layout/virtoutp.hxx @@ -49,22 +49,22 @@ private: SwRect aRect; SwRect aOrgRect; Size aSize; - USHORT nCount; + sal_uInt16 nCount; - BOOL DoesFit( const Size &rOut ); + sal_Bool DoesFit( const Size &rOut ); public: SwLayVout() : pSh(0), pOut(0), pVirDev(0), aSize(0, VIRTUALHEIGHT), nCount(0) {} ~SwLayVout() { delete pVirDev; } /// OD 27.09.2002 #103636# - change 2nd parameter <rRect> - no longer <const> - void Enter( ViewShell *pShell, SwRect &rRect, BOOL bOn ); + void Enter( ViewShell *pShell, SwRect &rRect, sal_Bool bOn ); void Leave() { --nCount; Flush(); } void SetOrgRect( SwRect &rRect ) { aOrgRect = rRect; } const SwRect& GetOrgRect() const { return aOrgRect; } - BOOL IsFlushable() { return 0 != pOut; } + sal_Bool IsFlushable() { return 0 != pOut; } void _Flush(); void Flush() { if( pOut ) _Flush(); } }; diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index ade3efd4e70d..9909b6147d83 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -96,11 +96,11 @@ SwFrm::SwFrm( SwModify *pMod ) : pNext( 0 ), pPrev( 0 ), pDrawObjs( 0 ) - , bInfBody( FALSE ) - , bInfTab ( FALSE ) - , bInfFly ( FALSE ) - , bInfFtn ( FALSE ) - , bInfSct ( FALSE ) + , bInfBody( sal_False ) + , bInfTab ( sal_False ) + , bInfFly ( sal_False ) + , bInfFtn ( sal_False ) + , bInfSct ( sal_False ) { #ifdef DBG_UTIL bFlag01 = bFlag02 = bFlag03 = bFlag04 = bFlag05 = 0; @@ -110,8 +110,8 @@ SwFrm::SwFrm( SwModify *pMod ) : bInvalidR2L = bInvalidVert = 1; bDerivedR2L = bDerivedVert = bRightToLeft = bVertical = bReverse = 0; bValidPos = bValidPrtArea = bValidSize = bValidLineNum = bRetouche = - bFixSize = bColLocked = FALSE; - bCompletePaint = bInfInvalid = TRUE; + bFixSize = bColLocked = sal_False; + bCompletePaint = bInfInvalid = sal_True; } @@ -124,7 +124,7 @@ ViewShell * SwFrm::GetShell() const } -void SwFrm::CheckDir( UINT16 nDir, BOOL bVert, BOOL bOnlyBiDi, BOOL bBrowse ) +void SwFrm::CheckDir( sal_uInt16 nDir, sal_Bool bVert, sal_Bool bOnlyBiDi, sal_Bool bBrowse ) { if( FRMDIR_ENVIRONMENT == nDir || ( bVert && bOnlyBiDi ) ) { @@ -152,7 +152,7 @@ void SwFrm::CheckDir( UINT16 nDir, BOOL bVert, BOOL bOnlyBiDi, BOOL bBrowse ) } } -void SwFrm::CheckDirection( BOOL bVert ) +void SwFrm::CheckDirection( sal_Bool bVert ) { if( bVert ) { @@ -169,7 +169,7 @@ void SwFrm::CheckDirection( BOOL bVert ) } } -void SwSectionFrm::CheckDirection( BOOL bVert ) +void SwSectionFrm::CheckDirection( sal_Bool bVert ) { const SwFrmFmt* pFmt = GetFmt(); if( pFmt ) @@ -180,7 +180,7 @@ void SwSectionFrm::CheckDirection( BOOL bVert ) SwFrm::CheckDirection( bVert ); } -void SwFlyFrm::CheckDirection( BOOL bVert ) +void SwFlyFrm::CheckDirection( sal_Bool bVert ) { const SwFrmFmt* pFmt = GetFmt(); if( pFmt ) @@ -191,7 +191,7 @@ void SwFlyFrm::CheckDirection( BOOL bVert ) SwFrm::CheckDirection( bVert ); } -void SwTabFrm::CheckDirection( BOOL bVert ) +void SwTabFrm::CheckDirection( sal_Bool bVert ) { const SwFrmFmt* pFmt = GetFmt(); if( pFmt ) @@ -202,7 +202,7 @@ void SwTabFrm::CheckDirection( BOOL bVert ) SwFrm::CheckDirection( bVert ); } -void SwCellFrm::CheckDirection( BOOL bVert ) +void SwCellFrm::CheckDirection( sal_Bool bVert ) { const SwFrmFmt* pFmt = GetFmt(); const SfxPoolItem* pItem; @@ -210,7 +210,7 @@ void SwCellFrm::CheckDirection( BOOL bVert ) // using it. Otherwise the dynamic pool default is used, which may be set // to LTR in case of OOo 1.0 documents. // <-- - if( pFmt && SFX_ITEM_SET == pFmt->GetItemState( RES_FRAMEDIR, TRUE, &pItem ) ) + if( pFmt && SFX_ITEM_SET == pFmt->GetItemState( RES_FRAMEDIR, sal_True, &pItem ) ) { const SvxFrameDirectionItem* pFrmDirItem = static_cast<const SvxFrameDirectionItem*>(pItem); CheckDir( pFrmDirItem->GetValue(), bVert, sal_False, @@ -220,7 +220,7 @@ void SwCellFrm::CheckDirection( BOOL bVert ) SwFrm::CheckDirection( bVert ); } -void SwTxtFrm::CheckDirection( BOOL bVert ) +void SwTxtFrm::CheckDirection( sal_Bool bVert ) { CheckDir( GetTxtNode()->GetSwAttrSet().GetFrmDir().GetValue(), bVert, sal_True, @@ -237,13 +237,13 @@ void SwTxtFrm::CheckDirection( BOOL bVert ) |*************************************************************************/ void SwFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) { - BYTE nInvFlags = 0; + sal_uInt8 nInvFlags = 0; if( pNew && RES_ATTRSET_CHG == pNew->Which() ) { SfxItemIter aNIter( *((SwAttrSetChg*)pNew)->GetChgSet() ); SfxItemIter aOIter( *((SwAttrSetChg*)pOld)->GetChgSet() ); - while( TRUE ) + while( sal_True ) { _UpdateAttrFrm( (SfxPoolItem*)aOIter.GetCurItem(), (SfxPoolItem*)aNIter.GetCurItem(), nInvFlags ); @@ -285,9 +285,9 @@ void SwFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) } void SwFrm::_UpdateAttrFrm( SfxPoolItem *pOld, SfxPoolItem *pNew, - BYTE &rInvFlags ) + sal_uInt8 &rInvFlags ) { - USHORT nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0; + sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0; switch( nWhich ) { case RES_BOX: @@ -324,19 +324,19 @@ void SwFrm::_UpdateAttrFrm( SfxPoolItem *pOld, SfxPoolItem *pNew, { if ( IsRowFrm() ) { - BOOL bInFollowFlowRow = 0 != IsInFollowFlowRow(); + sal_Bool bInFollowFlowRow = 0 != IsInFollowFlowRow(); if ( bInFollowFlowRow || 0 != IsInSplitTableRow() ) { SwTabFrm* pTab = FindTabFrm(); if ( bInFollowFlowRow ) pTab = pTab->FindMaster(); - pTab->SetRemoveFollowFlowLinePending( TRUE ); + pTab->SetRemoveFollowFlowLinePending( sal_True ); } } break; } case RES_COL: - ASSERT( FALSE, "Spalten fuer neuen FrmTyp?" ); + ASSERT( sal_False, "Spalten fuer neuen FrmTyp?" ); break; default: @@ -351,7 +351,7 @@ void SwFrm::_UpdateAttrFrm( SfxPoolItem *pOld, SfxPoolItem *pNew, |* Letzte Aenderung MA 26. Jun. 96 |* |*************************************************************************/ -void SwFrm::Prepare( const PrepareHint, const void *, BOOL ) +void SwFrm::Prepare( const PrepareHint, const void *, sal_Bool ) { /* Do nothing */ } @@ -471,7 +471,7 @@ void SwFrm::InvalidatePage( const SwPageFrm *pPage ) const { const SwTxtNode *pTxtNode = pTxtFrm->GetTxtNode(); if (pTxtNode && pTxtNode->IsGrammarCheckDirty()) - pRoot->SetNeedGrammarCheck( TRUE ); + pRoot->SetNeedGrammarCheck( sal_True ); } } } @@ -486,7 +486,7 @@ void SwFrm::InvalidatePage( const SwPageFrm *pPage ) const |*************************************************************************/ Size SwFrm::ChgSize( const Size& aNewSize ) { - bFixSize = TRUE; + bFixSize = sal_True; const Size aOldSize( Frm().SSize() ); if ( aNewSize == aOldSize ) return aOldSize; @@ -826,7 +826,7 @@ void SwCntntFrm::Paste( SwFrm* pParent, SwFrm* pSibling) if( pNxt->IsSctFrm() ) pNxt = ((SwSectionFrm*)pNxt)->ContainsCntnt(); if( pNxt && pNxt->IsTxtFrm() && pNxt->IsInFtn() ) - pNxt->Prepare( PREP_FTN, 0, FALSE ); + pNxt->Prepare( PREP_FTN, 0, sal_False ); } if ( Frm().Height() ) @@ -864,7 +864,7 @@ void SwCntntFrm::Paste( SwFrm* pParent, SwFrm* pSibling) if( pFrm && pFrm->IsSctFrm() ) pFrm = ((SwSectionFrm*)pFrm)->ContainsAny(); if( pFrm ) - pFrm->Prepare( PREP_QUOVADIS, 0, FALSE ); + pFrm->Prepare( PREP_QUOVADIS, 0, sal_False ); if( !GetNext() ) { pFrm = FindFtnFrm()->GetNext(); @@ -914,7 +914,7 @@ void SwCntntFrm::Cut() { pFrm->_InvalidatePrt(); if( IsInFtn() ) - pFrm->Prepare( PREP_QUOVADIS, 0, FALSE ); + pFrm->Prepare( PREP_QUOVADIS, 0, sal_False ); } // --> OD 2004-07-15 #i26250# - invalidate printing area of previous // table frame. @@ -958,7 +958,7 @@ void SwCntntFrm::Cut() } } if( pFrm && IsInFtn() ) - pFrm->Prepare( PREP_ERGOSUM, 0, FALSE ); + pFrm->Prepare( PREP_ERGOSUM, 0, sal_False ); if( IsInSct() && !GetPrev() ) { SwSectionFrm* pSct = FindSctFrm(); @@ -1008,7 +1008,7 @@ void SwCntntFrm::Cut() if ( pMasterTab ) { pMasterTab->_InvalidatePos(); - pMasterTab->SetRemoveFollowFlowLinePending( TRUE ); + pMasterTab->SetRemoveFollowFlowLinePending( sal_True ); } } // <-- @@ -1060,7 +1060,7 @@ void SwCntntFrm::Cut() ( pUp->IsFtnFrm() && pUp->IsColLocked() ) ) // <-- { - pSct->DelEmpty( FALSE ); + pSct->DelEmpty( sal_False ); // Wenn ein gelockter Bereich nicht geloescht werden darf, // so ist zumindest seine Groesse durch das Entfernen seines // letzten Contents ungueltig geworden. @@ -1068,7 +1068,7 @@ void SwCntntFrm::Cut() } else { - pSct->DelEmpty( TRUE ); + pSct->DelEmpty( sal_True ); delete pSct; } } @@ -1154,7 +1154,7 @@ void SwLayoutFrm::Paste( SwFrm* pParent, SwFrm* pSibling) if( pFrm->IsSctFrm() ) pFrm = ((SwSectionFrm*)pFrm)->ContainsAny(); if( pFrm ) - pFrm->Prepare( PREP_ERGOSUM, 0, FALSE ); + pFrm->Prepare( PREP_ERGOSUM, 0, sal_False ); } } if ( IsInFtn() && 0 != ( pFrm = GetIndPrev() ) ) @@ -1162,7 +1162,7 @@ void SwLayoutFrm::Paste( SwFrm* pParent, SwFrm* pSibling) if( pFrm->IsSctFrm() ) pFrm = ((SwSectionFrm*)pFrm)->ContainsAny(); if( pFrm ) - pFrm->Prepare( PREP_QUOVADIS, 0, FALSE ); + pFrm->Prepare( PREP_QUOVADIS, 0, sal_False ); } } @@ -1170,7 +1170,7 @@ void SwLayoutFrm::Paste( SwFrm* pParent, SwFrm* pSibling) { // AdjustNeighbourhood wird jetzt auch in Spalten aufgerufen, // die sich nicht in Rahmen befinden - BYTE nAdjust = GetUpper()->IsFtnBossFrm() ? + sal_uInt8 nAdjust = GetUpper()->IsFtnBossFrm() ? ((SwFtnBossFrm*)GetUpper())->NeighbourhoodAdjustment( this ) : NA_GROW_SHRINK; SwTwips nGrow = (Frm().*fnRect->fnGetHeight)(); @@ -1218,7 +1218,7 @@ void SwLayoutFrm::Cut() { if( pUp->IsFtnBossFrm() ) { - BYTE nAdjust= ((SwFtnBossFrm*)pUp)->NeighbourhoodAdjustment( this ); + sal_uInt8 nAdjust= ((SwFtnBossFrm*)pUp)->NeighbourhoodAdjustment( this ); if( NA_ONLY_ADJUST == nAdjust ) AdjustNeighbourhood( -nShrink ); else @@ -1262,7 +1262,7 @@ void SwLayoutFrm::Cut() |* Letzte Aenderung MA 05. May. 94 |* |*************************************************************************/ -SwTwips SwFrm::Grow( SwTwips nDist, BOOL bTst, BOOL bInfo ) +SwTwips SwFrm::Grow( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) { ASSERT( nDist >= 0, "Negatives Wachstum?" ); @@ -1314,7 +1314,7 @@ SwTwips SwFrm::Grow( SwTwips nDist, BOOL bTst, BOOL bInfo ) |* Letzte Aenderung MA 05. May. 94 |* |*************************************************************************/ -SwTwips SwFrm::Shrink( SwTwips nDist, BOOL bTst, BOOL bInfo ) +SwTwips SwFrm::Shrink( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) { ASSERT( nDist >= 0, "Negative Verkleinerung?" ); @@ -1385,14 +1385,14 @@ SwTwips SwFrm::Shrink( SwTwips nDist, BOOL bTst, BOOL bInfo ) |* Letzte Aenderung AMA 02. Nov. 98 |* |*************************************************************************/ -SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, BOOL bTst ) +SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, sal_Bool bTst ) { PROTOCOL_ENTER( this, PROT_ADJUSTN, 0, &nDiff ); if ( !nDiff || !GetUpper()->IsFtnBossFrm() ) // nur innerhalb von Seiten/Spalten return 0L; - BOOL bBrowse = GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); + sal_Bool bBrowse = GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); //Der (Page)Body veraendert sich nur im BrowseMode, aber nicht wenn er //Spalten enthaelt. @@ -1513,7 +1513,7 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, BOOL bTst ) //Anpassung von Frm und Prt sorgen wird. const long nOldFrmHeight = Frm().Height(); const long nOldPrtHeight = Prt().Height(); - const BOOL bOldComplete = IsCompletePaint(); + const sal_Bool bOldComplete = IsCompletePaint(); if ( IsBodyFrm() ) Prt().SSize().Height() = nOldFrmHeight; @@ -1555,13 +1555,13 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, BOOL bTst ) SwFtnContFrm* pCont = (SwFtnContFrm*)GetNext(); SwTwips nMinH = 0; SwFtnFrm* pFtn = (SwFtnFrm*)pCont->Lower(); - BOOL bFtn = FALSE; + sal_Bool bFtn = sal_False; while( pFtn ) { if( !pFtn->GetAttr()->GetFtn().IsEndNote() ) { nMinH += (pFtn->Frm().*fnRect->fnGetHeight)(); - bFtn = TRUE; + bFtn = sal_True; } pFtn = (SwFtnFrm*)pFtn->GetNext(); } @@ -1583,7 +1583,7 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, BOOL bTst ) } else { - const BOOL bFtnPage = pBoss->IsPageFrm() && ((SwPageFrm*)pBoss)->IsFtnPage(); + const sal_Bool bFtnPage = pBoss->IsPageFrm() && ((SwPageFrm*)pBoss)->IsFtnPage(); if ( bFtnPage && !IsFtnContFrm() ) pFrm = (SwFrm*)pBoss->FindFtnCont(); if ( !pFrm ) @@ -1651,7 +1651,7 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, BOOL bTst ) { const SwSortedObjs &rObjs = *pBoss->GetDrawObjs(); ASSERT( pBoss->IsPageFrm(), "Header/Footer out of page?" ); - for ( USHORT i = 0; i < rObjs.Count(); ++i ) + for ( sal_uInt16 i = 0; i < rObjs.Count(); ++i ) { SwAnchoredObject* pAnchoredObj = rObjs[i]; if ( pAnchoredObj->ISA(SwFlyFrm) ) @@ -1717,7 +1717,7 @@ void SwFrm::ImplInvalidateSize() { if ( _InvalidationAllowed( INVALID_SIZE ) ) { - bValidSize = FALSE; + bValidSize = sal_False; if ( IsFlyFrm() ) ((SwFlyFrm*)this)->_Invalidate(); else @@ -1732,7 +1732,7 @@ void SwFrm::ImplInvalidatePrt() { if ( _InvalidationAllowed( INVALID_PRTAREA ) ) { - bValidPrtArea = FALSE; + bValidPrtArea = sal_False; if ( IsFlyFrm() ) ((SwFlyFrm*)this)->_Invalidate(); else @@ -1747,7 +1747,7 @@ void SwFrm::ImplInvalidatePos() { if ( _InvalidationAllowed( INVALID_POS ) ) { - bValidPos = FALSE; + bValidPos = sal_False; if ( IsFlyFrm() ) { ((SwFlyFrm*)this)->_Invalidate(); @@ -1766,7 +1766,7 @@ void SwFrm::ImplInvalidateLineNum() { if ( _InvalidationAllowed( INVALID_LINENUM ) ) { - bValidLineNum = FALSE; + bValidLineNum = sal_False; ASSERT( IsTxtFrm(), "line numbers are implemented for text only" ); InvalidatePage(); @@ -1789,7 +1789,7 @@ void SwFrm::ReinitializeFrmSizeAttrFlags() if ( ATT_VAR_SIZE == rFmtSize.GetHeightSizeType() || ATT_MIN_SIZE == rFmtSize.GetHeightSizeType()) { - bFixSize = FALSE; + bFixSize = sal_False; if ( GetType() & (FRM_HEADER | FRM_FOOTER | FRM_ROW) ) { SwFrm *pFrm = ((SwLayoutFrm*)this)->Lower(); @@ -1828,7 +1828,7 @@ void SwFrm::ReinitializeFrmSizeAttrFlags() * * FME 2007-08-30 #i81146# new loop control |*************************************************************************/ -void SwFrm::ValidateThisAndAllLowers( const USHORT nStage ) +void SwFrm::ValidateThisAndAllLowers( const sal_uInt16 nStage ) { // Stage 0: Only validate frames. Do not process any objects. // Stage 1: Only validate fly frames and all of their contents. @@ -1839,9 +1839,9 @@ void SwFrm::ValidateThisAndAllLowers( const USHORT nStage ) if ( !bOnlyObject || ISA(SwFlyFrm) ) { - bValidSize = TRUE; - bValidPrtArea = TRUE; - bValidPos = TRUE; + bValidSize = sal_True; + bValidPrtArea = sal_True; + bValidPos = sal_True; } if ( bIncludeObjects ) @@ -1880,7 +1880,7 @@ void SwFrm::ValidateThisAndAllLowers( const USHORT nStage ) |* Letzte Aenderung MA 25. Mar. 99 |* |*************************************************************************/ -SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) +SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) { SWRECTFN( this ) @@ -1889,8 +1889,8 @@ SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) nDist > (LONG_MAX - nFrmHeight ) ) nDist = LONG_MAX - nFrmHeight; - const BOOL bBrowse = GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); - const USHORT nTmpType = bBrowse ? 0x2084: 0x2004; //Row+Cell, Browse mit Body + const sal_Bool bBrowse = GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); + const sal_uInt16 nTmpType = bBrowse ? 0x2084: 0x2004; //Row+Cell, Browse mit Body if( !(GetUpper()->GetType() & nTmpType) && GetUpper()->HasFixSize() ) { if ( !bTst ) @@ -1992,7 +1992,7 @@ SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) |* Letzte Aenderung MA 05. May. 94 |* |*************************************************************************/ -SwTwips SwCntntFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) +SwTwips SwCntntFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) { SWRECTFN( this ) ASSERT( nDist >= 0, "nDist < 0" ); @@ -2062,7 +2062,7 @@ SwTwips SwCntntFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) const SwSortedObjs* pSorted = pPage ? pPage->GetSortedObjs() : 0; if( pSorted ) { - for ( USHORT i = 0; i < pSorted->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pSorted->Count(); ++i ) { const SwAnchoredObject* pAnchoredObj = (*pSorted)[i]; const SwRect aBound( pAnchoredObj->GetObjRectWithSpaces() ); @@ -2117,7 +2117,7 @@ SwTwips SwCntntFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) |*************************************************************************/ void SwCntntFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) { - BYTE nInvFlags = 0; + sal_uInt8 nInvFlags = 0; if( pNew && RES_ATTRSET_CHG == pNew->Which() ) { @@ -2125,7 +2125,7 @@ void SwCntntFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) SfxItemIter aOIter( *((SwAttrSetChg*)pOld)->GetChgSet() ); SwAttrSetChg aOldSet( *(SwAttrSetChg*)pOld ); SwAttrSetChg aNewSet( *(SwAttrSetChg*)pNew ); - while( TRUE ) + while( sal_True ) { _UpdateAttr( (SfxPoolItem*)aOIter.GetCurItem(), (SfxPoolItem*)aNIter.GetCurItem(), nInvFlags, @@ -2189,11 +2189,11 @@ void SwCntntFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) } void SwCntntFrm::_UpdateAttr( SfxPoolItem* pOld, SfxPoolItem* pNew, - BYTE &rInvFlags, + sal_uInt8 &rInvFlags, SwAttrSetChg *pOldSet, SwAttrSetChg *pNewSet ) { - BOOL bClear = TRUE; - USHORT nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0; + sal_Bool bClear = sal_True; + sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0; switch ( nWhich ) { case RES_FMT_CHG: @@ -2208,7 +2208,7 @@ void SwCntntFrm::_UpdateAttr( SfxPoolItem* pOld, SfxPoolItem* pNew, if ( !GetPrev() ) CheckPageDescs( pPage ); if ( pPage && GetAttrSet()->GetPageDesc().GetNumOffset() ) - ((SwRootFrm*)pPage->GetUpper())->SetVirtPageNum( TRUE ); + ((SwRootFrm*)pPage->GetUpper())->SetVirtPageNum( sal_True ); SwDocPosUpdate aMsgHnt( pPage->Frm().Top() ); pPage->GetFmt()->GetDoc()->UpdatePageFlds( &aMsgHnt ); } @@ -2323,7 +2323,7 @@ void SwCntntFrm::_UpdateAttr( SfxPoolItem* pOld, SfxPoolItem* pNew, /* no break here */ default: - bClear = FALSE; + bClear = sal_False; } if ( bClear ) { @@ -2353,7 +2353,7 @@ SwLayoutFrm::SwLayoutFrm( SwFrmFmt* pFmt ): { const SwFmtFrmSize &rFmtSize = pFmt->GetFrmSize(); if ( rFmtSize.GetHeightSizeType() == ATT_FIX_SIZE ) - bFixSize = TRUE; + bFixSize = sal_True; } // --> OD 2004-06-29 #i28701# @@ -2409,10 +2409,10 @@ SwTwips SwLayoutFrm::InnerHeight() const |* Letzte Aenderung MA 23. Sep. 96 |* |*************************************************************************/ -SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) +SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) { - const BOOL bBrowse = GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); - const USHORT nTmpType = bBrowse ? 0x2084: 0x2004; //Row+Cell, Browse mit Body + const sal_Bool bBrowse = GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); + const sal_uInt16 nTmpType = bBrowse ? 0x2084: 0x2004; //Row+Cell, Browse mit Body if( !(GetType() & nTmpType) && HasFixSize() ) return 0; @@ -2439,7 +2439,7 @@ SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) SwRect aOldFrm( Frm() ); sal_Bool bMoveAccFrm = sal_False; - BOOL bChgPos = IsVertical() && !IsReverse(); + sal_Bool bChgPos = IsVertical() && !IsReverse(); if ( !bTst ) { (Frm().*fnRect->fnSetHeight)( nFrmHeight + nDist ); @@ -2453,7 +2453,7 @@ SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) { if ( GetUpper() ) { // AdjustNeighbourhood jetzt auch in Spalten (aber nicht in Rahmen) - BYTE nAdjust = GetUpper()->IsFtnBossFrm() ? + sal_uInt8 nAdjust = GetUpper()->IsFtnBossFrm() ? ((SwFtnBossFrm*)GetUpper())->NeighbourhoodAdjustment( this ) : NA_GROW_SHRINK; if( NA_ONLY_ADJUST == nAdjust ) @@ -2575,10 +2575,10 @@ SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) |* Letzte Aenderung MA 25. Mar. 99 |* |*************************************************************************/ -SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) +SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) { - const BOOL bBrowse = GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); - const USHORT nTmpType = bBrowse ? 0x2084: 0x2004; //Row+Cell, Browse mit Body + const sal_Bool bBrowse = GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); + const sal_uInt16 nTmpType = bBrowse ? 0x2084: 0x2004; //Row+Cell, Browse mit Body if( !(GetType() & nTmpType) && HasFixSize() ) return 0; @@ -2589,7 +2589,7 @@ SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) nDist = nFrmHeight; SwTwips nMin = 0; - BOOL bChgPos = IsVertical() && !IsReverse(); + sal_Bool bChgPos = IsVertical() && !IsReverse(); if ( Lower() ) { if( !Lower()->IsNeighbourFrm() ) @@ -2620,7 +2620,7 @@ SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) bMoveAccFrm = sal_True; } - BYTE nAdjust = GetUpper() && GetUpper()->IsFtnBossFrm() ? + sal_uInt8 nAdjust = GetUpper() && GetUpper()->IsFtnBossFrm() ? ((SwFtnBossFrm*)GetUpper())->NeighbourhoodAdjustment( this ) : NA_GROW_SHRINK; @@ -2729,7 +2729,7 @@ SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) { // Wenn wir sowieso schon in einer anderen Spalte/Seite sitzen // als der Frame mit der Referenz, dann brauchen wir nicht // auch noch seinen Master zu invalidieren. - SwFrm *pTmp = pCnt->FindFtnBossFrm(TRUE) == FindFtnBossFrm(TRUE) + SwFrm *pTmp = pCnt->FindFtnBossFrm(sal_True) == FindFtnBossFrm(sal_True) ? pCnt->FindMaster()->GetFrm() : pCnt; pTmp->Prepare( PREP_ADJUST_FRM ); pTmp->InvalidateSize(); @@ -2797,7 +2797,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize ) pLowerFrm = pLowerFrm->GetNext(); else break; - } while( TRUE ); + } while( sal_True ); // If found last lower is a section frame containing no section // (section frame isn't valid and will be deleted in the future), // travel backwards. @@ -2810,7 +2810,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize ) // contains invalid section frames. if( pLowerFrm->IsSctFrm() ) pLowerFrm = ((SwSectionFrm*)pLowerFrm)->GetSection() && - !((SwSectionFrm*)pLowerFrm)->ToMaximize( FALSE ) ? + !((SwSectionFrm*)pLowerFrm)->ToMaximize( sal_False ) ? ((SwSectionFrm*)pLowerFrm)->FindLastCntnt() : NULL; // continue with found last lower, probably the last content of a section @@ -2841,7 +2841,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize ) pLowerFrm->InvalidatePage( pPage ); if( !pLowerFrm->IsFlowFrm() || !SwFlowFrm::CastFlowFrm( pLowerFrm )->HasFollow() ) - pLowerFrm->InvalidateNextPos( TRUE ); + pLowerFrm->InvalidateNextPos( sal_True ); if ( pLowerFrm->IsTxtFrm() ) ((SwCntntFrm*)pLowerFrm)->Prepare( PREP_ADJUST_FRM ); } @@ -2922,7 +2922,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize ) // In vertical layout these are neighbour frames (cell and column frames), // header frames and footer frames. // In horizontal layout these are all frames, which aren't neighbour frames. - const USHORT nFixWidth = bVert ? (FRM_NEIGHBOUR | FRM_HEADFOOT) + const sal_uInt16 nFixWidth = bVert ? (FRM_NEIGHBOUR | FRM_HEADFOOT) : ~FRM_NEIGHBOUR; // Declare const unsigned short <nFixHeight> and init it this frame types @@ -2930,7 +2930,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize ) // In vertical layout these are all frames, which aren't neighbour frames, // header frames, footer frames, body frames or foot note container frames. // In horizontal layout these are neighbour frames. - const USHORT nFixHeight= bVert ? ~(FRM_NEIGHBOUR | FRM_HEADFOOT | FRM_BODYFTNC) + const sal_uInt16 nFixHeight= bVert ? ~(FRM_NEIGHBOUR | FRM_HEADFOOT | FRM_BODYFTNC) : FRM_NEIGHBOUR; // Travel through all lowers using <GetNext()> @@ -2948,7 +2948,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize ) { // If lower isn't a table, row, cell or section frame, adjust its // frame size. - const USHORT nLowerType = pLowerFrm->GetType(); + const sal_uInt16 nLowerType = pLowerFrm->GetType(); if ( !(nLowerType & (FRM_TAB|FRM_ROW|FRM_CELL|FRM_SECTION)) ) { if ( bWidthChgd ) @@ -3125,7 +3125,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize ) // Finally adjust the columns if width is set to auto // Possible optimisation: execute this code earlier in this function and // return??? - if ( ( bVert && bHeightChgd || ! bVert && bWidthChgd ) && + if ( ( (bVert && bHeightChgd) || (! bVert && bWidthChgd) ) && Lower()->IsColumnFrm() ) { // get column attribute @@ -3163,16 +3163,16 @@ void SwLayoutFrm::Format( const SwBorderAttrs *pAttrs ) if ( bValidPrtArea && bValidSize ) return; - const USHORT nLeft = (USHORT)pAttrs->CalcLeft( this ); - const USHORT nUpper = pAttrs->CalcTop(); + const sal_uInt16 nLeft = (sal_uInt16)pAttrs->CalcLeft( this ); + const sal_uInt16 nUpper = pAttrs->CalcTop(); - const USHORT nRight = (USHORT)((SwBorderAttrs*)pAttrs)->CalcRight( this ); - const USHORT nLower = pAttrs->CalcBottom(); - BOOL bVert = IsVertical() && !IsPageFrm(); + const sal_uInt16 nRight = (sal_uInt16)((SwBorderAttrs*)pAttrs)->CalcRight( this ); + const sal_uInt16 nLower = pAttrs->CalcBottom(); + sal_Bool bVert = IsVertical() && !IsPageFrm(); SwRectFn fnRect = bVert ? fnRectVert : fnRectHori; if ( !bValidPrtArea ) { - bValidPrtArea = TRUE; + bValidPrtArea = sal_True; (this->*fnRect->fnSetXMargins)( nLeft, nRight ); (this->*fnRect->fnSetYMargins)( nUpper, nLower ); } @@ -3185,7 +3185,7 @@ void SwLayoutFrm::Format( const SwBorderAttrs *pAttrs ) const SwFmtFrmSize &rSz = GetFmt()->GetFrmSize(); SwTwips nMinHeight = rSz.GetHeightSizeType() == ATT_MIN_SIZE ? rSz.GetHeight() : 0; do - { bValidSize = TRUE; + { bValidSize = sal_True; //Die Groesse in der VarSize wird durch den Inhalt plus den //Raendern bestimmt. @@ -3222,7 +3222,7 @@ void SwLayoutFrm::Format( const SwBorderAttrs *pAttrs ) if( (this->*fnRect->fnSetLimit)( nLimit ) && nOldLeft == (Frm().*fnRect->fnGetLeft)() && nOldTop == (Frm().*fnRect->fnGetTop)() ) - bValidSize = bValidPrtArea = TRUE; + bValidSize = bValidPrtArea = sal_True; } } while ( !bValidSize ); } @@ -3231,12 +3231,12 @@ void SwLayoutFrm::Format( const SwBorderAttrs *pAttrs ) do { if ( Frm().Height() != pAttrs->GetSize().Height() ) ChgSize( Size( Frm().Width(), pAttrs->GetSize().Height())); - bValidSize = TRUE; + bValidSize = sal_True; MakePos(); } while ( !bValidSize ); } else - bValidSize = TRUE; + bValidSize = sal_True; } } @@ -3251,7 +3251,7 @@ void SwLayoutFrm::Format( const SwBorderAttrs *pAttrs ) static void InvaPercentFlys( SwFrm *pFrm, SwTwips nDiff ) { ASSERT( pFrm->GetDrawObjs(), "Can't find any Objects" ); - for ( USHORT i = 0; i < pFrm->GetDrawObjs()->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pFrm->GetDrawObjs()->Count(); ++i ) { SwAnchoredObject* pAnchoredObj = (*pFrm->GetDrawObjs())[i]; if ( pAnchoredObj->ISA(SwFlyFrm) ) @@ -3260,7 +3260,7 @@ static void InvaPercentFlys( SwFrm *pFrm, SwTwips nDiff ) const SwFmtFrmSize &rSz = pFly->GetFmt()->GetFrmSize(); if ( rSz.GetWidthPercent() || rSz.GetHeightPercent() ) { - BOOL bNotify = TRUE; + sal_Bool bNotify = sal_True; // If we've a fly with more than 90% relative height... if( rSz.GetHeightPercent() > 90 && pFly->GetAnchorFrm() && rSz.GetHeightPercent() != 0xFF && nDiff ) @@ -3275,7 +3275,7 @@ static void InvaPercentFlys( SwFrm *pFrm, SwTwips nDiff ) ( nDiff + pRel->Prt().Height() )*9 && pFly->GetFmt()->GetSurround().GetSurround() != SURROUND_THROUGHT ) - bNotify = FALSE; + bNotify = sal_False; } if( bNotify ) pFly->InvalidateSize(); @@ -3321,7 +3321,7 @@ void SwLayoutFrm::InvaPercentLowers( SwTwips nDiff ) |* Letzte Aenderung MA 10. Oct. 96 |* |*************************************************************************/ -long SwLayoutFrm::CalcRel( const SwFmtFrmSize &rSz, BOOL ) const +long SwLayoutFrm::CalcRel( const SwFmtFrmSize &rSz, sal_Bool ) const { long nRet = rSz.GetWidth(), nPercent = rSz.GetWidthPercent(); @@ -3380,7 +3380,7 @@ long MA_FASTCALL lcl_CalcMinColDiff( SwLayoutFrm *pLayFrm ) return nDiff ? nDiff : nFirstDiff ? nFirstDiff : 240; } -BOOL lcl_IsFlyHeightClipped( SwLayoutFrm *pLay ) +sal_Bool lcl_IsFlyHeightClipped( SwLayoutFrm *pLay ) { SwFrm *pFrm = pLay->ContainsCntnt(); while ( pFrm ) @@ -3391,7 +3391,7 @@ BOOL lcl_IsFlyHeightClipped( SwLayoutFrm *pLay ) if ( pFrm->GetDrawObjs() ) { sal_uInt32 nCnt = pFrm->GetDrawObjs()->Count(); - for ( USHORT i = 0; i < nCnt; ++i ) + for ( sal_uInt16 i = 0; i < nCnt; ++i ) { SwAnchoredObject* pAnchoredObj = (*pFrm->GetDrawObjs())[i]; if ( pAnchoredObj->ISA(SwFlyFrm) ) @@ -3399,13 +3399,13 @@ BOOL lcl_IsFlyHeightClipped( SwLayoutFrm *pLay ) SwFlyFrm* pFly = static_cast<SwFlyFrm*>(pAnchoredObj); if ( pFly->IsHeightClipped() && ( !pFly->IsFlyFreeFrm() || pFly->GetPageFrm() ) ) - return TRUE; + return sal_True; } } } pFrm = pFrm->FindNextCnt(); } - return FALSE; + return sal_False; } /************************************************************************* @@ -3430,10 +3430,10 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, //3. Weiter mit 1. bis zur Stabilitaet. const SwFmtCol &rCol = rAttrs.GetAttrSet().GetCol(); - const USHORT nNumCols = rCol.GetNumCols(); + const sal_uInt16 nNumCols = rCol.GetNumCols(); - BOOL bEnd = FALSE; - BOOL bBackLock = FALSE; + sal_Bool bEnd = sal_False; + sal_Bool bBackLock = sal_False; SwViewImp *pImp = GetShell() ? GetShell()->Imp() : 0; { // Zugrunde liegender Algorithmus @@ -3467,14 +3467,14 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, long nMinimum = nMinHeight; long nMaximum; - BOOL bNoBalance = FALSE; + sal_Bool bNoBalance = sal_False; SWRECTFN( this ) if( IsSctFrm() ) { nMaximum = (Frm().*fnRect->fnGetHeight)() - nBorder + (Frm().*fnRect->fnBottomDist)( (GetUpper()->*fnRect->fnGetPrtBottom)() ); - nMaximum += GetUpper()->Grow( LONG_MAX, TRUE ); + nMaximum += GetUpper()->Grow( LONG_MAX, sal_True ); if( nMaximum < nMinimum ) { if( nMaximum < 0 ) @@ -3509,8 +3509,8 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, SwFrm* pFtnAny = pFtnCont->ContainsAny(); if( pFtnAny && pFtnAny->IsValid() ) { - bBackLock = TRUE; - ((SwSectionFrm*)this)->SetFtnLock( TRUE ); + bBackLock = sal_True; + ((SwSectionFrm*)this)->SetFtnLock( sal_True ); } } } @@ -3542,7 +3542,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, if ( pImp ) pImp->CheckWaitCrsr(); - bValidSize = TRUE; + bValidSize = sal_True; //Erstmal die Spalten formatieren, das entlastet den //Stack ein wenig. //Bei der Gelegenheit stellen wir auch gleich mal die @@ -3555,7 +3555,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, AdjustColumns( &rCol, sal_False ); // <-- - for ( USHORT i = 0; i < nNumCols; ++i ) + for ( sal_uInt16 i = 0; i < nNumCols; ++i ) { pCol->Calc(); // ColumnFrms besitzen jetzt einen BodyFrm, der auch kalkuliert werden will @@ -3570,7 +3570,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, pCol = (SwLayoutFrm*)Lower(); ASSERT( pCol && pCol->GetNext(), ":-( Spalten auf Urlaub?"); // bMinDiff wird gesetzt, wenn es keine leere Spalte gibt - BOOL bMinDiff = TRUE; + sal_Bool bMinDiff = sal_True; // OD 28.03.2003 #108446# - check for all column content and all columns while ( bMinDiff && pCol ) { @@ -3584,7 +3584,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, SwTwips nMaxFree = 0; SwTwips nAllFree = LONG_MAX; // bFoundLower wird gesetzt, wenn es mind. eine nichtleere Spalte gibt - BOOL bFoundLower = FALSE; + sal_Bool bFoundLower = sal_False; while( pCol ) { SwLayoutFrm* pLay = (SwLayoutFrm*)pCol->Lower(); @@ -3592,7 +3592,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, (pLay->Prt().*fnRect->fnGetHeight)(); if( pLay->Lower() ) { - bFoundLower = TRUE; + bFoundLower = sal_True; nInnerHeight += pLay->InnerHeight(); } else if( nInnerHeight < 0 ) @@ -3600,7 +3600,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, if( pLay->GetNext() ) { - bFoundLower = TRUE; + bFoundLower = sal_True; pLay = (SwLayoutFrm*)pLay->GetNext(); ASSERT( pLay->IsFtnContFrm(),"FtnContainer exspected" ); nInnerHeight += pLay->InnerHeight(); @@ -3761,10 +3761,10 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, } } else - bEnd = TRUE; + bEnd = sal_True; } else - bEnd = TRUE; + bEnd = sal_True; } while ( !bEnd || !bValidSize ); } @@ -3773,10 +3773,10 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, ::CalcCntnt( this, true ); if( IsSctFrm() ) { - // OD 14.03.2003 #i11760# - adjust 2nd parameter - TRUE --> true + // OD 14.03.2003 #i11760# - adjust 2nd parameter - sal_True --> true ::CalcCntnt( this, true ); if( bBackLock ) - ((SwSectionFrm*)this)->SetFtnLock( FALSE ); + ((SwSectionFrm*)this)->SetFtnLock( sal_False ); } } @@ -3790,7 +3790,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, |* |*************************************************************************/ -SwCntntFrm* lcl_InvalidateSection( SwFrm *pCnt, BYTE nInv ) +SwCntntFrm* lcl_InvalidateSection( SwFrm *pCnt, sal_uInt8 nInv ) { SwSectionFrm* pSect = pCnt->FindSctFrm(); // Wenn unser CntntFrm in einer Tabelle oder Fussnote steht, sind nur @@ -3813,7 +3813,7 @@ SwCntntFrm* lcl_InvalidateSection( SwFrm *pCnt, BYTE nInv ) return pRet; } -SwCntntFrm* lcl_InvalidateTable( SwTabFrm *pTable, BYTE nInv ) +SwCntntFrm* lcl_InvalidateTable( SwTabFrm *pTable, sal_uInt8 nInv ) { if( ( nInv & INV_SECTION ) && pTable->IsInSct() ) lcl_InvalidateSection( pTable, nInv ); @@ -3826,9 +3826,9 @@ SwCntntFrm* lcl_InvalidateTable( SwTabFrm *pTable, BYTE nInv ) return pTable->FindLastCntnt(); } -void lcl_InvalidateAllCntnt( SwCntntFrm *pCnt, BYTE nInv ); +void lcl_InvalidateAllCntnt( SwCntntFrm *pCnt, sal_uInt8 nInv ); -void lcl_InvalidateCntnt( SwCntntFrm *pCnt, BYTE nInv ) +void lcl_InvalidateCntnt( SwCntntFrm *pCnt, sal_uInt8 nInv ) { SwCntntFrm *pLastTabCnt = NULL; SwCntntFrm *pLastSctCnt = NULL; @@ -3879,7 +3879,7 @@ void lcl_InvalidateCntnt( SwCntntFrm *pCnt, BYTE nInv ) } if( nInv & INV_SIZE ) - pCnt->Prepare( PREP_CLEAR, 0, FALSE ); + pCnt->Prepare( PREP_CLEAR, 0, sal_False ); if( nInv & INV_POS ) pCnt->_InvalidatePos(); if( nInv & INV_PRTAREA ) @@ -3892,10 +3892,10 @@ void lcl_InvalidateCntnt( SwCntntFrm *pCnt, BYTE nInv ) } } -void lcl_InvalidateAllCntnt( SwCntntFrm *pCnt, BYTE nInv ) +void lcl_InvalidateAllCntnt( SwCntntFrm *pCnt, sal_uInt8 nInv ) { SwSortedObjs &rObjs = *pCnt->GetDrawObjs(); - for ( USHORT i = 0; i < rObjs.Count(); ++i ) + for ( sal_uInt16 i = 0; i < rObjs.Count(); ++i ) { SwAnchoredObject* pAnchoredObj = rObjs[i]; if ( pAnchoredObj->ISA(SwFlyFrm) ) @@ -3911,7 +3911,7 @@ void lcl_InvalidateAllCntnt( SwCntntFrm *pCnt, BYTE nInv ) } } -void SwRootFrm::InvalidateAllCntnt( BYTE nInv ) +void SwRootFrm::InvalidateAllCntnt( sal_uInt8 nInv ) { // Erst werden alle Seitengebundenen FlyFrms abgearbeitet. SwPageFrm *pPage = (SwPageFrm*)Lower(); @@ -3927,7 +3927,7 @@ void SwRootFrm::InvalidateAllCntnt( BYTE nInv ) if ( pPage->GetSortedObjs() ) { const SwSortedObjs &rObjs = *pPage->GetSortedObjs(); - for ( USHORT i = 0; i < rObjs.Count(); ++i ) + for ( sal_uInt16 i = 0; i < rObjs.Count(); ++i ) { SwAnchoredObject* pAnchoredObj = rObjs[i]; if ( pAnchoredObj->ISA(SwFlyFrm) ) |