sal_Bool to bool

Change-Id: I5c134bce37e1be05618b14e7dbb22911cd6656c1

12 files changed, 93 insertions, 91 deletions

diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index c83b7970ff5c..92f7a5e17ba9 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -42,18 +42,18 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
     ::sfx2::SvBaseLinkRef refLink;       ///< If graphics only as link then pointer is set.
     Size nGrfSize;
     OUString aLowResGrf;                   ///< HTML: LowRes graphics (substitute until regular HighRes graphics is loaded).
-    sal_Bool bInSwapIn              :1;
+    bool bInSwapIn              :1;
 
-    sal_Bool bGraphicArrived        :1;
-    sal_Bool bChgTwipSize           :1;
-    sal_Bool bChgTwipSizeFromPixel  :1;
-    sal_Bool bFrameInPaint          :1; ///< To avoid Start-/EndActions in Paint via SwapIn.
-    sal_Bool bScaleImageMap         :1; ///< Scale image map in SetTwipSize.
+    bool bGraphicArrived        :1;
+    bool bChgTwipSize           :1;
+    bool bChgTwipSizeFromPixel  :1;
+    bool bFrameInPaint          :1; ///< To avoid Start-/EndActions in Paint via SwapIn.
+    bool bScaleImageMap         :1; ///< Scale image map in SetTwipSize.
 
     boost::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer;
     bool mbLinkedInputStreamReady;
     com::sun::star::uno::Reference<com::sun::star::io::XInputStream> mxInputStream;
-    sal_Bool mbIsStreamReadOnly;
+    bool mbIsStreamReadOnly;
 
     SwGrfNode( const SwNodeIndex& rWhere,
                const OUString& rGrfName, const OUString& rFltName,
@@ -71,8 +71,8 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
                SwAttrSet* pAutoAttr = 0 );
 
     void InsertLink( const OUString& rGrfName, const OUString& rFltName );
-    sal_Bool ImportGraphic( SvStream& rStrm );
-    sal_Bool HasStreamName() const { return maGrfObj.HasUserData(); }
+    bool ImportGraphic( SvStream& rStrm );
+    bool HasStreamName() const { return maGrfObj.HasUserData(); }
     /** adjust return type and rename method to
        indicate that its an private one. */
 
@@ -140,40 +140,44 @@ public:
     virtual Size GetTwipSize() const;
     void SetTwipSize( const Size& rSz );
 
-    sal_Bool IsTransparent() const;
+    bool IsTransparent() const;
 
-    inline sal_Bool IsAnimated() const              { return maGrfObj.IsAnimated(); }
+    inline bool IsAnimated() const              { return maGrfObj.IsAnimated(); }
 
-    inline sal_Bool IsChgTwipSize() const           { return bChgTwipSize; }
-    inline sal_Bool IsChgTwipSizeFromPixel() const  { return bChgTwipSizeFromPixel; }
-    inline void SetChgTwipSize( sal_Bool b, sal_Bool bFromPx=sal_False )        { bChgTwipSize = b; bChgTwipSizeFromPixel = bFromPx; }
+    inline bool IsChgTwipSize() const           { return bChgTwipSize; }
+    inline bool IsChgTwipSizeFromPixel() const  { return bChgTwipSizeFromPixel; }
+    inline void SetChgTwipSize( bool b, bool bFromPx=false )
+    {
+        bChgTwipSize = b;
+        bChgTwipSizeFromPixel = bFromPx;
+    }
 
-    inline sal_Bool IsGraphicArrived() const         { return bGraphicArrived; }
-    inline void SetGraphicArrived( sal_Bool b )      { bGraphicArrived = b; }
+    inline bool IsGraphicArrived() const        { return bGraphicArrived; }
+    inline void SetGraphicArrived( bool b )     { bGraphicArrived = b; }
 
-    inline sal_Bool IsFrameInPaint() const          { return bFrameInPaint; }
-    inline void SetFrameInPaint( sal_Bool b )       { bFrameInPaint = b; }
+    inline bool IsFrameInPaint() const          { return bFrameInPaint; }
+    inline void SetFrameInPaint( bool b )       { bFrameInPaint = b; }
 
-    inline sal_Bool IsScaleImageMap() const         { return bScaleImageMap; }
-    inline void SetScaleImageMap( sal_Bool b )      { bScaleImageMap = b; }
+    inline bool IsScaleImageMap() const         { return bScaleImageMap; }
+    inline void SetScaleImageMap( bool b )      { bScaleImageMap = b; }
 
     /// in ndcopy.cxx
     virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const;
 
     /** Re-read in case graphic was not OK. The current one
        gets replaced by the new one. */
-    sal_Bool ReRead( const OUString& rGrfName, const OUString& rFltName,
+    bool ReRead( const OUString& rGrfName, const OUString& rFltName,
                  const Graphic* pGraphic = 0,
                  const GraphicObject* pGrfObj = 0,
-                 sal_Bool bModify = sal_True );
+                 bool bModify = true );
     /// Loading of graphic immediately before displaying.
-    short SwapIn( sal_Bool bWaitForData = sal_False );
+    short SwapIn( bool bWaitForData = false );
     /// Remove graphic in order to free memory.
     short SwapOut();
     /// Access to storage stream-name.
     void SetStreamName( const OUString& r ) { maGrfObj.SetUserData( r ); }
     /// Is this node selected by any shell?
-    sal_Bool IsSelected() const;
+    bool IsSelected() const;
 
     /// Communicate to graphic that node is in Undo-range.
     virtual sal_Bool SavePersistentData();
@@ -199,7 +203,7 @@ public:
     void TriggerAsyncRetrieveInputStream();
     void ApplyInputStream(
         com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream,
-        const sal_Bool bIsStreamReadOnly );
+        const bool bIsStreamReadOnly );
     void UpdateLinkWithInputStream();
     bool IsAsyncRetrieveInputStreamPossible() const;
 };
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index b31918f5e6cb..ed1e6ac65ffa 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1965,7 +1965,7 @@ void SwDoc::ReRead( SwPaM& rPam, const OUString& rGrfName,
                                                 GetMirrorGrf().GetValue() )
             pGrfNd->SetAttr( SwMirrorGrf() );
 
-        pGrfNd->ReRead( rGrfName, rFltName, pGraphic, pGrafObj, sal_True );
+        pGrfNd->ReRead( rGrfName, rFltName, pGraphic, pGrafObj, true );
         SetModified();
     }
 }
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 56e47df244fc..fd5842792c74 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -232,7 +232,7 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
     SwNoTxtNode& rNoTNd = *(SwNoTxtNode*)GetNode();
     SwGrfNode* pGrfNd = rNoTNd.GetGrfNode();
     if( pGrfNd )
-        pGrfNd->SetFrameInPaint( sal_True );
+        pGrfNd->SetFrameInPaint( true );
 
     // #i13147# - add 2nd parameter with value <sal_True> to
     // method call <FindFlyFrm().GetContour(..)> to indicate that it is called
@@ -287,7 +287,7 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
         // If it's not visible, simply delete the given Area
         lcl_ClearArea( *this, *pSh->GetOut(), aPaintArea, SwRect() );
     if( pGrfNd )
-        pGrfNd->SetFrameInPaint( sal_False );
+        pGrfNd->SetFrameInPaint( false );
 
     pOut->Pop();
     SfxProgress::LeaveLock();
diff --git a/sw/source/core/docnode/ndnotxt.cxx b/sw/source/core/docnode/ndnotxt.cxx
index b1b41a0d40e7..f5de845759c5 100644
--- a/sw/source/core/docnode/ndnotxt.cxx
+++ b/sw/source/core/docnode/ndnotxt.cxx
@@ -251,7 +251,7 @@ Graphic SwNoTxtNode::GetGraphic() const
     Graphic aRet;
     if ( GetGrfNode() )
     {
-        ((SwGrfNode*)this)->SwapIn( sal_True );
+        ((SwGrfNode*)this)->SwapIn( true );
         aRet = ((SwGrfNode*)this)->GetGrf();
     }
     else
diff --git a/sw/source/core/docnode/retrieveinputstreamconsumer.cxx b/sw/source/core/docnode/retrieveinputstreamconsumer.cxx
index f621fd8b2ee2..6bfa562c2aa2 100644
--- a/sw/source/core/docnode/retrieveinputstreamconsumer.cxx
+++ b/sw/source/core/docnode/retrieveinputstreamconsumer.cxx
@@ -55,7 +55,7 @@ void SwAsyncRetrieveInputStreamThreadConsumer::CreateThread( const OUString& rUR
 
 void SwAsyncRetrieveInputStreamThreadConsumer::ApplyInputStream(
     com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream,
-    const sal_Bool bIsStreamReadOnly )
+    const bool bIsStreamReadOnly )
 {
     mrGrfNode.ApplyInputStream( xInputStream, bIsStreamReadOnly );
 }
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index 46341cb9d528..2dd2075bc0ca 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -125,9 +125,9 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
     }
 
     bool bUpdate = false;
-    sal_Bool bGraphicArrived = sal_False;
+    bool bGraphicArrived = false;
     sal_Bool bGraphicPieceArrived = sal_False;
-    sal_Bool bDontNotify = sal_False;
+    bool bDontNotify = false;
     Size aGrfSz, aFrmFmtSz;
 
     if( pCntntNode->IsGrfNode() )
@@ -167,7 +167,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
                 // If only a part arrives, but the size is not set
                 // we need to go through bGraphicArrived down there.
                 // Or else the graphic is painted at its definitive size
-                bGraphicArrived = sal_True;
+                bGraphicArrived = true;
                 bGraphicPieceArrived = sal_False;
             }
 
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index f1a343ce3583..53bed9a939e9 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -1662,7 +1662,7 @@ const Graphic *SwFEShell::GetGrfAtPos( const Point &rPt,
                 pNd->GetFileFilterNms( &rName, 0 );
                 if ( rName.isEmpty() )
                     rName = pFly->GetFmt()->GetName();
-                pNd->SwapIn( sal_True );
+                pNd->SwapIn( true );
                 return &pNd->GetGrf();
             }
         }
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index a4bcbaeb3ddf..f1d5c4b956f8 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -67,20 +67,20 @@ SwGrfNode::SwGrfNode(
     mpReplacementGraphic(0),
     // #i73788#
     mbLinkedInputStreamReady( false ),
-    mbIsStreamReadOnly( sal_False )
+    mbIsStreamReadOnly( false )
 {
     maGrfObj.SetSwapStreamHdl( LINK(this, SwGrfNode, SwapGraphic) );
     bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel =
-        bFrameInPaint = bScaleImageMap = sal_False;
+        bFrameInPaint = bScaleImageMap = false;
 
-    bGraphicArrived = sal_True;
+    bGraphicArrived = true;
 
     // fdo#50763 inline image has already been read into memory
     if (rGrfName.startsWith("data:")) {
         maGrfObj.SetGraphic( *pGraphic, rGrfName );
     }
     else {
-        ReRead(rGrfName,rFltName, pGraphic, 0, sal_False);
+        ReRead(rGrfName,rFltName, pGraphic, 0, false);
     }
 }
 
@@ -92,14 +92,14 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
     mpReplacementGraphic(0),
     // #i73788#
     mbLinkedInputStreamReady( false ),
-    mbIsStreamReadOnly( sal_False )
+    mbIsStreamReadOnly( false )
 {
     maGrfObj.SetSwapStreamHdl( LINK(this, SwGrfNode, SwapGraphic) );
     if( rGrfObj.HasUserData() && rGrfObj.IsSwappedOut() )
         maGrfObj.SetSwapState();
     bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel =
-        bFrameInPaint = bScaleImageMap = sal_False;
-    bGraphicArrived = sal_True;
+        bFrameInPaint = bScaleImageMap = false;
+    bGraphicArrived = true;
 }
 
 /** Create new SW/G reader.
@@ -117,7 +117,7 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
     mpReplacementGraphic(0),
     // #i73788#
     mbLinkedInputStreamReady( false ),
-    mbIsStreamReadOnly( sal_False )
+    mbIsStreamReadOnly( false )
 {
     maGrfObj.SetSwapStreamHdl( LINK(this, SwGrfNode, SwapGraphic) );
 
@@ -125,8 +125,8 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
     maGrfObj.SetGraphic( aGrf, rGrfName );
 
     bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel =
-        bFrameInPaint = bScaleImageMap = sal_False;
-    bGraphicArrived = sal_True;
+        bFrameInPaint = bScaleImageMap = false;
+    bGraphicArrived = true;
 
     InsertLink( rGrfName, rFltName );
     if( IsLinkedFile() )
@@ -141,12 +141,13 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
     }
 }
 
-sal_Bool SwGrfNode::ReRead(
+bool SwGrfNode::ReRead(
     const OUString& rGrfName, const OUString& rFltName,
     const Graphic* pGraphic, const GraphicObject* pGrfObj,
-    sal_Bool bNewGrf )
+    bool bNewGrf )
 {
-    sal_Bool bReadGrf = sal_False, bSetTwipSize = sal_True;
+    bool bReadGrf = false;
+    bool bSetTwipSize = true;
     delete mpReplacementGraphic;
     mpReplacementGraphic = 0;
 
@@ -192,7 +193,7 @@ sal_Bool SwGrfNode::ReRead(
         {
             maGrfObj.SetGraphic( *pGraphic, rGrfName );
             onGraphicChanged();
-            bReadGrf = sal_True;
+            bReadGrf = true;
         }
         else if( pGrfObj )
         {
@@ -201,7 +202,7 @@ sal_Bool SwGrfNode::ReRead(
                 maGrfObj.SetSwapState();
             maGrfObj.SetLink( rGrfName );
             onGraphicChanged();
-            bReadGrf = sal_True;
+            bReadGrf = true;
         }
         else
         {
@@ -225,7 +226,7 @@ sal_Bool SwGrfNode::ReRead(
                 }
             }
             onGraphicChanged();
-            bSetTwipSize = sal_False;
+            bSetTwipSize = false;
         }
     }
     else if( pGraphic && rGrfName.isEmpty() )
@@ -236,7 +237,7 @@ sal_Bool SwGrfNode::ReRead(
 
         maGrfObj.SetGraphic( *pGraphic );
         onGraphicChanged();
-        bReadGrf = sal_True;
+        bReadGrf = true;
     }
     else if( pGrfObj && rGrfName.isEmpty() )
     {
@@ -248,11 +249,11 @@ sal_Bool SwGrfNode::ReRead(
         onGraphicChanged();
         if( pGrfObj->HasUserData() && pGrfObj->IsSwappedOut() )
             maGrfObj.SetSwapState();
-        bReadGrf = sal_True;
+        bReadGrf = true;
     }
     // Was the graphic already loaded?
     else if( !bNewGrf && GRAPHIC_NONE != maGrfObj.GetType() )
-        return sal_True;
+        return true;
     else
     {
         if( HasStreamName() )
@@ -267,7 +268,7 @@ sal_Bool SwGrfNode::ReRead(
             {
                 maGrfObj.SetGraphic( *pGraphic, rGrfName );
                 onGraphicChanged();
-                bReadGrf = sal_True;
+                bReadGrf = true;
                 // create connection without update, as we have the graphic
                 ((SwBaseLink*)&refLink)->Connect();
             }
@@ -276,7 +277,7 @@ sal_Bool SwGrfNode::ReRead(
                 maGrfObj = *pGrfObj;
                 maGrfObj.SetLink( rGrfName );
                 onGraphicChanged();
-                bReadGrf = sal_True;
+                bReadGrf = true;
                 // create connection without update, as we have the graphic
                 ((SwBaseLink*)&refLink)->Connect();
             }
@@ -455,7 +456,7 @@ Size SwGrfNode::GetTwipSize() const
     return nGrfSize;
 }
 
-sal_Bool SwGrfNode::ImportGraphic( SvStream& rStrm )
+bool SwGrfNode::ImportGraphic( SvStream& rStrm )
 {
     Graphic aGraphic;
     const OUString aURL(maGrfObj.GetUserData());
@@ -468,10 +469,10 @@ sal_Bool SwGrfNode::ImportGraphic( SvStream& rStrm )
         maGrfObj.SetGraphic( aGraphic );
         maGrfObj.SetUserData( aURL );
         onGraphicChanged();
-        return sal_True;
+        return true;
     }
 
-    return sal_False;
+    return false;
 }
 
 namespace
@@ -520,13 +521,13 @@ StreamAndStorageNames lcl_GetStreamStorageNames( const OUString sUserData )
  *          1 if reading successful,
  *          0 if not loaded
  */
-short SwGrfNode::SwapIn( sal_Bool bWaitForData )
+short SwGrfNode::SwapIn( bool bWaitForData )
 {
     if( bInSwapIn ) // not recursively!
         return short(!maGrfObj.IsSwappedOut());
 
     short nRet = 0;
-    bInSwapIn = sal_True;
+    bInSwapIn = true;
     SwBaseLink* pLink = (SwBaseLink*)(::sfx2::SvBaseLink*) refLink;
 
     if( pLink )
@@ -597,7 +598,7 @@ short SwGrfNode::SwapIn( sal_Bool bWaitForData )
         if( !nGrfSize.Width() && !nGrfSize.Height() )
             SetTwipSize( ::GetGraphicSizeTwip( maGrfObj.GetGraphic(), 0 ) );
     }
-    bInSwapIn = sal_False;
+    bInSwapIn = false;
     return nRet;
 }
 
@@ -715,7 +716,7 @@ void SwGrfNode::InsertLink( const OUString& rGrfName, const OUString& rFltName )
         }
         else
         {
-            sal_Bool bSync = rFltName == "SYNCHRON";
+            const bool bSync = rFltName == "SYNCHRON";
             refLink->SetSynchron( bSync );
             refLink->SetContentType( SOT_FORMATSTR_ID_SVXB );
 
@@ -737,10 +738,10 @@ void SwGrfNode::ReleaseLink()
         const bool bHasOriginalData(aLocalGraphic.IsLink());
 
         {
-            bInSwapIn = sal_True;
+            bInSwapIn = true;
             SwBaseLink* pLink = (SwBaseLink*)(::sfx2::SvBaseLink*) refLink;
-            pLink->SwapIn( sal_True, sal_True );
-            bInSwapIn = sal_False;
+            pLink->SwapIn( true, true );
+            bInSwapIn = false;
         }
 
         getIDocumentLinksAdministration()->GetLinkManager().Remove( refLink );
@@ -790,7 +791,7 @@ void SwGrfNode::SetTwipSize( const Size& rSz )
         ScaleImageMap();
 
         // do not re-scale Image-Map
-        SetScaleImageMap( sal_False );
+        SetScaleImageMap( false );
     }
 }
 
@@ -1029,9 +1030,9 @@ IMPL_LINK( SwGrfNode, SwapGraphic, GraphicObject*, pGrfObj )
             // then make it by your self
             if( !bInSwapIn )
             {
-                bool bIsModifyLocked = IsModifyLocked();
+                const bool bIsModifyLocked = IsModifyLocked();
                 LockModify();
-                SwapIn( sal_False );
+                SwapIn( false );
                 if( !bIsModifyLocked )
                     UnlockModify();
             }
@@ -1156,18 +1157,15 @@ GraphicAttr& SwGrfNode::GetGraphicAttr( GraphicAttr& rGA,
     return rGA;
 }
 
-sal_Bool SwGrfNode::IsTransparent() const
+bool SwGrfNode::IsTransparent() const
 {
-    sal_Bool bRet = maGrfObj.IsTransparent();
-    if( !bRet ) // ask the attribut
-        bRet = 0 != GetSwAttrSet().GetTransparencyGrf().GetValue();
-
-    return bRet;
+    return maGrfObj.IsTransparent() ||
+        GetSwAttrSet().GetTransparencyGrf().GetValue() != 0;
 }
 
-sal_Bool SwGrfNode::IsSelected() const
+bool SwGrfNode::IsSelected() const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const SwEditShell* pESh = GetDoc()->GetEditShell();
     if( pESh )
     {
@@ -1177,7 +1175,7 @@ sal_Bool SwGrfNode::IsSelected() const
             if( pV->ISA( SwEditShell ) && pN == &((SwCrsrShell*)pV)
                                 ->GetCrsr()->GetPoint()->nNode.GetNode() )
             {
-                bRet = sal_True;
+                bRet = true;
                 break;
             }
         }
@@ -1223,7 +1221,7 @@ bool SwGrfNode::IsLinkedInputStreamReady() const
 
 void SwGrfNode::ApplyInputStream(
     com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream,
-    const sal_Bool bIsStreamReadOnly )
+    const bool bIsStreamReadOnly )
 {
     if ( IsLinkedFile() )
     {
diff --git a/sw/source/core/inc/retrieveinputstreamconsumer.hxx b/sw/source/core/inc/retrieveinputstreamconsumer.hxx
index 64f660c4e315..fc9f2cc52208 100644
--- a/sw/source/core/inc/retrieveinputstreamconsumer.hxx
+++ b/sw/source/core/inc/retrieveinputstreamconsumer.hxx
@@ -46,7 +46,7 @@ class SwAsyncRetrieveInputStreamThreadConsumer
         */
         void ApplyInputStream(
             com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream,
-            const sal_Bool bIsStreamReadOnly );
+            const bool bIsStreamReadOnly );
 
     private:
 
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 31db7c87e47a..6a1de08e6176 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -815,13 +815,13 @@ void SwUndoReRead::SetAndSave(::sw::UndoRedoContext & rContext)
 
     if( pOldNm )
     {
-        pGrfNd->ReRead( *pOldNm, pFltr ? *pFltr : OUString(), 0, 0, sal_True );
+        pGrfNd->ReRead( *pOldNm, pFltr ? *pFltr : OUString(), 0, 0, true );
         delete pOldNm;
         delete pOldFltr;
     }
     else
     {
-        pGrfNd->ReRead( OUString(), OUString(), pOldGrf, 0, sal_True );
+        pGrfNd->ReRead( OUString(), OUString(), pOldGrf, 0, true );
         delete pOldGrf;
     }
 
@@ -852,7 +852,7 @@ void SwUndoReRead::SaveGraphicData( const SwGrfNode& rGrfNd )
     }
     else
     {
-        ((SwGrfNode&)rGrfNd).SwapIn( sal_True );
+        ((SwGrfNode&)rGrfNd).SwapIn( true );
         pGrf = new Graphic( rGrfNd.GetGrf() );
         pNm = pFltr = 0;
     }
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index a6f6561fd0e6..22229ea0872f 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -1675,7 +1675,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
                         if ( aActSize.Width() == 0 && aActSize.Height() == 0 &&
                              pGrfNode->IsLinkedFile() )
                         {
-                            pGrfNode->SwapIn( sal_True );
+                            pGrfNode->SwapIn( true );
                             aActSize = pGrfNode->GetTwipSize();
                         }
                     }
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 43934afae04b..7da9981b51ee 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -562,9 +562,9 @@ IMAGE_SETEVENT:
 
     Size aGrfSz( 0, 0 );
     sal_Bool bSetTwipSize = sal_True;       // Twip-Size am Node setzen?
-    sal_Bool bChangeFrmSize = sal_False;    // Frame-Format nachtraeglich anpassen?
+    bool bChangeFrmSize = false;    // Frame-Format nachtraeglich anpassen?
     sal_Bool bRequestGrfNow = sal_False;
-    sal_Bool bSetScaleImageMap = sal_False;
+    bool bSetScaleImageMap = false;
     sal_uInt8 nPrcWidth = 0, nPrcHeight = 0;
 
     if( !nWidth || !nHeight )
@@ -580,7 +580,7 @@ IMAGE_SETEVENT:
         }
 
         // Die Groesse des Rahmens wird nachtraeglich gesetzt
-        bChangeFrmSize = sal_True;
+        bChangeFrmSize = true;
         aGrfSz = aTwipSz;
         if( !nWidth && !nHeight )
         {
@@ -657,7 +657,7 @@ IMAGE_SETEVENT:
             // die Grafik muss beim SetTwipSize skaliert werden, wenn
             // wir keine Groesse am Node gesetzt haben oder die Groesse
             // nicht der Grafikgroesse entsprach.
-            bSetScaleImageMap = sal_True;
+            bSetScaleImageMap = true;
         }
     }
 
@@ -733,13 +733,13 @@ IMAGE_SETEVENT:
         if( !sAltNm.isEmpty() )
             pGrfNd->SetTitle( sAltNm );
 
-        if( bSetTwipSize )
-            pGrfNd->SetTwipSize( aGrfSz );
+    if( bSetTwipSize )
+        pGrfNd->SetTwipSize( aGrfSz );
 
-        pGrfNd->SetChgTwipSize( bChangeFrmSize, bChangeFrmSize );
+    pGrfNd->SetChgTwipSize( bChangeFrmSize, bChangeFrmSize );
 
         if( bSetScaleImageMap )
-            pGrfNd->SetScaleImageMap( sal_True );
+            pGrfNd->SetScaleImageMap( true );
     }
 
     if( aAttrTab.pINetFmt )