sal_Bool to bool

Change-Id: I31fa2f4a711f01ca134e8a977eb2147637fc7830

10 files changed, 88 insertions, 88 deletions

diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index 2ae79717df15..2006675b6b90 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -90,10 +90,10 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx,
                             const SwNodeIndex &rEndIdx );
 
 // prevent creation of Flys in _InsertCnt, e.g. for table headlines
-extern sal_Bool bDontCreateObjects;
+extern bool bDontCreateObjects;
 
 // for FlyCnts, see SwFlyAtCntFrm::MakeAll()
-extern sal_Bool bSetCompletePaintOnInvalidate;
+extern bool bSetCompletePaintOnInvalidate;
 
 // for table settings via keyboard
 long CalcRowRstHeight( SwLayoutFrm *pRow );
@@ -118,12 +118,12 @@ void Notify_Background( const SdrObject* pObj,
 
 const SwFrm* GetVirtualUpper( const SwFrm* pFrm, const Point& rPos );
 
-sal_Bool Is_Lower_Of( const SwFrm *pCurrFrm, const SdrObject* pObj );
+bool Is_Lower_Of( const SwFrm *pCurrFrm, const SdrObject* pObj );
 
 // FIXME: EasyHack (refactoring): rename method and parameter name in all files
 const SwFrm *FindKontext( const SwFrm *pFrm, sal_uInt16 nAdditionalKontextTyp );
 
-sal_Bool IsFrmInSameKontext( const SwFrm *pInnerFrm, const SwFrm *pFrm );
+bool IsFrmInSameKontext( const SwFrm *pInnerFrm, const SwFrm *pFrm );
 
 const SwFrm * FindPage( const SwRect &rRect, const SwFrm *pPage );
 
@@ -136,7 +136,7 @@ SwFrm* GetFrmOfModify( const SwRootFrm* pLayout,
                        const sal_Bool bCalcFrm = sal_False );
 
 // Should extra data (reline stroke, line numbers) be painted?
-sal_Bool IsExtraData( const SwDoc *pDoc );
+bool IsExtraData( const SwDoc *pDoc );
 
 // #i11760# - method declaration <CalcCntnt(..)>
 void CalcCntnt( SwLayoutFrm *pLay,
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx
index d23d55eb307c..a4ae9cc95e71 100644
--- a/sw/source/core/inc/layact.hxx
+++ b/sw/source/core/inc/layact.hxx
@@ -100,7 +100,7 @@ class SwLayAction
     sal_Bool bBrowseActionStop; //Action fruehzeitig beenden (per bInput) und den
                             //Rest dem Idler ueberlassen.
     sal_Bool bWaitAllowed;      //Wartecursor erlaubt?
-    sal_Bool bPaintExtraData;   //Anzeige von Zeilennumerierung o. ae. eingeschaltet?
+    bool bPaintExtraData;   //Anzeige von Zeilennumerierung o. ae. eingeschaltet?
     sal_Bool bActionInProgress; // wird in Action() anfangs gesetzt und zum Schluss geloescht
 
     // OD 14.04.2003 #106346# - new flag for content formatting on interrupt.
@@ -152,7 +152,7 @@ public:
     sal_Bool IsPaint()              const       { return bPaint; }
     sal_Bool IsIdle()               const       { return bIdle;  }
     sal_Bool IsReschedule()         const       { return bReschedule;  }
-    sal_Bool IsPaintExtraData()     const       { return bPaintExtraData;}
+    bool IsPaintExtraData()     const       { return bPaintExtraData;}
     sal_Bool IsStopPrt()          const;
     sal_Bool IsInterrupt()        const { return IsInput() || IsStopPrt(); }
 
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 81976e79174e..b3e4f4fc1478 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -353,7 +353,7 @@ void SwFlyAtCntFrm::MakeAll()
         // #i28701# - use new method <GetPageFrm()>
         if( GetPageFrm() )
         {
-            bSetCompletePaintOnInvalidate = sal_True;
+            bSetCompletePaintOnInvalidate = true;
             {
                 SwFlyFrmFmt *pFmt = (SwFlyFrmFmt*)GetFmt();
                 const SwFmtFrmSize &rFrmSz = GetFmt()->GetFrmSize();
@@ -541,7 +541,7 @@ void SwFlyAtCntFrm::MakeAll()
                 SetRestartLayoutProcess( true );
                 SetTmpConsiderWrapInfluenceOfOtherObjs( true );
             }
-            bSetCompletePaintOnInvalidate = sal_False;
+            bSetCompletePaintOnInvalidate = false;
         }
     }
 }
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 96139b1786ae..cb7500eebf02 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -90,9 +90,9 @@ void sw_RemoveFtns( SwFtnBossFrm* pBoss, sal_Bool bPageOnly, sal_Bool bEndNotes
 using namespace ::com::sun::star;
 
 
-sal_Bool bObjsDirect = sal_True;
-sal_Bool bDontCreateObjects = sal_False;
-sal_Bool bSetCompletePaintOnInvalidate = sal_False;
+bool bObjsDirect = true;
+bool bDontCreateObjects = false;
+bool bSetCompletePaintOnInvalidate = false;
 
 sal_uInt8 StackHack::nCnt = 0;
 sal_Bool StackHack::bLocked = sal_False;
@@ -136,12 +136,12 @@ SwFrmNotify::~SwFrmNotify()
     }
 
     SWRECTFN( pFrm )
-    const sal_Bool bAbsP = POS_DIFF( aFrm, pFrm->Frm() );
-    const sal_Bool bChgWidth =
+    const bool bAbsP = POS_DIFF( aFrm, pFrm->Frm() );
+    const bool bChgWidth =
             (aFrm.*fnRect->fnGetWidth)() != (pFrm->Frm().*fnRect->fnGetWidth)();
-    const sal_Bool bChgHeight =
+    const bool bChgHeight =
             (aFrm.*fnRect->fnGetHeight)()!=(pFrm->Frm().*fnRect->fnGetHeight)();
-    const sal_Bool bChgFlyBasePos = pFrm->IsTxtFrm() &&
+    const bool bChgFlyBasePos = pFrm->IsTxtFrm() &&
        ( ( mnFlyAnchorOfst != ((SwTxtFrm*)pFrm)->GetBaseOfstForFly( sal_True ) ) ||
          ( mnFlyAnchorOfstNoWrap != ((SwTxtFrm*)pFrm)->GetBaseOfstForFly( sal_False ) ) );
 
@@ -223,9 +223,9 @@ SwFrmNotify::~SwFrmNotify()
     }
 
     //Fuer Hintergrundgrafiken muss bei Groessenaenderungen ein Repaint her.
-    const sal_Bool bPrtWidth =
+    const bool bPrtWidth =
             (aPrt.*fnRect->fnGetWidth)() != (pFrm->Prt().*fnRect->fnGetWidth)();
-    const sal_Bool bPrtHeight =
+    const bool bPrtHeight =
             (aPrt.*fnRect->fnGetHeight)()!=(pFrm->Prt().*fnRect->fnGetHeight)();
     if ( bPrtWidth || bPrtHeight )
     {
@@ -244,7 +244,7 @@ SwFrmNotify::~SwFrmNotify()
         }
     }
 
-    const sal_Bool bPrtP = POS_DIFF( aPrt, pFrm->Prt() );
+    const bool bPrtP = POS_DIFF( aPrt, pFrm->Prt() );
     if ( bAbsP || bPrtP || bChgWidth || bChgHeight ||
          bPrtWidth || bPrtHeight || bChgFlyBasePos )
     {
@@ -473,16 +473,16 @@ SwLayNotify::~SwLayNotify()
 
     SwLayoutFrm *pLay = GetLay();
     SWRECTFN( pLay )
-    sal_Bool bNotify = sal_False;
+    bool bNotify = false;
     if ( pLay->Prt().SSize() != aPrt.SSize() )
     {
         if ( !IsLowersComplete() )
         {
-            sal_Bool bInvaPercent;
+            bool bInvaPercent;
 
             if ( pLay->IsRowFrm() )
             {
-                bInvaPercent = sal_True;
+                bInvaPercent = true;
                 long nNew = (pLay->Prt().*fnRect->fnGetHeight)();
                 if( nNew != (aPrt.*fnRect->fnGetHeight)() )
                      ((SwRowFrm*)pLay)->AdjustCells( nNew, sal_True);
@@ -498,7 +498,7 @@ SwLayNotify::~SwLayNotify()
                 //3. Wenn der Fly eine feste Hoehe hat und die Spalten in der
                 //   Hoehe danebenliegen.
                 //4. niemals bei SectionFrms.
-                sal_Bool bLow;
+                bool bLow;
                 if( pLay->IsFlyFrm() )
                 {
                     if ( pLay->Lower() )
@@ -508,7 +508,7 @@ SwLayNotify::~SwLayNotify()
                              != (pLay->Prt().*fnRect->fnGetHeight)();
                     }
                     else
-                        bLow = sal_False;
+                        bLow = false;
                 }
                 else if( pLay->IsSctFrm() )
                 {
@@ -520,12 +520,12 @@ SwLayNotify::~SwLayNotify()
                             bLow = pLay->Prt().Width() != aPrt.Width();
                     }
                     else
-                        bLow = sal_False;
+                        bLow = false;
                 }
                 else if( pLay->IsFooterFrm() && !pLay->HasFixSize() )
                     bLow = pLay->Prt().Width() != aPrt.Width();
                 else
-                    bLow = sal_True;
+                    bLow = true;
                 bInvaPercent = bLow;
                 if ( bLow )
                 {
@@ -551,7 +551,7 @@ SwLayNotify::~SwLayNotify()
                     }
                 }
             }
-            bNotify = sal_True;
+            bNotify = true;
             //TEUER!! aber wie macht man es geschickter?
             if( bInvaPercent )
                 pLay->InvaPercentLowers( pLay->Prt().Height() - aPrt.Height() );
@@ -571,9 +571,9 @@ SwLayNotify::~SwLayNotify()
         }
     }
     //Lower benachrichtigen wenn sich die Position veraendert hat.
-    const sal_Bool bPrtPos = POS_DIFF( aPrt, pLay->Prt() );
-    const sal_Bool bPos = bPrtPos || POS_DIFF( aFrm, pLay->Frm() );
-    const sal_Bool bSize = pLay->Frm().SSize() != aFrm.SSize();
+    const bool bPrtPos = POS_DIFF( aPrt, pLay->Prt() );
+    const bool bPos = bPrtPos || POS_DIFF( aFrm, pLay->Frm() );
+    const bool bSize = pLay->Frm().SSize() != aFrm.SSize();
 
     if ( bPos && pLay->Lower() && !IsLowersComplete() )
         pLay->Lower()->InvalidatePos();
@@ -856,7 +856,7 @@ SwCntntNotify::~SwCntntNotify()
         }
     }
 
-    sal_Bool bFirst = (aFrm.*fnRect->fnGetWidth)() == 0;
+    bool bFirst = (aFrm.*fnRect->fnGetWidth)() == 0;
 
     if ( pCnt->IsNoTxtFrm() )
     {
@@ -1240,7 +1240,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
     //Wenn in der DocStatistik eine brauchebare Seitenzahl angegeben ist
     //(wird beim Schreiben gepflegt), so wird von dieser Seitenanzahl
     //ausgegengen.
-    const sal_Bool bStartPercent = bPages && !nEndIndex;
+    const bool bStartPercent = bPages && !nEndIndex;
 
     SwPageFrm *pPage = pLay->FindPageFrm();
     const SwFrmFmts *pTbl = pDoc->GetSpzFrmFmts();
@@ -1263,7 +1263,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
         {
             const sal_uLong nPageCount = pPageMaker->CalcPageCount();
             if( nPageCount )
-                bObjsDirect = sal_False;
+                bObjsDirect = false;
         }
     }
     else
@@ -1591,7 +1591,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
     {
         if ( !bDontCreateObjects )
             AppendAllObjs( pTbl, pLayout );
-        bObjsDirect = sal_True;
+        bObjsDirect = true;
     }
 
     if( pPageMaker )
@@ -1616,7 +1616,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
 void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx,
                const SwNodeIndex &rEndIdx )
 {
-    bObjsDirect = sal_False;
+    bObjsDirect = false;
 
     SwNodeIndex aTmp( rSttIdx );
     sal_uLong nEndIdx = rEndIdx.GetIndex();
@@ -1658,8 +1658,8 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx,
             // auf die naechste Seite schieben. Innerhalb eines Rahmens auch
             // nicht ( in der 1. Spalte eines Rahmens waere pFrm Moveable()! )
             // Auch in spaltigen Bereichen in Tabellen waere pFrm Moveable.
-            sal_Bool bMoveNext = nEndIdx - rSttIdx.GetIndex() > 120;
-            sal_Bool bAllowMove = !pFrm->IsInFly() && pFrm->IsMoveable() &&
+            bool bMoveNext = nEndIdx - rSttIdx.GetIndex() > 120;
+            bool bAllowMove = !pFrm->IsInFly() && pFrm->IsMoveable() &&
                  (!pFrm->IsInTab() || pFrm->IsTabFrm() );
             if ( bMoveNext && bAllowMove )
             {
@@ -1825,7 +1825,7 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx,
         }
     }
 
-    bObjsDirect = sal_True;
+    bObjsDirect = true;
 }
 
 
@@ -2493,7 +2493,7 @@ SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart )
     SwFrm *pFloat = pSav;
     if( !pStart )
         pStart = pSav;
-    sal_Bool bGo = pStart == pSav;
+    bool bGo = pStart == pSav;
     do
     {
         if( bGo )
@@ -2532,7 +2532,7 @@ SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart )
                 pFloat = pFloat->GetNext();
                 if( !bGo && pFloat == pStart )
                 {
-                    bGo = sal_True;
+                    bGo = true;
                     pFloat->pPrev->pNext = NULL;
                     pFloat->pPrev = NULL;
                 }
@@ -3222,7 +3222,7 @@ const SwFrm* GetVirtualUpper( const SwFrm* pFrm, const Point& rPos )
 
 /*************************************************************************/
 
-sal_Bool Is_Lower_Of( const SwFrm *pCurrFrm, const SdrObject* pObj )
+bool Is_Lower_Of( const SwFrm *pCurrFrm, const SdrObject* pObj )
 {
     Point aPos;
     const SwFrm* pFrm;
@@ -3241,7 +3241,7 @@ sal_Bool Is_Lower_Of( const SwFrm *pCurrFrm, const SdrObject* pObj )
     pFrm = GetVirtualUpper( pFrm, aPos );
     do
     {   if ( pFrm == pCurrFrm )
-            return sal_True;
+            return true;
         if( pFrm->IsFlyFrm() )
         {
             aPos = pFrm->Frm().Pos();
@@ -3250,7 +3250,7 @@ sal_Bool Is_Lower_Of( const SwFrm *pCurrFrm, const SdrObject* pObj )
         else
             pFrm = pFrm->GetUpper();
     } while ( pFrm );
-    return sal_False;
+    return false;
 }
 
 const SwFrm *FindKontext( const SwFrm *pFrm, sal_uInt16 nAdditionalKontextTyp )
@@ -3269,7 +3269,7 @@ const SwFrm *FindKontext( const SwFrm *pFrm, sal_uInt16 nAdditionalKontextTyp )
     return pFrm;
 }
 
-sal_Bool IsFrmInSameKontext( const SwFrm *pInnerFrm, const SwFrm *pFrm )
+bool IsFrmInSameKontext( const SwFrm *pInnerFrm, const SwFrm *pFrm )
 {
     const SwFrm *pKontext = FindKontext( pInnerFrm, 0 );
 
@@ -3280,9 +3280,9 @@ sal_Bool IsFrmInSameKontext( const SwFrm *pInnerFrm, const SwFrm *pFrm )
     {   if ( pFrm->GetType() & nTyp )
         {
             if( pFrm == pKontext )
-                return sal_True;
+                return true;
             if( pFrm->IsCellFrm() )
-                return sal_False;
+                return false;
         }
         if( pFrm->IsFlyFrm() )
         {
@@ -3293,7 +3293,7 @@ sal_Bool IsFrmInSameKontext( const SwFrm *pInnerFrm, const SwFrm *pFrm )
             pFrm = pFrm->GetUpper();
     } while( pFrm );
 
-    return sal_False;
+    return false;
 }
 
 
@@ -3505,7 +3505,7 @@ SwFrm* GetFrmOfModify( const SwRootFrm* pLayout, SwModify const& rMod, sal_uInt1
     return pMinFrm;
 }
 
-sal_Bool IsExtraData( const SwDoc *pDoc )
+bool IsExtraData( const SwDoc *pDoc )
 {
     const SwLineNumberInfo &rInf = pDoc->GetLineNumberInfo();
     return rInf.IsPaintLineNumbers() ||
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index baa7be1ca7d3..bbd4608f4ee2 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -347,7 +347,7 @@ SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool )
         }
     }
     const ViewShell *pSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0;
-    const sal_Bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode();
+    const bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode();
     SwPageFrm *pPage = pBoss->FindPageFrm();
     if ( bBrowseMode || !pPage->IsFtnPage() )
     {
@@ -893,11 +893,11 @@ SwLayoutFrm *SwFrm::GetPrevFtnLeaf( MakePageType eMakeFtn )
     if ( pRet )
     {
         const SwFtnBossFrm* pNewBoss = pRet->FindFtnBossFrm();
-        sal_Bool bJump = sal_False;
+        bool bJump = false;
         if( pOldBoss->IsColumnFrm() && pOldBoss->GetPrev() ) // es gibt eine vorherige Spalte
             bJump = pOldBoss->GetPrev() != (SwFrm*)pNewBoss;         // sind wir darin gelandet?
         else if( pNewBoss->IsColumnFrm() && pNewBoss->GetNext() )
-            bJump = sal_True; // es gibt hinter dem neuen Boss noch eine Spalte, die aber nicht
+            bJump = true; // es gibt hinter dem neuen Boss noch eine Spalte, die aber nicht
                           // der alte Boss sein kann, das haben wir ja bereits geprueft.
         else // hier landen wir nur, wenn neuer und alter Boss entweder Seiten oder letzte (neu)
         {   // bzw. erste (alt) Spalten einer Seite sind. In diesem Fall muss noch geprueft
@@ -905,7 +905,7 @@ SwLayoutFrm *SwFrm::GetPrevFtnLeaf( MakePageType eMakeFtn )
             sal_uInt16 nDiff = pOldPage->GetPhyPageNum() - pRet->FindPageFrm()->GetPhyPageNum();
             if ( nDiff > 2 ||
                  (nDiff > 1 && !((SwPageFrm*)pOldPage->GetPrev())->IsEmptyPage()) )
-                bJump = sal_True;
+                bJump = true;
         }
         if( bJump )
             SwFlowFrm::SetMoveBwdJump( sal_True );
@@ -1518,7 +1518,7 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
             !pNew->GetAttr()->GetFtn().IsEndNote() );
         sal_uInt16 nRefNum = pBoss->GetPhyPageNum();    // Die Seiten- und
         sal_uInt16 nRefCol = lcl_ColumnNum( pBoss );    // Spaltennummer der neuen Fussnote
-        sal_Bool bEnd = sal_False;
+        bool bEnd = false;
         SwFtnFrm *pLastSib = 0;
         while ( pSibling && !bEnd && (nCmpPos <= nStPos) )
         {
@@ -1539,7 +1539,7 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
                     ( nTmpRef == nRefNum && lcl_ColumnNum( pBoss ) <= nRefCol ))
                     pSibling = pFoll;
                 else
-                    bEnd = sal_True;
+                    bEnd = true;
             }
             else
             {
@@ -1554,7 +1554,7 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
                 if ( pCont )
                     pSibling = (SwFtnFrm*)pCont->Lower();
                 else
-                    bEnd = sal_True;
+                    bEnd = true;
             }
             if ( !bEnd && pSibling )
                 nCmpPos = ::lcl_FindFtnPos( pDoc, pSibling->GetAttr() );
@@ -1563,7 +1563,7 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
                 if ( (nLastPos < nCmpPos) && (nCmpPos > nStPos) )
                 {
                     pSibling = pLastSib;
-                    bEnd = sal_True;
+                    bEnd = true;
                 }
             }
         }
@@ -1619,7 +1619,7 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
     SwFtnBossFrm *pBoss = this;
     SwPageFrm *pPage = FindPageFrm();
     SwPageFrm *pMyPage = pPage;
-    sal_Bool bChgPage = sal_False;
+    bool bChgPage = false;
     sal_Bool bEnd = sal_False;
     if ( pAttr->GetFtn().IsEndNote() )
     {
@@ -1640,7 +1640,7 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
             while ( pPage->GetNext() && !pPage->IsEndNotePage() )
             {
                 pPage = (SwPageFrm*)pPage->GetNext();
-                bChgPage = sal_True;
+                bChgPage = true;
             }
             if ( !pPage->IsEndNotePage() )
             {
@@ -1648,7 +1648,7 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
                 pPage = ::InsertNewPage( *pDesc, pPage->GetUpper(),
                         !pPage->OnRightPage(), false, sal_False, sal_True, 0 );
                 pPage->SetEndNotePage( sal_True );
-                bChgPage = sal_True;
+                bChgPage = true;
             }
             else
             {
@@ -1683,7 +1683,7 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
                 !((SwPageFrm*)pPage->GetNext())->IsEndNotePage() )
         {
             pPage = (SwPageFrm*)pPage->GetNext();
-            bChgPage = sal_True;
+            bChgPage = true;
         }
 
         if ( !pPage->IsFtnPage() )
@@ -1691,7 +1691,7 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
             SwPageDesc *pDesc = pDoc->GetFtnInfo().GetPageDesc( *pDoc );
             pPage = ::InsertNewPage( *pDesc, pPage->GetUpper(),
                 !pPage->OnRightPage(), false, sal_False, sal_True, pPage->GetNext() );
-            bChgPage = sal_True;
+            bChgPage = true;
         }
         else
         {
@@ -2033,7 +2033,7 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm*   _pRef,
     while ( _pFtn->GetMaster() )
         _pFtn = _pFtn->GetMaster();
 
-    sal_Bool bFound = sal_False;
+    bool bFound = false;
 
     while ( _pFtn )
     {
@@ -2080,7 +2080,7 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm*   _pRef,
         }
 
         // OD 03.04.2003 #108446# - determine, if found footnote has to be collected.
-        sal_Bool bCollectFoundFtn = sal_False;
+        bool bCollectFoundFtn = false;
         if ( _pFtn->GetRef() == _pRef && !_pFtn->GetAttr()->GetFtn().IsEndNote() )
         {
             if ( _bCollectOnlyPreviousFtns )
@@ -2092,12 +2092,12 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm*   _pRef,
                      pBossOfFoundFtn->IsBefore( _pRefFtnBossFrm )
                    )
                 {
-                    bCollectFoundFtn = sal_True;
+                    bCollectFoundFtn = true;
                 }
             }
             else
             {
-                bCollectFoundFtn = sal_True;
+                bCollectFoundFtn = true;
             }
         }
 
@@ -2126,7 +2126,7 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm*   _pRef,
             }
             _pFtn->Cut();
             FtnInArr( _rFtnArr, _pFtn );
-            bFound = sal_True;
+            bFound = true;
         }
         else
         {
@@ -2211,7 +2211,7 @@ void SwFtnBossFrm::_MoveFtns( SwFtnFrms &rFtnArr, sal_Bool bCalc )
             {
                 SwTxtFtn *pAttr = pFtn->GetAttr();
                 pCnt = pFtn->ContainsAny();
-                sal_Bool bUnlock = !pFtn->IsBackMoveLocked();
+                bool bUnlock = !pFtn->IsBackMoveLocked();
                 pFtn->LockBackMove();
 
                 // #i49383# - disable unlock of position of
@@ -2301,7 +2301,7 @@ void SwFtnBossFrm::_MoveFtns( SwFtnFrms &rFtnArr, sal_Bool bCalc )
             SwTxtFtn* pAttr = pNextFtn->GetAttr();
             SwFrm* pCnt = pNextFtn->ContainsAny();
 
-            sal_Bool bUnlock = !pNextFtn->IsBackMoveLocked();
+            bool bUnlock = !pNextFtn->IsBackMoveLocked();
             pNextFtn->LockBackMove();
             // #i49383# - disable unlock of position of
             // lower objects during format of footnote content.
@@ -2417,7 +2417,7 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock,
         SwFrm* pCntnt = pFirst->ContainsAny();
         if( pCntnt )
         {
-            sal_Bool bUnlock = !pFirst->IsBackMoveLocked();
+            bool bUnlock = !pFirst->IsBackMoveLocked();
             pFirst->LockBackMove();
             pFirst->Calc();
             pCntnt->Calc();
@@ -2437,8 +2437,8 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock,
     SwFrm *pCnt = pFtn ? pFtn->ContainsAny() : 0;
     if ( pCnt )
     {
-        sal_Bool bMore = sal_True;
-        sal_Bool bStart = pAttr == 0; // wenn kein Attribut uebergeben wird, alle bearbeiten
+        bool bMore = true;
+        bool bStart = pAttr == 0; // wenn kein Attribut uebergeben wird, alle bearbeiten
         // #i49383# - disable unlock of position of
         // lower objects during format of footnote and footnote content.
         SwFtnFrm* pLastFtnFrm( 0L );
@@ -2509,7 +2509,7 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock,
                 }
                 if ( bLock )
                 {
-                    sal_Bool bUnlock = !pFtnFrm->IsBackMoveLocked();
+                    bool bUnlock = !pFtnFrm->IsBackMoveLocked();
                     pFtnFrm->LockBackMove();
                     pFtnFrm->Calc();
                     pCnt->Calc();
@@ -2581,10 +2581,10 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock,
                     SwFtnFrm* pFtnFrm = pCnt->FindFtnFrm();
                     if( pFtnFrm->GetRef()->FindFtnBossFrm(
                         pFtnFrm->GetAttr()->GetFtn().IsEndNote() ) != this )
-                        bMore = sal_False;
+                        bMore = false;
                 }
                 else
-                    bMore = sal_False;
+                    bMore = false;
             }
             if( pDel )
             {
@@ -2598,7 +2598,7 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock,
                 if ( pAttr &&
                      (::lcl_FindFtnPos( pDoc,
                                     pCnt->FindFtnFrm()->GetAttr()) > nFtnPos ) )
-                    bMore = sal_False;
+                    bMore = false;
             }
         } while ( bMore );
         // #i49383#
@@ -3005,10 +3005,10 @@ sal_Bool SwCntntFrm::MoveFtnCntFwd( sal_Bool bMakePage, SwFtnBossFrm *pOldBoss )
 
     if ( pNewUpper )
     {
-        sal_Bool bSameBoss = sal_True;
+        bool bSameBoss = true;
         SwFtnBossFrm * const pNewBoss = pNewUpper->FindFtnBossFrm();
         //Wechseln wir die Spalte/Seite?
-        if ( sal_False == ( bSameBoss = (pNewBoss == pOldBoss) ) )
+        if ( !( bSameBoss = (pNewBoss == pOldBoss) ) )
         {
             bSamePage = pOldBoss->FindPageFrm() == pNewBoss->FindPageFrm(); // Seitenwechsel?
             pNewUpper->Calc();
diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx
index 1944d7b94a4c..2466d6cbd968 100644
--- a/sw/source/core/layout/hffrm.cxx
+++ b/sw/source/core/layout/hffrm.cxx
@@ -49,7 +49,7 @@
 // #i43771#
 #include <objectformatter.hxx>
 
-extern sal_Bool bObjsDirect;    //frmtool.cxx
+extern bool bObjsDirect;    //frmtool.cxx
 
 static SwTwips lcl_GetFrmMinHeight(const SwLayoutFrm & rFrm)
 {
@@ -126,8 +126,8 @@ SwHeadFootFrm::SwHeadFootFrm( SwFrmFmt * pFmt, SwFrm* pSib, sal_uInt16 nTypeIn)
     OSL_ENSURE( rCnt.GetCntntIdx(), "No content for Header." );
 
     // Have the objects created right now for header and footer
-    sal_Bool bOld = bObjsDirect;
-    bObjsDirect = sal_True;
+    bool bOld = bObjsDirect;
+    bObjsDirect = true;
     sal_uLong nIndex = rCnt.GetCntntIdx()->GetIndex();
     ::_InsertCnt( this, pFmt->GetDoc(), ++nIndex );
     bObjsDirect = bOld;
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index 69a76184dadb..ed13aa266e11 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -818,7 +818,7 @@ sal_Bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex )
                             SwFrm *pPrv;
                             if( nRepeat > 0 )
                             {
-                                bDontCreateObjects = sal_True; //frmtool
+                                bDontCreateObjects = true; //frmtool
 
                                 // Insert new headlines:
                                 sal_uInt16 nRowIdx = 0;
@@ -835,7 +835,7 @@ sal_Bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex )
                                     ++nRowIdx;
                                 }
 
-                                bDontCreateObjects = sal_False;
+                                bDontCreateObjects = false;
                                 pPrv = pHeadline;
                                 nRows = nRows + nRepeat;
                             }
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index cee1587fcf7c..b6da50985ae5 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2981,7 +2981,7 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const
     SwRect aRect( rRect );
     aRect.Intersection( pSh->VisArea() );
 
-    const sal_Bool bExtraData = ::IsExtraData( GetFmt()->GetDoc() );
+    const bool bExtraData = ::IsExtraData( GetFmt()->GetDoc() );
 
     pLines = new SwLineRects;   //Container for borders.
 
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 7e217694e951..db3f7b2b0907 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -1203,11 +1203,11 @@ bool SwTabFrm::Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKee
         for ( nRowCount = 0; nRowCount < nRepeat; ++nRowCount )
         {
             // Insert new headlines:
-            bDontCreateObjects = sal_True;              //frmtool
+            bDontCreateObjects = true;              //frmtool
             SwRowFrm* pHeadline = new SwRowFrm(
                                     *GetTable()->GetTabLines()[ nRowCount ], this );
             pHeadline->SetRepeatedHeadline( true );
-            bDontCreateObjects = sal_False;
+            bDontCreateObjects = false;
             pHeadline->InsertBefore( pFoll, 0 );
 
             SwPageFrm *pPage = pHeadline->FindPageFrm();
@@ -3207,10 +3207,10 @@ void SwTabFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
                 const sal_uInt16 nNewRepeat = GetTable()->GetRowsToRepeat();
                 for ( sal_uInt16 nIdx = 0; nIdx < nNewRepeat; ++nIdx )
                 {
-                    bDontCreateObjects = sal_True;          //frmtool
+                    bDontCreateObjects = true;          //frmtool
                     SwRowFrm* pHeadline = new SwRowFrm( *GetTable()->GetTabLines()[ nIdx ], this );
                     pHeadline->SetRepeatedHeadline( true );
-                    bDontCreateObjects = sal_False;
+                    bDontCreateObjects = false;
                     pHeadline->Paste( this, pLowerRow );
                 }
             }
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 220cd4f4686e..b71a39adbe76 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -232,7 +232,7 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd )
     if ( Imp()->GetRegion() && Imp()->GetRegion()->GetOrigin() != VisArea() )
         Imp()->DelRegion();
 
-    const sal_Bool bExtraData = ::IsExtraData( GetDoc() );
+    const bool bExtraData = ::IsExtraData( GetDoc() );
 
     if ( !bIdleEnd )
     {