sal_Bool to bool

Change-Id: Ife2f52b70bd40a8f5c7582b9bdb7b19dd8c354af

7 files changed, 67 insertions, 67 deletions

diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx
index eb35a9faea46..08da53c9ee6a 100644
--- a/sw/inc/charfmt.hxx
+++ b/sw/inc/charfmt.hxx
@@ -44,7 +44,7 @@ namespace CharFmt
 {
     extern const SfxItemSet* GetItemSet( const SfxPoolItem& rAttr );
     extern const SfxPoolItem* GetItem( const SwTxtAttr& rAttr, sal_uInt16 nWhich );
-    extern sal_Bool IsItemIncluded( const sal_uInt16 nWhich, const SwTxtAttr *pAttr );
+    extern bool IsItemIncluded( const sal_uInt16 nWhich, const SwTxtAttr *pAttr );
 }
 
 #endif
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index ac27eba83a92..808172420f0f 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -52,7 +52,7 @@ class SwTxtFrm: public SwCntntFrm
     friend class SwTestFormat;
     friend class WidowsAndOrphans;
     friend class SwTxtFrmLocker;        // duerfen Lock()/Unlock()
-    friend sal_Bool sw_ChangeOffset( SwTxtFrm* pFrm, sal_uInt16 nNew );
+    friend bool sw_ChangeOffset( SwTxtFrm* pFrm, sal_uInt16 nNew );
 
     static SwCache *pTxtCache;  //Pointer auf den Line-Cache
     static long nMinPrtLine;    //Diese Linie darf beim Drucken nicht
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index 0e84cc38ad33..ddff63fd9a79 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -183,7 +183,7 @@ sal_uLong SwXMLTextBlocks::GetMacroTable( sal_uInt16 nIdx,
         {
             xRoot = xBlkRoot->openStorageElement( aPackageName, embed::ElementModes::READ );
             long nTmp = SOT_FORMATSTR_ID_STARWRITER_60;
-            sal_Bool bOasis = ( SotStorage::GetVersion( xRoot ) > nTmp );
+            bool bOasis = ( SotStorage::GetVersion( xRoot ) > nTmp );
 
             OUString sStreamName(RTL_CONSTASCII_USTRINGPARAM("atevent.xml"));
             uno::Reference < io::XStream > xDocStream = xRoot->openStreamElement(
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 483c00783943..db086486fbdb 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -489,18 +489,18 @@ static void lcl_SortedTabColInsert( SwTabCols &rToFill, const SwTableBox *pBox,
         pLine = pCur ? pCur->GetUpper() : 0;
     }
 
-    sal_Bool bInsert = !bRefreshHidden;
+    bool bInsert = !bRefreshHidden;
     for ( sal_uInt16 j = 0; bInsert && (j < rToFill.Count()); ++j )
     {
         long nCmp = rToFill[j];
         if ( (nPos >= ((nCmp >= COLFUZZY) ? nCmp - COLFUZZY : nCmp)) &&
              (nPos <= (nCmp + COLFUZZY)) )
         {
-            bInsert = sal_False;        // Already has it.
+            bInsert = false;        // Already has it.
         }
         else if ( nPos < nCmp )
         {
-            bInsert = sal_False;
+            bInsert = false;
             rToFill.Insert( nPos, bHidden, j );
         }
     }
@@ -840,7 +840,7 @@ static void lcl_ProcessBoxSet( SwTableBox *pBox, Parm &rParm )
 }
 
 static void lcl_ProcessBoxPtr( SwTableBox *pBox, std::deque<SwTableBox*> &rBoxArr,
-                           sal_Bool bBefore )
+                           bool bBefore )
 {
     if ( !pBox->GetTabLines().empty() )
     {
@@ -986,7 +986,7 @@ void SwTable::SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld,
             // in a PtrArray.
             const SwTableBoxes &rBoxes = pStart->GetUpper()->GetTabBoxes();
             for ( sal_uInt16 i = 0; i < rBoxes.size(); ++i )
-                ::lcl_ProcessBoxPtr( rBoxes[i], aParm.aBoxArr, sal_False );
+                ::lcl_ProcessBoxPtr( rBoxes[i], aParm.aBoxArr, false );
 
             const SwTableLine *pLine = pStart->GetUpper()->GetUpper() ?
                                     pStart->GetUpper()->GetUpper()->GetUpper() : 0;
@@ -994,13 +994,13 @@ void SwTable::SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld,
             while ( pLine )
             {
                 const SwTableBoxes &rBoxes2 = pLine->GetTabBoxes();
-                sal_Bool bBefore = sal_True;
+                bool bBefore = true;
                 for ( sal_uInt16 i = 0; i < rBoxes2.size(); ++i )
                 {
                     if ( rBoxes2[i] != pExcl )
                         ::lcl_ProcessBoxPtr( rBoxes2[i], aParm.aBoxArr, bBefore );
                     else
-                        bBefore = sal_False;
+                        bBefore = false;
                 }
                 pExcl = pLine->GetUpper();
                 pLine = pLine->GetUpper() ? pLine->GetUpper()->GetUpper() : 0;
@@ -1340,15 +1340,15 @@ void SwTable::NewSetTabCols( Parm &rParm, const SwTabCols &rNew,
 |*
 |*************************************************************************/
 
-sal_Bool IsValidRowName( const String& rStr )
+bool IsValidRowName( const String& rStr )
 {
-    sal_Bool bIsValid = sal_True;
+    bool bIsValid = true;
     xub_StrLen nLen = rStr.Len();
     for (xub_StrLen i = 0;  i < nLen && bIsValid;  ++i)
     {
         const sal_Unicode cChar = rStr.GetChar(i);
         if (cChar < '0' || cChar > '9')
-            bIsValid = sal_False;
+            bIsValid = false;
     }
     return bIsValid;
 }
@@ -1364,7 +1364,7 @@ sal_uInt16 SwTable::_GetBoxNum( String& rStr, sal_Bool bFirstPart,
     {
         // the first one uses letters for addressing!
         sal_Unicode cChar;
-        sal_Bool bFirst = sal_True;
+        bool bFirst = true;
         while( 0 != ( cChar = rStr.GetChar( nPos )) &&
                ( (cChar >= 'A' && cChar <= 'Z') ||
                  (cChar >= 'a' && cChar <= 'z') ) )
@@ -1372,7 +1372,7 @@ sal_uInt16 SwTable::_GetBoxNum( String& rStr, sal_Bool bFirstPart,
             if( (cChar -= 'A') >= 26 )
                 cChar -= 'a' - '[';
             if( bFirst )
-                bFirst = sal_False;
+                bFirst = false;
             else
                 ++nRet;
             nRet = nRet * 52 + cChar;
@@ -2315,12 +2315,12 @@ void SwTableBoxFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
                     //          - align left for horizontal alignment, if RIGHT
                     //          - align top for vertical alignment, if BOTTOM is set
                     SvNumberFormatter* pNumFmtr = GetDoc()->GetNumberFormatter();
-                    sal_Bool bNewIsTxtFmt = pNumFmtr->IsTextFormat( nNewFmt ) ||
+                    bool bNewIsTxtFmt = pNumFmtr->IsTextFormat( nNewFmt ) ||
                                         NUMBERFORMAT_TEXT == nNewFmt;
 
                     if( (!bNewIsTxtFmt && nOldFmt != nNewFmt) || pNewFml )
                     {
-                        sal_Bool bChgTxt = sal_True;
+                        bool bChgTxt = true;
                         double fVal = 0;
                         if( !pNewVal && SFX_ITEM_SET != GetItemState(
                             RES_BOXATR_VALUE, sal_False, (const SfxPoolItem**)&pNewVal ))
@@ -2333,7 +2333,7 @@ void SwTableBoxFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
                                 String aTxt( GetDoc()->GetNodes()[ nNdPos ]
                                                 ->GetTxtNode()->GetRedlineTxt());
                                 if( !aTxt.Len() )
-                                    bChgTxt = sal_False;
+                                    bChgTxt = false;
                                 else
                                 {
                                     // Keep Tabs
diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx
index fb03e71dd50f..27a9075ed41b 100644
--- a/sw/source/core/text/atrstck.cxx
+++ b/sw/source/core/text/atrstck.cxx
@@ -171,7 +171,7 @@ const SfxPoolItem* GetItem( const SwTxtAttr& rAttr, sal_uInt16 nWhich )
 
        bool bInParent = RES_TXTATR_AUTOFMT != rAttr.Which();
        const SfxPoolItem* pItem;
-       sal_Bool bRet = SFX_ITEM_SET == pSet->GetItemState( nWhich, bInParent, &pItem );
+       bool bRet = SFX_ITEM_SET == pSet->GetItemState( nWhich, bInParent, &pItem );
 
        return bRet ? pItem : 0;
     }
@@ -184,9 +184,9 @@ const SfxPoolItem* GetItem( const SwTxtAttr& rAttr, sal_uInt16 nWhich )
  * checks if item is included in character/inet/auto style
  *************************************************************************/
 
-sal_Bool IsItemIncluded( const sal_uInt16 nWhich, const SwTxtAttr *pAttr )
+bool IsItemIncluded( const sal_uInt16 nWhich, const SwTxtAttr *pAttr )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     const SfxItemSet* pItemSet = CharFmt::GetItemSet( pAttr->GetAttr() );
     if ( pItemSet )
@@ -424,7 +424,7 @@ void SwAttrHandler::Init( const SfxPoolItem** pPoolItem, const SwAttrSet* pAS,
         SfxItemIter aIter( *pAS );
         sal_uInt16 nWhich;
         const SfxPoolItem* pItem = aIter.GetCurItem();
-        while( sal_True )
+        while( true )
         {
             nWhich = pItem->Which();
             if (isCHRATR(nWhich))
@@ -470,7 +470,7 @@ void SwAttrHandler::PushAndChg( const SwTxtAttr& rAttr, SwFont& rFnt )
         for ( sal_uInt16 i = RES_CHRATR_BEGIN; i < RES_CHRATR_END; i++)
         {
             const SfxPoolItem* pItem;
-            sal_Bool bRet = SFX_ITEM_SET == pSet->GetItemState( i, rAttr.Which() != RES_TXTATR_AUTOFMT, &pItem );
+            bool bRet = SFX_ITEM_SET == pSet->GetItemState( i, rAttr.Which() != RES_TXTATR_AUTOFMT, &pItem );
 
             if ( bRet )
             {
@@ -553,7 +553,7 @@ void SwAttrHandler::PopAndChg( const SwTxtAttr& rAttr, SwFont& rFnt )
         for ( sal_uInt16 i = RES_CHRATR_BEGIN; i < RES_CHRATR_END; i++)
         {
             const SfxPoolItem* pItem;
-            sal_Bool bRet = SFX_ITEM_SET == pSet->GetItemState( i, RES_TXTATR_AUTOFMT != rAttr.Which(), &pItem );
+            bool bRet = SFX_ITEM_SET == pSet->GetItemState( i, RES_TXTATR_AUTOFMT != rAttr.Which(), &pItem );
             if ( bRet )
             {
                 // we remove rAttr from the appropriate stack
@@ -864,7 +864,7 @@ void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, sal_Bool bPu
         }
         case RES_CHRATR_TWO_LINES :
         {
-            sal_Bool bRuby = 0 !=
+            bool bRuby = 0 !=
                     aAttrStack[ StackPos[ RES_TXTATR_CJK_RUBY ] ].Count();
             sal_Bool bTwoLineAct = sal_False;
 
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 196b73a5f4f3..dc59db5e1111 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -103,7 +103,7 @@ SwTxtFrm *GetAdjFrmAtPos( SwTxtFrm *pFrm, const SwPosition &rPos,
     return pFrmAtPos ? pFrmAtPos : pFrm;
 }
 
-sal_Bool sw_ChangeOffset( SwTxtFrm* pFrm, xub_StrLen nNew )
+bool sw_ChangeOffset( SwTxtFrm* pFrm, xub_StrLen nNew )
 {
     // Do not scroll in areas and outside of flies
     OSL_ENSURE( !pFrm->IsFollow(), "Illegal Scrolling by Follow!" );
@@ -123,7 +123,7 @@ sal_Bool sw_ChangeOffset( SwTxtFrm* pFrm, xub_StrLen nNew )
                     ( pFrm->GetDrawObjs() && pFrm->GetDrawObjs()->Count() ) )
                 {
                     if( !pFrm->GetOfst() )
-                        return sal_False;
+                        return false;
                     nNew = 0;
                 }
                 pFrm->SetOfst( nNew );
@@ -131,11 +131,11 @@ sal_Bool sw_ChangeOffset( SwTxtFrm* pFrm, xub_StrLen nNew )
                 pFrm->GetFormatted();
                 if( pFrm->Frm().HasArea() )
                     pFrm->getRootFrm()->GetCurrShell()->InvalidateWindows( pFrm->Frm() );
-                return sal_True;
+                return true;
             }
         }
     }
-    return sal_False;
+    return false;
 }
 
 /*************************************************************************
@@ -269,7 +269,7 @@ sal_Bool SwTxtFrm::GetCharRect( SwRect& rOrig, const SwPosition &rPos,
         if ( bVert )
             nMaxY = pFrm->SwitchVerticalToHorizontal( nMaxY );
 
-        sal_Bool bGoOn = sal_True;
+        bool bGoOn = true;
         xub_StrLen nOffset = rPos.nContent.GetIndex();
         xub_StrLen nNextOfst;
 
@@ -298,7 +298,7 @@ sal_Bool SwTxtFrm::GetCharRect( SwRect& rOrig, const SwPosition &rPos,
                 pFrm->GetTxtNode()->GetTxt().Len() != nNextOfst )
                 bGoOn = sw_ChangeOffset( pFrm, nNextOfst );
             else
-                bGoOn = sal_False;
+                bGoOn = false;
         } while ( bGoOn );
 
         if ( pCMS )
@@ -531,14 +531,14 @@ struct SwFillData
     SwPosition* pPos;
     const Point& rPoint;
     SwTwips nLineWidth;
-    sal_Bool bFirstLine : 1;
-    sal_Bool bInner     : 1;
-    sal_Bool bColumn    : 1;
-    sal_Bool bEmpty     : 1;
+    bool bFirstLine : 1;
+    bool bInner     : 1;
+    bool bColumn    : 1;
+    bool bEmpty     : 1;
     SwFillData( const SwCrsrMoveState *pC, SwPosition* pP, const SwRect& rR,
         const Point& rPt ) : aFrm( rR ), pCMS( pC ), pPos( pP ), rPoint( rPt ),
-        nLineWidth( 0 ), bFirstLine( sal_True ), bInner( sal_False ), bColumn( sal_False ),
-        bEmpty( sal_True ){}
+        nLineWidth( 0 ), bFirstLine( true ), bInner( false ), bColumn( false ),
+        bEmpty( true ){}
     SwFillMode Mode() const { return pCMS->pFill->eMode; }
     long X() const { return rPoint.X(); }
     long Y() const { return rPoint.Y(); }
@@ -627,21 +627,21 @@ sal_Bool SwTxtFrm::_GetCrsrOfst(SwPosition* pPos, const Point& rPoint,
             {
                 if( pTxtNd->GetTxt().Len() > nOffset ||
                     rPoint.Y() < Frm().Top() )
-                    pFillData->bInner = sal_True;
+                    pFillData->bInner = true;
                 pFillData->bFirstLine = aLine.GetLineNr() < 2;
                 if( pTxtNd->GetTxt().Len() )
                 {
-                    pFillData->bEmpty = sal_False;
+                    pFillData->bEmpty = false;
                     pFillData->nLineWidth = aLine.GetCurr()->Width();
                 }
             }
         }
     }
-    sal_Bool bChgFillData = sal_False;
+    bool bChgFillData = false;
     if( pFillData && FindPageFrm()->Frm().IsInside( aOldPoint ) )
     {
         FillCrsrPos( *pFillData );
-        bChgFillData = sal_True;
+        bChgFillData = true;
     }
 
     if ( IsVertical() )
@@ -827,8 +827,8 @@ sal_Bool SwTxtFrm::_UnitUp( SwPaM *pPam, const SwTwips nOffset,
             const xub_StrLen nStart = aLine.GetStart();
             aLine.GetCharRect( &aCharBox, nPos );
 
-            sal_Bool bSecondOfDouble = ( aInf.IsMulti() && ! aInf.IsFirstMulti() );
-            sal_Bool bPrevLine = ( pPrevLine && pPrevLine != aLine.GetCurr() );
+            bool bSecondOfDouble = ( aInf.IsMulti() && ! aInf.IsFirstMulti() );
+            bool bPrevLine = ( pPrevLine && pPrevLine != aLine.GetCurr() );
 
             if( !pPrevLine && !bSecondOfDouble && GetOfst() && !IsFollow() )
             {
@@ -1005,7 +1005,7 @@ static void lcl_VisualMoveRecursion( const SwLineLayout& rCurrLine, xub_StrLen n
     }
     else
     {
-        sal_Bool bRecurse = pPor && pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->IsBidi();
+        bool bRecurse = pPor && pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->IsBidi();
 
         // 1. special case: at beginning of bidi portion
         if ( bRecurse && nIdx == nPos )
@@ -1013,7 +1013,7 @@ static void lcl_VisualMoveRecursion( const SwLineLayout& rCurrLine, xub_StrLen n
             // leave bidi portion
             if ( nCrsrLevel == nDefaultDir )
             {
-                bRecurse = sal_False;
+                bRecurse = false;
             }
         }
 
@@ -1026,7 +1026,7 @@ static void lcl_VisualMoveRecursion( const SwLineLayout& rCurrLine, xub_StrLen n
             // enter bidi portion
             if ( nCrsrLevel % 2 == nDefaultDir % 2 )
             {
-                bRecurse = sal_True;
+                bRecurse = true;
                 nIdx = nIdx - pLast->GetLen();
                 pPor = pLast;
 
@@ -1111,7 +1111,7 @@ void SwTxtFrm::PrepareVisualMove( xub_StrLen& nPos, sal_uInt8& nCrsrLevel,
     }
 
     const sal_uInt8 nDefaultDir = static_cast<sal_uInt8>(IsRightToLeft() ? UBIDI_RTL : UBIDI_LTR);
-    const sal_Bool bVisualRight = ( nDefaultDir == UBIDI_LTR && bForward ) ||
+    const bool bVisualRight = ( nDefaultDir == UBIDI_LTR && bForward ) ||
                                   ( nDefaultDir == UBIDI_RTL && ! bForward );
 
     //
@@ -1125,7 +1125,7 @@ void SwTxtFrm::PrepareVisualMove( xub_StrLen& nPos, sal_uInt8& nCrsrLevel,
     ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(pLineString), nLen, nDefaultDir, NULL, &nError ); // UChar != sal_Unicode in MinGW
 
     xub_StrLen nTmpPos;
-    sal_Bool bOutOfBounds = sal_False;
+    bool bOutOfBounds = false;
 
     if ( nPos < nStt + nLen )
     {
@@ -1139,7 +1139,7 @@ void SwTxtFrm::PrepareVisualMove( xub_StrLen& nPos, sal_uInt8& nCrsrLevel,
             else
             {
                 nPos = nDefaultDir == UBIDI_RTL ? 0 : nStt + nLen;
-                bOutOfBounds = sal_True;
+                bOutOfBounds = true;
             }
         }
         else
@@ -1149,7 +1149,7 @@ void SwTxtFrm::PrepareVisualMove( xub_StrLen& nPos, sal_uInt8& nCrsrLevel,
             else
             {
                 nPos = nDefaultDir == UBIDI_RTL ? nStt + nLen : 0;
-                bOutOfBounds = sal_True;
+                bOutOfBounds = true;
             }
         }
     }
@@ -1222,7 +1222,7 @@ sal_Bool SwTxtFrm::_UnitDown(SwPaM *pPam, const SwTwips nOffset,
             const xub_StrLen nStart = aLine.GetStart();
             aLine.GetCharRect( &aCharBox, nPos );
 
-            sal_Bool bFirstOfDouble = ( aInf.IsMulti() && aInf.IsFirstMulti() );
+            bool bFirstOfDouble = ( aInf.IsMulti() && aInf.IsFirstMulti() );
 
             if( pNextLine || bFirstOfDouble )
             {
@@ -1385,7 +1385,7 @@ void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const
             if( pFrm->IsTxtFrm() )
             {
                 rFill.Fill().nColumnCnt = nNextCol;
-                rFill.bColumn = sal_True;
+                rFill.bColumn = true;
                 if( rFill.pPos )
                 {
                     SwTxtNode* pTxtNd = ((SwTxtFrm*)pFrm)->GetTxtNode();
@@ -1461,8 +1461,8 @@ void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const
             nDiff /= nDist;
             rFill.Fill().nParaCnt = static_cast<sal_uInt16>(nDiff + 1);
             rFill.nLineWidth = 0;
-            rFill.bInner = sal_False;
-            rFill.bEmpty = sal_True;
+            rFill.bInner = false;
+            rFill.bEmpty = true;
             rFill.SetOrient( text::HoriOrientation::LEFT );
         }
         else
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 2747dd243d8e..16641e7d27ee 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -60,7 +60,7 @@ public:
     inline FormatLevel()  { ++nLevel; }
     inline ~FormatLevel() { --nLevel; }
     inline MSHORT GetLevel() const { return nLevel; }
-    static sal_Bool LastLevel() { return 10 < nLevel; }
+    static bool LastLevel() { return 10 < nLevel; }
 };
 MSHORT FormatLevel::nLevel = 0;
 
@@ -238,7 +238,7 @@ sal_Bool SwTxtFrm::CalcFollow( const xub_StrLen nTxtOfst )
         if ( !pMyFollow->GetNext() && !pMyFollow->HasFtn() )
             nOldBottom = bVert ? 0 : LONG_MAX;
 
-        while( sal_True )
+        while( true )
         {
             if( !FormatLevel::LastLevel() )
             {
@@ -558,7 +558,7 @@ void SwTxtFrm::_AdjustFollow( SwTxtFormatter &rLine,
     if( GetFollow() )
     {
 #if OSL_DEBUG_LEVEL > 1
-        static sal_Bool bTest = sal_False;
+        static bool bTest = false;
         if( !bTest || ( nMode & 1 ) )
 #endif
         if ( nMode )
@@ -979,7 +979,7 @@ void SwTxtFrm::FormatAdjust( SwTxtFormatter &rLine,
     // If the current values have been calculated, show that they
     // are valid now
     *(pPara->GetReformat()) = SwCharRange();
-    sal_Bool bDelta = *pPara->GetDelta() != 0;
+    bool bDelta = *pPara->GetDelta() != 0;
     *(pPara->GetDelta()) = 0;
 
     if( rLine.IsStop() )
@@ -1124,7 +1124,7 @@ sal_Bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine, const sal_Bool bPrev )
     // The current line break object
     const SwLineLayout *pNew = rLine.GetCurr();
 
-    sal_Bool bUnChg = nOldLen == pNew->GetLen() &&
+    bool bUnChg = nOldLen == pNew->GetLen() &&
                   bOldHyph == pNew->IsEndHyph();
     if ( bUnChg && !bPrev )
     {
@@ -1289,7 +1289,7 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
     // of) would not trigger a reformatting of the previous line. Adding 1
     // to the result of FindBrk() does not solve the problem in all cases,
     // nevertheless it should be sufficient.
-    sal_Bool bPrev = rLine.GetPrev() &&
+    bool bPrev = rLine.GetPrev() &&
                      ( FindBrk( rString, rLine.GetStart(), rReformat.Start() + 1 )
                        // #i46560#
                        + 1
@@ -1312,7 +1312,7 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
             {
                 ++nNew;
                 rLine.Next();
-                bPrev = sal_False;
+                bPrev = false;
             }
         }
         rReformat.Len()  += rReformat.Start() - nNew;
@@ -1333,7 +1333,7 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
     // The bFirst flag makes sure that Next() is not called.
     // The whole thing looks weird, but we need to make sure that
     // rLine stops at the last non-fitting line when calling IsBreakNow.
-    sal_Bool bFirst  = sal_True;
+    bool bFirst  = true;
     sal_Bool bFormat = sal_True;
 
     // The CharToLine() can also get us into the danger zone.
@@ -1345,7 +1345,7 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
                     && aFrmBreak.IsBreakNowWidAndOrp( rLine );
     if( bBreak )
     {
-        sal_Bool bPrevDone = 0 != rLine.Prev();
+        bool bPrevDone = 0 != rLine.Prev();
         while( bPrevDone && aFrmBreak.IsBreakNowWidAndOrp(rLine) )
             bPrevDone = 0 != rLine.Prev();
         if( bPrevDone )
@@ -1380,7 +1380,7 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
          bWatchMidHyph = sal_False;
 
     const SwAttrSet& rAttrSet = GetTxtNode()->GetSwAttrSet();
-    sal_Bool bMaxHyph = ( 0 !=
+    bool bMaxHyph = ( 0 !=
         ( rInf.MaxHyph() = rAttrSet.GetHyphenZone().GetMaxHyphens() ) );
     if ( bMaxHyph )
         rLine.InitCntHyph();
@@ -1418,7 +1418,7 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
     do
     {
         if( bFirst )
-            bFirst = sal_False;
+            bFirst = false;
         else
         {
             if ( bMaxHyph )
@@ -1755,8 +1755,8 @@ void SwTxtFrm::Format( const SwBorderAttrs * )
         // We do not want to be interrupted during formatting
         SwTxtFrmLocker aLock(this);
         SwTxtLineAccess aAccess( this );
-        const sal_Bool bNew = !aAccess.SwTxtLineAccess::IsAvailable();
-        const sal_Bool bSetOfst = ( GetOfst() && GetOfst() > GetTxtNode()->GetTxt().Len() );
+        const bool bNew = !aAccess.SwTxtLineAccess::IsAvailable();
+        const bool bSetOfst = ( GetOfst() && GetOfst() > GetTxtNode()->GetTxt().Len() );
 
         if( CalcPreps() )
             ; // nothing