sal_Bool -> bool in mostly vcl module

Conflicts:
include/vcl/settings.hxx
svtools/source/table/tablecontrol_impl.cxx
sw/source/core/frmedt/fecopy.cxx
vcl/inc/canvasbitmap.hxx
vcl/inc/headless/svpframe.hxx
vcl/inc/unx/salframe.h
vcl/inc/win/salframe.h
vcl/inc/win/salprn.h
vcl/inc/win/salvd.h
vcl/osx/DragSource.cxx
vcl/osx/DragSource.hxx
vcl/osx/DropTarget.cxx
vcl/osx/DropTarget.hxx
vcl/osx/OSXTransferable.cxx
vcl/osx/OSXTransferable.hxx
vcl/osx/clipboard.cxx
vcl/osx/clipboard.hxx
vcl/osx/salprn.cxx
vcl/qa/cppunit/canvasbitmaptest.cxx
vcl/source/components/fontident.cxx
vcl/source/control/edit.cxx
vcl/source/control/spinfld.cxx
vcl/source/gdi/gdimtf.cxx
vcl/source/gdi/virdev.cxx
vcl/source/helper/canvasbitmap.cxx
vcl/source/window/dockwin.cxx
vcl/unx/generic/dtrans/X11_selection.hxx
vcl/unx/kde/UnxFilePicker.cxx
vcl/unx/kde/UnxFilePicker.hxx
vcl/unx/kde4/KDE4FilePicker.cxx
vcl/unx/kde4/KDE4FilePicker.hxx
vcl/unx/kde4/KDESalFrame.hxx

Change-Id: I9866d985da86dea2a56feff23f91c1467a1636b0
Reviewed-on: https://gerrit.libreoffice.org/8219
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

26 files changed, 74 insertions, 75 deletions

diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx
index b8dd5826cbb8..19ffcb8b2412 100644
--- a/include/sfx2/dockwin.hxx
+++ b/include/sfx2/dockwin.hxx
@@ -62,7 +62,7 @@ protected:
     virtual void        ToggleFloatingMode();
     virtual void        StartDocking();
     virtual bool        Docking( const Point& rPos, Rectangle& rRect );
-    virtual void        EndDocking( const Rectangle& rRect, sal_Bool bFloatMode );
+    virtual void        EndDocking( const Rectangle& rRect, bool bFloatMode );
     virtual void        Resizing( Size& rSize );
     virtual void        Paint( const Rectangle& rRect );
     virtual bool        Close();
diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx
index ddc8220fc1d4..b9c1e03fb66e 100644
--- a/include/sfx2/titledockwin.hxx
+++ b/include/sfx2/titledockwin.hxx
@@ -101,7 +101,7 @@ namespace sfx2
         virtual void SetText( const OUString& i_rText );
 
         // DockingWindow overridables
-        void EndDocking( const Rectangle& rRect, sal_Bool bFloatMode );
+        void EndDocking( const Rectangle& rRect, bool bFloatMode );
 
         // own overridables
         virtual void onLayoutDone();
diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx
index 9b60912bb38b..6fad42f27c74 100644
--- a/include/svtools/calendar.hxx
+++ b/include/svtools/calendar.hxx
@@ -420,7 +420,7 @@ public:
 
     virtual void        Select();
 
-    virtual bool        ShowDropDown( sal_Bool bShow );
+    virtual bool        ShowDropDown( bool bShow );
     virtual Calendar*   CreateCalendar( Window* pParent );
     Calendar*           GetCalendar();
 
diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx
index fa69831d7fa3..3464d03de94c 100644
--- a/include/vcl/abstdlg.hxx
+++ b/include/vcl/abstdlg.hxx
@@ -30,7 +30,6 @@ class VCL_DLLPUBLIC VclAbstractDialog
 {
 public:
     virtual short           Execute() = 0;
-    //virtual void          Show( sal_Bool bVisible = sal_True, sal_uInt16 nFlags = 0 ) = 0;
     virtual                 ~VclAbstractDialog();
 };
 
diff --git a/include/vcl/accel.hxx b/include/vcl/accel.hxx
index b61506ebcf8d..362d2c788f3b 100644
--- a/include/vcl/accel.hxx
+++ b/include/vcl/accel.hxx
@@ -45,7 +45,7 @@ private:
     sal_uInt16      mnCurId;
     sal_uInt16      mnCurRepeat;
     bool        mbIsCancel;
-    sal_Bool*       mpDel;
+    bool*       mpDel;
 
     SAL_DLLPRIVATE  void        ImplInit();
     SAL_DLLPRIVATE  void        ImplCopyData( ImplAccelData& rAccelData );
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 3e64da7657ad..86e404ec6a83 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -403,7 +403,7 @@ public:
         @param rData
         The system dependent BitmapSystemData structure to be filled
 
-        @return sal_True if the bitmap has a valid system object (e.g. not empty)
+        @return true if the bitmap has a valid system object (e.g. not empty)
     */
     bool                    GetSystemData( BitmapSystemData& rData ) const;
 
@@ -424,7 +424,7 @@ public:
         @param eConversion
         The format this bitmap should be converted to.
 
-        @return sal_True, if the conversion was completed successfully.
+        @return true, if the conversion was completed successfully.
      */
     bool                    Convert( BmpConversion eConversion );
 
@@ -436,7 +436,7 @@ public:
         @param eReduce
         Algorithm to use for color reduction
 
-        @return sal_True, if the color reduction operation was completed successfully.
+        @return true, if the color reduction operation was completed successfully.
      */
     bool                    ReduceColors( sal_uInt16 nNewColorCount,
                                           BmpReduce eReduce = BMP_REDUCE_SIMPLE );
@@ -462,9 +462,9 @@ public:
         dimension, i.e. negative left,top rectangle coordinates or
         exceeding width or height is ignored.
 
-        @return sal_True, if cropping was performed successfully. If
+        @return true, if cropping was performed successfully. If
         nothing had to be cropped, because e.g. the crop rectangle
-        included the bitmap, sal_False is returned, too!
+        included the bitmap, false is returned, too!
      */
     bool                    Crop( const Rectangle& rRectPixel );
 
@@ -479,7 +479,7 @@ public:
         @param pInitColor
         Color to use for padded pixel
 
-        @return sal_True, if padding was performed successfully. sal_False is
+        @return true, if padding was performed successfully. false is
         not only returned when the operation failed, but also if
         nothing had to be done, e.g. because nDX and nDY were zero.
      */
@@ -503,7 +503,7 @@ public:
         equal to the object this method is called on, copying takes
         place within the same bitmap.
 
-        @return sal_True, if the operation completed successfully. sal_False
+        @return true, if the operation completed successfully. false
         is not only returned when the operation failed, but also if
         nothing had to be done, e.g. because one of the rectangles are
         empty.
@@ -520,7 +520,7 @@ public:
         @param eCombine
         The combine operation to perform on the bitmap
 
-        @return sal_True, if the operation was completed successfully.
+        @return true, if the operation was completed successfully.
      */
     bool                    CombineSimple( const Bitmap& rMask,
                                            BmpCombine eCombine );
@@ -539,7 +539,7 @@ public:
         @param rBackgroundColor
         Background color to use for every pixel during alpha blending
 
-        @return sal_True, if blending was successful, sal_False otherwise
+        @return true, if blending was successful, false otherwise
      */
     bool                    Blend( const AlphaMask& rAlpha,
                                    const Color&     rBackgroundColor );
@@ -549,13 +549,13 @@ public:
         @param rFillColor
         Color value to use for filling
 
-        @return sal_True, if the operation was completed successfully.
+        @return true, if the operation was completed successfully.
      */
     bool                    Erase( const Color& rFillColor );
 
     /** Perform the Invert operation on every pixel
 
-        @return sal_True, if the operation was completed successfully.
+        @return true, if the operation was completed successfully.
      */
     bool                    Invert();
 
@@ -564,7 +564,7 @@ public:
         @param nMirrorFlags
         About which axis (horizontal, vertical, or both) to mirror
 
-        @return sal_True, if the operation was completed successfully.
+        @return true, if the operation was completed successfully.
      */
     bool                    Mirror( sal_uLong nMirrorFlags );
 
@@ -576,7 +576,7 @@ public:
         @param nScaleFlag
         The algorithm to be used for scaling
 
-        @return sal_True, if the operation was completed successfully.
+        @return true, if the operation was completed successfully.
      */
     bool                    Scale( const Size& rNewSize, sal_uInt32 nScaleFlag = BMP_SCALE_DEFAULT );
 
@@ -591,7 +591,7 @@ public:
         @param nScaleFlag
         Method of scaling - it is recommended that either BMP_SCALE_DEFAULT or BMP_SCALE_BESTQUALITY be used.
 
-        @return sal_True, if the operation was completed successfully.
+        @return true, if the operation was completed successfully.
      */
     bool                    Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag = BMP_SCALE_DEFAULT );
 
@@ -610,7 +610,7 @@ public:
         in. The empty spaces around that rotated original bitmap are
         then filled with this color.
 
-        @return sal_True, if the operation was completed successfully.
+        @return true, if the operation was completed successfully.
      */
     bool                    Rotate( long nAngle10, const Color& rFillColor );
 
@@ -653,7 +653,7 @@ public:
         @param rReplaceColor
         Color to be placed in all changed pixel
 
-        @return sal_True, if the operation was completed successfully.
+        @return true, if the operation was completed successfully.
      */
     bool                    Replace( const Bitmap& rMask, const Color& rReplaceColor );
 
@@ -665,7 +665,7 @@ public:
         @param rMergeColor
         Background color to be used for merging
 
-        @return sal_True, if the operation was completed successfully.
+        @return true, if the operation was completed successfully.
      */
     bool                    Replace( const AlphaMask& rAlpha, const Color& rMergeColor );
 
@@ -682,7 +682,7 @@ public:
         rSearchColor and the individual pixel values, such that the
         corresponding pixel is still regarded a match.
 
-        @return sal_True, if the operation was completed successfully.
+        @return true, if the operation was completed successfully.
      */
     bool                    Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol = 0 );
 
@@ -702,7 +702,7 @@ public:
         pSearchColor colors and the individual pixel values, such that
         the corresponding pixel is still regarded a match.
 
-        @return sal_True, if the operation was completed successfully.
+        @return true, if the operation was completed successfully.
      */
     bool                    Replace( const Color* pSearchColors, const Color* rReplaceColors,
                                      sal_uLong nColorCount, sal_uLong* pTols = NULL );
@@ -722,7 +722,7 @@ public:
         @param pProgress
         A callback for showing the progress of the vectorization
 
-        @return sal_True, if the operation was completed successfully.
+        @return true, if the operation was completed successfully.
      */
     bool                    Vectorize( PolyPolygon& rPolyPoly,
                                        sal_uLong nFlags = BMP_VECTORIZE_OUTER,
@@ -747,7 +747,7 @@ public:
         @param pProgress
         A callback for showing the progress of the vectorization
 
-        @return sal_True, if the operation was completed successfully.
+        @return true, if the operation was completed successfully.
      */
     bool                    Vectorize( GDIMetaFile& rMtf, sal_uInt8 cReduce = 0,
                                        sal_uLong nFlags = BMP_VECTORIZE_INNER,
@@ -776,9 +776,9 @@ public:
         (0.0,10.0]. Values outside this range are regarded as 1.0.
 
         @param bInvert
-        If sal_True, invert the channel values with the logical 'not' operator
+        If true, invert the channel values with the logical 'not' operator
 
-        @return sal_True, if the operation was completed successfully.
+        @return true, if the operation was completed successfully.
      */
     bool                    Adjust( short nLuminancePercent = 0,
                                     short nContrastPercent = 0,
@@ -799,7 +799,7 @@ public:
         @param pProgress
         A callback for showing the progress of the vectorization
 
-        @return sal_True, if the operation was completed successfully.
+        @return true, if the operation was completed successfully.
      */
     bool                    Filter( BmpFilter eFilter,
                                     const BmpFilterParam* pFilterParam = NULL,
diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx
index 506a38bc7fcb..97b3a5b1f66e 100644
--- a/include/vcl/bitmapex.hxx
+++ b/include/vcl/bitmapex.hxx
@@ -126,7 +126,7 @@ public:
         @param eConversion
         The format this bitmap should be converted to.
 
-        @return sal_True, if the conversion was completed successfully.
+        @return true, if the conversion was completed successfully.
      */
     bool                Convert( BmpConversion eConversion );
 
@@ -138,7 +138,7 @@ public:
         @param eReduce
         Algorithm to use for color reduction
 
-        @return sal_True, if the color reduction operation was completed successfully.
+        @return true, if the color reduction operation was completed successfully.
      */
     bool                ReduceColors( sal_uInt16 nNewColorCount,
                                       BmpReduce eReduce = BMP_REDUCE_SIMPLE );
@@ -164,9 +164,9 @@ public:
         dimension, i.e. negative left,top rectangle coordinates or
         exceeding width or height is ignored.
 
-        @return sal_True, if cropping was performed successfully. If
+        @return true, if cropping was performed successfully. If
         nothing had to be cropped, because e.g. the crop rectangle
-        included the bitmap, sal_False is returned, too!
+        included the bitmap, false is returned, too!
      */
     bool                Crop( const Rectangle& rRectPixel );
 
@@ -184,7 +184,7 @@ public:
         @param bExpandTransparent
         Whether to expand the transparency color or not.
 
-        @return sal_True, if padding was performed successfully. sal_False is
+        @return true, if padding was performed successfully. false is
         not only returned when the operation failed, but also if
         nothing had to be done, e.g. because nDX and nDY were zero.
      */
@@ -209,7 +209,7 @@ public:
         equal to the object this method is called on, copying takes
         place within the same bitmap.
 
-        @return sal_True, if the operation completed successfully. sal_False
+        @return true, if the operation completed successfully. false
         is not only returned when the operation failed, but also if
         nothing had to be done, e.g. because one of the rectangles are
         empty.
@@ -224,13 +224,13 @@ public:
         Color value to use for filling. Set the transparency part of
         the color to fill the mask.
 
-        @return sal_True, if the operation was completed successfully.
+        @return true, if the operation was completed successfully.
      */
     bool                Erase( const Color& rFillColor );
 
     /** Perform the Invert operation on every pixel
 
-        @return sal_True, if the operation was completed successfully.
+        @return true, if the operation was completed successfully.
      */
     bool                Invert();
 
@@ -239,7 +239,7 @@ public:
         @param nMirrorFlags
         About which axis (horizontal, vertical, or both) to mirror
 
-        @return sal_True, if the operation was completed successfully.
+        @return true, if the operation was completed successfully.
      */
     bool                Mirror( sal_uLong nMirrorFlags );
 
@@ -251,7 +251,7 @@ public:
         @param nScaleFlag
         The algorithm to be used for scaling
 
-        @return sal_True, if the operation was completed successfully.
+        @return true, if the operation was completed successfully.
      */
     bool                Scale( const Size& rNewSize, sal_uInt32 nScaleFlag = BMP_SCALE_DEFAULT );
 
@@ -266,7 +266,7 @@ public:
         @param nScaleFlag
         The algorithm to be used for scaling
 
-        @return sal_True, if the operation was completed successfully.
+        @return true, if the operation was completed successfully.
      */
     bool                Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag = BMP_SCALE_DEFAULT );
 
@@ -281,7 +281,7 @@ public:
         in. The empty spaces around that rotated original bitmap are
         then filled with this color.
 
-        @return sal_True, if the operation was completed successfully.
+        @return true, if the operation was completed successfully.
      */
     bool                Rotate( long nAngle10, const Color& rFillColor );
 
@@ -298,7 +298,7 @@ public:
         rSearchColor and the individual pixel values, such that the
         corresponding pixel is still regarded a match.
 
-        @return sal_True, if the operation was completed successfully.
+        @return true, if the operation was completed successfully.
      */
     bool                Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol = 0 );
 
@@ -318,7 +318,7 @@ public:
         pSearchColor colors and the individual pixel values, such that
         the corresponding pixel is still regarded a match.
 
-        @return sal_True, if the operation was completed successfully.
+        @return true, if the operation was completed successfully.
      */
     bool                Replace( const Color* pSearchColors, const Color* pReplaceColors,
                                  sal_uLong nColorCount, const sal_uLong* pTols = NULL );
@@ -346,9 +346,9 @@ public:
         (0.0,10.0]. Values outside this range are regarded as 1.0.
 
         @param bInvert
-        If sal_True, invert the channel values with the logical 'not' operator
+        If true, invert the channel values with the logical 'not' operator
 
-        @return sal_True, if the operation was completed successfully.
+        @return true, if the operation was completed successfully.
      */
     bool                Adjust( short nLuminancePercent = 0,
                                 short nContrastPercent = 0,
@@ -369,7 +369,7 @@ public:
         @param pProgress
         A callback for showing the progress of the vectorization
 
-        @return sal_True, if the operation was completed successfully.
+        @return true, if the operation was completed successfully.
      */
     bool                Filter( BmpFilter eFilter,
                                 const BmpFilterParam* pFilterParam = NULL,
diff --git a/include/vcl/bmpacc.hxx b/include/vcl/bmpacc.hxx
index a233e9624820..a6472b479b27 100644
--- a/include/vcl/bmpacc.hxx
+++ b/include/vcl/bmpacc.hxx
@@ -254,7 +254,7 @@ inline Point BitmapReadAccess::BottomRight() const
 inline bool BitmapReadAccess::IsTopDown() const
 {
     DBG_ASSERT( mpBuffer, "Access is not valid!" );
-    return( mpBuffer ? sal::static_int_cast<sal_Bool>( BMP_SCANLINE_ADJUSTMENT( mpBuffer->mnFormat ) == BMP_FORMAT_TOP_DOWN ) : sal_False );
+    return( mpBuffer ? sal::static_int_cast<bool>( BMP_SCANLINE_ADJUSTMENT( mpBuffer->mnFormat ) == BMP_FORMAT_TOP_DOWN ) : false );
 }
 
 // ------------------------------------------------------------------
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index 86b37ee4a72a..1e460878cfa4 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -86,7 +86,7 @@ protected:
 
 protected:
     explicit            ComboBox( WindowType nType );
-    bool            IsDropDownBox() const { return mpFloatWin ? sal_True : sal_False; }
+    bool            IsDropDownBox() const { return mpFloatWin ? true : false; }
 
     virtual void  FillLayoutData() const;
 public:
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index f1f3fbd5e2f4..2c0a3d4ceb39 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -285,7 +285,7 @@ public:
 
     virtual void    StartDocking();
     virtual bool    Docking( const Point& rPos, Rectangle& rRect );
-    virtual void    EndDocking( const Rectangle& rRect, sal_Bool bFloatMode );
+    virtual void    EndDocking( const Rectangle& rRect, bool bFloatMode );
     virtual bool    PrepareToggleFloatingMode();
     virtual void    ToggleFloatingMode();
 
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 747a96e771cf..3fe232d96539 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -183,7 +183,7 @@ public:
     void                SetEchoChar( sal_Unicode c );
     sal_Unicode         GetEchoChar() const { return mcEchoChar; }
 
-    virtual void        SetReadOnly( sal_Bool bReadOnly = sal_True );
+    virtual void        SetReadOnly( bool bReadOnly = true );
     virtual bool        IsReadOnly() const { return mbReadOnly; }
 
     void                SetInsertMode( bool bInsert );
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index 01f6c2f8d4fa..e3e066da01ab 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -356,7 +356,7 @@ public:
 
     // --------------------------------------------------------------
     // MT: Remove these methods too, ExtDateFormat should be enough!
-    //     What should happen if using DDMMYYYY, but ShowCentury=sal_False?
+    //     What should happen if using DDMMYYYY, but ShowCentury=false?
     // --------------------------------------------------------------
     void                    SetLongFormat( bool bLong );
     bool                    IsLongFormat() const { return mbLongFormat; }
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index d62cf40a3f69..03403d7dac1b 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -187,9 +187,9 @@ public:
 
     /** starts the detection
 
-        if bExtendedInfo == sal_True the file header is used to derive
+        if bExtendedInfo == true the file header is used to derive
         as many properties as possible (size, color, etc.) */
-    virtual bool    Detect( sal_Bool bExtendedInfo = sal_False );
+    virtual bool    Detect( bool bExtendedInfo = false );
 
     /** @return the file format, GFF_NOT if no format was recognized */
     sal_uInt16          GetFileFormat() const { return nFormat; }
diff --git a/include/vcl/keycod.hxx b/include/vcl/keycod.hxx
index 4e8cf1f5111b..4029c30bc618 100644
--- a/include/vcl/keycod.hxx
+++ b/include/vcl/keycod.hxx
@@ -67,7 +67,7 @@ public:
     OUString        GetName( Window* pWindow = NULL ) const;
 
     bool        IsFunction() const
-                    { return ((eFunc != KEYFUNC_DONTKNOW) ? sal_True : sal_False); }
+                    { return ((eFunc != KEYFUNC_DONTKNOW) ? true : false); }
 
     KeyFuncType GetFunction() const;
 
diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx
index 8f986fcbc63b..76ec86b6673d 100644
--- a/include/vcl/lstbox.hxx
+++ b/include/vcl/lstbox.hxx
@@ -70,7 +70,7 @@ protected:
     SAL_DLLPRIVATE void    ImplInit( Window* pParent, WinBits nStyle );
     SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle );
     SAL_DLLPRIVATE void    ImplLoadRes( const ResId& rResId );
-    bool               IsDropDownBox() const { return mpFloatWin ? sal_True : sal_False; }
+    bool               IsDropDownBox() const { return mpFloatWin ? true : false; }
 
 protected:
     explicit            ListBox( WindowType nType );
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 96cf410592a7..8b081d17c391 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -311,7 +311,7 @@ public:
     void                SetSelectHdl( const Link& rLink )       { aSelectHdl = rLink; }
     const Link&         GetSelectHdl() const                    { return aSelectHdl; }
 
-    bool                HasLogo() const { return pLogo ? sal_True : sal_False; }
+    bool                HasLogo() const { return pLogo ? true : false; }
 
     void                AddEventListener( const Link& rEventListener );
     void                RemoveEventListener( const Link& rEventListener );
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index 6e92484f4827..54889a35bde8 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -277,7 +277,7 @@ inline BitmapColor::BitmapColor() :
             mcBlueOrIndex   ( 0 ),
             mcGreen         ( 0 ),
             mcRed           ( 0 ),
-            mbIndex         ( sal_False )
+            mbIndex         ( false )
 {
 }
 
@@ -287,7 +287,7 @@ inline BitmapColor::BitmapColor( sal_uInt8 cRed, sal_uInt8 cGreen, sal_uInt8 cBl
             mcBlueOrIndex   ( cBlue ),
             mcGreen         ( cGreen ),
             mcRed           ( cRed ),
-            mbIndex         ( sal_False )
+            mbIndex         ( false )
 {
 }
 
@@ -317,7 +317,7 @@ inline BitmapColor::BitmapColor( sal_uInt8 cIndex ) :
             mcBlueOrIndex   ( cIndex ),
             mcGreen         ( 0 ),
             mcRed           ( 0 ),
-            mbIndex         ( sal_True )
+            mbIndex         ( true )
 {
 }
 
diff --git a/include/vcl/seleng.hxx b/include/vcl/seleng.hxx
index d6bb2d3cd955..6762a1e051a5 100644
--- a/include/vcl/seleng.hxx
+++ b/include/vcl/seleng.hxx
@@ -50,9 +50,9 @@ public:
     virtual void    DestroyAnchor() = 0;
 
     // move cursor, at the same time match cursor position to the selection
-    // starting at anchor. sal_True == Ok
+    // starting at anchor. true == Ok
     virtual bool    SetCursorAtPoint( const Point& rPointPixel,
-                                          sal_Bool bDontSelectAtCursor = sal_False ) = 0;
+                                          bool bDontSelectAtCursor = false ) = 0;
 
     virtual bool    IsSelectionAtPoint( const Point& rPointPixel ) = 0;
     virtual void        DeselectAtPoint( const Point& rPointPixel ) = 0;
@@ -96,7 +96,7 @@ public:
                                          sal_uLong nAutoRepeatInterval = SELENG_AUTOREPEAT_INTERVAL );
                         ~SelectionEngine();
 
-    // sal_True: Event was processed by Selection Engine
+    // true: Event was processed by Selection Engine
     bool                SelMouseButtonDown( const MouseEvent& rMEvt );
     bool                SelMouseButtonUp( const MouseEvent& rMEvt );
     bool                SelMouseMove( const MouseEvent& rMEvt );
diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx
index bfb69b6431e1..117b0a773f4d 100644
--- a/include/vcl/spinfld.hxx
+++ b/include/vcl/spinfld.hxx
@@ -74,7 +74,7 @@ public:
     explicit        SpinField( Window* pParent, const ResId& );
     virtual         ~SpinField();
 
-    virtual bool    ShowDropDown( sal_Bool bShow );
+    virtual bool    ShowDropDown( bool bShow );
 
     virtual void    Up();
     virtual void    Down();
diff --git a/include/vcl/textdata.hxx b/include/vcl/textdata.hxx
index f4bf40815e19..3b3fc530328e 100644
--- a/include/vcl/textdata.hxx
+++ b/include/vcl/textdata.hxx
@@ -52,7 +52,7 @@ public:
 
 inline bool TextPaM::operator == ( const TextPaM& rPaM ) const
 {
-    return ( ( mnPara == rPaM.mnPara ) && ( mnIndex == rPaM.mnIndex ) ) ? sal_True : sal_False;
+    return ( ( mnPara == rPaM.mnPara ) && ( mnIndex == rPaM.mnIndex ) ) ? true : false;
 }
 
 inline bool TextPaM::operator != ( const TextPaM& rPaM ) const
@@ -63,13 +63,13 @@ inline bool TextPaM::operator != ( const TextPaM& rPaM ) const
 inline bool TextPaM::operator < ( const TextPaM& rPaM ) const
 {
     return ( ( mnPara < rPaM.mnPara ) ||
-             ( ( mnPara == rPaM.mnPara ) && mnIndex < rPaM.mnIndex ) ) ? sal_True : sal_False;
+             ( ( mnPara == rPaM.mnPara ) && mnIndex < rPaM.mnIndex ) ) ? true : false;
 }
 
 inline bool TextPaM::operator > ( const TextPaM& rPaM ) const
 {
     return ( ( mnPara > rPaM.mnPara ) ||
-             ( ( mnPara == rPaM.mnPara ) && mnIndex > rPaM.mnIndex ) ) ? sal_True : sal_False;
+             ( ( mnPara == rPaM.mnPara ) && mnIndex > rPaM.mnIndex ) ) ? true : false;
 }
 
 class VCL_DLLPUBLIC TextSelection
diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx
index 700def50dbda..04416ea78e2d 100644
--- a/include/vcl/texteng.hxx
+++ b/include/vcl/texteng.hxx
@@ -273,7 +273,7 @@ public:
     void                SetRightToLeft( bool bR2L );
     bool            IsRightToLeft() const { return mbRightToLeft; }
 
-    bool            HasUndoManager() const { return mpUndoManager ? sal_True : sal_False; }
+    bool            HasUndoManager() const { return mpUndoManager ? true : false; }
     ::svl::IUndoManager&
                         GetUndoManager();
     void                UndoActionStart( sal_uInt16 nId = 0 );
diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx
index 474036b1aab2..91db8cb0a3b5 100644
--- a/include/vcl/timer.hxx
+++ b/include/vcl/timer.hxx
@@ -49,7 +49,7 @@ public:
     /// set the timeout in milliseconds
     void            SetTimeout( sal_uLong nTimeoutMs );
     sal_uLong       GetTimeout() const { return mnTimeout; }
-    bool        IsActive() const { return mbActive ? sal_True : sal_False; }
+    bool        IsActive() const { return mbActive ? true : false; }
 
     void            SetTimeoutHdl( const Link& rLink ) { maTimeoutHdl = rLink; }
     const Link&     GetTimeoutHdl() const { return maTimeoutHdl; }
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index f0abfe9162e5..35f46744b171 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -319,7 +319,7 @@ public:
     virtual void        ToggleFloatingMode();
     virtual void        StartDocking();
     virtual bool        Docking( const Point& rPos, Rectangle& rRect );
-    virtual void        EndDocking( const Rectangle& rRect, sal_Bool bFloatMode );
+    virtual void        EndDocking( const Rectangle& rRect, bool bFloatMode );
     virtual void        Resizing( Size& rSize );
     virtual Size        GetOptimalSize() const;
 
diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx
index 55ea3304b562..cd5df4d0e930 100644
--- a/include/vcl/vclevent.hxx
+++ b/include/vcl/vclevent.hxx
@@ -192,7 +192,7 @@ namespace com { namespace sun { namespace star {
 #define VCLEVENT_WINDOW_STARTDOCKING            1227    // pData = DockingData
 #define VCLEVENT_WINDOW_DOCKING                 1228
 #define VCLEVENT_WINDOW_ENDDOCKING              1229    // pData = EndDockingData
-#define VCLEVENT_WINDOW_PREPARETOGGLEFLOATING   1230    // pData = sal_Bool
+#define VCLEVENT_WINDOW_PREPARETOGGLEFLOATING   1230    // pData = bool
 #define VCLEVENT_WINDOW_TOGGLEFLOATING          1231
 #define VCLEVENT_WINDOW_ENDPOPUPMODE            1232    // pData = EndPopupModeData
 
@@ -261,8 +261,8 @@ public:
     void Call( VclSimpleEvent* pEvent ) const;
 
     // stops notifying when any handler has processed the event
-    // and returns sal_True in that case
-    // a handler must return sal_True to signal that it has processed the event
+    // and returns true in that case
+    // a handler must return true to signal that it has processed the event
     bool Process( VclSimpleEvent* pEvent ) const;
     void addListener( const Link& rListener );
     void removeListener( const Link& rListener );
diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx
index b0bbf97000b5..7e21355a8bce 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
@@ -75,7 +75,7 @@ public:
     virtual void    EnableUpdateData( sal_uLong nTimeout = EDIT_UPDATEDATA_TIMEOUT );
     virtual void    DisableUpdateData() { delete pUpdateDataTimer; pUpdateDataTimer = NULL; }
 
-    virtual void    SetReadOnly( sal_Bool bReadOnly = sal_True );
+    virtual void    SetReadOnly( bool bReadOnly = sal_True );
     virtual bool    IsReadOnly() const;
 
     void            EnableFocusSelectionHide( bool bHide );
diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx
index be494afd49c1..14702410b317 100644
--- a/include/vcl/wrkwin.hxx
+++ b/include/vcl/wrkwin.hxx
@@ -72,7 +72,7 @@ public:
     void            ShowFullScreenMode( bool bFullScreenMode,
                                         sal_Int32 nDisplayScreen );
     /**
-     @overload void ShowFullScreenMode(sal_Bool bFullScreenMode, sal_Int32 nDisplayScreen)
+     @overload void ShowFullScreenMode(bool bFullScreenMode, sal_Int32 nDisplayScreen)
     */
     void            ShowFullScreenMode( bool bFullScreenMode = true );
     void            EndFullScreenMode() { ShowFullScreenMode( false ); }
@@ -82,7 +82,7 @@ public:
                                            sal_uInt16 nFlags,
                                            sal_Int32  nDisplayScreen );
     /**
-     @overload void StartPresentationMode( sal_Bool bPresentation, sal_uInt16 nFlags, sal_uInt32 nDisplayScreen)
+     @overload void StartPresentationMode( bool bPresentation, sal_uInt16 nFlags, sal_uInt32 nDisplayScreen)
     */
     void            StartPresentationMode( bool   bPresentation = true,
                                            sal_uInt16 nFlags = 0 );