diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2012-12-07 23:46:54 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2012-12-07 23:48:03 +0900 |
commit | a25b3dd6c474f2a496c0ba2b1d24926ea60417da (patch) | |
tree | c574765096d97e7fd5687f358a8625691a099f8b | |
parent | a48e2fd9049797110b3b2505c363557284987ca8 (diff) |
sal_Bool to bool
Change-Id: I4f4ffff778ff0bb14ddb3e4ae5f9b76104fc8bed
-rw-r--r-- | sw/source/core/text/porrst.cxx | 10 | ||||
-rw-r--r-- | sw/source/core/text/porrst.hxx | 10 | ||||
-rw-r--r-- | sw/source/core/text/portab.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/text/portxt.cxx | 6 | ||||
-rw-r--r-- | sw/source/core/text/redlnitr.hxx | 8 | ||||
-rw-r--r-- | sw/source/core/text/txtdrop.cxx | 16 | ||||
-rw-r--r-- | sw/source/core/text/txtfly.cxx | 18 | ||||
-rw-r--r-- | sw/source/core/text/txtfrm.cxx | 34 | ||||
-rw-r--r-- | sw/source/core/text/txtftn.cxx | 34 |
9 files changed, 69 insertions, 69 deletions
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx index 7c03572648c5..cb35c4c16502 100644 --- a/sw/source/core/text/porrst.cxx +++ b/sw/source/core/text/porrst.cxx @@ -126,7 +126,7 @@ void SwBreakPortion::HandlePortion( SwPortionHandler& rPH ) const SwKernPortion::SwKernPortion( SwLinePortion &rPortion, short nKrn, - sal_Bool bBG, sal_Bool bGK ) : + bool bBG, bool bGK ) : nKern( nKrn ), bBackground( bBG ), bGridKern( bGK ) { Height( rPortion.Height() ); @@ -139,7 +139,7 @@ SwKernPortion::SwKernPortion( SwLinePortion &rPortion, short nKrn, } SwKernPortion::SwKernPortion( const SwLinePortion& rPortion ) : - nKern( 0 ), bBackground( sal_False ), bGridKern( sal_True ) + nKern( 0 ), bBackground( false ), bGridKern( true ) { Height( rPortion.Height() ); SetAscent( rPortion.GetAscent() ); @@ -191,7 +191,7 @@ void SwKernPortion::FormatEOL( SwTxtFormatInfo &rInf ) } SwArrowPortion::SwArrowPortion( const SwLinePortion &rPortion ) : - bLeft( sal_True ) + bLeft( true ) { Height( rPortion.Height() ); SetAscent( rPortion.GetAscent() ); @@ -200,7 +200,7 @@ SwArrowPortion::SwArrowPortion( const SwLinePortion &rPortion ) : } SwArrowPortion::SwArrowPortion( const SwTxtPaintInfo &rInf ) - : bLeft( sal_False ) + : bLeft( false ) { Height( (sal_uInt16)(rInf.GetTxtFrm()->Prt().Height()) ); aPos.X() = rInf.GetTxtFrm()->Frm().Left() + @@ -320,7 +320,7 @@ sal_Bool SwTxtFrm::FormatEmpty() { SwTxtFly aTxtFly( this ); SwRect aRect; - sal_Bool bFirstFlyCheck = 0 != Prt().Height(); + bool bFirstFlyCheck = 0 != Prt().Height(); if ( !bCollapse && bFirstFlyCheck && aTxtFly.IsOn() && aTxtFly.IsAnyObj( aRect ) ) return sal_False; diff --git a/sw/source/core/text/porrst.hxx b/sw/source/core/text/porrst.hxx index 38edfcb3b13d..e613f57866bb 100644 --- a/sw/source/core/text/porrst.hxx +++ b/sw/source/core/text/porrst.hxx @@ -66,8 +66,8 @@ public: class SwKernPortion : public SwLinePortion { short nKern; - sal_Bool bBackground; - sal_Bool bGridKern; + bool bBackground; + bool bGridKern; public: @@ -77,7 +77,7 @@ public: // bGridKern indicates, that the kerning portion is used to provide // additional space in grid mode. SwKernPortion( SwLinePortion &rPortion, short nKrn, - sal_Bool bBG = sal_False, sal_Bool bGridKern = sal_False ); + bool bBG = false, bool bGridKern = false ); // This constructor only sets the height and ascent to the values // of rPortion. It is only used for kerning portions for grid mode @@ -96,13 +96,13 @@ public: class SwArrowPortion : public SwLinePortion { Point aPos; - sal_Bool bLeft; + bool bLeft; public: SwArrowPortion( const SwLinePortion &rPortion ); SwArrowPortion( const SwTxtPaintInfo &rInf ); virtual void Paint( const SwTxtPaintInfo &rInf ) const; virtual SwLinePortion *Compress(); - inline sal_Bool IsLeft() const { return bLeft; } + inline bool IsLeft() const { return bLeft; } inline const Point& GetPos() const { return aPos; } OUTPUT_OPERATOR }; diff --git a/sw/source/core/text/portab.hxx b/sw/source/core/text/portab.hxx index 63a8f37e7618..75841be07b70 100644 --- a/sw/source/core/text/portab.hxx +++ b/sw/source/core/text/portab.hxx @@ -41,7 +41,7 @@ public: sal_Bool PostFormat( SwTxtFormatInfo &rInf ); inline sal_Bool IsFilled() const { return 0 != cFill; } inline KSHORT GetTabPos() const { return nTabPos; } - inline sal_Bool IsAutoTabStop() const { return bAutoTabStop; } + inline bool IsAutoTabStop() const { return bAutoTabStop; } // Accessibility: pass information about this portion to the PortionHandler virtual void HandlePortion( SwPortionHandler& rPH ) const; diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index 3f5934a51830..617cf393f390 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -150,7 +150,7 @@ static sal_uInt16 lcl_AddSpace( const SwTxtSizeInfo &rInf, const XubString* pStr // Here starts the good old "Look for blanks and add space to them" part. // Note: We do not want to add space to an isolated latin blank in front // of some complex characters in RTL environment - const sal_Bool bDoNotAddSpace = + const bool bDoNotAddSpace = LATIN == nScript && ( nEnd == nPos + 1 ) && pSI && ( i18n::ScriptType::COMPLEX == pSI->ScriptType( nPos + 1 ) ) && @@ -286,7 +286,7 @@ void SwTxtPortion::BreakUnderflow( SwTxtFormatInfo &rInf ) * SwTxtPortion::_Format() *************************************************************************/ -static sal_Bool lcl_HasContent( const SwFldPortion& rFld, SwTxtFormatInfo &rInf ) +static bool lcl_HasContent( const SwFldPortion& rFld, SwTxtFormatInfo &rInf ) { String aTxt; return rFld.GetExpTxt( rInf, aTxt ) && aTxt.Len(); @@ -432,7 +432,7 @@ sal_Bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf ) // breakPos < index or no breakpos at all else { - sal_Bool bFirstPor = rInf.GetLineStart() == rInf.GetIdx(); + bool bFirstPor = rInf.GetLineStart() == rInf.GetIdx(); if( aGuess.BreakPos() != STRING_LEN && aGuess.BreakPos() != rInf.GetLineStart() && ( !bFirstPor || rInf.GetFly() || rInf.GetLast()->IsFlyPortion() || diff --git a/sw/source/core/text/redlnitr.hxx b/sw/source/core/text/redlnitr.hxx index bbcbd68cc3d6..80bdba19395e 100644 --- a/sw/source/core/text/redlnitr.hxx +++ b/sw/source/core/text/redlnitr.hxx @@ -39,13 +39,13 @@ class SwExtend xub_StrLen nPos; xub_StrLen nEnd; sal_Bool _Leave( SwFont& rFnt, xub_StrLen nNew ); - sal_Bool Inside() const { return ( nPos >= nStart && nPos < nEnd ); } + bool Inside() const { return ( nPos >= nStart && nPos < nEnd ); } void ActualizeFont( SwFont &rFnt, xub_StrLen nAttr ); public: SwExtend( const std::vector<sal_uInt16> &rA, xub_StrLen nSt ) : pFnt(0), rArr( rA ), nStart( nSt ), nPos( STRING_LEN ), nEnd( nStart + rA.size() ) {} ~SwExtend() { delete pFnt; } - sal_Bool IsOn() const { return pFnt != 0; } + bool IsOn() const { return pFnt != 0; } void Reset() { if( pFnt ) { delete pFnt; pFnt = NULL; } nPos = STRING_LEN; } sal_Bool Leave( SwFont& rFnt, xub_StrLen nNew ) { if( pFnt ) return _Leave( rFnt, nNew ); return sal_False; } @@ -84,7 +84,7 @@ public: xub_StrLen nRedlPos, sal_Bool bShw, const std::vector<sal_uInt16> *pArr = 0, xub_StrLen nStart = STRING_LEN ); ~SwRedlineItr(); - inline sal_Bool IsOn() const { return bOn || ( pExt && pExt->IsOn() ); } + inline bool IsOn() const { return bOn || ( pExt && pExt->IsOn() ); } inline void Clear( SwFont* pFnt ) { if( bOn ) _Clear( pFnt ); } void ChangeTxtAttr( SwFont* pFnt, SwTxtAttr &rHt, sal_Bool bChg ); inline short Seek( SwFont& rFnt, xub_StrLen nNew, xub_StrLen nOld ) @@ -98,7 +98,7 @@ public: sal_Bool CheckLine( xub_StrLen nChkStart, xub_StrLen nChkEnd ); inline sal_Bool LeaveExtend( SwFont& rFnt, xub_StrLen nNew ) { return pExt->Leave(rFnt, nNew ); } - inline sal_Bool ExtOn() { if( pExt ) return pExt->IsOn(); return sal_False; } + inline bool ExtOn() { if( pExt ) return pExt->IsOn(); return false; } inline void UpdateExtFont( SwFont &rFnt ) { OSL_ENSURE( ExtOn(), "UpdateExtFont without ExtOn" ); pExt->UpdateFont( rFnt ); } diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx index d296780b32d7..af2cf6f8c234 100644 --- a/sw/source/core/text/txtdrop.cxx +++ b/sw/source/core/text/txtdrop.cxx @@ -734,7 +734,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTxtFormatInfo &rInf ) OSL_ENSURE( pDrop->GetPart(),"DropPortion without part during font calculation"); SwDropPortionPart* pCurrPart = pDrop->GetPart(); - const sal_Bool bUseCache = ! pCurrPart->GetFollow(); + const bool bUseCache = ! pCurrPart->GetFollow(); xub_StrLen nIdx = rInf.GetIdx(); XubString aStr( rInf.GetTxt(), nIdx, pCurrPart->GetLen() ); @@ -792,7 +792,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTxtFormatInfo &rInf ) aFactor[ nTmpIdx ] = (sal_uInt16)nFactor; } - sal_Bool bGrow = ( pDrop->GetLen() != 0 ); + bool bGrow = ( pDrop->GetLen() != 0 ); // for growing controll long nMax = KSHRT_MAX; @@ -801,7 +801,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTxtFormatInfo &rInf ) long nGrow = 0; #endif - sal_Bool bWinUsed = sal_False; + bool bWinUsed = false; Font aOldFnt; MapMode aOldMap( MAP_TWIP ); OutputDevice* pOut = rInf.GetOut(); @@ -815,8 +815,8 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTxtFormatInfo &rInf ) { // reset pCurrPart to first part pCurrPart = pDrop->GetPart(); - sal_Bool bFirstGlyphRect = sal_True; - sal_Bool bHaveGlyphRect = sal_False; + bool bFirstGlyphRect = true; + bool bHaveGlyphRect = false; Rectangle aCommonRect, aRect; while ( pCurrPart ) @@ -852,7 +852,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTxtFormatInfo &rInf ) { if ( ! bWinUsed ) { - bWinUsed = sal_True; + bWinUsed = true; aOldMap = pWin->GetMapMode( ); pWin->SetMapMode( MapMode( MAP_TWIP ) ); aOldFnt = pWin->GetFont(); @@ -885,7 +885,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTxtFormatInfo &rInf ) if ( bFirstGlyphRect ) { aCommonRect = aRect; - bFirstGlyphRect = sal_False; + bFirstGlyphRect = false; } else aCommonRect.Union( aRect ); @@ -935,7 +935,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTxtFormatInfo &rInf ) nIdx = rInf.GetIdx(); } else - bGrow = sal_False; + bGrow = false; } if ( bWinUsed ) diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index 2a1aadaf0381..b6653dbc27bb 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -304,8 +304,8 @@ const SwRect SwContourCache::ContourRect( const SwFmt* pFmt, MSHORT nIdx = 0; while( nIdx < nCount && (*pTmp)[ nIdx ] < nXPos ) ++nIdx; - sal_Bool bOdd = (nIdx % 2) ? sal_True : sal_False; - sal_Bool bSet = sal_True; + bool bOdd = (nIdx % 2); + bool bSet = true; if( bOdd ) --nIdx; // within interval else if( ! bRight && ( nIdx >= nCount || (*pTmp)[ nIdx ] != nXPos ) ) @@ -313,7 +313,7 @@ const SwRect SwContourCache::ContourRect( const SwFmt* pFmt, if( nIdx ) nIdx -= 2; // an interval to the left else - bSet = sal_False; // before the first interval + bSet = false; // before the first interval } if( bSet && nIdx < nCount ) @@ -508,7 +508,7 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo &rInf ) SwRegionRects aRegion( aRect ); - sal_Bool bOpaque = sal_False; + bool bOpaque = false; // #i68520# const sal_uInt32 nCurrOrd = mpCurrAnchoredObj ? mpCurrAnchoredObj->GetDrawObj()->GetOrdNum() @@ -558,7 +558,7 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo &rInf ) if ( !pNoTxt || (!pNoTxt->IsTransparent() && !rSur.IsContour()) ) { - bOpaque = sal_True; + bOpaque = true; aRegion -= pFly->Frm(); } } @@ -699,7 +699,7 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, if ( bInFooterOrHeader ) { SwFmtVertOrient aVert( rFrmFmt.GetVertOrient() ); - sal_Bool bVertPrt = aVert.GetRelationOrient() == text::RelOrientation::PRINT_AREA || + bool bVertPrt = aVert.GetRelationOrient() == text::RelOrientation::PRINT_AREA || aVert.GetRelationOrient() == text::RelOrientation::PAGE_PRINT_AREA; if( bVertPrt ) return sal_False; @@ -881,7 +881,7 @@ SwAnchoredObjList* SwTxtFly::InitAnchoredObjList() const bool bFooterHeader = 0 != pCurrFrm->FindFooterOrHeader(); const IDocumentSettingAccess* pIDSA = pCurrFrm->GetTxtNode()->getIDocumentSettingAccess(); // #i40155# - check, if frame is marked not to wrap - const sal_Bool bWrapAllowed = ( pIDSA->get(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING) || + const bool bWrapAllowed = ( pIDSA->get(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING) || ( !pCurrFrm->IsInFtn() && !bFooterHeader ) ); bOn = sal_False; @@ -1153,7 +1153,7 @@ void SwTxtFly::CalcRightMargin( SwRect &rFly, // #i68520# SwSurround eSurroundForTextWrap; - sal_Bool bStop = sal_False; + bool bStop = false; // #i68520# SwAnchoredObjList::size_type nPos = 0; @@ -1211,7 +1211,7 @@ void SwTxtFly::CalcRightMargin( SwRect &rFly, // overrule the FlyFrm if( nRight > nFlyRight ) nRight = nFlyRight; - bStop = sal_True; + bStop = true; } } } diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index 7b903271b255..9ede82ecf0b9 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -720,7 +720,7 @@ void SwTxtFrm::_InvalidateRange( const SwCharRange &aRange, const long nD) SetWidow( sal_False ); SwParaPortion *pPara = GetPara(); - sal_Bool bInv = sal_False; + bool bInv = false; if( 0 != nD ) { //Auf nDelta werden die Differenzen zwischen alter und @@ -728,7 +728,7 @@ void SwTxtFrm::_InvalidateRange( const SwCharRange &aRange, const long nD) //wenn Zeichen eingefuegt wurden, positiv, wenn Zeichen //geloescht wurden. *(pPara->GetDelta()) += nD; - bInv = sal_True; + bInv = true; } SwCharRange &rReformat = *(pPara->GetReformat()); if(aRange != rReformat) { @@ -736,7 +736,7 @@ void SwTxtFrm::_InvalidateRange( const SwCharRange &aRange, const long nD) rReformat = aRange; else rReformat += aRange; - bInv = sal_True; + bInv = true; } if(bInv) { @@ -948,8 +948,8 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) // Dies spart Stack, man muss nur aufpassen, // dass sie Variablen gesetzt werden. xub_StrLen nPos, nLen; - sal_Bool bSetFldsDirty = sal_False; - sal_Bool bRecalcFtnFlag = sal_False; + bool bSetFldsDirty = false; + bool bRecalcFtnFlag = false; switch( nWhich ) { @@ -977,7 +977,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) } SET_WRONG( nPos, nLen, true ) SET_SCRIPT_INVAL( nPos ) - bSetFldsDirty = sal_True; + bSetFldsDirty = true; if( HasFollow() ) lcl_ModifyOfst( this, nPos, nLen ); } @@ -988,7 +988,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) InvalidateRange( SwCharRange( nPos, 1 ), -1 ); SET_WRONG( nPos, -1, true ) SET_SCRIPT_INVAL( nPos ) - bSetFldsDirty = bRecalcFtnFlag = sal_True; + bSetFldsDirty = bRecalcFtnFlag = true; if( HasFollow() ) lcl_ModifyOfst( this, nPos, STRING_LEN ); } @@ -1008,7 +1008,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) } SET_WRONG( nPos, m, true ) SET_SCRIPT_INVAL( nPos ) - bSetFldsDirty = bRecalcFtnFlag = sal_True; + bSetFldsDirty = bRecalcFtnFlag = true; if( HasFollow() ) lcl_ModifyOfst( this, nPos, nLen ); } @@ -1086,7 +1086,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) else _InvalidateRange( SwCharRange( nPos, 1 ) ); } - bSetFldsDirty = sal_True; + bSetFldsDirty = true; // ST2 if ( SwSmartTagMgr::Get().IsSmartTagsEnabled() ) SET_WRONG( nPos, nPos + 1, false ) @@ -1140,7 +1140,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) nClear |= 0x02; --nCount; } - sal_Bool bLineSpace = SFX_ITEM_SET == rNewSet.GetItemState( + bool bLineSpace = SFX_ITEM_SET == rNewSet.GetItemState( RES_PARATR_LINESPACING, sal_False ), bRegister = SFX_ITEM_SET == rNewSet.GetItemState( RES_PARATR_REGISTER, sal_False ); @@ -1322,7 +1322,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) if ( GetPrev() ) CheckKeep(); Prepare( PREP_CLEAR ); - bSetFldsDirty = sal_True; + bSetFldsDirty = true; break; case RES_FRAMEDIR : SetDerivedR2L( sal_False ); @@ -1408,7 +1408,7 @@ void SwTxtFrm::PrepWidows( const MSHORT nNeed, sal_Bool bNotify ) // muss der Master darueber hinaus die Widow-Regel ueberpruefen. if( !nHave ) { - sal_Bool bSplit; + bool bSplit; if( !IsFollow() ) //Nur ein Master entscheidet ueber Orphans { const WidowsAndOrphans aWidOrp( this ); @@ -1416,7 +1416,7 @@ void SwTxtFrm::PrepWidows( const MSHORT nNeed, sal_Bool bNotify ) aLine.GetLineNr() >= aLine.GetDropLines() ); } else - bSplit = sal_True; + bSplit = true; if( bSplit ) { @@ -1439,19 +1439,19 @@ void SwTxtFrm::PrepWidows( const MSHORT nNeed, sal_Bool bNotify ) * SwTxtFrm::Prepare *************************************************************************/ -static sal_Bool lcl_ErgoVadis( SwTxtFrm* pFrm, xub_StrLen &rPos, const PrepareHint ePrep ) +static bool lcl_ErgoVadis( SwTxtFrm* pFrm, xub_StrLen &rPos, const PrepareHint ePrep ) { const SwFtnInfo &rFtnInfo = pFrm->GetNode()->GetDoc()->GetFtnInfo(); if( ePrep == PREP_ERGOSUM ) { if( !rFtnInfo.aErgoSum.Len() ) - return sal_False;; + return false;; rPos = pFrm->GetOfst(); } else { if( !rFtnInfo.aQuoVadis.Len() ) - return sal_False; + return false; if( pFrm->HasFollow() ) rPos = pFrm->GetFollow()->GetOfst(); else @@ -1459,7 +1459,7 @@ static sal_Bool lcl_ErgoVadis( SwTxtFrm* pFrm, xub_StrLen &rPos, const PrepareHi if( rPos ) --rPos; // unser letztes Zeichen } - return sal_True; + return true; } void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid, diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx index 20f4e5422503..0c3f056e7471 100644 --- a/sw/source/core/text/txtftn.cxx +++ b/sw/source/core/text/txtftn.cxx @@ -76,7 +76,7 @@ sal_Bool SwTxtFrm::_IsFtnNumFrm() const SwTxtFrm *SwTxtFrm::FindFtnRef( const SwTxtFtn *pFtn ) { SwTxtFrm *pFrm = this; - const sal_Bool bFwd = *pFtn->GetStart() >= GetOfst(); + const bool bFwd = *pFtn->GetStart() >= GetOfst(); while( pFrm ) { if( SwFtnBossFrm::FindFtn( pFrm, pFtn ) ) @@ -143,7 +143,7 @@ sal_Bool SwTxtFrm::CalcPrepFtnAdjust() !((SwSectionFrm*)pBoss->GetUpper())->IsFtnAtEnd() ) ) { const SwFtnContFrm *pCont = pBoss->FindFtnCont(); - sal_Bool bReArrange = sal_True; + bool bReArrange = true; SWRECTFN( this ) if ( pCont && (*fnRect->fnYDiff)( (pCont->Frm().*fnRect->fnGetTop)(), @@ -156,7 +156,7 @@ sal_Bool SwTxtFrm::CalcPrepFtnAdjust() pFtn = pBoss->FindFirstFtn( this ); } else - bReArrange = sal_False; + bReArrange = false; if( !pCont || !pFtn || bReArrange != (pFtn->FindFtnBossFrm() == pBoss) ) { SwTxtFormatInfo aInf( this ); @@ -213,7 +213,7 @@ static SwTwips lcl_GetFtnLower( const SwTxtFrm* pFrm, SwTwips nLower ) OSL_ENSURE( pTabFrm && pRow && pRow->GetUpper()->IsTabFrm(), "Upper of row should be tab" ); - const sal_Bool bDontSplit = !pTabFrm->IsFollow() && + const bool bDontSplit = !pTabFrm->IsFollow() && !pTabFrm->IsLayoutSplitAllowed(); SwTwips nMin = 0; @@ -352,7 +352,7 @@ SwTwips SwTxtFrm::_GetFtnFrmHeight() const #if OSL_DEBUG_LEVEL > 0 if( nTmp < 0 ) { - sal_Bool bInvalidPos = sal_False; + bool bInvalidPos = false; const SwLayoutFrm* pTmp = GetUpper(); while( !bInvalidPos && pTmp ) { @@ -436,7 +436,7 @@ void SwTxtFrm::RemoveFtn( const xub_StrLen nStart, const xub_StrLen nLen ) if( !pHints ) return; - sal_Bool bRollBack = nLen != STRING_LEN; + bool bRollBack = nLen != STRING_LEN; sal_uInt16 nSize = pHints->Count(); xub_StrLen nEnd; SwTxtFrm* pSource; @@ -456,10 +456,10 @@ void SwTxtFrm::RemoveFtn( const xub_StrLen nStart, const xub_StrLen nLen ) if( nSize ) { SwPageFrm* pUpdate = NULL; - sal_Bool bRemove = sal_False; + bool bRemove = false; SwFtnBossFrm *pFtnBoss = 0; SwFtnBossFrm *pEndBoss = 0; - sal_Bool bFtnEndDoc + bool bFtnEndDoc = FTNPOS_CHAPTER == GetNode()->GetDoc()->GetFtnInfo().ePos; for ( sal_uInt16 i = nSize; i; ) { @@ -491,7 +491,7 @@ void SwTxtFrm::RemoveFtn( const xub_StrLen nStart, const xub_StrLen nLen ) SwSectionFrm* pSect = (SwSectionFrm*) pFtnBoss->GetUpper(); if( pSect->IsFtnAtEnd() ) - bFtnEndDoc = sal_False; + bFtnEndDoc = false; } } } @@ -511,7 +511,7 @@ void SwTxtFrm::RemoveFtn( const xub_StrLen nStart, const xub_StrLen nLen ) if( pFtnFrm ) { - const sal_Bool bEndDoc = bEndn ? sal_True : bFtnEndDoc; + const bool bEndDoc = bEndn ? true : bFtnEndDoc; if( bRollBack ) { while ( pFtnFrm ) @@ -552,7 +552,7 @@ void SwTxtFrm::RemoveFtn( const xub_StrLen nStart, const xub_StrLen nLen ) pEndBoss->MoveFtns( this, pDest, pFtn ); else pFtnBoss->MoveFtns( this, pDest, pFtn ); - bRemove = sal_True; + bRemove = true; } ((SwTxtFrm*)pDest)->SetFtn( sal_True ); @@ -652,7 +652,7 @@ void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine ) #endif pSect = pBoss->FindSctFrm(); - sal_Bool bDocEnd = bEnd ? !( pSect && pSect->IsEndnAtEnd() ) : + bool bDocEnd = bEnd ? !( pSect && pSect->IsEndnAtEnd() ) : ( !( pSect && pSect->IsFtnAtEnd() ) && FTNPOS_CHAPTER == GetNode()->GetDoc()->GetFtnInfo().ePos ); //Ftn kann beim Follow angemeldet sein. @@ -721,7 +721,7 @@ void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine ) SwFtnFrm *pFtnFrm = pBoss->FindFtn( pSrcFrm, pFtn ); SwFtnBossFrm *pFtnBoss = pFtnFrm->FindFtnBossFrm(); - sal_Bool bBrutal = sal_False; + bool bBrutal = false; if( pFtnBoss == pBoss ) // Ref und Ftn sind auf der selben Seite/Spalte. { @@ -754,7 +754,7 @@ void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine ) return; } else - bBrutal = sal_True; + bBrutal = true; } else { @@ -763,13 +763,13 @@ void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine ) while( pTmp->GetNext() && pSrcFrm != pTmp ) pTmp = pTmp->GetNext(); if( pSrcFrm == pTmp ) - bBrutal = sal_True; + bBrutal = true; else { // Wenn unser Boss in einem spaltigen Bereich sitzt, es aber auf // der Seite schon einen FtnContainer gibt, hilft nur die brutale // Methode if( pSect && pSect->FindFtnBossFrm( !bEnd )->FindFtnCont() ) - bBrutal = sal_True; + bBrutal = true; // OD 08.11.2002 #104840# - use <SwLayoutFrm::IsBefore(..)> else if ( !pFtnFrm->GetPrev() || pFtnBoss->IsBefore( pBoss ) @@ -900,7 +900,7 @@ SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf, if( !rFtn.IsEndNote() ) { SwSectionFrm *pSct = pBoss->FindSctFrm(); - sal_Bool bAtSctEnd = pSct && pSct->IsFtnAtEnd(); + bool bAtSctEnd = pSct && pSct->IsFtnAtEnd(); if( FTNPOS_CHAPTER != pDoc->GetFtnInfo().ePos || bAtSctEnd ) { SwFrm* pFtnCont = pBoss->FindFtnCont(); |