sal_Bool to bool

Change-Id: Idfbc33106b20b06c5247c50d099972305f016a51

17 files changed, 73 insertions, 73 deletions

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 0183d1f7e971..ca5efc9dd9f8 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1803,7 +1803,7 @@ public:
     // Query if ::com::sun::star::util::URL was visited.
     // Query via Doc, if only a ::com::sun::star::text::Bookmark has been given.
     // In this case the document name has to be set in front.
-    sal_Bool IsVisitedURL( const String& rURL ) const;
+    bool IsVisitedURL( const String& rURL ) const;
 
     /// Save current values for automatic registration of exceptions in Autocorrection.
     void SetAutoCorrExceptWord( SwAutoCorrExceptWord* pNew );
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 941e20c9c760..5cb721bf750b 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -103,7 +103,7 @@ public:
     inline void SetNextTxtFmtColl(SwTxtFmtColl& rNext);
     SwTxtFmtColl& GetNextTxtFmtColl() const { return *pNextTxtFmtColl; }
 
-    sal_Bool IsAtDocNodeSet() const;
+    bool IsAtDocNodeSet() const;
 
     void SetAttrOutlineLevel( int );
     int  GetAttrOutlineLevel() const;
@@ -117,9 +117,9 @@ public:
 
     /** Override to recognize changes on the <SwNumRuleItem> and register/unregister
      the paragragh style at the corresponding <SwNumRule> instance. */
-    virtual sal_Bool SetFmtAttr( const SfxPoolItem& rAttr );
-    virtual sal_Bool SetFmtAttr( const SfxItemSet& rSet );
-    virtual sal_Bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 );
+    virtual bool SetFmtAttr( const SfxPoolItem& rAttr );
+    virtual bool SetFmtAttr( const SfxItemSet& rSet );
+    virtual bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 );
 
     /// Override <ResetAllFmtAttr()> to stay assigned to list level of outline style.
     virtual sal_uInt16 ResetAllFmtAttr();
@@ -256,7 +256,7 @@ public:
     const SwCollCondition* HasCondition( const SwCollCondition& rCond ) const;
     const SwFmtCollConditions& GetCondColls() const     { return aCondColls; }
     void InsertCondition( const SwCollCondition& rCond );
-    sal_Bool RemoveCondition( const SwCollCondition& rCond );
+    bool RemoveCondition( const SwCollCondition& rCond );
 
     void SetConditions( const SwFmtCollConditions& );
 };
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 8b8b61b8cab4..51cea190af81 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -98,9 +98,9 @@ public:
                                           sal_Bool bInParents = sal_True ) const;
     inline SfxItemState GetItemState( sal_uInt16 nWhich, sal_Bool bSrchInParent = sal_True,
                                     const SfxPoolItem **ppItem = 0 ) const;
-    virtual sal_Bool SetFmtAttr( const SfxPoolItem& rAttr );
-    virtual sal_Bool SetFmtAttr( const SfxItemSet& rSet );
-    virtual sal_Bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 );
+    virtual bool SetFmtAttr( const SfxPoolItem& rAttr );
+    virtual bool SetFmtAttr( const SfxItemSet& rSet );
+    virtual bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 );
 
     /** Takes all hints from Delta-Array,
         @return count of deleted hints. */
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index a3c06d2780c8..2f027e9c9297 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -64,12 +64,12 @@ class SwHTMLTableLayoutCnts
     sal_uInt8 nPass1Done;           ///< How many times has Pass 1 been called?
     sal_uInt8 nWidthSet;            ///< How many times has the width been set?
 
-    sal_Bool bNoBreakTag;           ///< <NOBR>-Tag over complete content.
+    bool bNoBreakTag;           ///< <NOBR>-Tag over complete content.
 
 public:
 
     SwHTMLTableLayoutCnts( const SwStartNode* pSttNd, SwHTMLTableLayout* pTab,
-                           sal_Bool bNoBreakTag, SwHTMLTableLayoutCnts* pNxt );
+                           bool bNoBreakTag, SwHTMLTableLayoutCnts* pNxt );
 
     ~SwHTMLTableLayoutCnts();
 
@@ -89,7 +89,7 @@ public:
     void SetPass1Done( sal_uInt8 nRef ) { nPass1Done = nRef; }
     sal_Bool IsPass1Done( sal_uInt8 nRef ) const { return nRef==nPass1Done; }
 
-    sal_Bool HasNoBreakTag() const { return bNoBreakTag; }
+    bool HasNoBreakTag() const { return bNoBreakTag; }
 };
 
 class SwHTMLTableLayoutCell
diff --git a/sw/inc/lineinfo.hxx b/sw/inc/lineinfo.hxx
index 8dcb73255bc6..22bb1a9167a8 100644
--- a/sw/inc/lineinfo.hxx
+++ b/sw/inc/lineinfo.hxx
@@ -57,7 +57,7 @@ public:
     SwLineNumberInfo(const SwLineNumberInfo&);
 
     SwLineNumberInfo& operator=(const SwLineNumberInfo&);
-    sal_Bool operator==( const SwLineNumberInfo& rInf ) const;
+    bool operator==( const SwLineNumberInfo& rInf ) const;
 
     SwCharFmt *GetCharFmt( IDocumentStylePoolAccess& rIDSPA ) const;
     void SetCharFmt( SwCharFmt* );
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 317b4d32e692..7bc20283de88 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -184,11 +184,11 @@ public:
 #ifndef _FESHVIEW_ONLY_INLINE_NEEDED
 
     /// Query link-data.
-    sal_Bool IsGrfLink() const                  { return refLink.Is(); }
-    inline sal_Bool IsLinkedFile() const;
-    inline sal_Bool IsLinkedDDE() const;
+    bool IsGrfLink() const                  { return refLink.Is(); }
+    inline bool IsLinkedFile() const;
+    inline bool IsLinkedDDE() const;
     ::sfx2::SvBaseLinkRef GetLink() const    { return refLink; }
-    sal_Bool GetFileFilterNms( String* pFileNm, String* pFilterNm ) const;
+    bool GetFileFilterNms( String* pFileNm, String* pFilterNm ) const;
     void ReleaseLink();
 
     /** Scale an image-map: the image-map becomes zoomed in / out by
@@ -221,11 +221,11 @@ inline const SwGrfNode   *SwNode::GetGrfNode() const
 }
 
 #ifndef _FESHVIEW_ONLY_INLINE_NEEDED
-inline sal_Bool SwGrfNode::IsLinkedFile() const
+inline bool SwGrfNode::IsLinkedFile() const
 {
     return refLink.Is() && OBJECT_CLIENT_GRF == refLink->GetObjType();
 }
-inline sal_Bool SwGrfNode::IsLinkedDDE() const
+inline bool SwGrfNode::IsLinkedDDE() const
 {
     return refLink.Is() && OBJECT_CLIENT_DDE == refLink->GetObjType();
 }
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index f9287c3feaa3..65b3d0022837 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -386,7 +386,7 @@ sal_Bool SwFmt::SetDerivedFrom(SwFmt *pDerFrom)
     return sal_True;
 }
 
-sal_Bool SwFmt::SetFmtAttr( const SfxPoolItem& rAttr )
+bool SwFmt::SetFmtAttr( const SfxPoolItem& rAttr )
 {
     if ( IsInCache() || IsInSwFntCache() )
     {
@@ -396,14 +396,14 @@ sal_Bool SwFmt::SetFmtAttr( const SfxPoolItem& rAttr )
 
     // if Modify is locked then no modifications will be sent;
     // but call Modify always for FrmFmts
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const sal_uInt16 nFmtWhich = Which();
     if( IsModifyLocked() ||
         ( !GetDepends() &&
           (RES_GRFFMTCOLL == nFmtWhich  ||
            RES_TXTFMTCOLL == nFmtWhich ) ) )
     {
-        if( 0 != ( bRet = (0 != aSet.Put( rAttr ))) )
+        if( ( bRet = (0 != aSet.Put( rAttr ))) )
             aSet.SetModifyAtAttr( this );
         // #i71574#
         if ( nFmtWhich == RES_TXTFMTCOLL && rAttr.Which() == RES_PARATR_NUMRULE )
@@ -431,10 +431,10 @@ sal_Bool SwFmt::SetFmtAttr( const SfxPoolItem& rAttr )
     return bRet;
 }
 
-sal_Bool SwFmt::SetFmtAttr( const SfxItemSet& rSet )
+bool SwFmt::SetFmtAttr( const SfxItemSet& rSet )
 {
     if( !rSet.Count() )
-        return sal_False;
+        return false;
 
     if ( IsInCache() )
     {
@@ -445,14 +445,14 @@ sal_Bool SwFmt::SetFmtAttr( const SfxItemSet& rSet )
 
     // if Modify is locked then no modifications will be sent;
     // but call Modify always for FrmFmts
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const sal_uInt16 nFmtWhich = Which();
     if ( IsModifyLocked() ||
          ( !GetDepends() &&
            ( RES_GRFFMTCOLL == nFmtWhich ||
              RES_TXTFMTCOLL == nFmtWhich ) ) )
     {
-        if( 0 != ( bRet = (0 != aSet.Put( rSet ))) )
+        if( ( bRet = (0 != aSet.Put( rSet ))) )
             aSet.SetModifyAtAttr( this );
         // #i71574#
         if ( nFmtWhich == RES_TXTFMTCOLL )
@@ -478,10 +478,10 @@ sal_Bool SwFmt::SetFmtAttr( const SfxItemSet& rSet )
 }
 
 // remove Hint using nWhich from array with delta
-sal_Bool SwFmt::ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
+bool SwFmt::ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
 {
     if( !aSet.Count() )
-        return sal_False;
+        return false;
 
     if( !nWhich2 || nWhich2 < nWhich1 )
         nWhich2 = nWhich1; // then set to 1st ID, only this item
@@ -500,7 +500,7 @@ sal_Bool SwFmt::ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
 
     SwAttrSet aOld( *aSet.GetPool(), aSet.GetRanges() ),
               aNew( *aSet.GetPool(), aSet.GetRanges() );
-    sal_Bool bRet = 0 != aSet.ClearItem_BC( nWhich1, nWhich2, &aOld, &aNew );
+    bool bRet = 0 != aSet.ClearItem_BC( nWhich1, nWhich2, &aOld, &aNew );
     if( bRet )
     {
         SwAttrSetChg aChgOld( aSet, aOld );
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index 0e65267f7e15..7058d8b6c00c 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -335,18 +335,18 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         SwFmtColl::Modify( pOld, pNew );
 }
 
-sal_Bool SwTxtFmtColl::IsAtDocNodeSet() const
+bool SwTxtFmtColl::IsAtDocNodeSet() const
 {
     SwIterator<SwCntntNode,SwFmtColl> aIter( *this );
     const SwNodes& rNds = GetDoc()->GetNodes();
     for( SwCntntNode* pNode = aIter.First(); pNode; pNode = aIter.Next() )
         if( &(pNode->GetNodes()) == &rNds )
-            return sal_True;
+            return true;
 
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwTxtFmtColl::SetFmtAttr( const SfxPoolItem& rAttr )
+bool SwTxtFmtColl::SetFmtAttr( const SfxPoolItem& rAttr )
 {
     const bool bIsNumRuleItem = rAttr.Which() == RES_PARATR_NUMRULE;
     if ( bIsNumRuleItem )
@@ -354,7 +354,7 @@ sal_Bool SwTxtFmtColl::SetFmtAttr( const SfxPoolItem& rAttr )
         TxtFmtCollFunc::RemoveFromNumRule( *this );
     }
 
-    const sal_Bool bRet = SwFmtColl::SetFmtAttr( rAttr );
+    const bool bRet = SwFmtColl::SetFmtAttr( rAttr );
 
     if ( bIsNumRuleItem )
     {
@@ -364,7 +364,7 @@ sal_Bool SwTxtFmtColl::SetFmtAttr( const SfxPoolItem& rAttr )
     return bRet;
 }
 
-sal_Bool SwTxtFmtColl::SetFmtAttr( const SfxItemSet& rSet )
+bool SwTxtFmtColl::SetFmtAttr( const SfxItemSet& rSet )
 {
     const bool bIsNumRuleItemAffected =
                 rSet.GetItemState( RES_PARATR_NUMRULE, sal_False ) == SFX_ITEM_SET;
@@ -373,7 +373,7 @@ sal_Bool SwTxtFmtColl::SetFmtAttr( const SfxItemSet& rSet )
         TxtFmtCollFunc::RemoveFromNumRule( *this );
     }
 
-    const sal_Bool bRet = SwFmtColl::SetFmtAttr( rSet );
+    const bool bRet = SwFmtColl::SetFmtAttr( rSet );
 
     if ( bIsNumRuleItemAffected )
     {
@@ -383,7 +383,7 @@ sal_Bool SwTxtFmtColl::SetFmtAttr( const SfxItemSet& rSet )
     return bRet;
 }
 
-sal_Bool SwTxtFmtColl::ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
+bool SwTxtFmtColl::ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
 {
     const bool bIsNumRuleItemAffected =
                 ( nWhich2 != 0 && nWhich2 > nWhich1 )
@@ -395,7 +395,7 @@ sal_Bool SwTxtFmtColl::ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
         TxtFmtCollFunc::RemoveFromNumRule( *this );
     }
 
-    const sal_Bool bRet = SwFmtColl::ResetFmtAttr( nWhich1, nWhich2 );
+    const bool bRet = SwFmtColl::ResetFmtAttr( nWhich1, nWhich2 );
 
     return bRet;
 }
@@ -597,14 +597,14 @@ void SwConditionTxtFmtColl::InsertCondition( const SwCollCondition& rCond )
 }
 
 
-sal_Bool SwConditionTxtFmtColl::RemoveCondition( const SwCollCondition& rCond )
+bool SwConditionTxtFmtColl::RemoveCondition( const SwCollCondition& rCond )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     for( sal_uInt16 n = 0; n < aCondColls.size(); ++n )
         if( aCondColls[ n ] == rCond )
         {
             aCondColls.erase( aCondColls.begin() + n );
-            bRet = sal_True;
+            bRet = true;
         }
 
     return bRet;
diff --git a/sw/source/core/doc/gctable.cxx b/sw/source/core/doc/gctable.cxx
index 3bd51109fa6e..2a2e31290b15 100644
--- a/sw/source/core/doc/gctable.cxx
+++ b/sw/source/core/doc/gctable.cxx
@@ -41,7 +41,7 @@ inline const SvxBorderLine* GetLineTB( const SvxBoxItem* pBox, bool bTop )
 }
 
 
-sal_Bool _SwGCBorder_BoxBrd::CheckLeftBorderOfFormat( const SwFrmFmt& rFmt )
+bool _SwGCBorder_BoxBrd::CheckLeftBorderOfFormat( const SwFrmFmt& rFmt )
 {
     const SvxBorderLine* pBrd;
     const SfxPoolItem* pItem;
@@ -49,10 +49,10 @@ sal_Bool _SwGCBorder_BoxBrd::CheckLeftBorderOfFormat( const SwFrmFmt& rFmt )
         0 != ( pBrd = ((SvxBoxItem*)pItem)->GetLeft() ) )
     {
         if( *pBrdLn == *pBrd )
-            bAnyBorderFnd = sal_True;
-        return sal_True;
+            bAnyBorderFnd = true;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
 
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index 4dea4f718a43..409ae1c3ea50 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -88,7 +88,7 @@ public:
 
 SwHTMLTableLayoutCnts::SwHTMLTableLayoutCnts( const SwStartNode *pSttNd,
                                           SwHTMLTableLayout* pTab,
-                                          sal_Bool bNoBrTag,
+                                          bool bNoBrTag,
                                           SwHTMLTableLayoutCnts* pNxt ) :
     pNext( pNxt ), pBox( 0 ), pTable( pTab ), pStartNode( pSttNd ),
     nPass1Done( 0 ), nWidthSet( 0 ), bNoBreakTag( bNoBrTag )
@@ -437,7 +437,7 @@ SwFrmFmt *SwHTMLTableLayout::FindFlyFrmFmt() const
 
 static void lcl_GetMinMaxSize( sal_uLong& rMinNoAlignCnts, sal_uLong& rMaxNoAlignCnts,
                         sal_uLong& rAbsMinNoAlignCnts,
-                        SwTxtNode *pTxtNd, sal_uLong nIdx, sal_Bool bNoBreak )
+                        SwTxtNode *pTxtNd, sal_uLong nIdx, bool bNoBreak )
 {
     pTxtNd->GetMinMaxSize( nIdx, rMinNoAlignCnts, rMaxNoAlignCnts,
                            rAbsMinNoAlignCnts );
diff --git a/sw/source/core/doc/lineinfo.cxx b/sw/source/core/doc/lineinfo.cxx
index 00552a91c8bd..5aa327083d4e 100644
--- a/sw/source/core/doc/lineinfo.cxx
+++ b/sw/source/core/doc/lineinfo.cxx
@@ -107,7 +107,7 @@ SwLineNumberInfo& SwLineNumberInfo::operator=(const SwLineNumberInfo &rCpy)
     return *this;
 }
 
-sal_Bool SwLineNumberInfo::operator==( const SwLineNumberInfo& rInf ) const
+bool SwLineNumberInfo::operator==( const SwLineNumberInfo& rInf ) const
 {
     return  GetRegisteredIn() == rInf.GetRegisteredIn() &&
             aType.GetNumberingType() == rInf.GetNumType().GetNumberingType() &&
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index a62026c6c6a1..423dc355d2a9 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -79,9 +79,9 @@ using namespace com::sun::star;
 extern void ClrContourCache( const SdrObject *pObj ); // TxtFly.Cxx
 
 
-inline sal_Bool GetRealURL( const SwGrfNode& rNd, String& rTxt )
+inline bool GetRealURL( const SwGrfNode& rNd, String& rTxt )
 {
-    sal_Bool bRet = rNd.GetFileFilterNms( &rTxt, 0 );
+    bool bRet = rNd.GetFileFilterNms( &rTxt, 0 );
     if( bRet )
         rTxt = URIHelper::removePassword( rTxt, INetURLObject::WAS_ENCODED,
                                            INetURLObject::DECODE_UNAMBIGUOUS);
@@ -90,7 +90,7 @@ inline sal_Bool GetRealURL( const SwGrfNode& rNd, String& rTxt )
 
 static void lcl_PaintReplacement( const SwRect &rRect, const String &rText,
                            const ViewShell &rSh, const SwNoTxtFrm *pFrm,
-                           sal_Bool bDefect )
+                           bool bDefect )
 {
     static Font *pFont = 0;
     if ( !pFont )
@@ -108,7 +108,7 @@ static void lcl_PaintReplacement( const SwRect &rRect, const String &rText,
     const SwFmtURL &rURL = pFrm->FindFlyFrm()->GetFmt()->GetURL();
     if( rURL.GetURL().Len() || rURL.GetMap() )
     {
-        sal_Bool bVisited = sal_False;
+        bool bVisited = false;
         if ( rURL.GetMap() )
         {
             ImageMap *pMap = (ImageMap*)rURL.GetMap();
@@ -117,7 +117,7 @@ static void lcl_PaintReplacement( const SwRect &rRect, const String &rText,
                 IMapObject *pObj = pMap->GetIMapObject( i );
                 if( rSh.GetDoc()->IsVisitedURL( pObj->GetURL() ) )
                 {
-                    bVisited = sal_True;
+                    bVisited = true;
                     break;
                 }
             }
@@ -134,7 +134,7 @@ static void lcl_PaintReplacement( const SwRect &rRect, const String &rText,
     pFont->SetUnderline( eUnderline );
     pFont->SetColor( aCol );
 
-    const BitmapEx& rBmp = ViewShell::GetReplacementBitmap( bDefect != sal_False );
+    const BitmapEx& rBmp = ViewShell::GetReplacementBitmap( bDefect );
     Graphic::DrawEx( rSh.GetOut(), rText, *pFont, rBmp, rRect.Pos(), rRect.SSize() );
 }
 
@@ -249,7 +249,7 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
                 GetRealURL( *(SwGrfNode*)pNd, aTxt );
             if( !aTxt.Len() )
                 aTxt = FindFlyFrm()->GetFmt()->GetName();
-            lcl_PaintReplacement( Frm(), aTxt, *pSh, this, sal_False );
+            lcl_PaintReplacement( Frm(), aTxt, *pSh, this, false );
         }
         return;
     }
@@ -369,7 +369,7 @@ static void lcl_CalcRect( Point& rPt, Size& rDim, sal_uInt16 nMirror )
 *************************************************************************/
 
 void SwNoTxtFrm::GetGrfArea( SwRect &rRect, SwRect* pOrigRect,
-                             sal_Bool ) const
+                             bool ) const
 {
     // Currently only used for scaling, cropping and mirroring the contour of graphics!
     // Everything else is handled by GraphicObject
@@ -938,7 +938,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
                 String aTxt( pGrfNd->GetTitle() );
                 if ( !aTxt.Len() )
                     GetRealURL( *pGrfNd, aTxt );
-                ::lcl_PaintReplacement( aAlignedGrfArea, aTxt, *pShell, this, sal_False );
+                ::lcl_PaintReplacement( aAlignedGrfArea, aTxt, *pShell, this, false );
                 bContinue = false;
             }
             else if( rGrfObj.IsCached( pOut, aAlignedGrfArea.Pos(),
@@ -1037,7 +1037,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
                 if ( nResId )
                     aText = SW_RESSTR( nResId );
 
-                ::lcl_PaintReplacement( aAlignedGrfArea, aText, *pShell, this, sal_True );
+                ::lcl_PaintReplacement( aAlignedGrfArea, aText, *pShell, this, true );
             }
 
             // When printing, we must not collect the graphics
diff --git a/sw/source/core/doc/visiturl.cxx b/sw/source/core/doc/visiturl.cxx
index 0c95d5b74ff8..1036634a750f 100644
--- a/sw/source/core/doc/visiturl.cxx
+++ b/sw/source/core/doc/visiturl.cxx
@@ -64,7 +64,7 @@ void SwURLStateChanged::Notify( SfxBroadcaster& , const SfxHint& rHint )
             pDoc->GetDocShell()->GetMedium()->GetName().equals(sURL) )
             (sBkmk = pIURL->GetMark()).Insert( INET_MARK_TOKEN, 0 );
 
-        sal_Bool bAction = sal_False, bUnLockView = sal_False;
+        bool bAction = false, bUnLockView = false;
         const SwFmtINetFmt* pItem;
         const SwTxtINetFmt* pTxtAttr;
         const SwTxtNode* pTxtNd;
@@ -80,7 +80,7 @@ void SwURLStateChanged::Notify( SfxBroadcaster& , const SfxHint& rHint )
                 if( !bAction && pESh )
                 {
                     pESh->StartAllAction();
-                    bAction = sal_True;
+                    bAction = true;
                     bUnLockView = !pESh->IsViewLocked();
                     pESh->LockView( sal_True );
                 }
@@ -101,9 +101,9 @@ void SwURLStateChanged::Notify( SfxBroadcaster& , const SfxHint& rHint )
 
 // Check if the URL has been visited before. Via the Doc, if only one Bookmark is set
 // We need to put the Doc's name before it!
-sal_Bool SwDoc::IsVisitedURL( const String& rURL ) const
+bool SwDoc::IsVisitedURL( const String& rURL ) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( rURL.Len() )
     {
         INetURLHistory *pHist = INetURLHistory::GetOrCreate();
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 49077873486d..31c3debd4ec9 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -529,9 +529,9 @@ short SwGrfNode::SwapOut()
 }
 
 
-sal_Bool SwGrfNode::GetFileFilterNms( String* pFileNm, String* pFilterNm ) const
+bool SwGrfNode::GetFileFilterNms( String* pFileNm, String* pFilterNm ) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( refLink.Is() && refLink->GetLinkManager() )
     {
         sal_uInt16 nType = refLink->GetObjType();
@@ -548,7 +548,7 @@ sal_Bool SwGrfNode::GetFileFilterNms( String* pFileNm, String* pFilterNm ) const
                 ( *pFileNm += sTopic ) += sfx2::cTokenSeperator;
                 *pFileNm += sItem;
                 pFilterNm->AssignAscii( RTL_CONSTASCII_STRINGPARAM( "DDE" ));
-                bRet = sal_True;
+                bRet = true;
             }
         }
     }
diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx
index db8e158e9051..cc680df185a7 100644
--- a/sw/source/core/inc/notxtfrm.hxx
+++ b/sw/source/core/inc/notxtfrm.hxx
@@ -63,7 +63,7 @@ public:
                      SwCrsrMoveState* = 0) const;
 
     const Size &GetGrfSize() const  { return GetSize(); }
-    void GetGrfArea( SwRect &rRect, SwRect * = 0, sal_Bool bMirror = sal_True ) const;
+    void GetGrfArea( SwRect &rRect, SwRect * = 0, bool bMirror = true ) const;
 
     sal_Bool IsTransparent() const;
 
diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx
index e50098d31879..16f415cbcee5 100644
--- a/sw/source/core/inc/tblrwcl.hxx
+++ b/sw/source/core/inc/tblrwcl.hxx
@@ -139,18 +139,18 @@ struct _SwGCLineBorder
 class _SwGCBorder_BoxBrd
 {
     const editeng::SvxBorderLine* pBrdLn;
-    sal_Bool bAnyBorderFnd;
+    bool bAnyBorderFnd;
 public:
-    _SwGCBorder_BoxBrd() : pBrdLn( 0 ), bAnyBorderFnd( sal_False ) {}
+    _SwGCBorder_BoxBrd() : pBrdLn( 0 ), bAnyBorderFnd( false ) {}
 
     void SetBorder( const editeng::SvxBorderLine& rBorderLine )
-        { pBrdLn = &rBorderLine; bAnyBorderFnd = sal_False; }
+        { pBrdLn = &rBorderLine; bAnyBorderFnd = false; }
 
     // checke, ob die linke Border dieselbe wie die gesetzte ist
-    // returnt sal_False falls gar keine Border gesetzt ist
-    sal_Bool CheckLeftBorderOfFormat( const SwFrmFmt& rFmt );
+    // returnt false falls gar keine Border gesetzt ist
+    bool CheckLeftBorderOfFormat( const SwFrmFmt& rFmt );
 
-    sal_Bool IsAnyBorderFound() const { return bAnyBorderFnd; }
+    bool IsAnyBorderFound() const { return bAnyBorderFnd; }
 };
 
 void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara );
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 5a1c9fefd2e6..fb8096275efa 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -2652,7 +2652,7 @@ sal_Bool SwFlyFrm::GetContour( PolyPolygon&   rContour,
             SwRect aClip;
             SwRect aOrig;
             Lower()->Calc();
-            ((SwNoTxtFrm*)Lower())->GetGrfArea( aClip, &aOrig, sal_False );
+            ((SwNoTxtFrm*)Lower())->GetGrfArea( aClip, &aOrig, false );
             // OD 16.04.2003 #i13147# - copy method code <SvxContourDlg::ScaleContour(..)>
             // in order to avoid that graphic has to be loaded for contour scale.
             //SvxContourDlg::ScaleContour( rContour, aGrf, MAP_TWIP, aOrig.SSize() );