svtools: sal_Bool->bool

Change-Id: Ic9b4838c4d1b4d2d2ea4665811dd396bdbec31b7

4 files changed, 77 insertions, 77 deletions

diff --git a/svtools/source/graphic/grfattr.cxx b/svtools/source/graphic/grfattr.cxx
index d8057c1b8198..c53c056885b6 100644
--- a/svtools/source/graphic/grfattr.cxx
+++ b/svtools/source/graphic/grfattr.cxx
@@ -38,7 +38,7 @@ GraphicAttr::GraphicAttr() :
     mnRPercent      ( 0 ),
     mnGPercent      ( 0 ),
     mnBPercent      ( 0 ),
-    mbInvert        ( sal_False ),
+    mbInvert        ( false ),
     mcTransparency  ( 0 ),
     meDrawMode      ( GRAPHICDRAWMODE_STANDARD )
 {
@@ -52,7 +52,7 @@ GraphicAttr::~GraphicAttr()
 
 
 
-sal_Bool GraphicAttr::operator==( const GraphicAttr& rAttr ) const
+bool GraphicAttr::operator==( const GraphicAttr& rAttr ) const
 {
     return( ( mfGamma == rAttr.mfGamma ) &&
             ( mnMirrFlags == rAttr.mnMirrFlags ) &&
@@ -81,7 +81,7 @@ SvStream& ReadGraphicAttr( SvStream& rIStm, GraphicAttr& rAttr )
 
     rIStm.ReadUInt32( nTmp32 ).ReadUInt32( nTmp32 ).ReadDouble( rAttr.mfGamma ).ReadUInt32( rAttr.mnMirrFlags ).ReadUInt16( rAttr.mnRotate10 );
     rIStm.ReadInt16( rAttr.mnContPercent ).ReadInt16( rAttr.mnLumPercent ).ReadInt16( rAttr.mnRPercent ).ReadInt16( rAttr.mnGPercent ).ReadInt16( rAttr.mnBPercent );
-    rIStm.ReadUChar( rAttr.mbInvert ).ReadUChar( rAttr.mcTransparency ).ReadUInt16( nTmp16 );
+    rIStm.ReadCharAsBool( rAttr.mbInvert ).ReadUChar( rAttr.mcTransparency ).ReadUInt16( nTmp16 );
     rAttr.meDrawMode = (GraphicDrawMode) nTmp16;
 
     if( aCompat.GetVersion() >= 2 )
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index d3b66d24f5d0..087d27be6872 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -126,9 +126,9 @@ void GraphicObject::ImplConstruct()
     mpSwapOutTimer = NULL;
     mpSimpleCache = NULL;
     mnAnimationLoopCount = 0;
-    mbAutoSwapped = sal_False;
-    mbIsInSwapIn = sal_False;
-    mbIsInSwapOut = sal_False;
+    mbAutoSwapped = false;
+    mbIsInSwapIn = false;
+    mbIsInSwapOut = false;
 }
 
 void GraphicObject::ImplAssignGraphicData()
@@ -189,13 +189,13 @@ void GraphicObject::ImplAutoSwapIn()
     if( IsSwappedOut() )
     {
         if( mpMgr && mpMgr->ImplFillSwappedGraphicObject( *this, maGraphic ) )
-            mbAutoSwapped = sal_False;
+            mbAutoSwapped = false;
         else
         {
-            mbIsInSwapIn = sal_True;
+            mbIsInSwapIn = true;
 
             if( maGraphic.SwapIn() )
-                mbAutoSwapped = sal_False;
+                mbAutoSwapped = false;
             else
             {
                 SvStream* pStream = GetSwapStream();
@@ -238,7 +238,7 @@ void GraphicObject::ImplAutoSwapIn()
                 }
             }
 
-            mbIsInSwapIn = sal_False;
+            mbIsInSwapIn = false;
 
             if( !mbAutoSwapped && mpMgr )
                 mpMgr->ImplGraphicObjectWasSwappedIn( *this );
@@ -246,10 +246,10 @@ void GraphicObject::ImplAutoSwapIn()
     }
 }
 
-sal_Bool GraphicObject::ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& rSz, const GraphicAttr* pAttr,
-                                       PolyPolygon& rClipPolyPoly, sal_Bool& bRectClipRegion ) const
+bool GraphicObject::ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& rSz, const GraphicAttr* pAttr,
+                                       PolyPolygon& rClipPolyPoly, bool& bRectClipRegion ) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     if( GetType() != GRAPHIC_NONE )
     {
@@ -263,10 +263,10 @@ sal_Bool GraphicObject::ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size&
         if( nRot10 )
         {
             aClipPoly.Rotate( rPt, nRot10 );
-            bRectClipRegion = sal_False;
+            bRectClipRegion = false;
         }
         else
-            bRectClipRegion = sal_True;
+            bRectClipRegion = true;
 
         rClipPolyPoly = aClipPoly;
 
@@ -308,7 +308,7 @@ sal_Bool GraphicObject::ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size&
                 rPt = aOriginPoly[ 0 ];
             }
 
-            bRet = sal_True;
+            bRet = true;
         }
     }
 
@@ -329,7 +329,7 @@ GraphicObject& GraphicObject::operator=( const GraphicObject& rGraphicObj )
         maLink = rGraphicObj.maLink;
         maUserData = rGraphicObj.maUserData;
         ImplAssignGraphicData();
-        mbAutoSwapped = sal_False;
+        mbAutoSwapped = false;
         mpMgr = rGraphicObj.mpMgr;
 
         mpMgr->ImplRegisterObj( *this, maGraphic, NULL, &rGraphicObj );
@@ -338,7 +338,7 @@ GraphicObject& GraphicObject::operator=( const GraphicObject& rGraphicObj )
     return *this;
 }
 
-sal_Bool GraphicObject::operator==( const GraphicObject& rGraphicObj ) const
+bool GraphicObject::operator==( const GraphicObject& rGraphicObj ) const
 {
     return( ( rGraphicObj.maGraphic == maGraphic ) &&
             ( rGraphicObj.maAttr == maAttr ) &&
@@ -491,10 +491,10 @@ void GraphicObject::GraphicManagerDestroyed()
     ImplSetGraphicManager( NULL );
 }
 
-sal_Bool GraphicObject::IsCached( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+bool GraphicObject::IsCached( OutputDevice* pOut, const Point& rPt, const Size& rSz,
                               const GraphicAttr* pAttr, sal_uLong nFlags ) const
 {
-    sal_Bool bRet;
+    bool bRet;
 
     if( nFlags & GRFMGR_DRAW_CACHED )
     {
@@ -503,13 +503,13 @@ sal_Bool GraphicObject::IsCached( OutputDevice* pOut, const Point& rPt, const Si
         if ( pAttr && pAttr->IsCropped() )
         {
             PolyPolygon aClipPolyPoly;
-            sal_Bool        bRectClip;
+            bool        bRectClip;
             ImplGetCropParams( pOut, aPt, aSz, pAttr, aClipPolyPoly, bRectClip );
         }
         bRet = mpMgr->IsInCache( pOut, aPt, aSz, *this, ( pAttr ? *pAttr : GetAttr() ) );
     }
     else
-        bRet = sal_False;
+        bRet = false;
 
     return bRet;
 }
@@ -527,8 +527,8 @@ bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz,
     Point               aPt( rPt );
     Size                aSz( rSz );
     const sal_uInt32    nOldDrawMode = pOut->GetDrawMode();
-    sal_Bool                bCropped = aAttr.IsCropped();
-    sal_Bool                bCached = sal_False;
+    bool                bCropped = aAttr.IsCropped();
+    bool                bCached = false;
     bool bRet;
 
     // #i29534# Provide output rects for PDF writer
@@ -556,8 +556,8 @@ bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz,
     if( bCropped )
     {
         PolyPolygon aClipPolyPoly;
-        sal_Bool        bRectClip;
-        const sal_Bool  bCrop = ImplGetCropParams( pOut, aPt, aSz, &aAttr, aClipPolyPoly, bRectClip );
+        bool        bRectClip;
+        const bool  bCrop = ImplGetCropParams( pOut, aPt, aSz, &aAttr, aClipPolyPoly, bRectClip );
 
         pOut->Push( PUSH_CLIPREGION );
 
@@ -598,7 +598,7 @@ bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz,
 }
 
 // #i105243#
-sal_Bool GraphicObject::DrawWithPDFHandling( OutputDevice& rOutDev,
+bool GraphicObject::DrawWithPDFHandling( OutputDevice& rOutDev,
                                          const Point& rPt, const Size& rSz,
                                          const GraphicAttr* pGrfAttr,
                                          const sal_uLong nFlags )
@@ -606,7 +606,7 @@ sal_Bool GraphicObject::DrawWithPDFHandling( OutputDevice& rOutDev,
     const GraphicAttr aGrfAttr( pGrfAttr ? *pGrfAttr : GetAttr() );
 
     // Notify PDF writer about linked graphic (if any)
-    sal_Bool bWritingPdfLinkedGraphic( sal_False );
+    bool bWritingPdfLinkedGraphic( false );
     Point aPt( rPt );
     Size aSz( rSz );
     Rectangle aCropRect;
@@ -628,8 +628,8 @@ sal_Bool GraphicObject::DrawWithPDFHandling( OutputDevice& rOutDev,
             if( aGrfAttr.IsCropped() )
             {
                 PolyPolygon aClipPolyPoly;
-                sal_Bool bRectClip;
-                const sal_Bool bCrop = ImplGetCropParams( &rOutDev,
+                bool bRectClip;
+                const bool bCrop = ImplGetCropParams( &rOutDev,
                                                       aPt, aSz,
                                                       &aGrfAttr,
                                                       aClipPolyPoly,
@@ -644,7 +644,7 @@ sal_Bool GraphicObject::DrawWithPDFHandling( OutputDevice& rOutDev,
         }
     }
 
-    sal_Bool bRet = Draw( &rOutDev, rPt, rSz, &aGrfAttr, nFlags );
+    bool bRet = Draw( &rOutDev, rPt, rSz, &aGrfAttr, nFlags );
 
     // Notify PDF writer about linked graphic (if any)
     if( bWritingPdfLinkedGraphic )
@@ -658,11 +658,11 @@ sal_Bool GraphicObject::DrawWithPDFHandling( OutputDevice& rOutDev,
     return bRet;
 }
 
-sal_Bool GraphicObject::DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSize,
+bool GraphicObject::DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSize,
                                const Size& rOffset, const GraphicAttr* pAttr, sal_uLong nFlags, int nTileCacheSize1D )
 {
     if( pOut == NULL || rSize.Width() == 0 || rSize.Height() == 0 )
-        return sal_False;
+        return false;
 
     const MapMode   aOutMapMode( pOut->GetMapMode() );
     const MapMode   aMapMode( aOutMapMode.GetMapUnit(), Point(), aOutMapMode.GetScaleX(), aOutMapMode.GetScaleY() );
@@ -680,11 +680,11 @@ sal_Bool GraphicObject::DrawTiled( OutputDevice* pOut, const Rectangle& rArea, c
     return ImplDrawTiled( pOut, rArea, aOutTileSize, rOffset, pAttr, nFlags, nTileCacheSize1D );
 }
 
-sal_Bool GraphicObject::StartAnimation( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+bool GraphicObject::StartAnimation( OutputDevice* pOut, const Point& rPt, const Size& rSz,
                                     long nExtraData, const GraphicAttr* pAttr, sal_uLong /*nFlags*/,
                                     OutputDevice* pFirstFrameOutDev )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     GetGraphic();
 
@@ -696,13 +696,13 @@ sal_Bool GraphicObject::StartAnimation( OutputDevice* pOut, const Point& rPt, co
         {
             Point   aPt( rPt );
             Size    aSz( rSz );
-            sal_Bool    bCropped = aAttr.IsCropped();
+            bool    bCropped = aAttr.IsCropped();
 
             if( bCropped )
             {
                 PolyPolygon aClipPolyPoly;
-                sal_Bool        bRectClip;
-                const sal_Bool  bCrop = ImplGetCropParams( pOut, aPt, aSz, &aAttr, aClipPolyPoly, bRectClip );
+                bool        bRectClip;
+                const bool  bCrop = ImplGetCropParams( pOut, aPt, aSz, &aAttr, aClipPolyPoly, bRectClip );
 
                 pOut->Push( PUSH_CLIPREGION );
 
@@ -729,7 +729,7 @@ sal_Bool GraphicObject::StartAnimation( OutputDevice* pOut, const Point& rPt, co
             if( bCropped )
                 pOut->Pop();
 
-            bRet = sal_True;
+            bRet = true;
         }
         else
             bRet = Draw( pOut, rPt, rSz, &aAttr, GRFMGR_DRAW_STANDARD );
@@ -760,7 +760,7 @@ void GraphicObject::SetGraphic( const Graphic& rGraphic, const GraphicObject* pC
         mpSwapOutTimer->Stop();
 
     maGraphic = rGraphic;
-    mbAutoSwapped = sal_False;
+    mbAutoSwapped = false;
     ImplAssignGraphicData();
     maLink = "";
     delete mpSimpleCache, mpSimpleCache = NULL;
@@ -945,7 +945,7 @@ Graphic GraphicObject::GetTransformedGraphic( const Size& rDestSize, const MapMo
                     // cropping affects this frame, apply it then
                     // do _not_ apply enlargement, this is done below
                     ImplTransformBitmap( aAnimBmp.aBmpEx, rAttr, Size(), Size(),
-                                         aCropRectRel, rDestSize, sal_False );
+                                         aCropRectRel, rDestSize, false );
 
                     aAnim.Replace( aAnimBmp, nFrame );
                 }
@@ -990,7 +990,7 @@ Graphic GraphicObject::GetTransformedGraphic( const Size& rDestSize, const MapMo
         else
         {
             ImplTransformBitmap( aBitmapEx, rAttr, aCropLeftTop, aCropRightBottom,
-                                 aCropRect, rDestSize, sal_True );
+                                 aCropRect, rDestSize, true );
 
             aTransGraphic = aBitmapEx;
         }
@@ -1104,7 +1104,7 @@ void GraphicObject::SetSwapState()
 {
     if( !IsSwappedOut() )
     {
-        mbAutoSwapped = sal_True;
+        mbAutoSwapped = true;
 
         if( mpMgr )
             mpMgr->ImplGraphicObjectWasSwappedOut( *this );
@@ -1115,7 +1115,7 @@ IMPL_LINK_NOARG(GraphicObject, ImplAutoSwapOutHdl)
 {
     if( !IsSwappedOut() )
     {
-        mbIsInSwapOut = sal_True;
+        mbIsInSwapOut = true;
 
         SvStream* pStream = GetSwapStream();
 
@@ -1135,7 +1135,7 @@ IMPL_LINK_NOARG(GraphicObject, ImplAutoSwapOutHdl)
             }
         }
 
-        mbIsInSwapOut = sal_False;
+        mbIsInSwapOut = false;
     }
 
     if( mpSwapOutTimer )
@@ -1149,11 +1149,11 @@ SvStream& ReadGraphicObject( SvStream& rIStm, GraphicObject& rGraphicObj )
     VersionCompat   aCompat( rIStm, STREAM_READ );
     Graphic         aGraphic;
     GraphicAttr     aAttr;
-    sal_Bool            bLink;
+    bool            bLink;
 
     ReadGraphic( rIStm, aGraphic );
     ReadGraphicAttr( rIStm, aAttr );
-    rIStm.ReadUChar( bLink );
+    rIStm.ReadCharAsBool( bLink );
 
     rGraphicObj.SetGraphic( aGraphic );
     rGraphicObj.SetAttr( aAttr );
@@ -1174,7 +1174,7 @@ SvStream& ReadGraphicObject( SvStream& rIStm, GraphicObject& rGraphicObj )
 SvStream& WriteGraphicObject( SvStream& rOStm, const GraphicObject& rGraphicObj )
 {
     VersionCompat   aCompat( rOStm, STREAM_WRITE, 1 );
-    const sal_Bool      bLink =  rGraphicObj.HasLink();
+    const bool      bLink =  rGraphicObj.HasLink();
 
     WriteGraphic( rOStm, rGraphicObj.GetGraphic() );
     WriteGraphicAttr( rOStm, rGraphicObj.GetAttr() );
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx
index f1048e10a8ae..295b4e05faf1 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -64,7 +64,7 @@ void GraphicManager::SetMaxCacheSize( sal_uLong nNewCacheSize )
     mpCache->SetMaxDisplayCacheSize( nNewCacheSize );
 }
 
-void GraphicManager::SetMaxObjCacheSize( sal_uLong nNewMaxObjSize, sal_Bool bDestroyGreaterCached )
+void GraphicManager::SetMaxObjCacheSize( sal_uLong nNewMaxObjSize, bool bDestroyGreaterCached )
 {
     mpCache->SetMaxObjDisplayCacheSize( nNewMaxObjSize, bDestroyGreaterCached );
 }
@@ -79,22 +79,22 @@ void GraphicManager::ReleaseFromCache( const GraphicObject& /*rObj*/ )
     // !!!
 }
 
-sal_Bool GraphicManager::IsInCache( OutputDevice* pOut, const Point& rPt,
+bool GraphicManager::IsInCache( OutputDevice* pOut, const Point& rPt,
                                     const Size& rSz, const GraphicObject& rObj,
                                     const GraphicAttr& rAttr ) const
 {
     return mpCache->IsInDisplayCache( pOut, rPt, rSz, rObj, rAttr );
 }
 
-sal_Bool GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+bool GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Size& rSz,
                               GraphicObject& rObj, const GraphicAttr& rAttr,
-                              const sal_uLong nFlags, sal_Bool& rCached )
+                              const sal_uLong nFlags, bool& rCached )
 {
     Point   aPt( rPt );
     Size    aSz( rSz );
-    sal_Bool    bRet = sal_False;
+    bool    bRet = false;
 
-    rCached = sal_False;
+    rCached = false;
 
     if( ( rObj.GetType() == GRAPHIC_BITMAP ) || ( rObj.GetType() == GRAPHIC_GDIMETAFILE ) )
     {
@@ -126,7 +126,7 @@ sal_Bool GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Si
                 aGraphic.Draw( pOut, aPt, aSz );
             }
 
-            bRet = sal_True;
+            bRet = true;
         }
 
         if( !bRet )
@@ -135,7 +135,7 @@ sal_Bool GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Si
             if( !mpCache->DrawDisplayCacheObj( pOut, aPt, aSz, rObj, rAttr ) )
                 bRet = ImplDraw( pOut, aPt, aSz, rObj, rAttr, nFlags, rCached );
             else
-                bRet = rCached = sal_True;
+                bRet = rCached = true;
         }
     }
 
@@ -171,7 +171,7 @@ OString GraphicManager::ImplGetUniqueID( const GraphicObject& rObj ) const
     return mpCache->GetUniqueID( rObj );
 }
 
-sal_Bool GraphicManager::ImplFillSwappedGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute )
+bool GraphicManager::ImplFillSwappedGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute )
 {
     return( mpCache->FillSwappedGraphicObject( rObj, rSubstitute ) );
 }
@@ -181,13 +181,13 @@ void GraphicManager::ImplGraphicObjectWasSwappedIn( const GraphicObject& rObj )
     mpCache->GraphicObjectWasSwappedIn( rObj );
 }
 
-sal_Bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt,
+bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt,
                                const Size& rSz, GraphicObject& rObj,
                                const GraphicAttr& rAttr,
-                               const sal_uLong nFlags, sal_Bool& rCached )
+                               const sal_uLong nFlags, bool& rCached )
 {
     const Graphic&  rGraphic = rObj.GetGraphic();
-    sal_Bool            bRet = sal_False;
+    bool            bRet = false;
 
     if( rGraphic.IsSupportedGraphic() && !rGraphic.IsSwapOut() )
     {
@@ -205,7 +205,7 @@ sal_Bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt,
                 if( ImplCreateOutput( pOut, rPt, rSz, aSrcBmpEx, rAttr, nFlags, &aDstBmpEx ) )
                 {
                     rCached = mpCache->CreateDisplayCacheObj( pOut, rPt, rSz, rObj, rAttr, aDstBmpEx );
-                    bRet = sal_True;
+                    bRet = true;
                 }
             }
 
@@ -232,13 +232,13 @@ sal_Bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt,
                         if( ImplCreateOutput( pOut, rPt, rSz, aContainedBmpEx, rAttr, nFlags, &aDstBmpEx ) )
                         {
                             rCached = mpCache->CreateDisplayCacheObj( pOut, rPt, rSz, rObj, rAttr, aDstBmpEx );
-                            bRet = sal_True;
+                            bRet = true;
                         }
                     }
                     else
                     {
                         rCached = mpCache->CreateDisplayCacheObj( pOut, rPt, rSz, rObj, rAttr, aDstMtf );
-                        bRet = sal_True;
+                        bRet = true;
                     }
                 }
             }
@@ -250,7 +250,7 @@ sal_Bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt,
                 if( aGraphic.IsSupportedGraphic() )
                 {
                     aGraphic.Draw( pOut, rPt, rSz );
-                    bRet = sal_True;
+                    bRet = true;
                 }
             }
         }
@@ -259,7 +259,7 @@ sal_Bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt,
     return bRet;
 }
 
-sal_Bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttributes,
+bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttributes,
                                 sal_uInt16 nRot10, const Size& rUnrotatedSzPix,
                                 long nStartX, long nEndX, long nStartY, long nEndY,
                                 BitmapEx& rOutBmpEx )
@@ -818,7 +818,7 @@ sal_Bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAt
     return bRet;
 }
 
-sal_Bool GraphicManager::ImplCreateOutput( OutputDevice* pOutputDevice,
+bool GraphicManager::ImplCreateOutput( OutputDevice* pOutputDevice,
                                        const Point& rPoint, const Size& rSize,
                                        const BitmapEx& rBitmapEx, const GraphicAttr& rAttributes,
                                        const sal_uLong /*nFlags*/, BitmapEx* pBmpEx )
@@ -1036,7 +1036,7 @@ static BitmapEx checkMetadataBitmap( const BitmapEx& rBmpEx,
     return aBmpEx;
 }
 
-sal_Bool GraphicManager::ImplCreateOutput( OutputDevice* pOut,
+bool GraphicManager::ImplCreateOutput( OutputDevice* pOut,
                                        const Point& rPt, const Size& rSz,
                                        const GDIMetaFile& rMtf, const GraphicAttr& rAttr,
                                        const sal_uLong /*nFlags*/, GDIMetaFile& rOutMtf, BitmapEx& rOutBmpEx )
@@ -1345,7 +1345,7 @@ sal_Bool GraphicManager::ImplCreateOutput( OutputDevice* pOut,
         rOutBmpEx = BitmapEx();
     }
 
-    return sal_True;
+    return true;
 }
 
 void GraphicManager::ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, sal_uLong nAdjustmentFlags )
@@ -1632,7 +1632,7 @@ bool GraphicObject::ImplRenderTempTile( VirtualDevice& rVDev, int nExponent,
 
     // #105229# Switch off mapping (converting to logic and back to
     // pixel might cause roundoff errors)
-    sal_Bool bOldMap( rVDev.IsMapModeEnabled() );
+    bool bOldMap( rVDev.IsMapModeEnabled() );
     rVDev.EnableMapMode( false );
 
     bool bRet( ImplRenderTileRecursive( rVDev, nExponent, nMSBFactor, nNumTilesX, nNumTilesY,
@@ -1988,7 +1988,7 @@ void GraphicObject::ImplTransformBitmap( BitmapEx&          rBmpEx,
                                          const Size&        rCropRightBottom,
                                          const Rectangle&   rCropRect,
                                          const Size&        rDstSize,
-                                         sal_Bool               bEnlarge ) const
+                                         bool               bEnlarge ) const
 {
     // #107947# Extracted from svdograf.cxx
 
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index 771420065f1f..1b149dca502d 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -48,9 +48,9 @@ namespace svt
 OGenericUnoDialog::OGenericUnoDialog(const Reference< XComponentContext >& _rxContext)
         :OPropertyContainer(GetBroadcastHelper())
         ,m_pDialog(NULL)
-        ,m_bExecuting(sal_False)
-        ,m_bCanceled(sal_False)
-        ,m_bTitleAmbiguous(sal_True)
+        ,m_bExecuting(false)
+        ,m_bCanceled(false)
+        ,m_bTitleAmbiguous(true)
         ,m_bInitialized( false )
         ,m_bNeedInitialization( false )
         ,m_aContext(_rxContext)
@@ -112,7 +112,7 @@ void OGenericUnoDialog::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, con
     if (UNODIALOG_PROPERTY_ID_TITLE == nHandle)
     {
         // from now on m_sTitle is valid
-        m_bTitleAmbiguous = sal_False;
+        m_bTitleAmbiguous = false;
 
         if (m_pDialog)
             m_pDialog->SetText(m_sTitle);
@@ -212,8 +212,8 @@ sal_Int16 SAL_CALL OGenericUnoDialog::execute(  ) throw(RuntimeException, std::e
                     *this
                   );
 
-        m_bCanceled = sal_False;
-        m_bExecuting = sal_True;
+        m_bCanceled = false;
+        m_bExecuting = true;
 
         if ( !impl_ensureDialog_lck() )
             return 0;
@@ -238,7 +238,7 @@ sal_Int16 SAL_CALL OGenericUnoDialog::execute(  ) throw(RuntimeException, std::e
         // get the settings of the dialog
         executedDialog( nReturn );
 
-        m_bExecuting = sal_False;
+        m_bExecuting = false;
     }
 
     // outta here