sal_Bool to bool

Change-Id: Ic03470163e90f2f86b4d6fab8942834a0801d83f

8 files changed, 145 insertions, 145 deletions

diff --git a/sw/source/core/text/blink.cxx b/sw/source/core/text/blink.cxx
index 22c7344ffa0f..ffb6fe73183c 100644
--- a/sw/source/core/text/blink.cxx
+++ b/sw/source/core/text/blink.cxx
@@ -137,7 +137,7 @@ void SwBlink::Insert( const Point& rPoint, const SwLinePortion* pPor,
         aList.insert( pBlinkPor );
         pTxtFrm->SetBlinkPor();
         if( pPor->IsLayPortion() || pPor->IsParaPortion() )
-            ((SwLineLayout*)pPor)->SetBlinking( sal_True );
+            ((SwLineLayout*)pPor)->SetBlinking();
 
         if( !aTimer.IsActive() )
             aTimer.Start();
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index d6e8c8cb3ac7..a297d91c0884 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -103,7 +103,7 @@ void SwTxtFrm::ValidateFrm()
     // We at least have to save the MustFit flag!
     OSL_ENSURE( HasPara(), "ResetPreps(), missing ParaPortion." );
     SwParaPortion *pPara = GetPara();
-    const sal_Bool bMustFit = pPara->IsPrepMustFit();
+    const bool bMustFit = pPara->IsPrepMustFit();
     ResetPreps();
     pPara->SetPrepMustFit( bMustFit );
 
@@ -197,7 +197,7 @@ sal_Bool SwTxtFrm::CalcFollow( const sal_Int32 nTxtOfst )
     SwTxtFrm* pMyFollow = GetFollow();
 
     SwParaPortion *pPara = GetPara();
-    sal_Bool bFollowFld = pPara ? pPara->IsFollowField() : sal_False;
+    const bool bFollowFld = pPara && pPara->IsFollowField();
 
     if( !pMyFollow->GetOfst() || pMyFollow->GetOfst() != nTxtOfst ||
         bFollowFld || pMyFollow->IsFieldFollow() ||
@@ -787,10 +787,10 @@ sal_Bool SwTxtFrm::CalcPreps()
     SwParaPortion *pPara = GetPara();
     if ( !pPara )
         return sal_False;
-    sal_Bool bPrep = pPara->IsPrep();
-    sal_Bool bPrepWidows = pPara->IsPrepWidows();
-    sal_Bool bPrepAdjust = pPara->IsPrepAdjust();
-    sal_Bool bPrepMustFit = pPara->IsPrepMustFit();
+    const bool bPrep = pPara->IsPrep();
+    const bool bPrepWidows = pPara->IsPrepWidows();
+    const bool bPrepAdjust = pPara->IsPrepAdjust();
+    const bool bPrepMustFit = pPara->IsPrepMustFit();
     ResetPreps();
 
     sal_Bool bRet = sal_False;
@@ -872,7 +872,7 @@ sal_Bool SwTxtFrm::CalcPreps()
                     if( bPrepMustFit )
                     {
                         SwTxtLineAccess aAccess( this );
-                        aAccess.GetPara()->SetPrepMustFit( sal_True );
+                        aAccess.GetPara()->SetPrepMustFit();
                     }
                     return sal_False;
                 }
@@ -983,7 +983,7 @@ void SwTxtFrm::FormatAdjust( SwTxtFormatter &rLine,
 
     sal_Int32 nEnd = rLine.GetStart();
 
-    sal_Bool bHasToFit = pPara->IsPrepMustFit();
+    const bool bHasToFit = pPara->IsPrepMustFit();
 
     // The StopFlag is set by footnotes which want to go onto the next page
     // Call base class method <SwTxtFrmBreak::IsBreakNow(..)>
@@ -1130,7 +1130,7 @@ void SwTxtFrm::FormatAdjust( SwTxtFormatter &rLine,
     if( HasFollow() || IsInFtn() )
         _AdjustFollow( rLine, nEnd, nStrLen, nNew );
 
-    pPara->SetPrepMustFit( sal_False );
+    pPara->SetPrepMustFit( false );
 
     UNDO_SWAP( this )
 }
@@ -1151,7 +1151,7 @@ sal_Bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine, const sal_Bool bPrev )
     const KSHORT nOldAscent = pOldCur->GetAscent();
     const KSHORT nOldHeight = pOldCur->Height();
     const SwTwips nOldWidth = pOldCur->Width() + pOldCur->GetHangingMargin();
-    const sal_Bool bOldHyph = pOldCur->IsEndHyph();
+    const bool bOldHyph = pOldCur->IsEndHyph();
     SwTwips nOldTop = 0;
     SwTwips nOldBottom = 0;
     if( rLine.GetCurr()->IsClipping() )
@@ -1239,7 +1239,7 @@ sal_Bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine, const sal_Bool bPrev )
 
         // Finally we enlarge the repaint rectangle if we found an underscore
         // within our line. 40 Twips should be enough
-        const sal_Bool bHasUnderscore =
+        const bool bHasUnderscore =
                 ( rLine.GetInfo().GetUnderScorePos() < nNewStart );
         if ( bHasUnderscore || rLine.GetCurr()->HasUnderscore() )
             rRepaint.Bottom( rRepaint.Bottom() + 40 );
@@ -1517,8 +1517,8 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
         }
         if( bFormat )
         {
-            sal_Bool bOldEndHyph = rLine.GetCurr()->IsEndHyph();
-            sal_Bool bOldMidHyph = rLine.GetCurr()->IsMidHyph();
+            const bool bOldEndHyph = rLine.GetCurr()->IsEndHyph();
+            const bool bOldMidHyph = rLine.GetCurr()->IsMidHyph();
             bFormat = FormatLine( rLine, bPrev );
             // There can only be one bPrev ... (???)
             bPrev = false;
@@ -1670,7 +1670,7 @@ void SwTxtFrm::_Format( SwParaPortion *pPara )
         // Empty lines do not get tortured for very long:
         // pPara is cleared, which is the same as:
         // *pPara = SwParaPortion;
-        sal_Bool bMustFit = pPara->IsPrepMustFit();
+        const bool bMustFit = pPara->IsPrepMustFit();
         pPara->Truncate();
         pPara->FormatReset();
         if( pBlink && pPara->IsBlinking() )
@@ -1810,8 +1810,8 @@ void SwTxtFrm::Format( const SwBorderAttrs * )
         {
             if( GetTxtNode()->GetSwAttrSet().GetRegister().GetValue() )
             {
-                aAccess.GetPara()->SetPrepAdjust( sal_True );
-                aAccess.GetPara()->SetPrep( sal_True );
+                aAccess.GetPara()->SetPrepAdjust();
+                aAccess.GetPara()->SetPrep();
                 CalcPreps();
             }
             SetWidow( sal_False );
@@ -1883,7 +1883,7 @@ void SwTxtFrm::Format( const SwBorderAttrs * )
     // the PrepMustFit should not survive a Format operation
     SwParaPortion *pPara = GetPara();
     if ( pPara )
-           pPara->SetPrepMustFit( sal_False );
+           pPara->SetPrepMustFit( false );
 
     CalcBaseOfstForFly();
     _CalcHeightOfLastLine(); // #i11860#
diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index ea9ffe2aaa14..276ad5bed775 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -699,7 +699,7 @@ void SwTxtAdjuster::CalcAdjLine( SwLineLayout *pCurrent )
 {
     OSL_ENSURE( pCurrent->IsFormatAdj(), "CalcAdjLine: Why?" );
 
-    pCurrent->SetFormatAdj(sal_False);
+    pCurrent->SetFormatAdj(false);
 
     SwParaPortion* pPara = GetInfo().GetParaPortion();
 
@@ -765,7 +765,7 @@ SwFlyPortion *SwTxtAdjuster::CalcFlyPortion( const long nRealWidth,
         KSHORT nLocalWidth = KSHORT( aLocal.Left() + aLocal.Width() );
         if( nRealWidth < long( nLocalWidth ) )
             aLocal.Width( nRealWidth - aLocal.Left() );
-        GetInfo().GetParaPortion()->SetFly( sal_True );
+        GetInfo().GetParaPortion()->SetFly( true );
         pFlyPortion = new SwFlyPortion( aLocal );
         pFlyPortion->Height( KSHORT( rCurrRect.Height() ) );
         // The Width could be smaller than the FixWidth, thus:
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 539da8ec7577..46b16234253c 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -162,7 +162,7 @@ SwLinePortion *SwLineLayout::Insert( SwLinePortion *pIns )
             pPortion = new SwTxtPortion( *(SwLinePortion*)this );
             if( IsBlinking() && pBlink )
             {
-                SetBlinking( sal_False );
+                SetBlinking( false );
                 pBlink->Replace( this, pPortion );
             }
         }
@@ -291,7 +291,7 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
     KSHORT nFlyHeight = 0;
     KSHORT nFlyDescent = 0;
     bool bOnlyPostIts = true;
-    SetHanging( sal_False );
+    SetHanging( false );
 
     sal_Bool bTmpDummy = ( 0 == GetLen() );
     SwFlyCntPortion* pFlyCnt = 0;
@@ -311,7 +311,7 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
 
     if( pPortion )
     {
-        SetCntnt( sal_False );
+        SetCntnt( false );
         if( pPortion->IsBreakPortion() )
         {
             SetLen( pPortion->GetLen() );
@@ -389,8 +389,8 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
 
                 if( pPos->IsHangingPortion() )
                 {
-                    SetHanging( sal_True );
-                    rInf.GetParaPortion()->SetMargin( sal_True );
+                    SetHanging();
+                    rInf.GetParaPortion()->SetMargin();
                 }
 
                 // To prevent that a paragraph-end-character does not change
@@ -472,11 +472,11 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
                     {
                         OUString aTxt;
                         if( pPos->GetExpTxt( rInf, aTxt ) && !aTxt.isEmpty() )
-                            SetCntnt( sal_True );
+                            SetCntnt();
                     }
                     else if( ( pPos->InTxtGrp() || pPos->IsMultiPortion() ) &&
                              pPos->GetLen() )
-                        SetCntnt( sal_True );
+                        SetCntnt();
                 }
 
                 bTmpDummy = bTmpDummy && !HasCntnt() &&
@@ -2078,7 +2078,7 @@ SwScriptInfo* SwScriptInfo::GetScriptInfo( const SwTxtNode& rTNd,
 SwParaPortion::SwParaPortion()
 {
     FormatReset();
-    bFlys = bFtnNum = bMargin = sal_False;
+    bFlys = bFtnNum = bMargin = false;
     SetWhichPor( POR_PARA );
 }
 
@@ -2152,7 +2152,7 @@ SwTwips SwLineLayout::_GetHangingMargin() const
         pPor = pPor->GetPortion();
     }
     if( !bFound ) // update the hanging-flag
-        ((SwLineLayout*)this)->SetHanging( sal_False );
+        ((SwLineLayout*)this)->SetHanging( false );
     return nDiff;
 }
 
@@ -2171,7 +2171,7 @@ SwTwips SwTxtFrm::HangingMargin() const
         pLine = pLine->GetNext();
     } while ( pLine );
     if( !nRet ) // update the margin-flag
-        ((SwParaPortion*)GetPara())->SetMargin( sal_False );
+        ((SwParaPortion*)GetPara())->SetMargin( false );
     return nRet;
 }
 
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index ce610bd1ada1..e74a4fe1313f 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -92,21 +92,21 @@ private:
     std::vector<long>* pLLSpaceAdd;     // Used for justified alignment.
     std::deque<sal_uInt16>* pKanaComp;  // Used for Kana compression.
     KSHORT nRealHeight;                 // The height resulting from line spacing and register
-    sal_Bool bFormatAdj : 1;
-    sal_Bool bDummy     : 1;
-    sal_Bool bFntChg    : 1;
-    sal_Bool bEndHyph   : 1;
-    sal_Bool bMidHyph   : 1;
-    sal_Bool bTab       : 1;
-    sal_Bool bFly       : 1;
-    sal_Bool bRest      : 1;
-    sal_Bool bBlinking  : 1;
-    sal_Bool bClipping  : 1; // Clipping needed for exact line height
-    sal_Bool bContent   : 1; // Text for line numbering
-    sal_Bool bRedline   : 1; // The Redlining
-    sal_Bool bForcedLeftMargin : 1; // Left adjustment moved by the Fly
-    sal_Bool bHanging : 1; // Contains a hanging portion in the margin
-    sal_Bool bUnderscore : 1;
+    bool bFormatAdj : 1;
+    bool bDummy     : 1;
+    bool bFntChg    : 1;
+    bool bEndHyph   : 1;
+    bool bMidHyph   : 1;
+    bool bTab       : 1;
+    bool bFly       : 1;
+    bool bRest      : 1;
+    bool bBlinking  : 1;
+    bool bClipping  : 1; // Clipping needed for exact line height
+    bool bContent   : 1; // Text for line numbering
+    bool bRedline   : 1; // The Redlining
+    bool bForcedLeftMargin : 1; // Left adjustment moved by the Fly
+    bool bHanging : 1; // Contains a hanging portion in the margin
+    bool bUnderscore : 1;
 
     SwTwips _GetHangingMargin() const;
 
@@ -118,39 +118,39 @@ public:
 
     // Flags
     inline void ResetFlags();
-    inline void SetFormatAdj( const sal_Bool bNew ) { bFormatAdj = bNew; }
-    inline sal_Bool IsFormatAdj() const { return bFormatAdj; }
-    inline void SetFntChg( const sal_Bool bNew ) { bFntChg = bNew; }
-    inline sal_Bool IsFntChg() const { return bFntChg; }
-    inline void SetEndHyph( const sal_Bool bNew ) { bEndHyph = bNew; }
-    inline sal_Bool IsEndHyph() const { return bEndHyph; }
-    inline void SetMidHyph( const sal_Bool bNew ) { bMidHyph = bNew; }
-    inline sal_Bool IsMidHyph() const { return bMidHyph; }
-    inline void SetTab( const sal_Bool bNew ) { bTab = bNew; }
-    inline sal_Bool IsTab() const { return bTab; }
-    inline void SetFly( const sal_Bool bNew ) { bFly = bNew; }
-    inline sal_Bool IsFly() const { return bFly; }
-    inline void SetRest( const sal_Bool bNew ) { bRest = bNew; }
-    inline sal_Bool IsRest() const { return bRest; }
-    inline void SetBlinking( const sal_Bool bNew = sal_True ) { bBlinking = bNew; }
-    inline sal_Bool IsBlinking() const { return bBlinking; }
-    inline void SetCntnt( const sal_Bool bNew = sal_True ) { bContent = bNew; }
-    inline sal_Bool HasCntnt() const { return bContent; }
-    inline void SetRedline( const sal_Bool bNew = sal_True ) { bRedline = bNew; }
-    inline sal_Bool HasRedline() const { return bRedline; }
-    inline void SetForcedLeftMargin( const sal_Bool bNew = sal_True ) { bForcedLeftMargin = bNew; }
-    inline sal_Bool HasForcedLeftMargin() const { return bForcedLeftMargin; }
-    inline void SetHanging( const sal_Bool bNew = sal_True ) { bHanging = bNew; }
-    inline sal_Bool IsHanging() const { return bHanging; }
-    inline void SetUnderscore( const sal_Bool bNew = sal_True ) { bUnderscore = bNew; }
-    inline sal_Bool HasUnderscore() const { return bUnderscore; }
+    inline void SetFormatAdj( const bool bNew ) { bFormatAdj = bNew; }
+    inline bool IsFormatAdj() const { return bFormatAdj; }
+    inline void SetFntChg( const bool bNew ) { bFntChg = bNew; }
+    inline bool IsFntChg() const { return bFntChg; }
+    inline void SetEndHyph( const bool bNew ) { bEndHyph = bNew; }
+    inline bool IsEndHyph() const { return bEndHyph; }
+    inline void SetMidHyph( const bool bNew ) { bMidHyph = bNew; }
+    inline bool IsMidHyph() const { return bMidHyph; }
+    inline void SetTab( const bool bNew ) { bTab = bNew; }
+    inline bool IsTab() const { return bTab; }
+    inline void SetFly( const bool bNew ) { bFly = bNew; }
+    inline bool IsFly() const { return bFly; }
+    inline void SetRest( const bool bNew ) { bRest = bNew; }
+    inline bool IsRest() const { return bRest; }
+    inline void SetBlinking( const bool bNew = true ) { bBlinking = bNew; }
+    inline bool IsBlinking() const { return bBlinking; }
+    inline void SetCntnt( const bool bNew = true ) { bContent = bNew; }
+    inline bool HasCntnt() const { return bContent; }
+    inline void SetRedline( const bool bNew = true ) { bRedline = bNew; }
+    inline bool HasRedline() const { return bRedline; }
+    inline void SetForcedLeftMargin( const bool bNew = true ) { bForcedLeftMargin = bNew; }
+    inline bool HasForcedLeftMargin() const { return bForcedLeftMargin; }
+    inline void SetHanging( const bool bNew = true ) { bHanging = bNew; }
+    inline bool IsHanging() const { return bHanging; }
+    inline void SetUnderscore( const bool bNew = true ) { bUnderscore = bNew; }
+    inline bool HasUnderscore() const { return bUnderscore; }
 
     // Respecting empty dummy lines
-    inline void SetDummy( const sal_Bool bNew ) { bDummy = bNew; }
-    inline sal_Bool IsDummy() const { return bDummy; }
+    inline void SetDummy( const bool bNew ) { bDummy = bNew; }
+    inline bool IsDummy() const { return bDummy; }
 
-    inline void SetClipping( const sal_Bool bNew ) { bClipping = bNew; }
-    inline sal_Bool IsClipping() const { return bClipping; }
+    inline void SetClipping( const bool bNew ) { bClipping = bNew; }
+    inline bool IsClipping() const { return bClipping; }
 
     inline SwLineLayout();
     virtual ~SwLineLayout();
@@ -259,24 +259,24 @@ class SwParaPortion : public SwLineLayout
 
     // If a SwTxtFrm is locked, no changes occur to the formatting data (under
     // pLine) (compare with Orphans)
-    sal_Bool bFlys          : 1; // Overlapping Flys?
-    sal_Bool bPrep          : 1; // PREP_*
-    sal_Bool bPrepWidows    : 1; // PREP_WIDOWS
-    sal_Bool bPrepAdjust    : 1; // PREP_ADJUST_FRM
-    sal_Bool bPrepMustFit   : 1; // PREP_MUST_FIT
-    sal_Bool bFollowField   : 1; // We have a bit of field left for the Follow
-
-    sal_Bool bFixLineHeight : 1; // Fixed line height
-    sal_Bool bFtnNum    : 1; // contains a footnotenumberportion
-    sal_Bool bMargin    : 1; // contains a hanging punctuation in the margin
-
-    sal_Bool bFlag00    : 1;
-    sal_Bool bFlag11    : 1;
-    sal_Bool bFlag12    : 1;
-    sal_Bool bFlag13    : 1;
-    sal_Bool bFlag14    : 1;
-    sal_Bool bFlag15    : 1;
-    sal_Bool bFlag16    : 1;
+    bool bFlys          : 1; // Overlapping Flys?
+    bool bPrep          : 1; // PREP_*
+    bool bPrepWidows    : 1; // PREP_WIDOWS
+    bool bPrepAdjust    : 1; // PREP_ADJUST_FRM
+    bool bPrepMustFit   : 1; // PREP_MUST_FIT
+    bool bFollowField   : 1; // We have a bit of field left for the Follow
+
+    bool bFixLineHeight : 1; // Fixed line height
+    bool bFtnNum    : 1; // contains a footnotenumberportion
+    bool bMargin    : 1; // contains a hanging punctuation in the margin
+
+    bool bFlag00    : 1;
+    bool bFlag11    : 1;
+    bool bFlag12    : 1;
+    bool bFlag13    : 1;
+    bool bFlag14    : 1;
+    bool bFlag15    : 1;
+    bool bFlag16    : 1;
 
 public:
     SwParaPortion();
@@ -302,44 +302,44 @@ public:
     sal_Int32 GetParLen() const;
 
     // For Prepare()
-    sal_Bool UpdateQuoVadis( const OUString &rQuo );
+    bool UpdateQuoVadis( const OUString &rQuo );
 
     // Flags
-    inline void SetFly( const sal_Bool bNew = sal_True ) { bFlys = bNew; }
-    inline sal_Bool HasFly() const { return bFlys; }
+    inline void SetFly( const bool bNew = true ) { bFlys = bNew; }
+    inline bool HasFly() const { return bFlys; }
 
     // Preps
-    inline void SetPrep( const sal_Bool bNew = sal_True ) { bPrep = bNew; }
-    inline sal_Bool IsPrep() const { return bPrep; }
-    inline void SetPrepWidows( const sal_Bool bNew = sal_True ) { bPrepWidows = bNew; }
-    inline sal_Bool IsPrepWidows() const { return bPrepWidows; }
-    inline void SetPrepMustFit( const sal_Bool bNew = sal_True ) { bPrepMustFit = bNew; }
-    inline sal_Bool IsPrepMustFit() const { return bPrepMustFit; }
-    inline void SetPrepAdjust( const sal_Bool bNew = sal_True ) { bPrepAdjust = bNew; }
-    inline sal_Bool IsPrepAdjust() const { return bPrepAdjust; }
-    inline void SetFollowField( const sal_Bool bNew = sal_True ) { bFollowField = bNew; }
-    inline sal_Bool IsFollowField() const { return bFollowField; }
-    inline void SetFixLineHeight( const sal_Bool bNew = sal_True ) { bFixLineHeight = bNew; }
-    inline sal_Bool  IsFixLineHeight() const { return bFixLineHeight; }
-
-    inline void SetFtnNum( const sal_Bool bNew = sal_True ) { bFtnNum = bNew; }
-    inline sal_Bool  IsFtnNum() const { return bFtnNum; }
-    inline void SetMargin( const sal_Bool bNew = sal_True ) { bMargin = bNew; }
-    inline sal_Bool  IsMargin() const { return bMargin; }
-    inline void SetFlag00( const sal_Bool bNew = sal_True ) { bFlag00 = bNew; }
-    inline sal_Bool  IsFlag00() const { return bFlag00; }
-    inline void SetFlag11( const sal_Bool bNew = sal_True ) { bFlag11 = bNew; }
-    inline sal_Bool  IsFlag11() const { return bFlag11; }
-    inline void SetFlag12( const sal_Bool bNew = sal_True ) { bFlag12 = bNew; }
-    inline sal_Bool  IsFlag12() const { return bFlag12; }
-    inline void SetFlag13( const sal_Bool bNew = sal_True ) { bFlag13 = bNew; }
-    inline sal_Bool  IsFlag13() const { return bFlag13; }
-    inline void SetFlag14( const sal_Bool bNew = sal_True ) { bFlag14 = bNew; }
-    inline sal_Bool  IsFlag14() const { return bFlag14; }
-    inline void SetFlag15( const sal_Bool bNew = sal_True ) { bFlag15 = bNew; }
-    inline sal_Bool  IsFlag15() const { return bFlag15; }
-    inline void SetFlag16( const sal_Bool bNew = sal_True ) { bFlag16 = bNew; }
-    inline sal_Bool  IsFlag16() const { return bFlag16; }
+    inline void SetPrep( const bool bNew = true ) { bPrep = bNew; }
+    inline bool IsPrep() const { return bPrep; }
+    inline void SetPrepWidows( const bool bNew = true ) { bPrepWidows = bNew; }
+    inline bool IsPrepWidows() const { return bPrepWidows; }
+    inline void SetPrepMustFit( const bool bNew = true ) { bPrepMustFit = bNew; }
+    inline bool IsPrepMustFit() const { return bPrepMustFit; }
+    inline void SetPrepAdjust( const bool bNew = true ) { bPrepAdjust = bNew; }
+    inline bool IsPrepAdjust() const { return bPrepAdjust; }
+    inline void SetFollowField( const bool bNew = true ) { bFollowField = bNew; }
+    inline bool IsFollowField() const { return bFollowField; }
+    inline void SetFixLineHeight( const bool bNew = true ) { bFixLineHeight = bNew; }
+    inline bool IsFixLineHeight() const { return bFixLineHeight; }
+
+    inline void SetFtnNum( const bool bNew = true ) { bFtnNum = bNew; }
+    inline bool IsFtnNum() const { return bFtnNum; }
+    inline void SetMargin( const bool bNew = true ) { bMargin = bNew; }
+    inline bool IsMargin() const { return bMargin; }
+    inline void SetFlag00( const bool bNew = true ) { bFlag00 = bNew; }
+    inline bool IsFlag00() const { return bFlag00; }
+    inline void SetFlag11( const bool bNew = true ) { bFlag11 = bNew; }
+    inline bool IsFlag11() const { return bFlag11; }
+    inline void SetFlag12( const bool bNew = true ) { bFlag12 = bNew; }
+    inline bool IsFlag12() const { return bFlag12; }
+    inline void SetFlag13( const bool bNew = true ) { bFlag13 = bNew; }
+    inline bool IsFlag13() const { return bFlag13; }
+    inline void SetFlag14( const bool bNew = true ) { bFlag14 = bNew; }
+    inline bool IsFlag14() const { return bFlag14; }
+    inline void SetFlag15( const bool bNew = true ) { bFlag15 = bNew; }
+    inline bool IsFlag15() const { return bFlag15; }
+    inline void SetFlag16( const bool bNew = true ) { bFlag16 = bNew; }
+    inline bool IsFlag16() const { return bFlag16; }
 
     // Read/Write methods for the SWG filter
     SvStream &ReadSwg ( SvStream& rStream ); //$ istream
@@ -366,12 +366,12 @@ inline void SwLineLayout::ResetFlags()
 {
     bFormatAdj = bDummy = bFntChg = bTab = bEndHyph = bMidHyph = bFly
     = bRest = bBlinking = bClipping = bContent = bRedline
-    = bForcedLeftMargin = bHanging = sal_False;
+    = bForcedLeftMargin = bHanging = false;
 }
 
 inline SwLineLayout::SwLineLayout()
     : pNext( 0 ), pLLSpaceAdd( 0 ), pKanaComp( 0 ), nRealHeight( 0 ),
-      bUnderscore( sal_False )
+      bUnderscore( false )
 {
     ResetFlags();
     SetWhichPor( POR_LAY );
@@ -379,7 +379,7 @@ inline SwLineLayout::SwLineLayout()
 
 inline void SwParaPortion::ResetPreps()
 {
-    bPrep = bPrepWidows = bPrepAdjust = bPrepMustFit = sal_False;
+    bPrep = bPrepWidows = bPrepAdjust = bPrepMustFit = false;
 }
 
 inline void SwParaPortion::FormatReset()
@@ -389,9 +389,9 @@ inline void SwParaPortion::FormatReset()
     // bFlys needs to be retained in SwTxtFrm::_Format() so that empty
     // paragraphs that needed to avoid Frames with no flow, reformat
     // when the Frame disappears from the Area
-    // bFlys = sal_False;
+    // bFlys = false;
     ResetPreps();
-    bFollowField = bFixLineHeight = bMargin = sal_False;
+    bFollowField = bFixLineHeight = bMargin = false;
 }
 
 inline SwLinePortion *SwLineLayout::GetFirstPortion() const
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 12124a7f1c02..cc5f01e236a7 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -1374,7 +1374,7 @@ void SwTxtFrm::PrepWidows( const MSHORT nNeed, sal_Bool bNotify )
     SwParaPortion *pPara = GetPara();
     if ( !pPara )
         return;
-    pPara->SetPrepWidows( sal_True );
+    pPara->SetPrepWidows();
 
     MSHORT nHave = nNeed;
 
@@ -1530,7 +1530,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
                                 _InvalidatePrt();
                                 _InvalidateSize();
             /* no break here */
-        case PREP_ADJUST_FRM :  pPara->SetPrepAdjust( sal_True );
+        case PREP_ADJUST_FRM :  pPara->SetPrepAdjust();
                                 if( IsFtnNumFrm() != pPara->IsFtnNum() ||
                                     IsUndersized() )
                                 {
@@ -1539,9 +1539,9 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
                                         _SetOfst( 0 );
                                 }
                                 break;
-        case PREP_MUST_FIT :        pPara->SetPrepMustFit( sal_True );
+        case PREP_MUST_FIT :        pPara->SetPrepMustFit();
             /* no break here */
-        case PREP_WIDOWS_ORPHANS :  pPara->SetPrepAdjust( sal_True );
+        case PREP_WIDOWS_ORPHANS :  pPara->SetPrepAdjust();
                                     break;
 
         case PREP_WIDOWS :
@@ -1661,7 +1661,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
 
             // if we don't overlap with anybody:
             // did any free-flying frame overlapped _before_ the position change?
-            sal_Bool bFormat = pPara->HasFly();
+            bool bFormat = pPara->HasFly();
             if( !bFormat )
             {
                 if( IsInFly() )
@@ -1669,7 +1669,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
                     SwTwips nTmpBottom = GetUpper()->Frm().Top() +
                         GetUpper()->Prt().Bottom();
                     if( nTmpBottom < Frm().Bottom() )
-                        bFormat = sal_True;
+                        bFormat = true;
                 }
                 if( !bFormat )
                 {
@@ -1684,7 +1684,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
                             if ( pAnchoredObj->GetFrmFmt().GetAnchor().GetAnchorId()
                                     == FLY_AT_CHAR )
                             {
-                                bFormat = sal_True;
+                                bFormat = true;
                                 break;
                             }
                         }
@@ -1733,7 +1733,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
         case PREP_REGISTER:
             if( GetTxtNode()->GetSwAttrSet().GetRegister().GetValue() )
             {
-                pPara->SetPrepAdjust( sal_True );
+                pPara->SetPrepAdjust();
                 CalcLineSpace();
                 InvalidateSize();
                 _InvalidatePrt();
@@ -1810,7 +1810,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
         }
     }
     if( pPara )
-        pPara->SetPrep( sal_True );
+        pPara->SetPrep();
 }
 
 /* --------------------------------------------------
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 3e2c875d7086..d0327e816ae7 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -1642,7 +1642,7 @@ void SwParaPortion::SetErgoSumNum( const OUString& rErgo )
  * Wird im SwTxtFrm::Prepare() gerufen
  *************************************************************************/
 
-sal_Bool SwParaPortion::UpdateQuoVadis( const OUString &rQuo )
+bool SwParaPortion::UpdateQuoVadis( const OUString &rQuo )
 {
     SwLineLayout *pLay = this;
     while( pLay->GetNext() )
@@ -1659,7 +1659,7 @@ sal_Bool SwParaPortion::UpdateQuoVadis( const OUString &rQuo )
     }
 
     if( !pQuo )
-        return sal_False;
+        return false;
 
     return pQuo->GetQuoTxt() == rQuo;
 }
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index 2b8bb0810292..8757c7e722b5 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -519,9 +519,9 @@ bool SwSoftHyphPortion::Format( SwTxtFormatInfo &rInf )
             rInf.SetSoftHyphPos(0);
             FormatEOL( rInf );
             if ( rInf.GetFly() )
-                rInf.GetRoot()->SetMidHyph( sal_True );
+                rInf.GetRoot()->SetMidHyph( true );
             else
-                rInf.GetRoot()->SetEndHyph( sal_True );
+                rInf.GetRoot()->SetEndHyph( true );
         }
         else
         {