bool improvements (related to mixing bool/sal_Bool in &=, |=, ^=)

Change-Id: I9869d9709f28b68ef7b518527175589d80644668

14 files changed, 18 insertions, 18 deletions

diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 5fcb79729065..a92b2d7cbe77 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -282,7 +282,7 @@ public:
     CGPoint*                makeCGptArray(sal_uLong nPoints, const SalPoint*  pPtAry);
     // native widget rendering methods that require mirroring
     virtual sal_Bool        hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
-                                              const Point& aPos, sal_Bool& rIsInside );
+                                              const Point& aPos, bool& rIsInside ) SAL_OVERRIDE;
     virtual sal_Bool        drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                            ControlState nState, const ImplControlValue& aValue,
                                            const OUString& aCaption );
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index ec6f5bc26112..28188260fb3c 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -143,7 +143,7 @@ protected:
 
     // native widget rendering methods that require mirroring
     virtual sal_Bool        hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
-                                                  const Point& aPos, sal_Bool& rIsInside );
+                                                  const Point& aPos, bool& rIsInside );
     virtual sal_Bool        drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                                ControlState nState, const ImplControlValue& aValue,
                                                const OUString& aCaption );
@@ -458,7 +458,7 @@ public:
                                                   ControlPart nPart,
                                                   const Rectangle& rControlRegion,
                                                   const Point& aPos,
-                                                  sal_Bool& rIsInside,
+                                                  bool& rIsInside,
                                                   const OutputDevice *pOutDev );
 
     // Request rendering of a particular control and/or part
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 9ddd99b48c5b..628221bf1f94 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -136,7 +136,7 @@ public:
     // native widget methods
     virtual sal_Bool        IsNativeControlSupported( ControlType nType, ControlPart nPart );
     virtual sal_Bool        hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
-                                              const Point& aPos, sal_Bool& rIsInside );
+                                              const Point& aPos, bool& rIsInside ) SAL_OVERRIDE;
     virtual sal_Bool        drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                            ControlState nState, const ImplControlValue& aValue,
                                            const OUString& rCaption );
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 58de36ad0f87..bea5b641db4f 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -247,7 +247,7 @@ protected:
 
     // native widget rendering methods that require mirroring
     virtual sal_Bool        hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
-                                              const Point& aPos, sal_Bool& rIsInside );
+                                              const Point& aPos, bool& rIsInside ) SAL_OVERRIDE;
     virtual sal_Bool        drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                            ControlState nState, const ImplControlValue& aValue,
                                            const OUString& aCaption );
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index ec6ca1d9c72f..299e1f9ba97f 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -392,7 +392,7 @@ sal_Bool AquaSalGraphics::IsNativeControlSupported( ControlType nType, ControlPa
  *  nType/nPart combination.
  */
 sal_Bool AquaSalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
-                        const Point& rPos, sal_Bool& rIsInside )
+                        const Point& rPos, bool& rIsInside )
 {
     if ( nType == CTRL_SCROLLBAR )
     {
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index a5a5bebfc1f0..53b2be29f615 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -820,7 +820,7 @@ void ScrollBar::ImplDoMouseAction( const Point& rMousePos, sal_Bool bCallAction
     sal_uInt16  nOldStateFlags = mnStateFlags;
     sal_Bool    bAction = sal_False;
     bool        bHorizontal = ( GetStyle() & WB_HORZ )? true: false;
-    sal_Bool    bIsInside = sal_False;
+    bool        bIsInside = false;
 
     Point aPoint( 0, 0 );
     Rectangle aControlRegion( aPoint, GetOutputSizePixel() );
@@ -930,7 +930,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt )
         const Point&        rMousePos = rMEvt.GetPosPixel();
         sal_uInt16          nTrackFlags = 0;
         bool                bHorizontal = ( GetStyle() & WB_HORZ )? true: false;
-        sal_Bool            bIsInside = sal_False;
+        bool                bIsInside = false;
         bool                bDragToMouse = false;
 
         Point aPoint( 0, 0 );
@@ -1266,7 +1266,7 @@ void ScrollBar::DataChanged( const DataChangedEvent& rDCEvt )
 Rectangle* ScrollBar::ImplFindPartRect( const Point& rPt )
 {
     bool    bHorizontal = ( GetStyle() & WB_HORZ )? true: false;
-    sal_Bool    bIsInside = sal_False;
+    bool    bIsInside = false;
 
     Point aPoint( 0, 0 );
     Rectangle aControlRegion( aPoint, GetOutputSizePixel() );
diff --git a/vcl/source/gdi/outdevnative.cxx b/vcl/source/gdi/outdevnative.cxx
index 68e65a3a277f..d04477930c6d 100644
--- a/vcl/source/gdi/outdevnative.cxx
+++ b/vcl/source/gdi/outdevnative.cxx
@@ -166,7 +166,7 @@ sal_Bool OutputDevice::HitTestNativeControl( ControlType nType,
                               ControlPart nPart,
                               const Rectangle& rControlRegion,
                               const Point& aPos,
-                              sal_Bool& rIsInside ) const
+                              bool& rIsInside ) const
 {
     if( !lcl_enableNativeWidget( *this ) )
         return sal_False;
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 27193e805b27..a67b9102db38 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -660,7 +660,7 @@ sal_Bool    SalGraphics::DrawEPS( long nX, long nY, long nWidth, long nHeight, v
 }
 
 sal_Bool SalGraphics::HitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
-                                                const Point& aPos, sal_Bool& rIsInside, const OutputDevice *pOutDev )
+                                                const Point& aPos, bool& rIsInside, const OutputDevice *pOutDev )
 {
     if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
     {
diff --git a/vcl/source/gdi/salnativewidgets-none.cxx b/vcl/source/gdi/salnativewidgets-none.cxx
index 13789539a4c3..bd97f0d67b7b 100644
--- a/vcl/source/gdi/salnativewidgets-none.cxx
+++ b/vcl/source/gdi/salnativewidgets-none.cxx
@@ -49,7 +49,7 @@ sal_Bool SalGraphics::hitTestNativeControl( ControlType,
                               ControlPart,
                               const Rectangle&,
                               const Point&,
-                              sal_Bool& )
+                              bool& )
 {
     return( sal_False );
 }
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 4c00db56c76e..3652f66db4b4 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -667,7 +667,7 @@ sal_Bool GtkSalGraphics::hitTestNativeControl( ControlType        nType,
                                 ControlPart        nPart,
                                 const Rectangle&        rControlRegion,
                                 const Point&        aPos,
-                                sal_Bool&            rIsInside )
+                                bool&            rIsInside )
 {
     if ( ( nType == CTRL_SCROLLBAR ) &&
          ( ( nPart == PART_BUTTON_UP ) ||
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 97473130374a..26c724555c5c 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -1212,7 +1212,7 @@ class KDESalGraphics : public X11SalGraphics
     virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart );
     virtual sal_Bool hitTestNativeControl( ControlType nType, ControlPart nPart,
                                        const Rectangle& rControlRegion, const Point& aPos,
-                                       sal_Bool& rIsInside );
+                                       bool& rIsInside ) SAL_OVERRIDE;
     virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart,
                                     const Rectangle& rControlRegion, ControlState nState,
                                     const ImplControlValue& aValue,
@@ -1272,7 +1272,7 @@ sal_Bool KDESalGraphics::IsNativeControlSupported( ControlType nType, ControlPar
 */
 sal_Bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart,
                                            const Rectangle& rControlRegion, const Point& rPos,
-                                           sal_Bool& rIsInside )
+                                           bool& rIsInside )
 {
     if ( nType == CTRL_SCROLLBAR )
     {
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index cf72dcd6aca1..abee781cab1b 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -952,7 +952,7 @@ sal_Bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart p
 */
 sal_Bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart,
                                            const Rectangle& rControlRegion, const Point& rPos,
-                                           sal_Bool& rIsInside )
+                                           bool& rIsInside )
 {
     if ( nType == CTRL_SCROLLBAR )
     {
diff --git a/vcl/unx/kde4/KDESalGraphics.hxx b/vcl/unx/kde4/KDESalGraphics.hxx
index b25afd652564..0fce28980a74 100644
--- a/vcl/unx/kde4/KDESalGraphics.hxx
+++ b/vcl/unx/kde4/KDESalGraphics.hxx
@@ -52,7 +52,7 @@ class KDESalGraphics : public X11SalGraphics
         */
         virtual sal_Bool hitTestNativeControl( ControlType type, ControlPart part,
                                         const Rectangle& rControlRegion, const Point& aPos,
-                                        sal_Bool& rIsInside );
+                                        bool& rIsInside ) SAL_OVERRIDE;
         /** Draw the requested control described by part/nControlState.
 
             @param rControlRegion
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index 674f03c60fbb..dc9885f134c5 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -354,7 +354,7 @@ sal_Bool WinSalGraphics::hitTestNativeControl( ControlType,
                               ControlPart,
                               const Rectangle&,
                               const Point&,
-                              sal_Bool& )
+                              bool& )
 {
     return FALSE;
 }