sal_Bool to bool

Change-Id: I8b76ba6d6a27cebefca3307a648bd5baafd27262

16 files changed, 78 insertions, 79 deletions

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 2e7357c47784..b124a5af012f 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -637,7 +637,7 @@ private:
                             const bool bCopyFlyAtFly = false ) const;
     sal_Int8 SetFlyFrmAnchor( SwFrmFmt& rFlyFmt, SfxItemSet& rSet, bool bNewFrms );
 
-    typedef SwFmt* (SwDoc:: *FNCopyFmt)( const String&, SwFmt*, sal_Bool, sal_Bool );
+    typedef SwFmt* (SwDoc:: *FNCopyFmt)( const String&, SwFmt*, bool, bool );
     SwFmt* CopyFmt( const SwFmt& rFmt, const SwFmtsBase& rFmtArr,
                         FNCopyFmt fnCopyFmt, const SwFmt& rDfltFmt );
     void CopyFmtArr( const SwFmtsBase& rSourceArr, SwFmtsBase& rDestArr,
@@ -697,9 +697,9 @@ private:
     void DoUpdateAllCharts();
     DECL_LINK( DoUpdateModifiedOLE, Timer * );
 
-     SwFmt *_MakeCharFmt(const String &, SwFmt *, sal_Bool, sal_Bool );
-     SwFmt *_MakeFrmFmt(const String &, SwFmt *, sal_Bool, sal_Bool );
-     SwFmt *_MakeTxtFmtColl(const String &, SwFmt *, sal_Bool, sal_Bool );
+     SwFmt *_MakeCharFmt(const String &, SwFmt *, bool, bool );
+     SwFmt *_MakeFrmFmt(const String &, SwFmt *, bool, bool );
+     SwFmt *_MakeTxtFmtColl(const String &, SwFmt *, bool, bool );
 
      void InitTOXTypes();
      void   Paste( const SwDoc& );
@@ -1225,14 +1225,14 @@ public:
     void RemoveAllFmtLanguageDependencies();
 
     SwFrmFmt  *MakeFrmFmt(const String &rFmtName, SwFrmFmt *pDerivedFrom,
-                          sal_Bool bBroadcast = sal_False, sal_Bool bAuto = sal_True);
+                          bool bBroadcast = false, bool bAuto = true);
     void       DelFrmFmt( SwFrmFmt *pFmt, bool bBroadcast = false );
     SwFrmFmt* FindFrmFmtByName( const String& rName ) const
         {   return (SwFrmFmt*)FindFmtByName( (SwFmtsBase&)*pFrmFmtTbl, rName ); }
 
     SwCharFmt *MakeCharFmt(const String &rFmtName, SwCharFmt *pDerivedFrom,
-                           sal_Bool bBroadcast = sal_False,
-                           sal_Bool bAuto = sal_True );
+                           bool bBroadcast = false,
+                           bool bAuto = true );
     void       DelCharFmt(sal_uInt16 nFmt, bool bBroadcast = false);
     void       DelCharFmt(SwCharFmt* pFmt, bool bBroadcast = false);
     SwCharFmt* FindCharFmtByName( const String& rName ) const
@@ -1244,13 +1244,13 @@ public:
     const SwTxtFmtColls *GetTxtFmtColls() const { return pTxtFmtCollTbl; }
     SwTxtFmtColl *MakeTxtFmtColl( const String &rFmtName,
                                   SwTxtFmtColl *pDerivedFrom,
-                                  sal_Bool bBroadcast = sal_False,
-                                  sal_Bool bAuto = sal_True );
+                                  bool bBroadcast = false,
+                                  bool bAuto = true );
     SwConditionTxtFmtColl* MakeCondTxtFmtColl( const String &rFmtName,
                                                SwTxtFmtColl *pDerivedFrom,
-                                               sal_Bool bBroadcast = sal_False);
-    void DelTxtFmtColl(sal_uInt16 nFmt, sal_Bool bBroadcast = sal_False);
-    void DelTxtFmtColl( SwTxtFmtColl* pColl, sal_Bool bBroadcast = sal_False );
+                                               bool bBroadcast = false);
+    void DelTxtFmtColl(sal_uInt16 nFmt, bool bBroadcast = false);
+    void DelTxtFmtColl( SwTxtFmtColl* pColl, bool bBroadcast = false );
     /** Add 4th optional parameter <bResetListAttrs>.
      'side effect' of <SetTxtFmtColl> with <bReset = true> is that the hard
      attributes of the affected text nodes are cleared, except the break
@@ -1258,7 +1258,7 @@ public:
      The new parameter <bResetListAttrs> indicates, if the list attributes
      (list style, restart at and restart with) are cleared as well in case
      that <bReset = true> and the paragraph style has a list style attribute set. */
-    sal_Bool SetTxtFmtColl( const SwPaM &rRg, SwTxtFmtColl *pFmt,
+    bool SetTxtFmtColl( const SwPaM &rRg, SwTxtFmtColl *pFmt,
                             bool bReset = true,
                             bool bResetListAttrs = false );
     SwTxtFmtColl* FindTxtFmtCollByName( const String& rName ) const
@@ -1348,7 +1348,7 @@ public:
     /** Copy the complete PageDesc - beyond document and "deep"!
      Optionally copying of PoolFmtId, -HlpId can be prevented. */
     void CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
-                        sal_Bool bCopyPoolIds = sal_True );
+                        bool bCopyPoolIds = true );
 
     /** Copy header (with contents) from SrcFmt to DestFmt
      (can also be copied into other document). */
@@ -1821,9 +1821,9 @@ public:
 
     /** Adjust left margin via object bar (similar to adjustment of numerations).
      One can either change the margin "by" adding or substracting a given
-     offset or set it "to" this position (bModulus = sal_True). */
-    void MoveLeftMargin( const SwPaM& rPam, sal_Bool bRight = sal_True,
-                        sal_Bool bModulus = sal_True );
+     offset or set it "to" this position (bModulus = true). */
+    void MoveLeftMargin( const SwPaM& rPam, bool bRight = true,
+                        bool bModulus = true );
 
     /// Query NumberFormatter.
     inline       SvNumberFormatter* GetNumberFormatter( sal_Bool bCreate = sal_True );
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 3b1c1bb5b0bd..2c76a42a4aaa 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -872,9 +872,9 @@ public:
 
     /** Adjust left margin via object bar (similar to adjustment of numerations).
      One can either change the margin "by" adding or substracting a given
-     offset or set it "to" this position @param (bModulus = sal_True). */
-    sal_Bool IsMoveLeftMargin( sal_Bool bRight = sal_True, sal_Bool bModulus = sal_True ) const;
-    void MoveLeftMargin( sal_Bool bRight = sal_True, sal_Bool bModulus = sal_True );
+     offset or set it "to" this position @param (bModulus = true). */
+    bool IsMoveLeftMargin( bool bRight = true, bool bModulus = true ) const;
+    void MoveLeftMargin( bool bRight = true, bool bModulus = true );
 
     /// Query NumberFormater from document.
           SvNumberFormatter* GetNumberFormatter();
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 883165f62cf3..593cb55b38ab 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -55,7 +55,7 @@ class SW_DLLPUBLIC SwFmt : public SwModify
     sal_uInt16 nPoolHelpId;       ///< HelpId for this Pool-style.
     sal_uInt8 nPoolHlpFileId;     ///< FilePos to Doc to these style helps.
     sal_Bool   bWritten : 1;      ///< TRUE: already written.
-    sal_Bool   bAutoFmt : 1;      /**< FALSE: it is a template.
+    bool   bAutoFmt : 1;      /**< FALSE: it is a template.
                                        default is true! */
     sal_Bool   bFmtInDTOR : 1;    /**< TRUE: Format becomes deleted. In order to be able
                                        to recognize this in FmtChg-message!! */
@@ -161,8 +161,8 @@ public:
     void   ResetWritten()    { bWritten = sal_False; }
 
     /// Query / set AutoFmt-flag.
-    sal_Bool IsAuto() const                 { return bAutoFmt; }
-    void SetAuto( sal_Bool bNew = sal_False )   { bAutoFmt = bNew; }
+    bool IsAuto() const                 { return bAutoFmt; }
+    void SetAuto( bool bNew = false )   { bAutoFmt = bNew; }
 
     /// Query / set bAutoUpdateFmt-flag.
     sal_Bool IsAutoUpdateFmt() const                { return bAutoUpdateFmt; }
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 93e6faf43a71..bbf9aaed671d 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1430,7 +1430,7 @@ SwTableFmt* SwDoc::MakeTblFrmFmt( const String &rFmtName,
 
 SwFrmFmt *SwDoc::MakeFrmFmt(const String &rFmtName,
                             SwFrmFmt *pDerivedFrom,
-                            sal_Bool bBroadcast, sal_Bool bAuto)
+                            bool bBroadcast, bool bAuto)
 {
 
     SwFrmFmt *pFmt = new SwFrmFmt( GetAttrPool(), rFmtName, pDerivedFrom );
@@ -1457,7 +1457,7 @@ SwFrmFmt *SwDoc::MakeFrmFmt(const String &rFmtName,
 
 SwFmt *SwDoc::_MakeFrmFmt(const String &rFmtName,
                             SwFmt *pDerivedFrom,
-                            sal_Bool bBroadcast, sal_Bool bAuto)
+                            bool bBroadcast, bool bAuto)
 {
     SwFrmFmt *pFrmFmt = dynamic_cast<SwFrmFmt*>(pDerivedFrom);
     pFrmFmt = MakeFrmFmt( rFmtName, pFrmFmt, bBroadcast, bAuto );
@@ -1468,12 +1468,12 @@ SwFmt *SwDoc::_MakeFrmFmt(const String &rFmtName,
 // #i40550# - add parameter <bAuto> - not relevant
 SwCharFmt *SwDoc::MakeCharFmt( const String &rFmtName,
                                SwCharFmt *pDerivedFrom,
-                               sal_Bool bBroadcast,
-                               sal_Bool )
+                               bool bBroadcast,
+                               bool )
 {
     SwCharFmt *pFmt = new SwCharFmt( GetAttrPool(), rFmtName, pDerivedFrom );
     pCharFmtTbl->push_back( pFmt );
-    pFmt->SetAuto( sal_False );
+    pFmt->SetAuto( false );
     SetModified();
 
     if (GetIDocumentUndoRedo().DoesUndo())
@@ -1494,7 +1494,7 @@ SwCharFmt *SwDoc::MakeCharFmt( const String &rFmtName,
 
 SwFmt *SwDoc::_MakeCharFmt(const String &rFmtName,
                             SwFmt *pDerivedFrom,
-                            sal_Bool bBroadcast, sal_Bool bAuto)
+                            bool bBroadcast, bool bAuto)
 {
     SwCharFmt *pCharFmt = dynamic_cast<SwCharFmt*>(pDerivedFrom);
     pCharFmt = MakeCharFmt( rFmtName, pCharFmt, bBroadcast, bAuto );
@@ -1509,13 +1509,13 @@ SwFmt *SwDoc::_MakeCharFmt(const String &rFmtName,
 // #i40550# - add parameter <bAuto> - not relevant
 SwTxtFmtColl* SwDoc::MakeTxtFmtColl( const String &rFmtName,
                                      SwTxtFmtColl *pDerivedFrom,
-                                     sal_Bool bBroadcast,
-                                     sal_Bool )
+                                     bool bBroadcast,
+                                     bool )
 {
     SwTxtFmtColl *pFmtColl = new SwTxtFmtColl( GetAttrPool(), rFmtName,
                                                 pDerivedFrom );
     pTxtFmtCollTbl->push_back(pFmtColl);
-    pFmtColl->SetAuto( sal_False );
+    pFmtColl->SetAuto( false );
     SetModified();
 
     if (GetIDocumentUndoRedo().DoesUndo())
@@ -1534,7 +1534,7 @@ SwTxtFmtColl* SwDoc::MakeTxtFmtColl( const String &rFmtName,
 
 SwFmt *SwDoc::_MakeTxtFmtColl(const String &rFmtName,
                             SwFmt *pDerivedFrom,
-                            sal_Bool bBroadcast, sal_Bool bAuto)
+                            bool bBroadcast, bool bAuto)
 {
     SwTxtFmtColl *pTxtFmtColl = dynamic_cast<SwTxtFmtColl*>(pDerivedFrom);
     pTxtFmtColl = MakeTxtFmtColl( rFmtName, pTxtFmtColl, bBroadcast, bAuto );
@@ -1545,12 +1545,12 @@ SwFmt *SwDoc::_MakeTxtFmtColl(const String &rFmtName,
 //FEATURE::CONDCOLL
 SwConditionTxtFmtColl* SwDoc::MakeCondTxtFmtColl( const String &rFmtName,
                                                   SwTxtFmtColl *pDerivedFrom,
-                                                  sal_Bool bBroadcast)
+                                                  bool bBroadcast)
 {
     SwConditionTxtFmtColl*pFmtColl = new SwConditionTxtFmtColl( GetAttrPool(),
                                                     rFmtName, pDerivedFrom );
     pTxtFmtCollTbl->push_back(pFmtColl);
-    pFmtColl->SetAuto( sal_False );
+    pFmtColl->SetAuto( false );
     SetModified();
 
     if (bBroadcast)
@@ -1569,12 +1569,12 @@ SwGrfFmtColl* SwDoc::MakeGrfFmtColl( const String &rFmtName,
     SwGrfFmtColl *pFmtColl = new SwGrfFmtColl( GetAttrPool(), rFmtName,
                                                 pDerivedFrom );
     pGrfFmtCollTbl->push_back( pFmtColl );
-    pFmtColl->SetAuto( sal_False );
+    pFmtColl->SetAuto( false );
     SetModified();
     return pFmtColl;
 }
 
-void SwDoc::DelTxtFmtColl(sal_uInt16 nFmtColl, sal_Bool bBroadcast)
+void SwDoc::DelTxtFmtColl(sal_uInt16 nFmtColl, bool bBroadcast)
 {
     OSL_ENSURE( nFmtColl, "Remove fuer Coll 0." );
 
@@ -1604,7 +1604,7 @@ void SwDoc::DelTxtFmtColl(sal_uInt16 nFmtColl, sal_Bool bBroadcast)
     SetModified();
 }
 
-void SwDoc::DelTxtFmtColl( SwTxtFmtColl *pColl, sal_Bool bBroadcast )
+void SwDoc::DelTxtFmtColl( SwTxtFmtColl *pColl, bool bBroadcast )
 {
     sal_uInt16 nFmt = pTxtFmtCollTbl->GetPos( pColl );
     OSL_ENSURE( USHRT_MAX != nFmt, "Collection not found," );
@@ -1684,7 +1684,7 @@ static bool lcl_SetTxtFmtColl( const SwNodePtr& rpNode, void* pArgs )
     return true;
 }
 
-sal_Bool SwDoc::SetTxtFmtColl( const SwPaM &rRg,
+bool SwDoc::SetTxtFmtColl( const SwPaM &rRg,
                            SwTxtFmtColl *pFmt,
                            bool bReset,
                            bool bResetListAttrs )
@@ -1692,7 +1692,7 @@ sal_Bool SwDoc::SetTxtFmtColl( const SwPaM &rRg,
     SwDataChanged aTmp( rRg );
     const SwPosition *pStt = rRg.Start(), *pEnd = rRg.End();
     SwHistory* pHst = 0;
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
 
     if (GetIDocumentUndoRedo().DoesUndo())
     {
@@ -1712,7 +1712,7 @@ sal_Bool SwDoc::SetTxtFmtColl( const SwPaM &rRg,
     GetNodes().ForEach( pStt->nNode.GetIndex(), pEnd->nNode.GetIndex()+1,
                         lcl_SetTxtFmtColl, &aPara );
     if( !aPara.nWhich )
-        bRet = sal_False;           // didn't find a valid Node
+        bRet = false;           // didn't find a valid Node
 
     if( bRet )
         SetModified();
@@ -1744,7 +1744,7 @@ SwFmt* SwDoc::CopyFmt( const SwFmt& rFmt,
 
     // Create the format and copy the attributes
     // #i40550#
-    SwFmt* pNewFmt = (this->*fnCopyFmt)( rFmt.GetName(), pParent, sal_False, sal_True );
+    SwFmt* pNewFmt = (this->*fnCopyFmt)( rFmt.GetName(), pParent, false, true );
     pNewFmt->SetAuto( rFmt.IsAuto() );
     pNewFmt->CopyAttrs( rFmt, sal_True );           // copy the attributes
 
@@ -1795,7 +1795,7 @@ SwTxtFmtColl* SwDoc::CopyTxtColl( const SwTxtFmtColl& rColl )
         pNewColl = new SwConditionTxtFmtColl( GetAttrPool(), rColl.GetName(),
                                                 pParent);
         pTxtFmtCollTbl->push_back( pNewColl );
-        pNewColl->SetAuto( sal_False );
+        pNewColl->SetAuto( false );
         SetModified();
 
         // copy the conditions
@@ -1905,7 +1905,7 @@ void SwDoc::CopyFmtArr( const SwFmtsBase& rSourceArr,
                 MakeCondTxtFmtColl( pSrc->GetName(), (SwTxtFmtColl*)&rDfltFmt );
             else
                 // #i40550#
-                (this->*fnCopyFmt)( pSrc->GetName(), &rDfltFmt, sal_False, sal_True );
+                (this->*fnCopyFmt)( pSrc->GetName(), &rDfltFmt, false, true );
         }
     }
 
@@ -1917,7 +1917,7 @@ void SwDoc::CopyFmtArr( const SwFmtsBase& rSourceArr,
             continue;
 
         pDest = FindFmtByName( rDestArr, pSrc->GetName() );
-        pDest->SetAuto( sal_False );
+        pDest->SetAuto( false );
         pDest->DelDiffs( *pSrc );
 
         // #i94285#: existing <SwFmtPageDesc> instance, before copying attributes
@@ -2034,7 +2034,7 @@ void SwDoc::CopyPageDescHeaderFooterImpl( bool bCpyHeader,
 }
 
 void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
-                            sal_Bool bCopyPoolIds )
+                            bool bCopyPoolIds )
 {
     bool bNotifyLayout = false;
     SwRootFrm* pTmpRoot = GetCurrentLayout();//swmod 080219
@@ -2219,7 +2219,7 @@ SwFmt* SwDoc::FindFmtByName( const SwFmtsBase& rFmtArr,
     return pFnd;
 }
 
-void SwDoc::MoveLeftMargin( const SwPaM& rPam, sal_Bool bRight, sal_Bool bModulus )
+void SwDoc::MoveLeftMargin( const SwPaM& rPam, bool bRight, bool bModulus )
 {
     SwHistory* pHistory = 0;
     if (GetIDocumentUndoRedo().DoesUndo())
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 87527a2593be..29829d30d7d0 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -1156,10 +1156,10 @@ SwFmt* SwDoc::GetFmtFromPool( sal_uInt16 nId )
             switch (nId & (COLL_GET_RANGE_BITS + POOLGRP_NOCOLLID) )
             {
                 case POOLGRP_CHARFMT:
-                    pNewFmt = _MakeCharFmt(aNm, pDeriveFmt, sal_False, sal_True);
+                    pNewFmt = _MakeCharFmt(aNm, pDeriveFmt, false, true);
                 break;
                 case POOLGRP_FRAMEFMT:
-                    pNewFmt = _MakeFrmFmt(aNm, pDeriveFmt, sal_False, sal_True);
+                    pNewFmt = _MakeFrmFmt(aNm, pDeriveFmt, false, true);
                 break;
                 default:
                 break;
@@ -1169,7 +1169,7 @@ SwFmt* SwDoc::GetFmtFromPool( sal_uInt16 nId )
         if( !bIsModified )
             ResetModified();
         pNewFmt->SetPoolFmtId( nId );
-        pNewFmt->SetAuto( sal_False );      // no AutoFormat
+        pNewFmt->SetAuto( false );      // no AutoFormat
     }
 
     switch( nId )
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index d60925d766a8..14206cd8fdf1 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -377,15 +377,15 @@ sal_uInt16 SwEditShell::GetSeqFtnList( SwSeqFldList& rList, bool bEndNotes )
 
 
 // Adjust left margin via object bar (similar to adjustment of numerations).
-sal_Bool SwEditShell::IsMoveLeftMargin( sal_Bool bRight, sal_Bool bModulus ) const
+bool SwEditShell::IsMoveLeftMargin( bool bRight, bool bModulus ) const
 {
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
 
     const SvxTabStopItem& rTabItem = (SvxTabStopItem&)GetDoc()->
                                 GetDefault( RES_PARATR_TABSTOP );
     sal_uInt16 nDefDist = static_cast<sal_uInt16>(rTabItem.Count() ? rTabItem[0].GetTabPos() : 1134);
     if( !nDefDist )
-        return sal_False;
+        return false;
 
     FOREACHPAM_START(this)
 
@@ -415,7 +415,7 @@ sal_Bool SwEditShell::IsMoveLeftMargin( sal_Bool bRight, sal_Bool bModulus ) con
                         bRet = nFrmWidth > ( nNext + MM50 );
                     }
                     else
-                        bRet = sal_False;
+                        bRet = false;
                 }
             }
 
@@ -426,7 +426,7 @@ sal_Bool SwEditShell::IsMoveLeftMargin( sal_Bool bRight, sal_Bool bModulus ) con
     return bRet;
 }
 
-void SwEditShell::MoveLeftMargin( sal_Bool bRight, sal_Bool bModulus )
+void SwEditShell::MoveLeftMargin( bool bRight, bool bModulus )
 {
     StartAllAction();
     StartUndo( UNDO_START );
diff --git a/sw/source/core/inc/UndoAttribute.hxx b/sw/source/core/inc/UndoAttribute.hxx
index a380c9d879bb..b2614d528737 100644
--- a/sw/source/core/inc/UndoAttribute.hxx
+++ b/sw/source/core/inc/UndoAttribute.hxx
@@ -200,7 +200,7 @@ class SwUndoMoveLeftMargin : public SwUndo, private SwUndRng
     const bool m_bModulus;
 
 public:
-    SwUndoMoveLeftMargin( const SwPaM&, sal_Bool bRight, sal_Bool bModulus );
+    SwUndoMoveLeftMargin( const SwPaM&, sal_Bool bRight, bool bModulus );
 
     virtual ~SwUndoMoveLeftMargin();
 
diff --git a/sw/source/core/undo/SwUndoFmt.cxx b/sw/source/core/undo/SwUndoFmt.cxx
index b2d8bab7888e..01baf2a9ba92 100644
--- a/sw/source/core/undo/SwUndoFmt.cxx
+++ b/sw/source/core/undo/SwUndoFmt.cxx
@@ -215,7 +215,7 @@ SwFmt * SwUndoTxtFmtCollCreate::Create(SwFmt * pDerivedFrom)
 
 void SwUndoTxtFmtCollCreate::Delete()
 {
-    pDoc->DelTxtFmtColl((SwTxtFmtColl *) pNew, sal_True);
+    pDoc->DelTxtFmtColl((SwTxtFmtColl *) pNew, true);
 }
 
 SwFmt * SwUndoTxtFmtCollCreate::Find(const String & rName) const
@@ -236,7 +236,7 @@ SwFmt * SwUndoTxtFmtCollDelete::Create(SwFmt * pDerivedFrom)
 
 void SwUndoTxtFmtCollDelete::Delete(SwFmt * pOld)
 {
-    pDoc->DelTxtFmtColl((SwTxtFmtColl *) pOld, sal_True);
+    pDoc->DelTxtFmtColl((SwTxtFmtColl *) pOld, true);
 }
 
 SwFmt * SwUndoTxtFmtCollDelete::Find(const String & rName) const
@@ -265,7 +265,7 @@ SwUndoCharFmtCreate::SwUndoCharFmtCreate(SwCharFmt * pNewFmt,
 
 SwFmt * SwUndoCharFmtCreate::Create(SwFmt * pDerivedFrom)
 {
-    return pDoc->MakeCharFmt(sNewName, (SwCharFmt *) pDerivedFrom, sal_True);
+    return pDoc->MakeCharFmt(sNewName, (SwCharFmt *) pDerivedFrom, true);
 }
 
 void SwUndoCharFmtCreate::Delete()
@@ -285,7 +285,7 @@ SwUndoCharFmtDelete::SwUndoCharFmtDelete(SwCharFmt * pOld, SwDoc * pDocument)
 
 SwFmt * SwUndoCharFmtDelete::Create(SwFmt * pDerivedFrom)
 {
-    return pDoc->MakeCharFmt(sOldName, (SwCharFmt *) pDerivedFrom, sal_True);
+    return pDoc->MakeCharFmt(sOldName, (SwCharFmt *) pDerivedFrom, true);
 }
 
 void SwUndoCharFmtDelete::Delete(SwFmt * pFmt)
@@ -320,7 +320,7 @@ SwUndoFrmFmtCreate::SwUndoFrmFmtCreate(SwFrmFmt * pNewFmt,
 
 SwFmt * SwUndoFrmFmtCreate::Create(SwFmt * pDerivedFrom)
 {
-    return pDoc->MakeFrmFmt(sNewName, (SwFrmFmt *) pDerivedFrom, sal_True, bAuto);
+    return pDoc->MakeFrmFmt(sNewName, (SwFrmFmt *) pDerivedFrom, true, bAuto);
 }
 
 void SwUndoFrmFmtCreate::Delete()
@@ -340,7 +340,7 @@ SwUndoFrmFmtDelete::SwUndoFrmFmtDelete(SwFrmFmt * pOld, SwDoc * pDocument)
 
 SwFmt * SwUndoFrmFmtDelete::Create(SwFmt * pDerivedFrom)
 {
-    return pDoc->MakeFrmFmt(sOldName, (SwFrmFmt *) pDerivedFrom, sal_True);
+    return pDoc->MakeFrmFmt(sOldName, (SwFrmFmt *) pDerivedFrom, true);
 }
 
 void SwUndoFrmFmtDelete::Delete(SwFmt * pFmt)
diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index d8efc07fe0b2..dc69cfcccead 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -1021,7 +1021,7 @@ void SwUndoDefaultAttr::RedoImpl(::sw::UndoRedoContext & rContext)
 }
 
 SwUndoMoveLeftMargin::SwUndoMoveLeftMargin(
-            const SwPaM& rPam, sal_Bool bFlag, sal_Bool bMod )
+            const SwPaM& rPam, sal_Bool bFlag, bool bMod )
     : SwUndo( bFlag ? UNDO_INC_LEFTMARGIN : UNDO_DEC_LEFTMARGIN )
     , SwUndRng( rPam )
     , m_pHistory( new SwHistory )
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index b53bc4857010..9ff6576a85a1 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -1123,7 +1123,7 @@ sal_Bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
             if( !pCFmt )
             {
                 pCFmt = pDoc->MakeCharFmt( aName, pParentCFmt );
-                pCFmt->SetAuto( sal_False );
+                pCFmt->SetAuto( false );
             }
         }
 
@@ -1209,7 +1209,7 @@ SwCharFmt* SwCSS1Parser::GetChrFmt( sal_uInt16 nToken2, const String& rClass ) c
         if( !pCFmt )
         {
             pCFmt = pDoc->MakeCharFmt( sCName, pDoc->GetDfltCharFmt() );
-            pCFmt->SetAuto( sal_False );
+            pCFmt->SetAuto( false );
         }
     }
 
@@ -1234,7 +1234,7 @@ SwCharFmt* SwCSS1Parser::GetChrFmt( sal_uInt16 nToken2, const String& rClass ) c
             if( pClass )
             {
                 pCFmt = pDoc->MakeCharFmt( aTmp, pCFmt );
-                pCFmt->SetAuto( sal_False );
+                pCFmt->SetAuto( false );
                 SfxItemSet aItemSet( pClass->GetItemSet() );
                 SetCharFmtAttrs( pCFmt, aItemSet );
             }
@@ -1404,7 +1404,7 @@ const SwPageDesc *SwCSS1Parser::GetPageDesc( sal_uInt16 nPoolId, sal_Bool bCreat
         pPageDesc = FindPageDesc( pDoc, nPoolId, nPage );
         OSL_ENSURE( pPageDesc==pNewPageDesc, "Seitenvorlage nicht gefunden" );
 
-        pDoc->CopyPageDesc( *pMasterPageDesc, *pNewPageDesc, sal_False );
+        pDoc->CopyPageDesc( *pMasterPageDesc, *pNewPageDesc, false );
 
         // Die Vorlagen an ihren neuen Zweck anpassen.
         const SwPageDesc *pFollow = 0;
@@ -1569,7 +1569,7 @@ void SwCSS1Parser::FillDropCap( SwFmtDrop& rDrop,
         if( !pCFmt )
         {
             pCFmt = pDoc->MakeCharFmt( aName, pDoc->GetDfltCharFmt() );
-            pCFmt->SetAuto( sal_False );
+            pCFmt->SetAuto( false );
         }
         SetCharFmtAttrs( pCFmt, rItemSet );
 
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index c6ef0ad59508..c1b4ac7fb30b 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1595,8 +1595,7 @@ bool SwWW8ImplReader::SetTxtFmtCollAndListLevel(const SwPaM& rRg,
     bool bRes = true;
     if( rStyleInfo.pFmt && rStyleInfo.bColl )
     {
-        bRes = rDoc.SetTxtFmtColl(rRg, (SwTxtFmtColl*)rStyleInfo.pFmt)
-            ? true : false;
+        bRes = rDoc.SetTxtFmtColl(rRg, (SwTxtFmtColl*)rStyleInfo.pFmt);
         SwTxtNode* pTxtNode = pPaM->GetNode()->GetTxtNode();
         OSL_ENSURE( pTxtNode, "No Text-Node at PaM-Position" );
         // make code robust
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index 43b25474488b..275c3c0f09e2 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -1709,7 +1709,7 @@ void SwDocStyleSheet::Create()
             if( !pCharFmt )
                 pCharFmt = rDoc.MakeCharFmt(aName,
                                             rDoc.GetDfltCharFmt());
-            pCharFmt->SetAuto( sal_False );
+            pCharFmt->SetAuto( false );
             break;
 
         case SFX_STYLE_FAMILY_PARA :
@@ -1727,7 +1727,7 @@ void SwDocStyleSheet::Create()
         case SFX_STYLE_FAMILY_FRAME:
             pFrmFmt = lcl_FindFrmFmt( rDoc, aName );
             if( !pFrmFmt )
-                pFrmFmt = rDoc.MakeFrmFmt(aName, rDoc.GetDfltFrmFmt(), sal_False, sal_False);
+                pFrmFmt = rDoc.MakeFrmFmt(aName, rDoc.GetDfltFrmFmt(), false, false);
 
             break;
 
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index 4e39c9da3a41..bfbf126eb70f 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -560,7 +560,7 @@ void SwNumRulesWithName::_SwNumFmtGlobal::ChgNumFmt( SwWrtShell& rSh,
             if( IsPoolUserFmt( nCharPoolId ) )
             {
                 pFmt = rSh.MakeCharFmt( sCharFmtName );
-                pFmt->SetAuto( sal_False );
+                pFmt->SetAuto( false );
             }
             else
                 pFmt = rSh.GetCharFmtFromPool( nCharPoolId );
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 8180724b5fa0..8a9e6dc5d49e 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -807,7 +807,7 @@ static void lcl_CopyFollowPageDesc(
         sal_uInt16 nNewDesc = pTargetDoc->MakePageDesc( sNewFollowPageDesc );
         SwPageDesc& rTargetFollowPageDesc = pTargetDoc->GetPageDesc( nNewDesc );
 
-        pTargetDoc->CopyPageDesc( *pFollowPageDesc, rTargetFollowPageDesc, sal_False );
+        pTargetDoc->CopyPageDesc( *pFollowPageDesc, rTargetFollowPageDesc, false );
         SwPageDesc aDesc( rTargetPageDesc );
         aDesc.SetFollow( &rTargetFollowPageDesc );
         pTargetDoc->ChgPageDesc( rTargetPageDesc.GetName(), aDesc );
@@ -1100,7 +1100,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
                                     SwPageDesc* pTargetPageDesc = pTargetShell->FindPageDescByName( sNewPageDescName );
                                     if(pSourcePageDesc && pTargetPageDesc)
                                     {
-                                        pTargetDoc->CopyPageDesc( *pSourcePageDesc, *pTargetPageDesc, sal_False );
+                                        pTargetDoc->CopyPageDesc( *pSourcePageDesc, *pTargetPageDesc, false );
                                         sModifiedStartingPageDesc = sNewPageDescName;
                                         lcl_CopyFollowPageDesc( *pTargetShell, *pSourcePageDesc, *pTargetPageDesc, nDocNo );
                                     }
@@ -2857,7 +2857,7 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
 
                 if(pWorkPageDesc && pTargetPageDesc)
                 {
-                    pTargetDoc->CopyPageDesc( *pWorkPageDesc, *pTargetPageDesc, sal_False );
+                    pTargetDoc->CopyPageDesc( *pWorkPageDesc, *pTargetPageDesc, false );
                     sModifiedStartingPageDesc = sNewPageDescName;
                     lcl_CopyFollowPageDesc( *pTargetShell, *pWorkPageDesc, *pTargetPageDesc, nDocNo );
                 }
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index cb062a99adb2..067568930035 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -1444,7 +1444,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
                 sal_uInt16 nHtmlMode = ::GetHtmlMode(GetView().GetDocShell());
                 nHtmlMode &= HTMLMODE_ON|HTMLMODE_SOME_STYLES;
                 if( (nHtmlMode == HTMLMODE_ON) || !rSh.IsMoveLeftMargin(
-                                        SID_INC_INDENT == nWhich, sal_True ))
+                                        SID_INC_INDENT == nWhich, true ))
                     rSet.DisableItem( nWhich );
             }
             break;
@@ -1456,7 +1456,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
                 nHtmlMode &= HTMLMODE_ON|HTMLMODE_SOME_STYLES;
                 if( (nHtmlMode == HTMLMODE_ON) ||
                     !rSh.IsMoveLeftMargin( FN_INC_INDENT_OFFSET == nWhich,
-                                            sal_False ))
+                                            false ))
                     rSet.DisableItem( nWhich );
             }
             break;
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 8f47d9bcae8a..c0c4a42afc05 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -428,7 +428,7 @@ sal_Bool SwView::InsertGraphicDlg( SfxRequest& rReq )
             if(!pFmt)
                 pFmt = pDoc->MakeFrmFmt(sGraphicFormat,
                                         pDocShell->GetDoc()->GetDfltFrmFmt(),
-                                        sal_True, sal_False);
+                                        true, false);
             rSh.SetFrmFmt( pFmt );
         }