sal_Bool to bool

Change-Id: I2bb29dd158e07d3fad924e9877b02435574f4d29

14 files changed, 199 insertions, 201 deletions

diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index c570d9139e79..51a2796266a6 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -1937,7 +1937,7 @@ sal_Bool SwTxtFrm::FormatQuick( bool bForceQuickFormat )
     SwFrmSwapper aSwapper( this, sal_True );
 
     SwTxtFrmLocker aLock(this);
-    SwTxtFormatInfo aInf( this, sal_False, sal_True );
+    SwTxtFormatInfo aInf( this, false, true );
     if( 0 != aInf.MaxHyph() )   // Respect MaxHyphen!
         return sal_False;
 
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 6aa466cca32f..73bbd5e564ad 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -89,7 +89,7 @@ using namespace ::com::sun::star::beans;
 #define DRAW_SPECIAL_OPTIONS_ROTATE 2
 
 #ifdef DBG_UTIL
-sal_Bool SwTxtSizeInfo::IsOptDbg() const { return GetOpt().IsTest4(); }
+bool SwTxtSizeInfo::IsOptDbg() const { return GetOpt().IsTest4(); }
 #endif
 
 SwLineInfo::SwLineInfo()
@@ -444,6 +444,11 @@ sal_Int32 SwTxtSizeInfo::GetTxtBreak( const long nLineWidth,
     return m_pFnt->GetTxtBreak( aDrawInf, nLineWidth );
 }
 
+bool SwTxtSizeInfo::_HasHint( const SwTxtNode* pTxtNode, sal_Int32 nPos )
+{
+    return pTxtNode->GetTxtAttrForCharAt(nPos);
+}
+
 void SwTxtPaintInfo::CtorInitTxtPaintInfo( SwTxtFrm *pFrame, const SwRect &rPaint )
 {
     CtorInitTxtSizeInfo( pFrame );
@@ -496,7 +501,7 @@ extern Color aGlobalRetoucheColor;
  * Returns if the current background color is dark.
  *************************************************************************/
 
-static sal_Bool lcl_IsDarkBackground( const SwTxtPaintInfo& rInf )
+static bool lcl_IsDarkBackground( const SwTxtPaintInfo& rInf )
 {
     const Color* pCol = rInf.GetFont()->GetBackColor();
     if( ! pCol || COL_TRANSPARENT == pCol->GetColor() )
@@ -510,7 +515,7 @@ static sal_Bool lcl_IsDarkBackground( const SwTxtPaintInfo& rInf )
         // See implementation in /core/layout/paintfrm.cxx
         // There is a background color, if there is a background brush and
         // its color is *not* "no fill"/"auto fill".
-        if( rInf.GetTxtFrm()->GetBackgroundBrush( pItem, pFillStyleItem, pFillGradientItem, pCol, aOrigBackRect, sal_False ) )
+        if( rInf.GetTxtFrm()->GetBackgroundBrush( pItem, pFillStyleItem, pFillGradientItem, pCol, aOrigBackRect, false ) )
         {
             if ( !pCol )
                 pCol = &pItem->GetColor();
@@ -536,9 +541,9 @@ static sal_Bool lcl_IsDarkBackground( const SwTxtPaintInfo& rInf )
 
 void SwTxtPaintInfo::_DrawText( const OUString &rText, const SwLinePortion &rPor,
                                 const sal_Int32 nStart, const sal_Int32 nLength,
-                                const sal_Bool bKern, const sal_Bool bWrong,
-                                const sal_Bool bSmartTag,
-                                const sal_Bool bGrammarCheck )  // SMARTTAGS
+                                const bool bKern, const bool bWrong,
+                                const bool bSmartTag,
+                                const bool bGrammarCheck )  // SMARTTAGS
 {
     if( !nLength )
         return;
@@ -589,10 +594,10 @@ void SwTxtPaintInfo::_DrawText( const OUString &rText, const SwLinePortion &rPor
 
     sal_Bool bCfgIsAutoGrammar = sal_False;
     SvtLinguConfig().GetProperty( UPN_IS_GRAMMAR_AUTO ) >>= bCfgIsAutoGrammar;
-    const sal_Bool bBullet = OnWin() && GetOpt().IsBlank() && IsNoSymbol();
-    const sal_Bool bTmpWrong = bWrong && OnWin() && GetOpt().IsOnlineSpell();
-    const sal_Bool bTmpGrammarCheck = bGrammarCheck && OnWin() && bCfgIsAutoGrammar && GetOpt().IsOnlineSpell();
-    const sal_Bool bTmpSmart = bSmartTag && OnWin() && !GetOpt().IsPagePreview() && SwSmartTagMgr::Get().IsSmartTagsEnabled(); // SMARTTAGS
+    const bool bBullet = OnWin() && GetOpt().IsBlank() && IsNoSymbol();
+    const bool bTmpWrong = bWrong && OnWin() && GetOpt().IsOnlineSpell();
+    const bool bTmpGrammarCheck = bGrammarCheck && OnWin() && bCfgIsAutoGrammar && GetOpt().IsOnlineSpell();
+    const bool bTmpSmart = bSmartTag && OnWin() && !GetOpt().IsPagePreview() && SwSmartTagMgr::Get().IsSmartTagsEnabled(); // SMARTTAGS
 
     OSL_ENSURE( GetParaPortion(), "No paragraph!");
     SwDrawTextInfo aDrawInf( m_pFrm->getRootFrm()->GetCurrShell(), *m_pOut, pSI, rText, nStart, nLength,
@@ -738,9 +743,9 @@ void SwTxtPaintInfo::CalcRect( const SwLinePortion& rPor,
     }
 
     // Adjust x coordinate if we are inside a bidi portion
-    const sal_Bool bFrmDir = GetTxtFrm()->IsRightToLeft();
-    bool bCounterDir = ( ! bFrmDir && DIR_RIGHT2LEFT == GetDirection() ) ||
-                       (   bFrmDir && DIR_LEFT2RIGHT == GetDirection() );
+    const bool bFrmDir = GetTxtFrm()->IsRightToLeft();
+    const bool bCounterDir = ( !bFrmDir && DIR_RIGHT2LEFT == GetDirection() ) ||
+                             (  bFrmDir && DIR_LEFT2RIGHT == GetDirection() );
 
     if ( bCounterDir )
         aPoint.A() -= aSize.Width();
@@ -911,8 +916,8 @@ static void lcl_DrawSpecial( const SwTxtPaintInfo& rInf, const SwLinePortion& rP
     ((SwTxtPaintInfo&)rInf).SetPos( aOldPos );
 }
 
-void SwTxtPaintInfo::DrawRect( const SwRect &rRect, sal_Bool bNoGraphic,
-                               sal_Bool bRetouche ) const
+void SwTxtPaintInfo::DrawRect( const SwRect &rRect, bool bNoGraphic,
+                               bool bRetouche ) const
 {
     if ( OnWin() || !bRetouche )
     {
@@ -1003,7 +1008,7 @@ void SwTxtPaintInfo::DrawRedArrow( const SwLinePortion &rPor ) const
     }
 }
 
-void SwTxtPaintInfo::DrawPostIts( const SwLinePortion&, sal_Bool bScript ) const
+void SwTxtPaintInfo::DrawPostIts( const SwLinePortion&, bool bScript ) const
 {
     if( OnWin() && m_pOpt->IsPostIts() )
     {
@@ -1103,7 +1108,7 @@ void SwTxtPaintInfo::DrawBackground( const SwLinePortion &rPor ) const
             pOut->SetLineColor();
         }
 
-        DrawRect( aIntersect, sal_True );
+        DrawRect( aIntersect, true );
         pOut->Pop();
     }
 }
@@ -1178,7 +1183,7 @@ void SwTxtPaintInfo::DrawBackBrush( const SwLinePortion &rPor ) const
         pTmpOut->SetFillColor(aFillColor);
         pTmpOut->SetLineColor();
 
-        DrawRect( aIntersect, sal_True, sal_False );
+        DrawRect( aIntersect, true, false );
 
         pTmpOut->Pop();
     }
@@ -1302,7 +1307,7 @@ const PropertyValues & SwTxtFormatInfo::GetHyphValues() const
     return aHyphVals;
 }
 
-sal_Bool SwTxtFormatInfo::InitHyph( const sal_Bool bAutoHyphen )
+bool SwTxtFormatInfo::InitHyph( const bool bAutoHyphen )
 {
     const SwAttrSet& rAttrSet = GetTxtFrm()->GetTxtNode()->GetSwAttrSet();
     SetHanging( rAttrSet.GetHangingPunctuation().GetValue() );
@@ -1310,7 +1315,7 @@ sal_Bool SwTxtFormatInfo::InitHyph( const sal_Bool bAutoHyphen )
     SetForbiddenChars( rAttrSet.GetForbiddenRule().GetValue() );
     const SvxHyphenZoneItem &rAttr = rAttrSet.GetHyphenZone();
     MaxHyph() = rAttr.GetMaxHyphens();
-    sal_Bool bAuto = bAutoHyphen || rAttr.IsHyphen();
+    const bool bAuto = bAutoHyphen || rAttr.IsHyphen();
     if( bAuto || bInterHyph )
     {
         const sal_Int16 nMinimalLeading  = std::max(rAttr.GetMinLead(), sal_uInt8(2));
@@ -1320,8 +1325,8 @@ sal_Bool SwTxtFormatInfo::InitHyph( const sal_Bool bAutoHyphen )
     return bAuto;
 }
 
-void SwTxtFormatInfo::CtorInitTxtFormatInfo( SwTxtFrm *pNewFrm, const sal_Bool bNewInterHyph,
-                                const sal_Bool bNewQuick, const sal_Bool bTst )
+void SwTxtFormatInfo::CtorInitTxtFormatInfo( SwTxtFrm *pNewFrm, const bool bNewInterHyph,
+                                const bool bNewQuick, const bool bTst )
 {
     CtorInitTxtPaintInfo( pNewFrm, SwRect() );
 
@@ -1334,10 +1339,10 @@ void SwTxtFormatInfo::CtorInitTxtFormatInfo( SwTxtFrm *pNewFrm, const sal_Bool b
     nMinWordLength  = 0;
     bAutoHyph = InitHyph();
 
-    bIgnoreFly = sal_False;
-    bFakeLineStart = sal_False;
-    bShift = sal_False;
-    bDropInit = sal_False;
+    bIgnoreFly = false;
+    bFakeLineStart = false;
+    bShift = false;
+    bDropInit = false;
     bTestFormat = bTst;
     nLeft = 0;
     nRight = 0;
@@ -1359,22 +1364,23 @@ void SwTxtFormatInfo::CtorInitTxtFormatInfo( SwTxtFrm *pNewFrm, const sal_Bool b
  * If we do not do interactive hyphenation, we only hyphenate if ParaFmt is
  * set to automatic hyphenation.
  *************************************************************************/
-sal_Bool SwTxtFormatInfo::IsHyphenate() const
+bool SwTxtFormatInfo::IsHyphenate() const
 {
     if( !bInterHyph && !bAutoHyph )
-        return sal_False;
+        return false;
 
     LanguageType eTmp = GetFont()->GetLanguage();
     if( LANGUAGE_DONTKNOW == eTmp || LANGUAGE_NONE == eTmp )
-        return sal_False;
+        return false;
 
     uno::Reference< XHyphenator > xHyph = ::GetHyphenator();
-    if (bInterHyph && xHyph.is())
+    if (!xHyph.is())
+        return false;
+
+    if (bInterHyph)
         SvxSpellWrapper::CheckHyphLang( xHyph, eTmp );
 
-    if( !xHyph.is() || !xHyph->hasLocale( g_pBreakIt->GetLocale(eTmp) ) )
-        return sal_False;
-    return sal_True;
+    return xHyph->hasLocale( g_pBreakIt->GetLocale(eTmp) );
 }
 
 /*************************************************************************
@@ -1396,7 +1402,7 @@ void SwTxtFormatInfo::Init()
     // Not initialized: pRest, nLeft, nRight, nFirst, nRealWidth
     X(0);
     bArrowDone = bFull = bFtnDone = bErgoDone = bNumDone = bNoEndHyph =
-        bNoMidHyph = bStop = bNewLine = bUnderFlow = bTabOverflow = sal_False;
+        bNoMidHyph = bStop = bNewLine = bUnderFlow = bTabOverflow = false;
 
     // generally we do not allow number portions in follows, except...
     if ( GetTxtFrm()->IsFollow() )
@@ -1439,7 +1445,7 @@ void SwTxtFormatInfo::Init()
 
 SwTxtFormatInfo::SwTxtFormatInfo( const SwTxtFormatInfo& rInf,
     SwLineLayout& rLay, SwTwips nActWidth ) : SwTxtPaintInfo( rInf ),
-    bTabOverflow( sal_False )
+    bTabOverflow( false )
 {
     pRoot = &rLay;
     pLast = &rLay;
@@ -1464,23 +1470,23 @@ SwTxtFormatInfo::SwTxtFormatInfo( const SwTxtFormatInfo& rInf,
     nMinLeading = 0;
     nMinTrailing = 0;
     nMinWordLength = 0;
-    bFull = sal_False;
-    bFtnDone = sal_True;
-    bErgoDone = sal_True;
-    bNumDone = sal_True;
-    bArrowDone = sal_True;
-    bStop = sal_False;
-    bNewLine = sal_True;
-    bShift  = sal_False;
-    bUnderFlow = sal_False;
-    bInterHyph = sal_False;
-    bAutoHyph = sal_False;
-    bDropInit = sal_False;
+    bFull = false;
+    bFtnDone = true;
+    bErgoDone = true;
+    bNumDone = true;
+    bArrowDone = true;
+    bStop = false;
+    bNewLine = true;
+    bShift = false;
+    bUnderFlow = false;
+    bInterHyph = false;
+    bAutoHyph = false;
+    bDropInit = false;
     bQuick  = rInf.bQuick;
-    bNoEndHyph  = sal_False;
-    bNoMidHyph  = sal_False;
-    bIgnoreFly = sal_False;
-    bFakeLineStart = sal_False;
+    bNoEndHyph = false;
+    bNoMidHyph = false;
+    bIgnoreFly = false;
+    bFakeLineStart = false;
 
     cTabDecimal = 0;
     cHookChar = 0;
@@ -1489,23 +1495,20 @@ SwTxtFormatInfo::SwTxtFormatInfo( const SwTxtFormatInfo& rInf,
     SetMulti( true );
     SetFirstMulti( rInf.IsFirstMulti() );
 }
-sal_Bool SwTxtFormatInfo::_CheckFtnPortion( SwLineLayout* pCurr )
+
+bool SwTxtFormatInfo::_CheckFtnPortion( SwLineLayout* pCurr )
 {
-    KSHORT nHeight = pCurr->GetRealHeight();
-    SwLinePortion *pPor = pCurr->GetPortion();
-    sal_Bool bRet = sal_False;
-    while( pPor )
+    const KSHORT nHeight = pCurr->GetRealHeight();
+    for( SwLinePortion *pPor = pCurr->GetPortion(); pPor; pPor = pPor->GetPortion() )
     {
         if( pPor->IsFtnPortion() && nHeight > ((SwFtnPortion*)pPor)->Orig() )
         {
-            bRet = sal_True;
             SetLineHeight( nHeight );
             SetLineNettoHeight( pCurr->Height() );
-            break;
+            return true;
         }
-        pPor = pPor->GetPortion();
     }
-    return bRet;
+    return false;
 }
 
 sal_Int32 SwTxtFormatInfo::ScanPortionEnd( const sal_Int32 nStart,
@@ -1604,15 +1607,15 @@ sal_Int32 SwTxtFormatInfo::ScanPortionEnd( const sal_Int32 nStart,
     return i;
 }
 
-sal_Bool SwTxtFormatInfo::LastKernPortion()
+bool SwTxtFormatInfo::LastKernPortion()
 {
     if( GetLast() )
     {
-         if( GetLast()->IsKernPortion() )
-            return sal_True;
+        if( GetLast()->IsKernPortion() )
+            return true;
         if( GetLast()->Width() || ( GetLast()->GetLen() &&
             !GetLast()->IsHolePortion() ) )
-            return sal_False;
+            return false;
     }
     SwLinePortion* pPor = GetRoot();
     SwLinePortion *pKern = NULL;
@@ -1627,9 +1630,9 @@ sal_Bool SwTxtFormatInfo::LastKernPortion()
     if( pKern )
     {
         SetLast( pKern );
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
 SwTxtSlot::SwTxtSlot(
@@ -1646,7 +1649,7 @@ SwTxtSlot::SwTxtSlot(
     if( pCh )
     {
         aTxt = OUString( pCh, strlen(pCh), RTL_TEXTENCODING_MS_1252 );
-        bOn = sal_True;
+        bOn = true;
     }
     else
         bOn = pPor->GetExpTxt( *pNew, aTxt );
@@ -1737,7 +1740,7 @@ SwFontSave::SwFontSave( const SwTxtSizeInfo &rInf, SwFont *pNew,
             ( pNew->GetBackColor() && pFnt->GetBackColor() &&
               ( *pNew->GetBackColor() != *pFnt->GetBackColor() ) ) )
         {
-            pNew->SetTransparent( sal_True );
+            pNew->SetTransparent( true );
             pNew->SetAlign( ALIGN_BASELINE );
             pInf->SetFont( pNew );
         }
@@ -1820,9 +1823,9 @@ SwDefFontSave::~SwDefFontSave()
     }
 }
 
-sal_Bool SwTxtFormatInfo::ChgHyph( const sal_Bool bNew )
+bool SwTxtFormatInfo::ChgHyph( const bool bNew )
 {
-    const sal_Bool bOld = bAutoHyph;
+    const bool bOld = bAutoHyph;
     if( bAutoHyph != bNew )
     {
         bAutoHyph = bNew;
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index d5f1d37114d3..e44d8e712311 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -67,7 +67,7 @@ class SwWrongList;
 #ifdef DBG_UTIL
 #define OPTDBG( rInf )   (rInf).IsOptDbg()
 #else
-#define OPTDBG( rInf )   sal_False
+#define OPTDBG( rInf )   false
 #endif
 
 /*************************************************************************
@@ -102,7 +102,7 @@ public:
 
     // vertical alignment
     inline sal_uInt16 GetVertAlign() const { return nVertAlign; }
-    inline bool HasSpecialAlign( sal_Bool bVert ) const
+    inline bool HasSpecialAlign( bool bVert ) const
         { return bVert ?
                  ( SvxParaVertAlignItem::BASELINE  != nVertAlign ) :
                  ( SvxParaVertAlignItem::BASELINE  != nVertAlign &&
@@ -276,7 +276,7 @@ public:
     inline void SetSnapToGrid( const bool bN ) { m_bSnapToGrid = bN; }
     inline sal_uInt8 GetDirection() const { return m_nDirection; }
     inline void SetDirection( const sal_uInt8 nNew ) { m_nDirection = nNew; }
-    inline sal_Bool IsRotated() const { return 0 != ( 1 & m_nDirection ); }
+    inline bool IsRotated() const { return ( 1 & m_nDirection ); }
 
     inline SwViewShell *GetVsh() { return m_pVsh; }
     inline const SwViewShell *GetVsh() const { return m_pVsh; }
@@ -338,7 +338,7 @@ public:
     friend SvStream & WriteSwTxtSizeInfo( SvStream &rOS, const SwTxtSizeInfo &rInf );
 
     // No Bullets for the symbol font!
-    inline sal_Bool IsNoSymbol() const
+    inline bool IsNoSymbol() const
     { return RTL_TEXTENCODING_SYMBOL != m_pFnt->GetCharSet( m_pFnt->GetActual() ); }
 
     void NoteAnimation() const;
@@ -347,9 +347,9 @@ public:
     inline SwTxtFrm *GetTxtFrm() { return m_pFrm; }
     inline const SwTxtFrm *GetTxtFrm() const { return m_pFrm; }
 
-    inline sal_Bool HasHint( sal_Int32 nPos ) const
+    inline bool HasHint( sal_Int32 nPos ) const
         { return _HasHint( m_pFrm->GetTxtNode(), nPos ); }
-    static sal_Bool _HasHint( const SwTxtNode* pTxtNode, sal_Int32 nPos );
+    static bool _HasHint( const SwTxtNode* pTxtNode, sal_Int32 nPos );
 
     // If Kana Compression is enabled, a minimum and maximum portion width
     // is calculated. We format lines with minimal size and share remaining
@@ -373,9 +373,9 @@ public:
     {
         m_aMaxWidth.clear();
     };
-    inline sal_Bool CompressLine()
+    inline bool CompressLine()
     {
-        return (sal_Bool)!m_aMaxWidth.empty();
+        return !m_aMaxWidth.empty();
     };
 
     //
@@ -392,7 +392,7 @@ public:
                    ? (*m_pKanaComp)[m_nKanaIdx] : 0; }
 
 #ifdef DBG_UTIL
-    sal_Bool IsOptDbg() const;
+    bool IsOptDbg() const;
 #endif
 };
 
@@ -415,9 +415,9 @@ class SwTxtPaintInfo : public SwTxtSizeInfo
     MSHORT nSpaceIdx;
     void _DrawText( const OUString &rText, const SwLinePortion &rPor,
                    const sal_Int32 nIdx, const sal_Int32 nLen,
-                   const sal_Bool bKern, const sal_Bool bWrong = sal_False,
-                   const sal_Bool bSmartTag = sal_False,
-                   const sal_Bool bGrammarCheck = sal_False );  // SMARTTAGS
+                   const bool bKern, const bool bWrong = false,
+                   const bool bSmartTag = false,
+                   const bool bGrammarCheck = false );  // SMARTTAGS
 
     SwTxtPaintInfo &operator=(const SwTxtPaintInfo&);
     void _NotifyURL( const SwLinePortion &rPor ) const;
@@ -460,21 +460,21 @@ public:
     inline void DrawText( const OUString &rText, const SwLinePortion &rPor,
                           const sal_Int32 nIdx = 0,
                           const sal_Int32 nLen = COMPLETE_STRING,
-                          const sal_Bool bKern = sal_False) const;
+                          const bool bKern = false) const;
     inline void DrawText( const SwLinePortion &rPor, const sal_Int32 nLen,
-                          const sal_Bool bKern = sal_False ) const;
+                          const bool bKern = false ) const;
     inline void DrawMarkedText( const SwLinePortion &rPor, const sal_Int32 nLen,
-                                const sal_Bool bKern,
-                                const sal_Bool bWrong,
-                                const sal_Bool bSmartTags,
-                                const sal_Bool bGrammarCheck ) const;
+                                const bool bKern,
+                                const bool bWrong,
+                                const bool bSmartTags,
+                                const bool bGrammarCheck ) const;
 
-    void DrawRect( const SwRect &rRect, sal_Bool bNoGraphic = sal_False,
-                   sal_Bool bRetouche = sal_True ) const;
+    void DrawRect( const SwRect &rRect, bool bNoGraphic = false,
+                   bool bRetouche = true ) const;
     void DrawTab( const SwLinePortion &rPor ) const;
     void DrawLineBreak( const SwLinePortion &rPor ) const;
     void DrawRedArrow( const SwLinePortion &rPor ) const;
-    void DrawPostIts( const SwLinePortion &rPor, sal_Bool bScript ) const;
+    void DrawPostIts( const SwLinePortion &rPor, bool bScript ) const;
     void DrawBackground( const SwLinePortion &rPor ) const;
     void DrawViewOpt( const SwLinePortion &rPor, const MSHORT nWhich ) const;
     void DrawBackBrush( const SwLinePortion &rPor ) const;
@@ -574,41 +574,41 @@ class SwTxtFormatInfo : public SwTxtPaintInfo
     sal_Int16  nMinTrailing;    // minimum number of chars after hyphenation point
     sal_Int16  nMinWordLength;  // minimum length of word to be hyphenated
 
-    sal_Bool bFull   : 1;      // Line is full
-    sal_Bool bFtnDone  : 1;    // Ftn already formatted
-    sal_Bool bErgoDone : 1;    // ErgoDone already formatted
-    sal_Bool bNumDone  : 1;    // bNumDone already formatted
-    sal_Bool bArrowDone : 1;   // Arrow to the left for scrolling paragraphs
-    sal_Bool bStop   : 1;      // Cancel immediately, discarding the line
-    sal_Bool bNewLine  : 1;    // Format another line
-    sal_Bool bShift  : 1;      // Position change: Repaint until further notice
-    sal_Bool bUnderFlow : 1;   // Context: UnderFlow() ?
-    sal_Bool bInterHyph: 1;    // Interactive hyphenation?
-    sal_Bool bAutoHyph : 1;    // Automatic hyphenation?
-    sal_Bool bDropInit : 1;    // Set DropWidth
-    sal_Bool bQuick  : 1;      // FormatQuick()
-    sal_Bool bNoEndHyph  : 1;  // Switch off hyphenation at the line end (due to MaxHyphens)
-    sal_Bool bNoMidHyph  : 1;  // Switch off hyphenation before flys (due to MaxHyphens)
-    sal_Bool bIgnoreFly: 1;    // FitToContent ignores flys
-    sal_Bool bFakeLineStart: 1; // String has been replaced by field portion
+    bool bFull : 1;             // Line is full
+    bool bFtnDone : 1;          // Ftn already formatted
+    bool bErgoDone : 1;         // ErgoDone already formatted
+    bool bNumDone : 1;          // bNumDone already formatted
+    bool bArrowDone : 1;        // Arrow to the left for scrolling paragraphs
+    bool bStop : 1;             // Cancel immediately, discarding the line
+    bool bNewLine : 1;          // Format another line
+    bool bShift : 1;            // Position change: Repaint until further notice
+    bool bUnderFlow : 1;        // Context: UnderFlow() ?
+    bool bInterHyph : 1;        // Interactive hyphenation?
+    bool bAutoHyph : 1;         // Automatic hyphenation?
+    bool bDropInit : 1;         // Set DropWidth
+    bool bQuick : 1;            // FormatQuick()
+    bool bNoEndHyph : 1;        // Switch off hyphenation at the line end (due to MaxHyphens)
+    bool bNoMidHyph : 1;        // Switch off hyphenation before flys (due to MaxHyphens)
+    bool bIgnoreFly : 1;        // FitToContent ignores flys
+    bool bFakeLineStart : 1;    // String has been replaced by field portion
                                 // info structure only pretends that we are at
                                 // the beginning of a line
-    sal_Bool bTabOverflow;      // Tabs are expanding after the end margin
+    bool bTabOverflow : 1;      // Tabs are expanding after the end margin
+    bool bTestFormat : 1;       // Test formatting from WouldFit, no notification etc.
 
     sal_Unicode   cTabDecimal;  // the current decimal delimiter
     sal_Unicode   cHookChar;    // For tabs in fields etc.
     sal_uInt8   nMaxHyph;       // Max. line count of followup hyphenations
-    sal_Bool   bTestFormat;     // Test formatting from WouldFit, no notification etc.
 
     // Hyphenating ...
-    sal_Bool InitHyph( const sal_Bool bAuto = sal_False );
-    sal_Bool _CheckFtnPortion( SwLineLayout* pCurr );
+    bool InitHyph( const bool bAuto = false );
+    bool _CheckFtnPortion( SwLineLayout* pCurr );
 
 public:
-    void CtorInitTxtFormatInfo( SwTxtFrm *pFrm, const sal_Bool bInterHyph = sal_False,
-        const sal_Bool bQuick = sal_False, const sal_Bool bTst = sal_False );
-    inline SwTxtFormatInfo(SwTxtFrm *pFrame,const sal_Bool bInterHyphL=sal_False,
-            const sal_Bool bQuickL = sal_False, const sal_Bool bTst = sal_False )
+    void CtorInitTxtFormatInfo( SwTxtFrm *pFrm, const bool bInterHyph = false,
+        const bool bQuick = false, const bool bTst = false );
+    inline SwTxtFormatInfo(SwTxtFrm *pFrame, const bool bInterHyphL = false,
+            const bool bQuickL = false, const bool bTst = false)
            { CtorInitTxtFormatInfo( pFrame, bInterHyphL, bQuickL, bTst ); }
 
     // For the formatting inside a double line in a line (multi-line portion)
@@ -644,35 +644,35 @@ public:
     inline void SetRoot( SwLineLayout *pNew ) { pRoot = pNew; }
     inline SwLinePortion *GetLast() { return pLast; }
     inline void SetLast( SwLinePortion *pNewLast ) { pLast = pNewLast; }
-    inline sal_Bool IsFull() const { return bFull; }
-    inline void SetFull( const sal_Bool bNew ) { bFull = bNew; }
-    inline sal_Bool IsHyphForbud() const
+    inline bool IsFull() const { return bFull; }
+    inline void SetFull( const bool bNew ) { bFull = bNew; }
+    inline bool IsHyphForbud() const
         { return pFly ? bNoMidHyph : bNoEndHyph; }
-    inline void SetHyphForbud( const sal_Bool bNew )
+    inline void SetHyphForbud( const bool bNew )
         { if ( pFly ) bNoMidHyph = bNew; else bNoEndHyph = bNew; }
     inline void ChkNoHyph( const sal_uInt8 bEnd, const sal_uInt8 bMid )
         { bNoEndHyph = (nMaxHyph && bEnd >= nMaxHyph);
           bNoMidHyph = (nMaxHyph && bMid >= nMaxHyph); }
-    inline sal_Bool IsIgnoreFly() const { return bIgnoreFly; }
-    inline void SetIgnoreFly( const sal_Bool bNew ) { bIgnoreFly = bNew; }
-    inline sal_Bool IsFakeLineStart() const { return bFakeLineStart; }
-    inline void SetFakeLineStart( const sal_Bool bNew ) { bFakeLineStart = bNew; }
-    inline sal_Bool IsStop() const { return bStop; }
-    inline void SetStop( const sal_Bool bNew ) { bStop = bNew; }
+    inline bool IsIgnoreFly() const { return bIgnoreFly; }
+    inline void SetIgnoreFly( const bool bNew ) { bIgnoreFly = bNew; }
+    inline bool IsFakeLineStart() const { return bFakeLineStart; }
+    inline void SetFakeLineStart( const bool bNew ) { bFakeLineStart = bNew; }
+    inline bool IsStop() const { return bStop; }
+    inline void SetStop( const bool bNew ) { bStop = bNew; }
     inline SwLinePortion *GetRest() { return pRest; }
     inline void SetRest( SwLinePortion *pNewRest ) { pRest = pNewRest; }
-    inline sal_Bool IsNewLine() const { return bNewLine; }
-    inline void SetNewLine( const sal_Bool bNew ) { bNewLine = bNew; }
-    inline sal_Bool IsShift() const { return bShift; }
-    inline void SetShift( const sal_Bool bNew ) { bShift = bNew; }
-    inline sal_Bool IsInterHyph() const { return bInterHyph; }
-    inline sal_Bool IsAutoHyph() const { return bAutoHyph; }
-    inline sal_Bool IsUnderFlow() const { return bUnderFlow; }
-    inline void ClrUnderFlow() { bUnderFlow = sal_False; }
-    inline sal_Bool IsDropInit() const { return bDropInit; }
-    inline void SetDropInit( const sal_Bool bNew ) { bDropInit = bNew; }
-    inline sal_Bool IsQuick() const { return bQuick; }
-    inline sal_Bool IsTest() const { return bTestFormat; }
+    inline bool IsNewLine() const { return bNewLine; }
+    inline void SetNewLine( const bool bNew ) { bNewLine = bNew; }
+    inline bool IsShift() const { return bShift; }
+    inline void SetShift( const bool bNew ) { bShift = bNew; }
+    inline bool IsInterHyph() const { return bInterHyph; }
+    inline bool IsAutoHyph() const { return bAutoHyph; }
+    inline bool IsUnderFlow() const { return bUnderFlow; }
+    inline void ClrUnderFlow() { bUnderFlow = false; }
+    inline bool IsDropInit() const { return bDropInit; }
+    inline void SetDropInit( const bool bNew ) { bDropInit = bNew; }
+    inline bool IsQuick() const { return bQuick; }
+    inline bool IsTest() const { return bTestFormat; }
 
     inline sal_Int32 GetLineStart() const { return nLineStart; }
     inline void SetLineStart( const sal_Int32 nNew ) { nLineStart = nNew; }
@@ -686,7 +686,7 @@ public:
     inline const SwLinePortion *GetUnderFlow() const { return pUnderFlow; }
     inline SwLinePortion *GetUnderFlow() { return pUnderFlow; }
     inline void SetUnderFlow( SwLinePortion *pNew )
-           { pUnderFlow = pNew; bUnderFlow = sal_True; }
+           { pUnderFlow = pNew; bUnderFlow = true; }
     inline sal_Int32 GetSoftHyphPos() const { return nSoftHyphPos; }
     inline void SetSoftHyphPos( const sal_Int32 nNew ) { nSoftHyphPos = nNew; }
 
@@ -713,21 +713,21 @@ public:
     inline sal_Unicode GetHookChar() const { return cHookChar; }
 
     // Done-Flags
-    inline sal_Bool IsFtnDone() const { return bFtnDone; }
-    inline void SetFtnDone( const sal_Bool bNew ) { bFtnDone = bNew; }
-    inline sal_Bool IsErgoDone() const { return bErgoDone; }
-    inline void SetErgoDone( const sal_Bool bNew ) { bErgoDone = bNew; }
-    inline sal_Bool IsNumDone() const { return bNumDone; }
-    inline void SetNumDone( const sal_Bool bNew ) { bNumDone = bNew; }
-    inline sal_Bool IsArrowDone() const { return bArrowDone; }
-    inline void SetArrowDone( const sal_Bool bNew ) { bArrowDone = bNew; }
+    inline bool IsFtnDone() const { return bFtnDone; }
+    inline void SetFtnDone( const bool bNew ) { bFtnDone = bNew; }
+    inline bool IsErgoDone() const { return bErgoDone; }
+    inline void SetErgoDone( const bool bNew ) { bErgoDone = bNew; }
+    inline bool IsNumDone() const { return bNumDone; }
+    inline void SetNumDone( const bool bNew ) { bNumDone = bNew; }
+    inline bool IsArrowDone() const { return bArrowDone; }
+    inline void SetArrowDone( const bool bNew ) { bArrowDone = bNew; }
 
     // For SwTxtPortion::Hyphenate
-    inline sal_Bool IsSoftHyph( const sal_Int32 nPos ) const;
-    sal_Bool ChgHyph( const sal_Bool bNew );
+    inline bool IsSoftHyph( const sal_Int32 nPos ) const;
+    bool ChgHyph( const bool bNew );
 
     // Should the hyphenate helper be discarded?
-    sal_Bool IsHyphenate() const;
+    bool IsHyphenate() const;
     inline sal_Int32 GetUnderScorePos() const { return nUnderScorePos; }
     inline void SetUnderScorePos( sal_Int32 nNew ) { nUnderScorePos = nNew; }
 
@@ -738,7 +738,7 @@ public:
     const com::sun::star::beans::PropertyValues &
                 GetHyphValues() const;
 
-    sal_Bool CheckFtnPortion( SwLineLayout* pCurr )
+    bool CheckFtnPortion( SwLineLayout* pCurr )
         { return IsFtnInside() && _CheckFtnPortion( pCurr ); }
 
     // Dropcaps called by SwTxtFormatter::CTOR
@@ -748,7 +748,7 @@ public:
     void Reset( const SwTxtFrm *pFrame); // , const sal_Bool bAll );
 
     // Sets the last SwKernPortion as pLast, if it is followed by empty portions
-    sal_Bool LastKernPortion();
+    bool LastKernPortion();
 
     // Looks for tabs, TabDec, TXTATR and BRK from nIdx until nEnd.
     // Return: Position; sets cHookChar if necessary
@@ -756,8 +756,8 @@ public:
 
     friend SvStream & WriteSwTxtFormatInfo( SvStream &rOS, const SwTxtFormatInfo &rInf );
 
-    inline void SetTabOverflow( sal_Bool bOverflow ) { bTabOverflow = bOverflow; }
-    inline sal_Bool IsTabOverflow( ) { return bTabOverflow; }
+    inline void SetTabOverflow( bool bOverflow ) { bTabOverflow = bOverflow; }
+    inline bool IsTabOverflow() { return bTabOverflow; }
 };
 
 /*************************************************************************
@@ -777,7 +777,7 @@ class SwTxtSlot
     SwWrongList* pTempList;
     sal_Int32 nIdx;
     sal_Int32 nLen;
-    sal_Bool bOn;
+    bool bOn;
 protected:
     SwTxtSizeInfo *pInf;
 public:
@@ -786,7 +786,7 @@ public:
     SwTxtSlot( const SwTxtSizeInfo *pNew, const SwLinePortion *pPor, bool bTxtLen,
                bool bExgLists, const sal_Char *pCh = NULL );
     ~SwTxtSlot();
-    inline sal_Bool IsOn() const { return bOn; }
+    inline bool IsOn() const { return bOn; }
 };
 
 /*************************************************************************
@@ -866,23 +866,23 @@ inline void SwTxtPaintInfo::SetPaintOfst( const SwTwips nNew )
 inline void SwTxtPaintInfo::DrawText( const OUString &rText,
                             const SwLinePortion &rPor,
                             const sal_Int32 nStart, const sal_Int32 nLength,
-                            const sal_Bool bKern ) const
+                            const bool bKern ) const
 {
     ((SwTxtPaintInfo*)this)->_DrawText( rText, rPor, nStart, nLength, bKern );
 }
 
 inline void SwTxtPaintInfo::DrawText( const SwLinePortion &rPor,
-        const sal_Int32 nLength, const sal_Bool bKern ) const
+        const sal_Int32 nLength, const bool bKern ) const
 {
     ((SwTxtPaintInfo*)this)->_DrawText( *m_pTxt, rPor, m_nIdx, nLength, bKern );
 }
 
 inline void SwTxtPaintInfo::DrawMarkedText( const SwLinePortion &rPor,
                                             const sal_Int32 nLength,
-                                            const sal_Bool bKern,
-                                            const sal_Bool bWrong,
-                                            const sal_Bool bSmartTags,
-                                            const sal_Bool bGrammarCheck ) const
+                                            const bool bKern,
+                                            const bool bWrong,
+                                            const bool bSmartTags,
+                                            const bool bGrammarCheck ) const
 {
     ((SwTxtPaintInfo*)this)->_DrawText( *m_pTxt, rPor, m_nIdx, nLength, bKern, bWrong, bSmartTags, bGrammarCheck );
 }
@@ -903,10 +903,10 @@ inline const SwAttrSet& SwTxtFormatInfo::GetCharAttr() const
 
 inline void SwTxtFormatInfo::SetParaFtn()
 {
-    GetTxtFrm()->SetFtn( sal_True );
+    GetTxtFrm()->SetFtn( true );
 }
 
-inline sal_Bool SwTxtFormatInfo::IsSoftHyph( const sal_Int32 nPos ) const
+inline bool SwTxtFormatInfo::IsSoftHyph( const sal_Int32 nPos ) const
 {
     return CHAR_SOFTHYPHEN == GetTxtFrm()->GetTxtNode()->GetTxt()[nPos];
 }
diff --git a/sw/source/core/text/porexp.cxx b/sw/source/core/text/porexp.cxx
index 66be8a5527cd..36897558bec2 100644
--- a/sw/source/core/text/porexp.cxx
+++ b/sw/source/core/text/porexp.cxx
@@ -112,10 +112,10 @@ void SwExpandPortion::Paint( const SwTxtPaintInfo &rInf ) const
 
     // ST2
     if ( rInf.GetSmartTags() || rInf.GetGrammarCheckList() )
-        rInf.DrawMarkedText( *this, rInf.GetLen(), sal_False, sal_False,
+        rInf.DrawMarkedText( *this, rInf.GetLen(), false, false,
             0 != rInf.GetSmartTags(), 0 != rInf.GetGrammarCheckList() );
     else
-        rInf.DrawText( *this, rInf.GetLen(), sal_False );
+        rInf.DrawText( *this, rInf.GetLen(), false );
 
     if( GetJoinBorderWithPrev() || GetJoinBorderWithNext() )
         *const_cast<SwTxtPaintInfo&>(rInf).GetFont() = aOldFont;
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index b3fa0e8b9adb..74957889b832 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -182,7 +182,7 @@ SwFldSlot::~SwFldSlot()
         pInf->SetTxt( *pOldTxt );
         pInf->SetIdx( nIdx );
         pInf->SetLen( nLen );
-        pInf->SetFakeLineStart( sal_False );
+        pInf->SetFakeLineStart( false );
     }
 }
 
@@ -726,7 +726,7 @@ static sal_Char const sDoubleSpace[] = "  ";
                 pThis->Width( nOldWidth - nSpaceOffs + 12 );
                 {
                     SwTxtSlot aDiffTxt( &aInf, this, true, false, sDoubleSpace );
-                    aInf.DrawText( *this, aInf.GetLen(), sal_True );
+                    aInf.DrawText( *this, aInf.GetLen(), true );
                 }
             }
             pThis->Width( nOldWidth );
@@ -835,11 +835,11 @@ sal_Bool SwGrfNumPortion::Format( SwTxtFormatInfo &rInf )
         {
             SetLen( 0 );
             SetNoPaint( sal_True );
-            rInf.SetNumDone( sal_False );
+            rInf.SetNumDone( false );
             return sal_True;
         }
     }
-    rInf.SetNumDone( sal_True );
+    rInf.SetNumDone( true );
 //    long nDiff = rInf.Left() - rInf.First() + rInf.ForcedLeftMargin();
     long nDiff = mbLabelAlignmentPosAndSpaceModeActive
                  ? 0
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index b306a43b0d84..e5e385d9f3f3 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -119,7 +119,7 @@ sal_Bool SwFlyCntPortion::Format( SwTxtFormatInfo &rInf )
         else
         {
             if( !rInf.GetFly() )
-                rInf.SetNewLine( sal_True );
+                rInf.SetNewLine( true );
             Width(0);
             SetAscent(0);
             SetLen(0);
diff --git a/sw/source/core/text/porglue.cxx b/sw/source/core/text/porglue.cxx
index aea370b8cb63..b57195b5b2f4 100644
--- a/sw/source/core/text/porglue.cxx
+++ b/sw/source/core/text/porglue.cxx
@@ -94,7 +94,7 @@ void SwGluePortion::Paint( const SwTxtPaintInfo &rInf ) const
         comphelper::string::padToLength(aBuf, GetFixWidth() / GetLen(), ' ');
         OUString aTxt(aBuf.makeStringAndClear());
         SwTxtPaintInfo aInf( rInf, &aTxt );
-        aInf.DrawText( *this, aTxt.getLength(), sal_True );
+        aInf.DrawText( *this, aTxt.getLength(), true );
     }
 
     if( rInf.OnWin() && rInf.GetOpt().IsBlank() && rInf.IsNoSymbol() )
@@ -116,12 +116,12 @@ void SwGluePortion::Paint( const SwTxtPaintInfo &rInf ) const
             aBulletPor.Width( aBulletSize.Width() );
             aBulletPor.Height( aBulletSize.Height() );
             aBulletPor.SetAscent( GetAscent() );
-            aInf.DrawText( aBulletPor, aBullet.getLength(), sal_True );
+            aInf.DrawText( aBulletPor, aBullet.getLength(), true );
         }
         else
         {
             SwTxtSlot aSlot( &rInf, this, true, false );
-            rInf.DrawText( *this, rInf.GetLen(), sal_True );
+            rInf.DrawText( *this, rInf.GetLen(), true );
         }
     }
 }
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 72a175fbfc41..51e2bfc5fa4a 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -111,7 +111,7 @@ sal_Bool SwBreakPortion::Format( SwTxtFormatInfo &rInf )
     Height( pRoot->Height() );
     SetAscent( pRoot->GetAscent() );
     if ( rInf.GetIdx()+1 == rInf.GetTxt().getLength() )
-        rInf.SetNewLine( sal_True );
+        rInf.SetNewLine( true );
     return sal_True;
 }
 
@@ -170,7 +170,7 @@ void SwKernPortion::Paint( const SwTxtPaintInfo &rInf ) const
             rInf.CalcRect( *this, &aClipRect, 0 );
             SwSaveClip aClip( (OutputDevice*)rInf.GetOut() );
             aClip.ChgClip( aClipRect, 0 );
-            rInf.DrawText( aTxtDouble, *this, 0, 2, sal_True );
+            rInf.DrawText( aTxtDouble, *this, 0, 2, true );
         }
     }
 }
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index a6871b41e4b6..4b72ac05ad75 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -587,9 +587,9 @@ void SwTxtPortion::Paint( const SwTxtPaintInfo &rInf ) const
         const bool bSmartTags = 0 != pSmarttags;
 
         if ( bWrong || bSmartTags || bGrammarCheck )
-            rInf.DrawMarkedText( *this, rInf.GetLen(), sal_False, bWrong, bSmartTags, bGrammarCheck );
+            rInf.DrawMarkedText( *this, rInf.GetLen(), false, bWrong, bSmartTags, bGrammarCheck );
         else
-            rInf.DrawText( *this, rInf.GetLen(), sal_False );
+            rInf.DrawText( *this, rInf.GetLen(), false );
     }
 }
 
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index 3686c299c9ab..19207b2e14a9 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -133,11 +133,6 @@ SwDropPortion::~SwDropPortion()
         pBlink->Delete( this );
 }
 
-sal_Bool SwTxtSizeInfo::_HasHint( const SwTxtNode* pTxtNode, sal_Int32 nPos )
-{
-    return 0 != pTxtNode->GetTxtAttrForCharAt(nPos);
-}
-
 /*************************************************************************
  *                    SwTxtNode::GetDropLen()
  *
@@ -1101,7 +1096,7 @@ sal_Bool SwDropPortion::Format( SwTxtFormatInfo &rInf )
             bFull = SwTxtPortion::Format( rInf );
         }
         else
-            rInf.SetDropInit( sal_True );
+            rInf.SetDropInit( true );
 
         Height( rInf.GetTxtHeight() );
         SetAscent( rInf.GetAscent() );
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index c98cd273e718..7031b5453f4c 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -1873,7 +1873,7 @@ SwTestFormat::SwTestFormat( SwTxtFrm* pTxtFrm, const SwFrm* pPre, SwTwips nMaxHe
     if ( pFrm->IsVertical() )
         pFrm->SwapWidthAndHeight();
 
-    SwTxtFormatInfo aInf( pFrm, sal_False, sal_True, sal_True );
+    SwTxtFormatInfo aInf( pFrm, false, true, true );
     SwTxtFormatter  aLine( pFrm, &aInf );
 
     pFrm->_Format( aLine, aInf );
@@ -2123,8 +2123,8 @@ SwTwips SwTxtFrm::CalcFitToContent()
     // #i31490#
     SwTxtFrmLocker aLock( this );
 
-    SwTxtFormatInfo aInf( this, sal_False, sal_True, sal_True );
-    aInf.SetIgnoreFly( sal_True );
+    SwTxtFormatInfo aInf( this, false, true, true );
+    aInf.SetIgnoreFly( true );
     SwTxtFormatter  aLine( this, &aInf );
     SwHookOut aHook( aInf );
 
@@ -2183,8 +2183,8 @@ void SwTxtFrm::CalcAdditionalFirstLineOffset()
             SwTxtFrmLocker aLock( this );
 
             // simulate text formatting
-            SwTxtFormatInfo aInf( this, sal_False, sal_True, sal_True );
-            aInf.SetIgnoreFly( sal_True );
+            SwTxtFormatInfo aInf( this, false, true, true );
+            aInf.SetIgnoreFly( true );
             SwTxtFormatter aLine( this, &aInf );
             SwHookOut aHook( aInf );
             aLine._CalcFitToContent();
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 6e66808662d8..f32e0a0e13e5 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -910,7 +910,7 @@ SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf,
             {
                 if( !pFtnCont )
                 {
-                    rInf.SetStop( sal_True );
+                    rInf.SetStop( true );
                     UNDO_SWAP( pFrm )
                     return 0;
                 }
@@ -927,7 +927,7 @@ SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf,
                             SwFtnFrm* pTmpFrm = (SwFtnFrm*)pFtnC->Lower();
                             if( pTmpFrm && *pTmpFrm < pFtn )
                             {
-                                rInf.SetStop( sal_True );
+                                rInf.SetStop( true );
                                 UNDO_SWAP( pFrm )
                                 return 0;
                             }
@@ -955,7 +955,7 @@ SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf,
                                 // Wir sind in der letzte Zeile und die Fussnote
                                 // ist auf eine andere Seite gewandert, dann wollen
                                 // wir mit ...
-                                rInf.SetStop( sal_True );
+                                rInf.SetStop( true );
                                 UNDO_SWAP( pFrm )
                                 return 0;
                             }
@@ -1435,7 +1435,7 @@ sal_Bool SwFtnPortion::Format( SwTxtFormatInfo &rInf )
     // an underflow during SwTxtGuess::Guess
     rInf.SetFakeLineStart( rInf.GetIdx() > rInf.GetLineStart() );
     sal_Bool bFull = SwFldPortion::Format( rInf );
-    rInf.SetFakeLineStart( sal_False );
+    rInf.SetFakeLineStart( false );
     SetAscent( rInf.GetAscent() );
     Height( rInf.GetTxtHeight() );
     rInf.SetFtnDone( !bFull );
@@ -1561,7 +1561,7 @@ void SwQuoVadisPortion::Paint( const SwTxtPaintInfo &rInf ) const
         rInf.DrawViewOpt( *this, POR_QUOVADIS );
         SwTxtSlot aDiffTxt( &rInf, this, true, false );
         SwFontSave aSave( rInf, pFnt );
-        rInf.DrawText( *this, rInf.GetLen(), sal_True );
+        rInf.DrawText( *this, rInf.GetLen(), true );
     }
 }
 
@@ -1598,7 +1598,7 @@ sal_Bool SwErgoSumPortion::Format( SwTxtFormatInfo &rInf )
 {
     sal_Bool bFull = SwFldPortion::Format( rInf );
     SetLen( 0 );
-    rInf.SetErgoDone( sal_True );
+    rInf.SetErgoDone( true );
 
     // 8317: keine mehrzeiligen Felder bei QuoVadis und ErgoSum
     if( bFull && rInf.GetRest() )
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index cb1a4fb987fd..9e7da94b31ce 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -83,7 +83,7 @@ sal_Bool SwTxtFrm::Hyphenate( SwInterHyphInfo &rHyphInf )
         if ( IsVertical() )
             SwapWidthAndHeight();
 
-        SwTxtFormatInfo aInf( this, sal_True );     // sal_True fuer interactive hyph!
+        SwTxtFormatInfo aInf( this, true );     // true for interactive hyph!
         SwTxtFormatter aLine( this, &aInf );
         aLine.CharToLine( rHyphInf.nStart );
         // Wenn wir innerhalb des ersten Wortes einer Zeile stehen, so koennte
@@ -500,7 +500,7 @@ sal_Bool SwSoftHyphPortion::Format( SwTxtFormatInfo &rInf )
         if( rInf.GetSoftHyphPos() )
             return sal_True;
 
-        const sal_Bool bHyph = rInf.ChgHyph( sal_True );
+        const bool bHyph = rInf.ChgHyph( true );
         if( rInf.IsHyphenate() )
         {
             rInf.SetSoftHyphPos( rInf.GetIdx() );
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index a466b6624fe2..1e5eb634f54a 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -434,7 +434,7 @@ sal_Bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf )
                 {
                     bFull = false;
                     if ( bTabOverflow && !IsAutoTabStop() )
-                        rInf.SetTabOverflow( sal_True );
+                        rInf.SetTabOverflow( true );
                 }
 
                 break;
@@ -620,7 +620,7 @@ void SwTabPortion::Paint( const SwTxtPaintInfo &rInf ) const
             KSHORT nChar = Width() / nCharWidth;
             OUStringBuffer aBuf;
             comphelper::string::padToLength(aBuf, nChar, ' ');
-            rInf.DrawText(aBuf.makeStringAndClear(), *this, 0, nChar, sal_True);
+            rInf.DrawText(aBuf.makeStringAndClear(), *this, 0, nChar, true);
         }
     }
 
@@ -639,7 +639,7 @@ void SwTabPortion::Paint( const SwTxtPaintInfo &rInf ) const
                 ++nChar; // to avoid gaps (Bug 13430)
             OUStringBuffer aBuf;
             comphelper::string::padToLength(aBuf, nChar, cFill);
-            rInf.DrawText(aBuf.makeStringAndClear(), *this, 0, nChar, sal_True);
+            rInf.DrawText(aBuf.makeStringAndClear(), *this, 0, nChar, true);
         }
     }
 }