sal_Bool to bool

Change-Id: Ic1cc3312e61e602c33be7444f8d4bbad9268ae77

17 files changed, 124 insertions, 123 deletions

diff --git a/sw/source/core/text/frminf.cxx b/sw/source/core/text/frminf.cxx
index c8f13c27b589..4d4f243d2f15 100644
--- a/sw/source/core/text/frminf.cxx
+++ b/sw/source/core/text/frminf.cxx
@@ -213,7 +213,7 @@ void SwTxtFrmInfo::GetSpaces( SwPaM &rPam, sal_Bool bWithLineBreak ) const
     SwTxtSizeInfo aInf( (SwTxtFrm*)pFrm );
     SwTxtMargin aLine( (SwTxtFrm*)pFrm, &aInf );
     SwPaM *pPam = &rPam;
-    sal_Bool bFirstLine = sal_True;
+    bool bFirstLine = true;
     do {
 
         if( aLine.GetCurr()->GetLen() )
@@ -240,7 +240,7 @@ void SwTxtFrmInfo::GetSpaces( SwPaM &rPam, sal_Bool bWithLineBreak ) const
                 }
             }
         }
-        bFirstLine = sal_False;
+        bFirstLine = false;
     }
     while( aLine.Next() );
 }
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index f5a1341bd5a0..78a59c40d0b1 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -68,7 +68,7 @@ using namespace ::com::sun::star;
 
 ////////////////////////////////////////////////////////////
 
-sal_Bool bInitFont = sal_True;
+bool bInitFont = true;
 
 class SwExtraPainter
 {
@@ -82,28 +82,28 @@ class SwExtraPainter
     SwTwips nRedX;
     sal_uLong nLineNr;
     MSHORT nDivider;
-    sal_Bool bGoLeft;
-    sal_Bool bLineNum;
+    bool bGoLeft;
+    bool bLineNum;
     inline sal_Bool IsClipChg() { return aClip.IsChg(); }
 public:
     SwExtraPainter( const SwTxtFrm *pFrm, ViewShell *pVwSh,
         const SwLineNumberInfo &rLnInf, const SwRect &rRct,
-        sal_Int16 eHor, sal_Bool bLnNm );
+        sal_Int16 eHor, bool bLnNm );
     ~SwExtraPainter() { delete pFnt; }
     inline SwFont* GetFont() const { return pFnt; }
     inline void IncLineNr() { ++nLineNr; }
-    inline sal_Bool HasNumber() { return !( nLineNr % rLineInf.GetCountBy() ); }
-    inline sal_Bool HasDivider() { if( !nDivider ) return sal_False;
+    inline bool HasNumber() { return !( nLineNr % rLineInf.GetCountBy() ); }
+    inline bool HasDivider() { if( !nDivider ) return false;
         return !(nLineNr % rLineInf.GetDividerCountBy()); }
 
-    void PaintExtra( SwTwips nY, long nAsc, long nMax, sal_Bool bRed );
+    void PaintExtra( SwTwips nY, long nAsc, long nMax, bool bRed );
     void PaintRedline( SwTwips nY, long nMax );
 };
 
 
 SwExtraPainter::SwExtraPainter( const SwTxtFrm *pFrm, ViewShell *pVwSh,
     const SwLineNumberInfo &rLnInf, const SwRect &rRct,
-    sal_Int16 eHor, sal_Bool bLnNm )
+    sal_Int16 eHor, bool bLnNm )
     : aClip( pVwSh->GetWin() || pFrm->IsUndersized() ? pVwSh->GetOut() : 0 ),
       aRect( rRct ), pTxtFrm( pFrm ), pSh( pVwSh ), pFnt( 0 ), rLineInf( rLnInf ),
       nLineNr( 1L ), bLineNum( bLnNm )
@@ -151,17 +151,17 @@ SwExtraPainter::SwExtraPainter( const SwTxtFrm *pFrm, ViewShell *pVwSh,
         }
         if( LINENUMBER_POS_LEFT == ePos )
         {
-            bGoLeft = sal_True;
+            bGoLeft = true;
             nX -= rLineInf.GetPosFromLeft();
             if( nX < aRect.Left() )
-                bLineNum = sal_False;
+                bLineNum = false;
         }
         else
         {
-            bGoLeft = sal_False;
+            bGoLeft = false;
             nX += pFrm->Frm().Width() + rLineInf.GetPosFromLeft();
             if( nX > aRect.Right() )
-                bLineNum = sal_False;
+                bLineNum = false;
         }
     }
     if( eHor != text::HoriOrientation::NONE )
@@ -183,7 +183,7 @@ SwExtraPainter::SwExtraPainter( const SwTxtFrm *pFrm, ViewShell *pVwSh,
     }
 }
 
-void SwExtraPainter::PaintExtra( SwTwips nY, long nAsc, long nMax, sal_Bool bRed )
+void SwExtraPainter::PaintExtra( SwTwips nY, long nAsc, long nMax, bool bRed )
 {
   // Line number is stronger than the divider
     const XubString aTmp( HasNumber() ? rLineInf.GetNumType().GetNumStr( nLineNr )
@@ -204,7 +204,7 @@ void SwExtraPainter::PaintExtra( SwTwips nY, long nAsc, long nMax, sal_Bool bRed
     aDrawInf.SetSnapToGrid( sal_False );
     aDrawInf.SetIgnoreFrmRTL( sal_True );
 
-    sal_Bool bTooBig = pFnt->GetSize( pFnt->GetActual() ).Height() > nMax &&
+    bool bTooBig = pFnt->GetSize( pFnt->GetActual() ).Height() > nMax &&
                 pFnt->GetHeight( pSh, *pSh->GetOut() ) > nMax;
     SwFont* pTmpFnt;
     if( bTooBig )
@@ -221,7 +221,7 @@ void SwExtraPainter::PaintExtra( SwTwips nY, long nAsc, long nMax, sal_Bool bRed
         pTmpFnt = GetFont();
     Point aTmpPos( nX, nY );
     aTmpPos.Y() += nAsc;
-    sal_Bool bPaint = sal_True;
+    bool bPaint = true;
     if( !IsClipChg() )
     {
         Size aSize = pTmpFnt->_GetTxtSize( aDrawInf );
@@ -234,7 +234,7 @@ void SwExtraPainter::PaintExtra( SwTwips nY, long nAsc, long nMax, sal_Bool bRed
         if( !aRect.IsInside( aRct ) )
         {
             if( aRct.Intersection( aRect ).IsEmpty() )
-                bPaint = sal_False;
+                bPaint = false;
             else
                 aClip.ChgClip( aRect, pTxtFrm );
         }
@@ -292,12 +292,12 @@ void SwTxtFrm::PaintExtraData( const SwRect &rRect ) const
     const IDocumentRedlineAccess* pIDRA = rTxtNode.getIDocumentRedlineAccess();
     const SwLineNumberInfo &rLineInf = rTxtNode.getIDocumentLineNumberAccess()->GetLineNumberInfo();
     const SwFmtLineNumber &rLineNum = GetAttrSet()->GetLineNumber();
-    sal_Bool bLineNum = !IsInTab() && rLineInf.IsPaintLineNumbers() &&
+    bool bLineNum = !IsInTab() && rLineInf.IsPaintLineNumbers() &&
                ( !IsInFly() || rLineInf.IsCountInFlys() ) && rLineNum.IsCount();
     sal_Int16 eHor = (sal_Int16)SW_MOD()->GetRedlineMarkPos();
     if( eHor != text::HoriOrientation::NONE && !IDocumentRedlineAccess::IsShowChanges( pIDRA->GetRedlineMode() ) )
         eHor = text::HoriOrientation::NONE;
-    sal_Bool bRedLine = eHor != text::HoriOrientation::NONE;
+    bool bRedLine = eHor != text::HoriOrientation::NONE;
     if ( bLineNum || bRedLine )
     {
         if( IsLocked() || IsHiddenNow() || !Prt().Height() )
@@ -330,7 +330,7 @@ void SwTxtFrm::PaintExtraData( const SwRect &rRect ) const
             aLayoutModeModifier.Modify( sal_False );
 
             SwTxtPainter  aLine( (SwTxtFrm*)this, &aInf );
-            sal_Bool bNoDummy = !aLine.GetNext(); // Only one empty line!
+            bool bNoDummy = !aLine.GetNext(); // Only one empty line!
 
             while( aLine.Y() + aLine.GetLineHeight() <= rRect.Top() )
             {
@@ -348,7 +348,7 @@ void SwTxtFrm::PaintExtraData( const SwRect &rRect ) const
 
             long nBottom = rRect.Bottom();
 
-            sal_Bool bNoPrtLine = 0 == GetMinPrtLine();
+            bool bNoPrtLine = 0 == GetMinPrtLine();
             if( !bNoPrtLine )
             {
                 while ( aLine.Y() < GetMinPrtLine() )
@@ -367,7 +367,7 @@ void SwTxtFrm::PaintExtraData( const SwRect &rRect ) const
                 {
                     if( bNoDummy || !aLine.GetCurr()->IsDummy() )
                     {
-                        sal_Bool bRed = bRedLine && aLine.GetCurr()->HasRedline();
+                        bool bRed = bRedLine && aLine.GetCurr()->HasRedline();
                         if( rLineInf.IsCountBlankLines() || aLine.GetCurr()->HasCntnt() )
                         {
                             if( bLineNum &&
@@ -377,7 +377,7 @@ void SwTxtFrm::PaintExtraData( const SwRect &rRect ) const
                                 aLine.CalcAscentAndHeight( nTmpAscent, nTmpHeight );
                                 aExtra.PaintExtra( aLine.Y(), nTmpAscent,
                                     nTmpHeight, bRed );
-                                bRed = sal_False;
+                                bRed = false;
                             }
                             aExtra.IncLineNr();
                         }
@@ -389,7 +389,8 @@ void SwTxtFrm::PaintExtraData( const SwRect &rRect ) const
         }
         else
         {
-            bRedLine &= ( MSHRT_MAX!= pIDRA->GetRedlinePos(rTxtNode, USHRT_MAX) );
+            if ( MSHRT_MAX == pIDRA->GetRedlinePos(rTxtNode, USHRT_MAX) )
+                bRedLine = false;
 
             if( bLineNum && rLineInf.IsCountBlankLines() &&
                 ( aExtra.HasNumber() || aExtra.HasDivider() ) )
@@ -454,7 +455,7 @@ sal_Bool SwTxtFrm::PaintEmpty( const SwRect &rRect, sal_Bool bCheck ) const
     ViewShell *pSh = getRootFrm()->GetCurrShell();
     if( pSh && ( pSh->GetViewOptions()->IsParagraph() || bInitFont ) )
     {
-        bInitFont = sal_False;
+        bInitFont = false;
         SwTxtFly aTxtFly( this );
         aTxtFly.SetTopRule();
         SwRect aRect;
@@ -662,7 +663,7 @@ void SwTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
         aInf.GetTxtFly()->Relax();
 
         OutputDevice* pOut = aInf.GetOut();
-        const sal_Bool bOnWin = pSh->GetWin() != 0;
+        const bool bOnWin = pSh->GetWin() != 0;
 
         SwSaveClip aClip( bOnWin || IsUndersized() ? pOut : 0 );
 
@@ -672,7 +673,7 @@ void SwTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
         aLine.TwipsToLine( rRect.Top() + 1 );
         long nBottom = rRect.Bottom();
 
-        sal_Bool bNoPrtLine = 0 == GetMinPrtLine();
+        bool bNoPrtLine = 0 == GetMinPrtLine();
         if( !bNoPrtLine )
         {
             while ( aLine.Y() < GetMinPrtLine() && aLine.Next() )
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index 7a6babee602b..d24da561f475 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -90,7 +90,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
     KSHORT nItalic = 0;
     if( ITALIC_NONE != rInf.GetFont()->GetItalic() && !rInf.NotEOL() )
     {
-        sal_Bool bAddItalic = sal_True;
+        bool bAddItalic = true;
 
         // do not add extra italic value if we have an active character grid
         if ( rInf.SnapToGrid() )
@@ -102,7 +102,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
         // do not add extra italic value for an isolated blank:
         if ( 1 == rInf.GetLen() &&
              CH_BLANK == rInf.GetTxt().GetChar( rInf.GetIdx() ) )
-            bAddItalic = sal_False;
+            bAddItalic = false;
 
         nItalic = bAddItalic ? nPorHeight / 12 : 0;
 
@@ -144,7 +144,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
         }
     }
 
-    sal_Bool bHyph = rInf.IsHyphenate() && !rInf.IsHyphForbud();
+    bool bHyph = rInf.IsHyphenate() && !rInf.IsHyphForbud();
     xub_StrLen nHyphPos = 0;
 
     // nCutPos is the first character not fitting to the current line
@@ -527,7 +527,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
 // returns true if word at position nPos has a diffenrent spelling
 // if hyphenated at this position (old german spelling)
 
-sal_Bool SwTxtGuess::AlternativeSpelling( const SwTxtFormatInfo &rInf,
+bool SwTxtGuess::AlternativeSpelling( const SwTxtFormatInfo &rInf,
     const xub_StrLen nPos )
 {
     // get word boundaries
diff --git a/sw/source/core/text/guess.hxx b/sw/source/core/text/guess.hxx
index bb4c20bd9032..92f05cb03653 100644
--- a/sw/source/core/text/guess.hxx
+++ b/sw/source/core/text/guess.hxx
@@ -49,7 +49,7 @@ public:
     // true, if current portion still fits to current line
     sal_Bool Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
                     const KSHORT nHeight );
-    sal_Bool AlternativeSpelling( const SwTxtFormatInfo &rInf, const xub_StrLen nPos );
+    bool AlternativeSpelling( const SwTxtFormatInfo &rInf, const xub_StrLen nPos );
 
     inline SwHangingPortion* GetHangingPortion() const { return pHanging; }
     inline void ClearHangingPortion() { pHanging = NULL; }
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index c5bac957a0fa..e37128db691b 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -303,10 +303,10 @@ void SwTxtSizeInfo::CtorInitTxtSizeInfo( SwTxtFrm *pFrame, SwFont *pNewFnt,
 
     nIdx = nNewIdx;
     nLen = nNewLen;
-    bNotEOL = sal_False;
-    bStopUnderFlow = bFtnInside = bOtherThanFtnInside = sal_False;
+    bNotEOL = false;
+    bStopUnderFlow = bFtnInside = bOtherThanFtnInside = false;
     bMulti = bFirstMulti = bRuby = bHanging = bScriptSpace =
-        bForbiddenChars = sal_False;
+        bForbiddenChars = false;
 
     SetLen( GetMinLen( *this ) );
 }
@@ -712,7 +712,7 @@ void SwTxtPaintInfo::CalcRect( const SwLinePortion& rPor,
 
     // Adjust x coordinate if we are inside a bidi portion
     const sal_Bool bFrmDir = GetTxtFrm()->IsRightToLeft();
-    sal_Bool bCounterDir = ( ! bFrmDir && DIR_RIGHT2LEFT == GetDirection() ) ||
+    bool bCounterDir = ( ! bFrmDir && DIR_RIGHT2LEFT == GetDirection() ) ||
                        (   bFrmDir && DIR_LEFT2RIGHT == GetDirection() );
 
     if ( bCounterDir )
@@ -758,8 +758,8 @@ static void lcl_DrawSpecial( const SwTxtPaintInfo& rInf, const SwLinePortion& rP
                       SwRect& rRect, const Color* pCol, sal_Unicode cChar,
                       sal_uInt8 nOptions )
 {
-    sal_Bool bCenter = 0 != ( nOptions & DRAW_SPECIAL_OPTIONS_CENTER );
-    sal_Bool bRotate = 0 != ( nOptions & DRAW_SPECIAL_OPTIONS_ROTATE );
+    bool bCenter = 0 != ( nOptions & DRAW_SPECIAL_OPTIONS_CENTER );
+    bool bRotate = 0 != ( nOptions & DRAW_SPECIAL_OPTIONS_ROTATE );
 
     // rRect is given in absolute coordinates
     if ( rInf.GetTxtFrm()->IsRightToLeft() )
@@ -1161,7 +1161,7 @@ void SwTxtPaintInfo::DrawViewOpt( const SwLinePortion &rPor,
 {
     if( OnWin() && !IsMulti() )
     {
-        sal_Bool bDraw = sal_False;
+        bool bDraw = false;
         switch( nWhich )
         {
             case POR_FTN:
@@ -1179,11 +1179,11 @@ void SwTxtPaintInfo::DrawViewOpt( const SwLinePortion &rPor,
                      SwViewOption::IsFieldShadings() &&
                      (POR_NUMBER != nWhich ||
                       pFrm->GetTxtNode()->HasMarkedLabel())) // #i27615#
-                    bDraw = sal_True;
+                    bDraw = true;
             break;
-            case POR_TAB:       if ( GetOpt().IsTab() )     bDraw = sal_True; break;
-            case POR_SOFTHYPH:  if ( GetOpt().IsSoftHyph() )bDraw = sal_True; break;
-            case POR_BLANK:     if ( GetOpt().IsHardBlank())bDraw = sal_True; break;
+            case POR_TAB:       if ( GetOpt().IsTab() )     bDraw = true; break;
+            case POR_SOFTHYPH:  if ( GetOpt().IsSoftHyph() )bDraw = true; break;
+            case POR_BLANK:     if ( GetOpt().IsHardBlank())bDraw = true; break;
             default:
             {
                 OSL_ENSURE( !this, "SwTxtPaintInfo::DrawViewOpt: don't know how to draw this" );
@@ -1725,13 +1725,13 @@ SwFontSave::~SwFontSave()
 SwDefFontSave::SwDefFontSave( const SwTxtSizeInfo &rInf )
         : pFnt( ((SwTxtSizeInfo&)rInf).GetFont()  )
 {
-    const sal_Bool bTmpAlter = pFnt->GetFixKerning() ||
+    const bool bTmpAlter = pFnt->GetFixKerning() ||
          ( RTL_TEXTENCODING_SYMBOL == pFnt->GetCharSet(pFnt->GetActual()) )
         ;
 
-    const sal_Bool bFamily = bTmpAlter &&
+    const bool bFamily = bTmpAlter &&
           pFnt->GetName( pFnt->GetActual() ) != numfunc::GetDefBulletFontname();
-    const sal_Bool bRotation = (sal_Bool)pFnt->GetOrientation() &&
+    const bool bRotation = pFnt->GetOrientation() &&
                                 ! rInf.GetTxtFrm()->IsVertical();
 
     if( bFamily || bRotation )
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 011ee7922202..3c010da222dd 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -102,7 +102,7 @@ public:
 
     // vertical alignment
     inline sal_uInt16 GetVertAlign() const { return nVertAlign; }
-    inline sal_Bool HasSpecialAlign( sal_Bool bVert ) const
+    inline bool HasSpecialAlign( sal_Bool bVert ) const
         { return bVert ?
                  ( SvxParaVertAlignItem::BASELINE  != nVertAlign ) :
                  ( SvxParaVertAlignItem::BASELINE  != nVertAlign &&
@@ -175,23 +175,23 @@ protected:
     const XubString *pTxt;
     xub_StrLen nIdx, nLen;
     sal_uInt16 nKanaIdx;
-    sal_Bool bOnWin     : 1;
-    sal_Bool bNotEOL    : 1;
-    sal_Bool bURLNotify : 1;
-    sal_Bool bStopUnderFlow : 1; // Underflow was stopped e.g. by a FlyPortion
-    sal_Bool bFtnInside : 1;     // the current line contains a footnote
-    sal_Bool bOtherThanFtnInside : 1; // the current line contains another portion than a footnote portion.
+    bool bOnWin     : 1;
+    bool bNotEOL    : 1;
+    bool bURLNotify : 1;
+    bool bStopUnderFlow : 1; // Underflow was stopped e.g. by a FlyPortion
+    bool bFtnInside : 1;     // the current line contains a footnote
+    bool bOtherThanFtnInside : 1; // the current line contains another portion than a footnote portion.
                                       // needed for checking keep together of footnote portion with previous portion
-    sal_Bool bMulti : 1;        // inside a multiportion
-    sal_Bool bFirstMulti : 1;   // this flag is used for two purposes:
+    bool bMulti : 1;        // inside a multiportion
+    bool bFirstMulti : 1;   // this flag is used for two purposes:
                                 // - the multiportion is the first lineportion
                                 // - indicates, if we are currently in second
                                 //   line of multi portion
-    sal_Bool bRuby : 1;         // during the formatting of a phonetic line
-    sal_Bool bHanging : 1;      // formatting of hanging punctuation allowed
-    sal_Bool bScriptSpace : 1;  // space between different scripts (Asian/Latin)
-    sal_Bool bForbiddenChars : 1; // Forbidden start/endline characters
-    sal_Bool bSnapToGrid : 1;   // paragraph snaps to grid
+    bool bRuby : 1;         // during the formatting of a phonetic line
+    bool bHanging : 1;      // formatting of hanging punctuation allowed
+    bool bScriptSpace : 1;  // space between different scripts (Asian/Latin)
+    bool bForbiddenChars : 1; // Forbidden start/endline characters
+    bool bSnapToGrid : 1;   // paragraph snaps to grid
     sal_uInt8 nDirection : 2;       // writing direction: 0/90/180/270 degree
 
 protected:
@@ -215,32 +215,32 @@ public:
     // rPos will set to the end of the multi-line part.
     SwMultiCreator* GetMultiCreator( xub_StrLen &rPos, SwMultiPortion* pM ) const;
 
-    inline sal_Bool OnWin() const { return bOnWin; }
-    inline void SetOnWin( const sal_Bool bNew ) { bOnWin = bNew; }
-    inline sal_Bool NotEOL() const { return bNotEOL; }
-    inline void SetNotEOL( const sal_Bool bNew ) { bNotEOL = bNew; }
-    inline sal_Bool URLNotify() const { return bURLNotify; }
-    inline void SetURLNotify( const sal_Bool bNew ) { bURLNotify = bNew; }
-    inline sal_Bool StopUnderFlow() const { return bStopUnderFlow; }
-    inline void SetStopUnderFlow( const sal_Bool bNew ) { bStopUnderFlow = bNew; }
-    inline sal_Bool IsFtnInside() const { return bFtnInside; }
-    inline void SetFtnInside( const sal_Bool bNew ) { bFtnInside = bNew; }
-    inline sal_Bool IsOtherThanFtnInside() const { return bOtherThanFtnInside; }
-    inline void SetOtherThanFtnInside( const sal_Bool bNew ) { bOtherThanFtnInside = bNew; }
-    inline sal_Bool IsMulti() const { return bMulti; }
-    inline void SetMulti( const sal_Bool bNew ) { bMulti = bNew; }
-    inline sal_Bool IsFirstMulti() const { return bFirstMulti; }
-    inline void SetFirstMulti( const sal_Bool bNew ) { bFirstMulti = bNew; }
-    inline sal_Bool IsRuby() const { return bRuby; }
-    inline void SetRuby( const sal_Bool bNew ) { bRuby = bNew; }
-    inline sal_Bool IsHanging() const { return bHanging; }
-    inline void SetHanging( const sal_Bool bNew ) { bHanging = bNew; }
-    inline sal_Bool HasScriptSpace() const { return bScriptSpace; }
-    inline void SetScriptSpace( const sal_Bool bNew ) { bScriptSpace = bNew; }
-    inline sal_Bool HasForbiddenChars() const { return bForbiddenChars; }
-    inline void SetForbiddenChars( const sal_Bool bN ) { bForbiddenChars = bN; }
-    inline sal_Bool SnapToGrid() const { return bSnapToGrid; }
-    inline void SetSnapToGrid( const sal_Bool bN ) { bSnapToGrid = bN; }
+    inline bool OnWin() const { return bOnWin; }
+    inline void SetOnWin( const bool bNew ) { bOnWin = bNew; }
+    inline bool NotEOL() const { return bNotEOL; }
+    inline void SetNotEOL( const bool bNew ) { bNotEOL = bNew; }
+    inline bool URLNotify() const { return bURLNotify; }
+    inline void SetURLNotify( const bool bNew ) { bURLNotify = bNew; }
+    inline bool StopUnderFlow() const { return bStopUnderFlow; }
+    inline void SetStopUnderFlow( const bool bNew ) { bStopUnderFlow = bNew; }
+    inline bool IsFtnInside() const { return bFtnInside; }
+    inline void SetFtnInside( const bool bNew ) { bFtnInside = bNew; }
+    inline bool IsOtherThanFtnInside() const { return bOtherThanFtnInside; }
+    inline void SetOtherThanFtnInside( const bool bNew ) { bOtherThanFtnInside = bNew; }
+    inline bool IsMulti() const { return bMulti; }
+    inline void SetMulti( const bool bNew ) { bMulti = bNew; }
+    inline bool IsFirstMulti() const { return bFirstMulti; }
+    inline void SetFirstMulti( const bool bNew ) { bFirstMulti = bNew; }
+    inline bool IsRuby() const { return bRuby; }
+    inline void SetRuby( const bool bNew ) { bRuby = bNew; }
+    inline bool IsHanging() const { return bHanging; }
+    inline void SetHanging( const bool bNew ) { bHanging = bNew; }
+    inline bool HasScriptSpace() const { return bScriptSpace; }
+    inline void SetScriptSpace( const bool bNew ) { bScriptSpace = bNew; }
+    inline bool HasForbiddenChars() const { return bForbiddenChars; }
+    inline void SetForbiddenChars( const bool bN ) { bForbiddenChars = bN; }
+    inline bool SnapToGrid() const { return bSnapToGrid; }
+    inline void SetSnapToGrid( const bool bN ) { bSnapToGrid = bN; }
     inline sal_uInt8 GetDirection() const { return nDirection; }
     inline void SetDirection( const sal_uInt8 nNew ) { nDirection = nNew; }
     inline sal_Bool IsRotated() const { return 0 != ( 1 & nDirection ); }
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 3127ae863634..954741bab6be 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -805,7 +805,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst,
 
                             if ( pCurr == &((SwMultiPortion*)pPor)->GetRoot() )
                             {
-                                GetInfo().SetFirstMulti( sal_True );
+                                GetInfo().SetFirstMulti( true );
 
                                 // we want to treat a double line portion like a
                                 // single line portion, if there is no text in
@@ -901,8 +901,8 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst,
                         if( nX || !pPor->InNumberGrp() )
                         {
                             SeekAndChg( aInf );
-                            const sal_Bool bOldOnWin = aInf.OnWin();
-                            aInf.SetOnWin( sal_False ); // keine BULLETs!
+                            const bool bOldOnWin = aInf.OnWin();
+                            aInf.SetOnWin( false ); // keine BULLETs!
                             SwTwips nTmp = nX;
                             aInf.SetKanaComp( pKanaComp );
                             aInf.SetKanaIdx( nKanaIdx );
@@ -914,7 +914,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst,
                             {
                                 pPor->SetLen( pPor->GetLen() + 1 );
                                 aInf.SetLen( pPor->GetLen() );
-                                aInf.SetOnWin( sal_False ); // keine BULLETs!
+                                aInf.SetOnWin( false ); // keine BULLETs!
                                 nTmp += pPor->GetTxtSize( aInf ).Width();
                                 aInf.SetOnWin( bOldOnWin );
                                 if ( pPor->InSpaceGrp() && nSpaceAdd )
@@ -1062,12 +1062,12 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst,
                     }
                     else
                     {
-                        const sal_Bool bOldOnWin = aInf.OnWin();
+                        const bool bOldOnWin = aInf.OnWin();
                         xub_StrLen nOldLen = pPor->GetLen();
                         pPor->SetLen( 1 );
                         aInf.SetLen( pPor->GetLen() );
                         SeekAndChg( aInf );
-                        aInf.SetOnWin( sal_False ); // keine BULLETs!
+                        aInf.SetOnWin( false ); // keine BULLETs!
                         aInf.SetKanaComp( pKanaComp );
                         aInf.SetKanaIdx( nKanaIdx );
                         nTmp = pPor->GetTxtSize( aInf ).Width();
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index b36aa42d9690..4b476211bfa0 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -224,7 +224,7 @@ SwLinePortion *SwTxtFormatter::UnderFlow( SwTxtFormatInfo &rInf )
         {
             pPor->Move( rInf );
             rInf.SetLast( pPor );
-            rInf.SetStopUnderFlow( sal_True );
+            rInf.SetStopUnderFlow( true );
             pPor = pUnderFlow;
         }
     }
@@ -1143,7 +1143,7 @@ static sal_Bool lcl_OldFieldRest( const SwLineLayout* pCurr )
 SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
 {
     // Underflow takes precedence
-    rInf.SetStopUnderFlow( sal_False );
+    rInf.SetStopUnderFlow( false );
     if( rInf.GetUnderFlow() )
     {
         OSL_ENSURE( rInf.IsFull(), "SwTxtFormatter::NewPortion: underflow but not full" );
@@ -1517,8 +1517,8 @@ xub_StrLen SwTxtFormatter::FormatLine( const xub_StrLen nStartPos )
     // Hier folgt bald die Unterlaufpruefung.
     while( bBuild )
     {
-        GetInfo().SetFtnInside( sal_False );
-        GetInfo().SetOtherThanFtnInside( sal_False );
+        GetInfo().SetFtnInside( false );
+        GetInfo().SetOtherThanFtnInside( false );
 
         // These values must not be reset by FormatReset();
         sal_Bool bOldNumDone = GetInfo().IsNumDone();
@@ -2636,7 +2636,7 @@ namespace {
 
             // Note: GetChareRect is not const. It definitely changes the
             // bMulti flag. We have to save and resore the old value.
-            sal_Bool bOldMulti = txtFmtInfo.IsMulti();
+            bool bOldMulti = txtFmtInfo.IsMulti();
             rThis.GetCharRect( &aRect, nReformat );
             txtFmtInfo.SetMulti( bOldMulti );
 
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index ee3862594b95..eb880be4a942 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -171,7 +171,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
     GetInfo().SetIdx( GetStart() );
     GetInfo().SetPos( GetTopLeft() );
 
-    const sal_Bool bDrawInWindow = GetInfo().OnWin();
+    const bool bDrawInWindow = GetInfo().OnWin();
 
     // 6882: Leerzeilen duerfen nicht wegoptimiert werden bei Paragraphzeichen.
     const sal_Bool bEndPor = GetInfo().GetOpt().IsParagraph() && !GetInfo().GetTxt().Len();
@@ -253,7 +253,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
     // if no special vertical alignment is used,
     // we calculate Y value for the whole line
     GETGRID( GetTxtFrm()->FindPageFrm() )
-    const sal_Bool bAdjustBaseLine =
+    const bool bAdjustBaseLine =
         GetLineInfo().HasSpecialAlign( GetTxtFrm()->IsVertical() ) ||
         ( 0 != pGrid );
     const SwTwips nLineBaseLine = GetInfo().GetPos().Y() + nTmpAscent;
diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx
index a6c10440e00e..a091b2c0963d 100644
--- a/sw/source/core/text/itrtxt.cxx
+++ b/sw/source/core/text/itrtxt.cxx
@@ -484,7 +484,7 @@ SwHookOut::SwHookOut( SwTxtSizeInfo& rInfo ) :
 
     // set new values
     rInfo.SetOut( rInfo.GetRefDev() );
-    rInfo.SetOnWin( sal_False );
+    rInfo.SetOnWin( false );
 }
 
 SwHookOut::~SwHookOut()
diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx
index ec4994a4e9af..1f8cdcf94094 100644
--- a/sw/source/core/text/itrtxt.hxx
+++ b/sw/source/core/text/itrtxt.hxx
@@ -292,7 +292,7 @@ class SwHookOut
 {
     SwTxtSizeInfo* pInf;
     OutputDevice* pOut;
-    sal_Bool bOnWin;
+    bool bOnWin;
 public:
     SwHookOut( SwTxtSizeInfo& rInfo );
     ~SwHookOut();
diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx
index b5a9add5f083..33506bfcc80c 100644
--- a/sw/source/core/text/porexp.hxx
+++ b/sw/source/core/text/porexp.hxx
@@ -50,14 +50,14 @@ public:
 class SwBlankPortion : public SwExpandPortion
 {
     sal_Unicode cChar;
-    sal_Bool bMulti;        // For multiportion brackets
+    bool bMulti;        // For multiportion brackets
 public:
-    inline  SwBlankPortion( sal_Unicode cCh, sal_Bool bMult = sal_False )
+    inline  SwBlankPortion( sal_Unicode cCh, bool bMult = false )
         : cChar( cCh ), bMulti( bMult )
         { cChar = cCh; SetLen(1); SetWhichPor( POR_BLANK ); }
 
-    sal_Bool IsMulti() const { return bMulti; }
-    void SetMulti( sal_Bool bNew ) { bMulti = bNew; }
+    bool IsMulti() const { return bMulti; }
+    void SetMulti( bool bNew ) { bMulti = bNew; }
 
     virtual SwLinePortion *Compress();
     virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, XubString &rTxt ) const;
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 9cd8a4764a7e..b018ca8fc34f 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -356,7 +356,7 @@ sal_Bool SwFldPortion::Format( SwTxtFormatInfo &rInf )
             // the ascent and height must be known
             SetAscent( rInf.GetAscent() );
             bFull = SwTxtPortion::Format( rInf );
-            rInf.SetNotEOL( sal_False );
+            rInf.SetNotEOL( false );
             rInf.SetLineStart( nOldLineStart );
         }
         xub_StrLen nTmpLen = GetLen();
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index 6a17a87c94e3..1cc5fea62403 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -367,7 +367,7 @@ void SwDoubleLinePortion::PaintBracket( SwTxtPaintInfo &rInf,
         rInf.X( rInf.X() + Width() - PostWidth() +
             ( nSpaceAdd > 0 ? CalcSpacing( nSpaceAdd, rInf ) : 0 ) );
 
-    SwBlankPortion aBlank( cCh, sal_True );
+    SwBlankPortion aBlank( cCh, true );
     aBlank.SetAscent( pBracket->nAscent );
     aBlank.Width( nChWidth );
     aBlank.Height( pBracket->nHeight );
@@ -1365,7 +1365,7 @@ void SwTxtPainter::PaintMultiPortion( const SwRect &rPaint,
     }
 
     // do not allow grid mode for first line in ruby portion
-    const sal_Bool bRubyInGrid = bHasGrid && rMulti.IsRuby();
+    const bool bRubyInGrid = bHasGrid && rMulti.IsRuby();
 
     const sal_uInt16 nOldHeight = rMulti.Height();
     const sal_Bool bOldGridModeAllowed = GetInfo().SnapToGrid();
@@ -1851,7 +1851,7 @@ sal_Bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf,
     SwTxtFormatInfo aInf( rInf, rMulti.GetRoot(), nActWidth );
     // Do we allow break cuts? The FirstMulti-Flag is evaluated during
     // line break determination.
-    sal_Bool bFirstMulti = rInf.GetIdx() != rInf.GetLineStart();
+    bool bFirstMulti = rInf.GetIdx() != rInf.GetLineStart();
 
     SwLinePortion *pNextFirst = NULL;
     SwLinePortion *pNextSecond = NULL;
@@ -1976,7 +1976,7 @@ sal_Bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf,
             if ( nActWidth == nMaxWidth && rInf.GetLineStart() == rInf.GetIdx() )
             // we have too less space, we must allow break cuts
             // ( the first multi flag is considered during TxtPortion::_Format() )
-                bFirstMulti = sal_False;
+                bFirstMulti = false;
             if( nActWidth <= nMinWidth )
                 break;
         }
@@ -1993,7 +1993,7 @@ sal_Bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf,
             if( nActWidth >= nMaxWidth )
                 break;
             // we do not allow break cuts during formatting
-            bFirstMulti = sal_True;
+            bFirstMulti = true;
         }
         delete pNextFirst;
         pNextFirst = NULL;
diff --git a/sw/source/core/text/pormulti.hxx b/sw/source/core/text/pormulti.hxx
index 0e50b5024626..767f3fac37ce 100644
--- a/sw/source/core/text/pormulti.hxx
+++ b/sw/source/core/text/pormulti.hxx
@@ -86,7 +86,7 @@ class SwMultiPortion : public SwLinePortion
     sal_Bool bTab1      :1; // First line tabulator
     sal_Bool bTab2      :1; // Second line includes tabulator
     sal_Bool bDouble    :1; // Double line
-    sal_Bool bRuby      :1; // Phonetics
+    bool bRuby      :1; // Phonetics
     sal_Bool bBidi      :1;
     sal_Bool bTop       :1; // Phonetic position
     sal_Bool bFormatted :1; // Already formatted
@@ -95,12 +95,12 @@ class SwMultiPortion : public SwLinePortion
     sal_Bool bFlyInCntnt:1; // Fly as character inside
 protected:
     SwMultiPortion( xub_StrLen nEnd ) : pFldRest( 0 ), bTab1( sal_False ),
-        bTab2( sal_False ), bDouble( sal_False ), bRuby( sal_False ),
+        bTab2( sal_False ), bDouble( sal_False ), bRuby( false ),
         bBidi( sal_False ), bFormatted( sal_False ), bFollowFld( sal_False ),
         nDirection( 0 ), bFlyInCntnt( sal_False )
         { SetWhichPor( POR_MULTI ); SetLen( nEnd ); }
     inline void SetDouble() { bDouble = sal_True; }
-    inline void SetRuby() { bRuby = sal_True; }
+    inline void SetRuby() { bRuby = true; }
     inline void SetBidi() { bBidi = sal_True; }
     inline void SetTop( sal_Bool bNew ) { bTop = bNew; }
     inline void SetTab1( sal_Bool bNew ) { bTab1 = bNew; }
@@ -123,7 +123,7 @@ public:
     inline sal_Bool HasFlyInCntnt() const { return bFlyInCntnt; }
     inline void SetFlyInCntnt( sal_Bool bNew ) { bFlyInCntnt = bNew; }
     inline sal_Bool IsDouble() const { return bDouble; }
-    inline sal_Bool IsRuby() const { return bRuby; }
+    inline bool IsRuby() const { return bRuby; }
     inline sal_Bool IsBidi() const { return bBidi; }
     inline sal_Bool OnTop() const { return bTop; }
     void ActualizeTabulator();
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 6cd4af38a517..3f5934a51830 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -184,8 +184,8 @@ static sal_uInt16 lcl_AddSpace( const SwTxtSizeInfo &rInf, const XubString* pStr
         // next character is inside a field?
         if ( CH_TXTATR_BREAKWORD == rInf.GetChar( nPos ) && pPor->InExpGrp() )
         {
-            sal_Bool bOldOnWin = rInf.OnWin();
-            ((SwTxtSizeInfo &)rInf).SetOnWin( sal_False );
+            bool bOldOnWin = rInf.OnWin();
+            ((SwTxtSizeInfo &)rInf).SetOnWin( false );
 
             XubString aStr( aEmptyStr );
             pPor->GetExpTxt( rInf, aStr );
@@ -612,8 +612,8 @@ xub_StrLen SwTxtPortion::GetSpaceCnt( const SwTxtSizeInfo &rInf,
         {
             // OnWin() likes to return a blank instead of an empty string from
             // time to time. We cannot use that here at all, however.
-            sal_Bool bOldOnWin = rInf.OnWin();
-            ((SwTxtSizeInfo &)rInf).SetOnWin( sal_False );
+            bool bOldOnWin = rInf.OnWin();
+            ((SwTxtSizeInfo &)rInf).SetOnWin( false );
 
             XubString aStr( aEmptyStr );
             GetExpTxt( rInf, aStr );
@@ -642,8 +642,8 @@ long SwTxtPortion::CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) cons
         {
             // OnWin() likes to return a blank instead of an empty string from
             // time to time. We cannot use that here at all, however.
-            sal_Bool bOldOnWin = rInf.OnWin();
-            ((SwTxtSizeInfo &)rInf).SetOnWin( sal_False );
+            bool bOldOnWin = rInf.OnWin();
+            ((SwTxtSizeInfo &)rInf).SetOnWin( false );
 
             XubString aStr( aEmptyStr );
             GetExpTxt( rInf, aStr );
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index d2a9822cc590..20f4e5422503 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -971,7 +971,7 @@ SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf,
     // Endlich: FtnPortion anlegen und raus hier...
     SwFtnPortion *pRet = new SwFtnPortion( rFtn.GetViewNumStr( *pDoc ),
                                             pFrm, pFtn, nReal );
-    rInf.SetFtnInside( sal_True );
+    rInf.SetFtnInside( true );
 
     UNDO_SWAP( pFrm )