bool improvements

Change-Id: Iede12ed1e35581cf48d64b898f22949d0c1aa6de

14 files changed, 177 insertions, 177 deletions

diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 8522af01c529..a4accba5de0f 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -958,7 +958,7 @@ sal_Bool Bitmap::Scale( const Size& rNewSize, sal_uInt32 nScaleFlag )
                       nScaleFlag );
     }
     else
-        bRet = sal_True;
+        bRet = true;
 
     return bRet;
 }
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index d04b146cff63..de5daf3444d2 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.cxx
@@ -198,7 +198,7 @@ sal_Bool GfxLink::LoadNative( Graphic& rGraphic )
             SvMemoryStream  aMemStm;
             sal_uLong           nCvtType;
 
-            aMemStm.SetBuffer( (char*) pData, mnBufSize, sal_False, mnBufSize );
+            aMemStm.SetBuffer( (char*) pData, mnBufSize, false, mnBufSize );
 
             switch( meType )
             {
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 3151ac28dbed..307e81088fd0 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -290,7 +290,7 @@ void MetaPixelAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
     WritePair( rOStm, maPt );
-    maColor.Write( rOStm, sal_True );
+    maColor.Write( rOStm, true );
 }
 
 // ------------------------------------------------------------------------
@@ -299,7 +299,7 @@ void MetaPixelAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
     rIStm >> maPt;
-    maColor.Read( rIStm, sal_True );
+    maColor.Read( rIStm, true );
 }
 
 // ========================================================================
@@ -2429,7 +2429,7 @@ void MetaMaskScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     {
         WRITE_BASE_COMPAT( rOStm, 1, pData );
         WriteDIB(maBmp, rOStm, false, true);
-        maColor.Write( rOStm, sal_True );
+        maColor.Write( rOStm, true );
         WritePair( rOStm, maDstPt );
         WritePair( rOStm, maDstSz );
         WritePair( rOStm, maSrcPt );
@@ -2443,7 +2443,7 @@ void MetaMaskScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
     ReadDIB(maBmp, rIStm, true);
-    maColor.Read( rIStm, sal_True );
+    maColor.Read( rIStm, true );
     rIStm >> maDstPt >> maDstSz >> maSrcPt >> maSrcSz;
 }
 
@@ -3056,7 +3056,7 @@ sal_Bool MetaLineColorAction::Compare( const MetaAction& rMetaAction ) const
 void MetaLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
-    maColor.Write( rOStm, sal_True );
+    maColor.Write( rOStm, true );
     rOStm.WriteUChar( mbSet );
 }
 
@@ -3065,7 +3065,7 @@ void MetaLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    maColor.Read( rIStm, sal_True );
+    maColor.Read( rIStm, true );
     rIStm >> mbSet;
 }
 
@@ -3114,7 +3114,7 @@ sal_Bool MetaFillColorAction::Compare( const MetaAction& rMetaAction ) const
 void MetaFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
-    maColor.Write( rOStm, sal_True );
+    maColor.Write( rOStm, true );
     rOStm.WriteUChar( mbSet );
 }
 
@@ -3123,7 +3123,7 @@ void MetaFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    maColor.Read( rIStm, sal_True );
+    maColor.Read( rIStm, true );
     rIStm >> mbSet;
 }
 
@@ -3167,7 +3167,7 @@ sal_Bool MetaTextColorAction::Compare( const MetaAction& rMetaAction ) const
 void MetaTextColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
-    maColor.Write( rOStm, sal_True );
+    maColor.Write( rOStm, true );
 }
 
 // ------------------------------------------------------------------------
@@ -3175,7 +3175,7 @@ void MetaTextColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaTextColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    maColor.Read( rIStm, sal_True );
+    maColor.Read( rIStm, true );
 }
 
 // ========================================================================
@@ -3223,7 +3223,7 @@ sal_Bool MetaTextFillColorAction::Compare( const MetaAction& rMetaAction ) const
 void MetaTextFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
-    maColor.Write( rOStm, sal_True );
+    maColor.Write( rOStm, true );
     rOStm.WriteUChar( mbSet );
 }
 
@@ -3232,7 +3232,7 @@ void MetaTextFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaTextFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    maColor.Read( rIStm, sal_True );
+    maColor.Read( rIStm, true );
     rIStm >> mbSet;
 }
 
@@ -3281,7 +3281,7 @@ sal_Bool MetaTextLineColorAction::Compare( const MetaAction& rMetaAction ) const
 void MetaTextLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
-    maColor.Write( rOStm, sal_True );
+    maColor.Write( rOStm, true );
     rOStm.WriteUChar( mbSet );
 }
 
@@ -3290,7 +3290,7 @@ void MetaTextLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaTextLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    maColor.Read( rIStm, sal_True );
+    maColor.Read( rIStm, true );
     rIStm >> mbSet;
 }
 
@@ -3339,7 +3339,7 @@ sal_Bool MetaOverlineColorAction::Compare( const MetaAction& rMetaAction ) const
 void MetaOverlineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
-    maColor.Write( rOStm, sal_True );
+    maColor.Write( rOStm, true );
     rOStm.WriteUChar( mbSet );
 }
 
@@ -3348,7 +3348,7 @@ void MetaOverlineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 void MetaOverlineColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     COMPAT( rIStm );
-    maColor.Read( rIStm, sal_True );
+    maColor.Read( rIStm, true );
     rIStm >> mbSet;
 }
 
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 8009275f24da..1e8d76638344 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -359,33 +359,33 @@ OutputDevice::OutputDevice() :
         mnTextLayoutMode = TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_TEXTORIGIN_LEFT;
     meOutDevType        = OUTDEV_DONTKNOW;
     meOutDevViewType    = OUTDEV_VIEWTYPE_DONTKNOW;
-    mbMap               = sal_False;
-    mbMapIsDefault      = sal_True;
-    mbClipRegion        = sal_False;
-    mbBackground        = sal_False;
-    mbOutput            = sal_True;
-    mbDevOutput         = sal_False;
-    mbOutputClipped     = sal_False;
+    mbMap               = false;
+    mbMapIsDefault      = true;
+    mbClipRegion        = false;
+    mbBackground        = false;
+    mbOutput            = true;
+    mbDevOutput         = false;
+    mbOutputClipped     = false;
     maTextColor         = Color( COL_BLACK );
     maOverlineColor     = Color( COL_TRANSPARENT );
     meTextAlign         = maFont.GetAlign();
     meRasterOp          = ROP_OVERPAINT;
     mnAntialiasing      = 0;
     meTextLanguage      = 0;  // TODO: get default from configuration?
-    mbLineColor         = sal_True;
-    mbFillColor         = sal_True;
-    mbInitLineColor     = sal_True;
-    mbInitFillColor     = sal_True;
-    mbInitFont          = sal_True;
-    mbInitTextColor     = sal_True;
-    mbInitClipRegion    = sal_True;
-    mbClipRegionSet     = sal_False;
-    mbKerning           = sal_False;
-    mbNewFont           = sal_True;
-    mbTextLines         = sal_False;
-    mbTextSpecial       = sal_False;
-    mbRefPoint          = sal_False;
-    mbEnableRTL         = sal_False;    // mirroring must be explicitly allowed (typically for windows only)
+    mbLineColor         = true;
+    mbFillColor         = true;
+    mbInitLineColor     = true;
+    mbInitFillColor     = true;
+    mbInitFont          = true;
+    mbInitTextColor     = true;
+    mbInitClipRegion    = true;
+    mbClipRegionSet     = false;
+    mbKerning           = false;
+    mbNewFont           = true;
+    mbTextLines         = false;
+    mbTextSpecial       = false;
+    mbRefPoint          = false;
+    mbEnableRTL         = false;    // mirroring must be explicitly allowed (typically for windows only)
 
     // struct ImplMapRes
     maMapRes.mnMapOfsX          = 0;
@@ -562,11 +562,11 @@ SalGraphics* OutputDevice::ImplGetGraphics() const
     if ( mpGraphics )
         return mpGraphics;
 
-    mbInitLineColor     = sal_True;
-    mbInitFillColor     = sal_True;
-    mbInitFont          = sal_True;
-    mbInitTextColor     = sal_True;
-    mbInitClipRegion    = sal_True;
+    mbInitLineColor     = true;
+    mbInitFillColor     = true;
+    mbInitFont          = true;
+    mbInitTextColor     = true;
+    mbInitClipRegion    = true;
 
     ImplSVData* pSVData = ImplGetSVData();
     if ( meOutDevType == OUTDEV_WINDOW )
@@ -892,7 +892,7 @@ void OutputDevice::ImplInitLineColor()
     else
         mpGraphics->SetLineColor();
 
-    mbInitLineColor = sal_False;
+    mbInitLineColor = false;
 }
 
 void OutputDevice::ImplInitFillColor()
@@ -913,7 +913,7 @@ void OutputDevice::ImplInitFillColor()
     else
         mpGraphics->SetFillColor();
 
-    mbInitFillColor = sal_False;
+    mbInitFillColor = false;
 }
 
 void OutputDevice::ImplInitClipRegion()
@@ -941,23 +941,23 @@ void OutputDevice::ImplInitClipRegion()
         if ( mbClipRegion )
             aRegion.Intersect( ImplPixelToDevicePixel( maRegion ) );
         if ( aRegion.IsEmpty() )
-            mbOutputClipped = sal_True;
+            mbOutputClipped = true;
         else
         {
-            mbOutputClipped = sal_False;
+            mbOutputClipped = false;
             ImplSelectClipRegion( aRegion );
         }
-        mbClipRegionSet = sal_True;
+        mbClipRegionSet = true;
     }
     else
     {
         if ( mbClipRegion )
         {
             if ( maRegion.IsEmpty() )
-                mbOutputClipped = sal_True;
+                mbOutputClipped = true;
             else
             {
-                mbOutputClipped = sal_False;
+                mbOutputClipped = false;
 
                 // #102532# Respect output offset also for clip region
                 Region aRegion( ImplPixelToDevicePixel( maRegion ) );
@@ -976,30 +976,30 @@ void OutputDevice::ImplInitClipRegion()
 
                 if ( aRegion.IsEmpty() )
                 {
-                    mbOutputClipped = sal_True;
+                    mbOutputClipped = true;
                 }
                 else
                 {
-                    mbOutputClipped = sal_False;
+                    mbOutputClipped = false;
                     ImplSelectClipRegion( aRegion );
                 }
             }
 
-            mbClipRegionSet = sal_True;
+            mbClipRegionSet = true;
         }
         else
         {
             if ( mbClipRegionSet )
             {
                 mpGraphics->ResetClipRegion();
-                mbClipRegionSet = sal_False;
+                mbClipRegionSet = false;
             }
 
-            mbOutputClipped = sal_False;
+            mbOutputClipped = false;
         }
     }
 
-    mbInitClipRegion = sal_False;
+    mbInitClipRegion = false;
 }
 
 void OutputDevice::ImplSetClipRegion( const Region* pRegion )
@@ -1011,15 +1011,15 @@ void OutputDevice::ImplSetClipRegion( const Region* pRegion )
         if ( mbClipRegion )
         {
             maRegion            = Region(true);
-            mbClipRegion        = sal_False;
-            mbInitClipRegion    = sal_True;
+            mbClipRegion        = false;
+            mbInitClipRegion    = true;
         }
     }
     else
     {
         maRegion            = *pRegion;
-        mbClipRegion        = sal_True;
-        mbInitClipRegion    = sal_True;
+        mbClipRegion        = true;
+        mbInitClipRegion    = true;
     }
 }
 
@@ -1091,7 +1091,7 @@ void OutputDevice::MoveClipRegion( long nHorzMove, long nVertMove )
 
         maRegion.Move( ImplLogicWidthToDevicePixel( nHorzMove ),
                        ImplLogicHeightToDevicePixel( nVertMove ) );
-        mbInitClipRegion = sal_True;
+        mbInitClipRegion = true;
     }
 
     if( mpAlphaVDev )
@@ -1106,8 +1106,8 @@ void OutputDevice::IntersectClipRegion( const Rectangle& rRect )
 
     Rectangle aRect = LogicToPixel( rRect );
     maRegion.Intersect( aRect );
-    mbClipRegion        = sal_True;
-    mbInitClipRegion    = sal_True;
+    mbClipRegion        = true;
+    mbInitClipRegion    = true;
 
     if( mpAlphaVDev )
         mpAlphaVDev->IntersectClipRegion( rRect );
@@ -1123,8 +1123,8 @@ void OutputDevice::IntersectClipRegion( const Region& rRegion )
 
         Region aRegion = LogicToPixel( rRegion );
         maRegion.Intersect( aRegion );
-        mbClipRegion        = sal_True;
-        mbInitClipRegion    = sal_True;
+        mbClipRegion        = true;
+        mbInitClipRegion    = true;
     }
 
     if( mpAlphaVDev )
@@ -1149,7 +1149,7 @@ void OutputDevice::SetRasterOp( RasterOp eRasterOp )
     if ( meRasterOp != eRasterOp )
     {
         meRasterOp = eRasterOp;
-        mbInitLineColor = mbInitFillColor = sal_True;
+        mbInitLineColor = mbInitFillColor = true;
 
         if( mpGraphics || ImplGetGraphics() )
             mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR == meRasterOp), ROP_INVERT == meRasterOp );
@@ -1167,8 +1167,8 @@ void OutputDevice::SetLineColor()
 
     if ( mbLineColor )
     {
-        mbInitLineColor = sal_True;
-        mbLineColor = sal_False;
+        mbInitLineColor = true;
+        mbLineColor = false;
         maLineColor = Color( COL_TRANSPARENT );
     }
 
@@ -1229,8 +1229,8 @@ void OutputDevice::SetLineColor( const Color& rColor )
     {
         if ( mbLineColor )
         {
-            mbInitLineColor = sal_True;
-            mbLineColor = sal_False;
+            mbInitLineColor = true;
+            mbLineColor = false;
             maLineColor = Color( COL_TRANSPARENT );
         }
     }
@@ -1238,8 +1238,8 @@ void OutputDevice::SetLineColor( const Color& rColor )
     {
         if( maLineColor != aColor )
         {
-            mbInitLineColor = sal_True;
-            mbLineColor = sal_True;
+            mbInitLineColor = true;
+            mbLineColor = true;
             maLineColor = aColor;
         }
     }
@@ -1256,8 +1256,8 @@ void OutputDevice::SetFillColor()
 
     if ( mbFillColor )
     {
-        mbInitFillColor = sal_True;
-        mbFillColor = sal_False;
+        mbInitFillColor = true;
+        mbFillColor = false;
         maFillColor = Color( COL_TRANSPARENT );
     }
 
@@ -1314,8 +1314,8 @@ void OutputDevice::SetFillColor( const Color& rColor )
     {
         if ( mbFillColor )
         {
-            mbInitFillColor = sal_True;
-            mbFillColor = sal_False;
+            mbInitFillColor = true;
+            mbFillColor = false;
             maFillColor = Color( COL_TRANSPARENT );
         }
     }
@@ -1323,8 +1323,8 @@ void OutputDevice::SetFillColor( const Color& rColor )
     {
         if ( maFillColor != aColor )
         {
-            mbInitFillColor = sal_True;
-            mbFillColor = sal_True;
+            mbInitFillColor = true;
+            mbFillColor = true;
             maFillColor = aColor;
         }
     }
@@ -1337,7 +1337,7 @@ void OutputDevice::SetBackground()
 {
 
     maBackground = Wallpaper();
-    mbBackground = sal_False;
+    mbBackground = false;
 
     if( mpAlphaVDev )
         mpAlphaVDev->SetBackground();
@@ -1349,9 +1349,9 @@ void OutputDevice::SetBackground( const Wallpaper& rBackground )
     maBackground = rBackground;
 
     if( rBackground.GetStyle() == WALLPAPER_NULL )
-        mbBackground = sal_False;
+        mbBackground = false;
     else
-        mbBackground = sal_True;
+        mbBackground = true;
 
     if( mpAlphaVDev )
         mpAlphaVDev->SetBackground( rBackground );
@@ -1363,7 +1363,7 @@ void OutputDevice::SetRefPoint()
     if ( mpMetaFile )
         mpMetaFile->AddAction( new MetaRefPointAction( Point(), sal_False ) );
 
-    mbRefPoint = sal_False;
+    mbRefPoint = false;
     maRefPoint.X() = maRefPoint.Y() = 0L;
 
     if( mpAlphaVDev )
@@ -1376,7 +1376,7 @@ void OutputDevice::SetRefPoint( const Point& rRefPoint )
     if ( mpMetaFile )
         mpMetaFile->AddAction( new MetaRefPointAction( rRefPoint, sal_True ) );
 
-    mbRefPoint = sal_True;
+    mbRefPoint = true;
     maRefPoint = rRefPoint;
 
     if( mpAlphaVDev )
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 5ec49501f5d0..a994dd86e687 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -2857,7 +2857,7 @@ void OutputDevice::ImplInitTextColor()
     if ( mbInitTextColor )
     {
         mpGraphics->SetTextColor( ImplColorToSal( GetTextColor() ) );
-        mbInitTextColor = sal_False;
+        mbInitTextColor = false;
     }
 }
 
@@ -2913,9 +2913,9 @@ bool OutputDevice::ImplNewFont() const
         return false;
 
     // mark when lower layers need to get involved
-    mbNewFont = sal_False;
+    mbNewFont = false;
     if( pFontEntry != pOldEntry )
-        mbInitFont = sal_True;
+        mbInitFont = true;
 
     // select font when it has not been initialized yet
     if ( !pFontEntry->mbInit )
@@ -3013,10 +3013,10 @@ bool OutputDevice::ImplNewFont() const
         {
             Size aOrigSize = maFont.GetSize();
             const_cast<Font&>(maFont).SetSize( Size( nNewWidth, aSize.Height() ) );
-            mbMap = sal_False;
-            mbNewFont = sal_True;
+            mbMap = false;
+            mbNewFont = true;
             ImplNewFont();  // recurse once using stretched width
-            mbMap = sal_True;
+            mbMap = true;
             const_cast<Font&>(maFont).SetSize( aOrigSize );
         }
     }
@@ -3092,10 +3092,10 @@ void OutputDevice::ImplDrawTextBackground( const SalLayout& rSalLayout )
     if ( mbLineColor || mbInitLineColor )
     {
         mpGraphics->SetLineColor();
-        mbInitLineColor = sal_True;
+        mbInitLineColor = true;
     }
     mpGraphics->SetFillColor( ImplColorToSal( GetTextFillColor() ) );
-    mbInitFillColor = sal_True;
+    mbInitFillColor = true;
 
     ImplDrawTextRect( nX, nY, 0, -(mpFontEntry->maMetric.mnAscent + mnEmphasisAscent),
                       nWidth,
@@ -3410,7 +3410,7 @@ void OutputDevice::ImplDrawWaveLine( long nBaseX, long nBaseY,
     if ( (nLineWidth == 1) && (nHeight == 1) )
     {
         mpGraphics->SetLineColor( ImplColorToSal( rColor ) );
-        mbInitLineColor = sal_True;
+        mbInitLineColor = true;
 
         long nEndX = nStartX+nWidth;
         long nEndY = nStartY;
@@ -3440,10 +3440,10 @@ void OutputDevice::ImplDrawWaveLine( long nBaseX, long nBaseY,
             if ( mbLineColor || mbInitLineColor )
             {
                 mpGraphics->SetLineColor();
-                mbInitLineColor = sal_True;
+                mbInitLineColor = true;
             }
             mpGraphics->SetFillColor( ImplColorToSal( rColor ) );
-            mbInitFillColor = sal_True;
+            mbInitFillColor = true;
             bDrawPixAsRect  = true;
             nPixWidth       = nLineWidth;
             nPixHeight      = ((nLineWidth*mnDPIX)+(mnDPIY/2))/mnDPIY;
@@ -3451,7 +3451,7 @@ void OutputDevice::ImplDrawWaveLine( long nBaseX, long nBaseY,
         else
         {
             mpGraphics->SetLineColor( ImplColorToSal( rColor ) );
-            mbInitLineColor = sal_True;
+            mbInitLineColor = true;
             nPixWidth       = 1;
             nPixHeight      = 1;
             bDrawPixAsRect  = false;
@@ -3653,10 +3653,10 @@ void OutputDevice::ImplDrawStraightTextLine( long nBaseX, long nBaseY,
         if ( mbLineColor || mbInitLineColor )
         {
             mpGraphics->SetLineColor();
-            mbInitLineColor = sal_True;
+            mbInitLineColor = true;
         }
         mpGraphics->SetFillColor( ImplColorToSal( aColor ) );
-        mbInitFillColor = sal_True;
+        mbInitFillColor = true;
 
         long nLeft = nDistX;
 
@@ -3844,10 +3844,10 @@ void OutputDevice::ImplDrawStrikeoutLine( long nBaseX, long nBaseY,
         if ( mbLineColor || mbInitLineColor )
         {
             mpGraphics->SetLineColor();
-            mbInitLineColor = sal_True;
+            mbInitLineColor = true;
         }
         mpGraphics->SetFillColor( ImplColorToSal( aColor ) );
-        mbInitFillColor = sal_True;
+        mbInitFillColor = true;
 
         const long& nLeft = nDistX;
 
@@ -4843,7 +4843,7 @@ void OutputDevice::SetAntialiasing( sal_uInt16 nMode )
     if ( mnAntialiasing != nMode )
     {
         mnAntialiasing = nMode;
-        mbInitFont = sal_True;
+        mbInitFont = true;
 
         if(mpGraphics)
         {
@@ -4938,12 +4938,12 @@ void OutputDevice::SetFont( const Font& rNewFont )
         && (aFont.GetColor() != maFont.GetColor() || aFont.GetColor() != maTextColor ) )
         {
             maTextColor = aFont.GetColor();
-            mbInitTextColor = sal_True;
+            mbInitTextColor = true;
             if( mpMetaFile )
                 mpMetaFile->AddAction( new MetaTextColorAction( aFont.GetColor() ) );
         }
         maFont      = aFont;
-        mbNewFont   = sal_True;
+        mbNewFont   = true;
 
         if( mpAlphaVDev )
         {
@@ -5019,7 +5019,7 @@ void OutputDevice::SetTextColor( const Color& rColor )
     if ( maTextColor != aColor )
     {
         maTextColor = aColor;
-        mbInitTextColor = sal_True;
+        mbInitTextColor = true;
     }
 
     if( mpAlphaVDev )
@@ -5210,7 +5210,7 @@ void OutputDevice::SetTextAlign( TextAlign eAlign )
     if ( maFont.GetAlign() != eAlign )
     {
         maFont.SetAlign( eAlign );
-        mbNewFont = sal_True;
+        mbNewFont = true;
     }
 
     if( mpAlphaVDev )
@@ -7415,8 +7415,8 @@ sal_Bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector
     sal_Bool bOldMap = mbMap;
     if( bOldMap )
     {
-        const_cast<OutputDevice&>(*this).mbMap = sal_False;
-        const_cast<OutputDevice&>(*this).mbNewFont = sal_True;
+        const_cast<OutputDevice&>(*this).mbMap = false;
+        const_cast<OutputDevice&>(*this).mbNewFont = true;
     }
 
     SalLayout* pSalLayout = NULL;
@@ -7476,7 +7476,7 @@ sal_Bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector
     {
         // restore original font size and map mode
         const_cast<OutputDevice&>(*this).mbMap = bOldMap;
-        const_cast<OutputDevice&>(*this).mbNewFont = sal_True;
+        const_cast<OutputDevice&>(*this).mbNewFont = true;
     }
 
     if( bRet || (OUTDEV_PRINTER == meOutDevType) || !mpFontEntry )
diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx
index c101ccc186b8..a18ce193dfde 100644
--- a/vcl/source/gdi/outdev4.cxx
+++ b/vcl/source/gdi/outdev4.cxx
@@ -660,10 +660,10 @@ void OutputDevice::DrawGradient( const Rectangle& rRect,
             if ( mbLineColor || mbInitLineColor )
             {
                 mpGraphics->SetLineColor();
-                mbInitLineColor = sal_True;
+                mbInitLineColor = true;
             }
 
-            mbInitFillColor = sal_True;
+            mbInitFillColor = true;
 
             // calculate step count if necessary
             if ( !aGradient.GetSteps() )
@@ -820,10 +820,10 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly,
                         if( mbLineColor || mbInitLineColor )
                         {
                             mpGraphics->SetLineColor();
-                            mbInitLineColor = sal_True;
+                            mbInitLineColor = true;
                         }
 
-                        mbInitFillColor = sal_True;
+                        mbInitFillColor = true;
 
                         // calculate step count if necessary
                         if ( !aGradient.GetSteps() )
diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx
index 83234c2e6cfb..24b5747f9468 100644
--- a/vcl/source/gdi/outmap.cxx
+++ b/vcl/source/gdi/outmap.cxx
@@ -702,12 +702,12 @@ void OutputDevice::SetMapMode()
 
     if ( mbMap || !maMapMode.IsDefault() )
     {
-        mbMap       = sal_False;
+        mbMap       = false;
         maMapMode   = MapMode();
 
         // create new objects (clip region werden nicht neu skaliert)
-        mbNewFont   = sal_True;
-        mbInitFont  = sal_True;
+        mbNewFont   = true;
+        mbInitFont  = true;
         if ( GetOutDevType() == OUTDEV_WINDOW )
         {
             if ( ((Window*)this)->mpWindowImpl->mpCursor )
@@ -806,8 +806,8 @@ void OutputDevice::SetMapMode( const MapMode& rNewMapMode )
         maMapMode = rNewMapMode;
 
     // create new objects (clip region werden nicht neu skaliert)
-    mbNewFont   = sal_True;
-    mbInitFont  = sal_True;
+    mbNewFont   = true;
+    mbInitFont  = true;
     if ( GetOutDevType() == OUTDEV_WINDOW )
     {
         if ( ((Window*)this)->mpWindowImpl->mpCursor )
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 464062aadfd0..fbfdbb5fd191 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -1801,7 +1801,7 @@ void PDFWriterImpl::PDFPage::appendWaveLine( sal_Int32 nWidth, sal_Int32 nY, sal
             // do not encrypt after all
             m_aContext.Encryption.OValue.clear();
             m_aContext.Encryption.UValue.clear();
-            OSL_ENSURE( 0, "encryption data failed sanity check, encryption disabled" );
+            OSL_ENSURE( false, "encryption data failed sanity check, encryption disabled" );
         }
         else // setup key lengths
             m_nAccessPermissions = computeAccessPermissions( m_aContext.Encryption, m_nKeyLength, m_nRC4KeyLength );
@@ -2202,7 +2202,7 @@ OutputDevice* PDFWriterImpl::getReferenceDevice()
         pVDev->SetMapMode( MAP_MM );
 
         m_pReferenceDevice->mpPDFWriter = this;
-        m_pReferenceDevice->ImplUpdateFontData( sal_True );
+        m_pReferenceDevice->ImplUpdateFontData( true );
     }
     return m_pReferenceDevice;
 }
@@ -2797,7 +2797,7 @@ bool PDFWriterImpl::emitGradients()
     for( std::list<GradientEmit>::iterator it = m_aGradients.begin();
          it != m_aGradients.end(); ++it )
     {
-        CHECK_RETURN( writeGradientFunction( *it ) );
+        if ( !writeGradientFunction( *it ) ) return false;
     }
     return true;
 }
@@ -2882,8 +2882,8 @@ bool PDFWriterImpl::emitTilings()
         aTilingObj.append( "/Length " );
         aTilingObj.append( (sal_Int32)nTilingStreamSize );
         aTilingObj.append( ">>\nstream\n" );
-        CHECK_RETURN( updateObject( it->m_nObject ) );
-        CHECK_RETURN( writeBuffer( aTilingObj.getStr(), aTilingObj.getLength() ) );
+        if ( !updateObject( it->m_nObject ) ) return false;
+        if ( !writeBuffer( aTilingObj.getStr(), aTilingObj.getLength() ) ) return false;
         checkAndEnableStreamEncryption( it->m_nObject );
         bool written = writeBuffer( it->m_pTilingStream->GetData(), nTilingStreamSize );
         delete it->m_pTilingStream;
@@ -2893,7 +2893,7 @@ bool PDFWriterImpl::emitTilings()
         disableStreamEncryption();
         aTilingObj.setLength( 0 );
         aTilingObj.append( "\nendstream\nendobj\n\n" );
-        CHECK_RETURN( writeBuffer( aTilingObj.getStr(), aTilingObj.getLength() ) );
+        if ( !writeBuffer( aTilingObj.getStr(), aTilingObj.getLength() ) ) return false;
     }
     return true;
 }
@@ -3894,19 +3894,19 @@ bool PDFWriterImpl::emitFonts()
             {
                 // create font stream
                 oslFileHandle aFontFile;
-                CHECK_RETURN( (osl_File_E_None == osl_openFile( aTmpName.pData, &aFontFile, osl_File_OpenFlag_Read ) ) );
+                if ( osl_File_E_None != osl_openFile( aTmpName.pData, &aFontFile, osl_File_OpenFlag_Read ) ) return false;
                 // get file size
                 sal_uInt64 nLength1;
-                CHECK_RETURN( (osl_File_E_None == osl_setFilePos( aFontFile, osl_Pos_End, 0 ) ) );
-                CHECK_RETURN( (osl_File_E_None == osl_getFilePos( aFontFile, &nLength1 ) ) );
-                CHECK_RETURN( (osl_File_E_None == osl_setFilePos( aFontFile, osl_Pos_Absolut, 0 ) ) );
+                if ( osl_File_E_None != osl_setFilePos( aFontFile, osl_Pos_End, 0 ) ) return false;
+                if ( osl_File_E_None != osl_getFilePos( aFontFile, &nLength1 ) ) return false;
+                if ( osl_File_E_None != osl_setFilePos( aFontFile, osl_Pos_Absolut, 0 ) ) return false;
 
                 #if OSL_DEBUG_LEVEL > 1
                 emitComment( "PDFWriterImpl::emitFonts" );
                 #endif
                 sal_Int32 nFontStream = createObject();
                 sal_Int32 nStreamLengthObject = createObject();
-                CHECK_RETURN( updateObject( nFontStream ) );
+                if ( !updateObject( nFontStream ) ) return false;
                 aLine.setLength( 0 );
                 aLine.append( nFontStream );
                 aLine.append( " 0 obj\n"
@@ -3925,8 +3925,8 @@ bool PDFWriterImpl::emitFonts()
 
                     aLine.append( ">>\n"
                                  "stream\n" );
-                    CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
-                    CHECK_RETURN( (osl_File_E_None == osl_getFilePos( m_aFile, &nStartPos ) ) );
+                    if ( !writeBuffer( aLine.getStr(), aLine.getLength() ) ) return false;
+                    if ( osl_File_E_None != osl_getFilePos( m_aFile, &nStartPos ) ) return false;
 
                     // copy font file
                     beginCompression();
@@ -3936,9 +3936,9 @@ bool PDFWriterImpl::emitFonts()
                     {
                         char buf[8192];
                         sal_uInt64 nRead;
-                        CHECK_RETURN( (osl_File_E_None == osl_readFile( aFontFile, buf, sizeof( buf ), &nRead ) ) );
-                        CHECK_RETURN( writeBuffer( buf, nRead ) );
-                        CHECK_RETURN( (osl_File_E_None == osl_isEndOfFile( aFontFile, &bEOF ) ) );
+                        if ( osl_File_E_None != osl_readFile( aFontFile, buf, sizeof( buf ), &nRead ) ) return false;
+                        if ( !writeBuffer( buf, nRead ) ) return false;
+                        if ( osl_File_E_None != osl_isEndOfFile( aFontFile, &bEOF ) ) return false;
                     } while( ! bEOF );
                 }
                 else if( (aSubsetInfo.m_nFontType & FontSubsetInfo::CFF_FONT) != 0 )
@@ -3951,9 +3951,9 @@ bool PDFWriterImpl::emitFonts()
                     boost::shared_array<unsigned char> pBuffer( new unsigned char[ nLength1 ] );
 
                     sal_uInt64 nBytesRead = 0;
-                    CHECK_RETURN( (osl_File_E_None == osl_readFile( aFontFile, pBuffer.get(), nLength1, &nBytesRead ) ) );
+                    if ( osl_File_E_None != osl_readFile( aFontFile, pBuffer.get(), nLength1, &nBytesRead ) ) return false;
                     DBG_ASSERT( nBytesRead==nLength1, "PDF-FontSubset read incomplete!" );
-                    CHECK_RETURN( (osl_File_E_None == osl_setFilePos( aFontFile, osl_Pos_Absolut, 0 ) ) );
+                    if ( osl_File_E_None != osl_setFilePos( aFontFile, osl_Pos_Absolut, 0 ) ) return false;
                     // get the PFB-segment lengths
                     ThreeInts aSegmentLengths = {0,0,0};
                     getPfbSegmentLengths( pBuffer.get(), (int)nBytesRead, aSegmentLengths );
@@ -3967,15 +3967,15 @@ bool PDFWriterImpl::emitFonts()
 
                     aLine.append( ">>\n"
                                  "stream\n" );
-                    CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
-                    CHECK_RETURN( (osl_File_E_None == osl_getFilePos( m_aFile, &nStartPos ) ) );
+                    if ( !writeBuffer( aLine.getStr(), aLine.getLength() ) ) return false;
+                    if ( osl_File_E_None != osl_getFilePos( m_aFile, &nStartPos ) ) return false;
 
                     // emit PFB-sections without section headers
                     beginCompression();
                     checkAndEnableStreamEncryption( nFontStream );
-                    CHECK_RETURN( writeBuffer( &pBuffer[6], aSegmentLengths[0] ) );
-                    CHECK_RETURN( writeBuffer( &pBuffer[12] + aSegmentLengths[0], aSegmentLengths[1] ) );
-                    CHECK_RETURN( writeBuffer( &pBuffer[18] + aSegmentLengths[0] + aSegmentLengths[1], aSegmentLengths[2] ) );
+                    if ( !writeBuffer( &pBuffer[6], aSegmentLengths[0] ) ) return false;
+                    if ( !writeBuffer( &pBuffer[12] + aSegmentLengths[0], aSegmentLengths[1] ) ) return false;
+                    if ( !writeBuffer( &pBuffer[18] + aSegmentLengths[0] + aSegmentLengths[1], aSegmentLengths[2] ) ) return false;
                 }
                 else
                 {
@@ -3989,20 +3989,20 @@ bool PDFWriterImpl::emitFonts()
                 osl_closeFile( aFontFile );
 
                 sal_uInt64 nEndPos = 0;
-                CHECK_RETURN( (osl_File_E_None == osl_getFilePos( m_aFile, &nEndPos ) ) );
+                if ( osl_File_E_None != osl_getFilePos( m_aFile, &nEndPos ) ) return false;
                 // end the stream
                 aLine.setLength( 0 );
                 aLine.append( "\nendstream\nendobj\n\n" );
-                CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
+                if ( !writeBuffer( aLine.getStr(), aLine.getLength() ) ) return false;
 
                 // emit stream length object
-                CHECK_RETURN( updateObject( nStreamLengthObject ) );
+                if ( !updateObject( nStreamLengthObject ) ) return false;
                 aLine.setLength( 0 );
                 aLine.append( nStreamLengthObject );
                 aLine.append( " 0 obj\n" );
                 aLine.append( (sal_Int64)(nEndPos-nStartPos) );
                 aLine.append( "\nendobj\n\n" );
-                CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
+                if ( !writeBuffer( aLine.getStr(), aLine.getLength() ) ) return false;
 
                 // write font descriptor
                 sal_Int32 nFontDescriptor = emitFontDescriptor( it->first, aSubsetInfo, lit->m_nFontID, nFontStream );
@@ -4011,7 +4011,7 @@ bool PDFWriterImpl::emitFonts()
                     nToUnicodeStream = createToUnicodeCMap( pEncoding, &aUnicodes[0], pUnicodesPerGlyph, pEncToUnicodeIndex, nGlyphs );
 
                 sal_Int32 nFontObject = createObject();
-                CHECK_RETURN( updateObject( nFontObject ) );
+                if ( !updateObject( nFontObject ) ) return false;
                 aLine.setLength( 0 );
                 aLine.append( nFontObject );
 
@@ -4043,7 +4043,7 @@ bool PDFWriterImpl::emitFonts()
                 }
                 aLine.append( ">>\n"
                              "endobj\n\n" );
-                CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
+                if ( !writeBuffer( aLine.getStr(), aLine.getLength() ) ) return false;
 
                 aFontIDToObject[ lit->m_nFontID ] = nFontObject;
             }
@@ -4072,7 +4072,7 @@ bool PDFWriterImpl::emitFonts()
         std::map< sal_Int32, sal_Int32 > aObjects = emitEmbeddedFont( eit->first, eit->second );
         for( std::map< sal_Int32, sal_Int32 >::iterator fit = aObjects.begin(); fit != aObjects.end(); ++fit )
         {
-            CHECK_RETURN( fit->second );
+            if ( !fit->second ) return false;
             aFontIDToObject[ fit->first ] = fit->second;
         }
     }
@@ -4083,7 +4083,7 @@ bool PDFWriterImpl::emitFonts()
         std::map< sal_Int32, sal_Int32 > aObjects = emitSystemFont( sit->first, sit->second );
         for( std::map< sal_Int32, sal_Int32 >::iterator fit = aObjects.begin(); fit != aObjects.end(); ++fit )
         {
-            CHECK_RETURN( fit->second );
+            if ( !fit->second ) return false;
             aFontIDToObject[ fit->first ] = fit->second;
         }
     }
@@ -4113,8 +4113,8 @@ bool PDFWriterImpl::emitFonts()
     appendBuiltinFontsToDict( aFontDict );
     aFontDict.append( "\n>>\nendobj\n\n" );
 
-    CHECK_RETURN( updateObject( getFontDictObject() ) );
-    CHECK_RETURN( writeBuffer( aFontDict.getStr(), aFontDict.getLength() ) );
+    if ( !updateObject( getFontDictObject() ) ) return false;
+    if ( !writeBuffer( aFontDict.getStr(), aFontDict.getLength() ) ) return false;
     return true;
 }
 
@@ -6808,7 +6808,7 @@ void PDFWriterImpl::sortWidgets()
         }
         else
         {
-            DBG_ASSERT( 0, "wrong number of sorted annotations" );
+            DBG_ASSERT( false, "wrong number of sorted annotations" );
             #if OSL_DEBUG_LEVEL > 0
             fprintf( stderr, "PDFWriterImpl::sortWidgets(): wrong number of sorted assertions on page nr %ld\n"
                      "    %ld sorted and %ld unsorted\n", (long int)it->first, (long int)it->second.aSortedAnnots.size(), (long int)nAnnots );
@@ -11087,7 +11087,7 @@ sal_Int32 PDFWriterImpl::beginStructureElement( PDFWriter::StructElement eType,
             if( childType == PDFWriter::Document )
             {
                 m_nCurrentStructElement = nNewCurElement;
-                DBG_ASSERT( 0, "Structure element inserted to StructTreeRoot that is not a document" );
+                DBG_ASSERT( false, "Structure element inserted to StructTreeRoot that is not a document" );
             }
             else {
                 OSL_FAIL( "document structure in disorder !" );
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index c423e0cd02e7..5fd03256fa84 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -413,7 +413,7 @@ OUString Printer::GetDefaultPrinterName()
 
 void Printer::ImplInitData()
 {
-    mbDevOutput         = sal_False;
+    mbDevOutput         = false;
     meOutDevType        = OUTDEV_PRINTER;
     mbDefPrinter        = sal_False;
     mnError             = 0;
@@ -579,7 +579,7 @@ void Printer::ImplUpdatePageData()
 
 void Printer::ImplUpdateFontList()
 {
-    ImplUpdateFontData( sal_True );
+    ImplUpdateFontData( true );
 }
 
 
@@ -831,8 +831,8 @@ sal_Bool Printer::SetPrinterProps( const Printer* pPrinter )
             mpFontCache = NULL;
             mpFontList = NULL;
 
-            mbInitFont = sal_True;
-            mbNewFont = sal_True;
+            mbInitFont = true;
+            mbNewFont = true;
             mpInfoPrinter = NULL;
         }
 
@@ -873,8 +873,8 @@ sal_Bool Printer::SetPrinterProps( const Printer* pPrinter )
             delete mpFontList;
             mpFontCache = NULL;
             mpFontList = NULL;
-            mbInitFont = sal_True;
-            mbNewFont = sal_True;
+            mbInitFont = true;
+            mbNewFont = true;
             mpInfoPrinter = NULL;
         }
 
@@ -1352,7 +1352,7 @@ sal_Bool Printer::EndJob()
         mnCurPrintPage  = 0;
         maJobName = OUString();
 
-        mbDevOutput = sal_False;
+        mbDevOutput = false;
         bRet = mpPrinter->EndJob();
         // FIXME: Do not destroy the printer asynchronously as Win95
         // can't handle destroying a printer object and printing
@@ -1378,7 +1378,7 @@ void Printer::ImplStartPage()
             ImplReleaseGraphics();
             mpJobGraphics = pGraphics;
         }
-        mbDevOutput = sal_True;
+        mbDevOutput = true;
 
         // PrintJob not aborted ???
         if ( IsJobActive() )
@@ -1402,7 +1402,7 @@ void Printer::ImplEndPage()
     {
         mpPrinter->EndPage();
         ImplReleaseGraphics();
-        mbDevOutput = sal_False;
+        mbDevOutput = false;
 
         mpJobGraphics = NULL;
         mbNewJobSetup = sal_False;
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index a905cca6c5be..16b035cfa2de 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -1255,7 +1255,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
                                     }
 
                                     const sal_Bool bOldMap = mbMap;
-                                    mbMap = aPaintVDev.mbMap = sal_False;
+                                    mbMap = aPaintVDev.mbMap = false;
 
                                     Bitmap aBandBmp( aPaintVDev.GetBitmap( Point(), aDstSzPix ) );
 
@@ -1271,7 +1271,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
                                     rOutMtf.AddAction( new MetaBmpScaleAction( aDstPtPix, aDstSzPix, aBandBmp ) );
                                     rOutMtf.AddAction( new MetaCommentAction( "PRNSPOOL_TRANSPARENTBITMAP_END" ) );
 
-                                    aPaintVDev.mbMap = sal_True;
+                                    aPaintVDev.mbMap = true;
                                     mbMap = bOldMap;
                                     aMapVDev.Pop();
                                     aPaintVDev.Pop();
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 26c5d13e01e7..fa418b89caf7 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -524,14 +524,14 @@ bool Printer::StartJob( const OUString& i_rJobName, boost::shared_ptr<vcl::Print
     mnError = PRINTER_OK;
 
     if ( IsDisplayPrinter() )
-        return sal_False;
+        return false;
 
     if ( IsJobActive() || IsPrinting() )
-        return sal_False;
+        return false;
 
     sal_uLong   nCopies = mnCopyCount;
     bool    bCollateCopy = mbCollateCopy;
-    bool    bUserCopy = sal_False;
+    bool    bUserCopy = false;
 
     if ( nCopies > 1 )
     {
@@ -545,20 +545,20 @@ bool Printer::StartJob( const OUString& i_rJobName, boost::shared_ptr<vcl::Print
         // need to do copies by hand ?
         if ( nCopies > nDevCopy )
         {
-            bUserCopy = sal_True;
+            bUserCopy = true;
             nCopies = 1;
-            bCollateCopy = sal_False;
+            bCollateCopy = false;
         }
     }
     else
-        bCollateCopy = sal_False;
+        bCollateCopy = false;
 
 
     ImplSVData* pSVData = ImplGetSVData();
     mpPrinter = pSVData->mpDefInst->CreatePrinter( mpInfoPrinter );
 
     if ( !mpPrinter )
-        return sal_False;
+        return false;
 
     sal_Bool bSinglePrintJobs = sal_False;
     beans::PropertyValue* pSingleValue = i_pController->getValue( OUString( "PrintCollateAsSingleJobs" ) );
diff --git a/vcl/source/gdi/svgdata.cxx b/vcl/source/gdi/svgdata.cxx
index 423505a35f8b..5786480c0296 100644
--- a/vcl/source/gdi/svgdata.cxx
+++ b/vcl/source/gdi/svgdata.cxx
@@ -129,7 +129,7 @@ void SvgData::ensureSequenceAndRange()
             }
             catch(const uno::Exception&)
             {
-                OSL_ENSURE(sal_False, "Got no graphic::XSvgParser (!)" );
+                OSL_ENSURE(false, "Got no graphic::XSvgParser (!)" );
             }
         }
 
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index 4ef472047e02..cc0cc1683fc8 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -92,7 +92,7 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev,
         mbScreenComp = ((VirtualDevice*)pOutDev)->mbScreenComp;
 
     meOutDevType    = OUTDEV_VIRDEV;
-    mbDevOutput     = sal_True;
+    mbDevOutput     = true;
     mpFontList      = pSVData->maGDIData.mpScreenFontList;
     mpFontCache     = pSVData->maGDIData.mpScreenFontCache;
     mnDPIX          = pOutDev->mnDPIX;
@@ -383,7 +383,7 @@ void VirtualDevice::SetReferenceDevice( RefDevMode i_eRefDevMode )
     {
     case REFDEV_NONE:
     default:
-        DBG_ASSERT( sal_False, "VDev::SetRefDev illegal argument!" );
+        DBG_ASSERT( false, "VDev::SetRefDev illegal argument!" );
         break;
     case REFDEV_MODE06:
         nDPIX = nDPIY = 600;
@@ -413,8 +413,8 @@ void VirtualDevice::ImplSetReferenceDevice( RefDevMode i_eRefDevMode, sal_Int32
     mbScreenComp = sal_False;
 
     // invalidate currently selected fonts
-    mbInitFont = sal_True;
-    mbNewFont = sal_True;
+    mbInitFont = true;
+    mbNewFont = true;
 
     // avoid adjusting font lists when already in refdev mode
     sal_uInt8 nOldRefDevMode = meRefDevMode;
diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx
index 297d98b85353..3b7bbab66562 100644
--- a/vcl/source/gdi/wall.cxx
+++ b/vcl/source/gdi/wall.cxx
@@ -143,7 +143,7 @@ SvStream& operator>>( SvStream& rIStm, ImplWallpaper& rImplWallpaper )
         // version 3 (new color format)
         if( aCompat.GetVersion() >= 3 )
         {
-            rImplWallpaper.maColor.Read( rIStm, sal_True );
+            rImplWallpaper.maColor.Read( rIStm, true );
         }
     }
 
@@ -177,7 +177,7 @@ SvStream& WriteImplWallpaper( SvStream& rOStm, const ImplWallpaper& rImplWallpap
         WriteDIBBitmapEx(*rImplWallpaper.mpBitmap, rOStm);
 
     // version 3 (new color format)
-    ( (Color&) rImplWallpaper.maColor ).Write( rOStm, sal_True );
+    ( (Color&) rImplWallpaper.maColor ).Write( rOStm, true );
 
     return rOStm;
 }