diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-22 14:58:57 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-22 15:00:54 +0100 |
| commit | bbd9668d5f70d8ff00a7b10915e7a16ceadb8443 (patch) | |
| tree | 4e65b4d58e6a4298219b1909f524b710677606d9 /vcl/source | |
| parent | 4eda1a0293a869bf804056f1e9e04c984c69454d (diff) | |
bool improvements (related to mixing bool/sal_Bool in &=, |=, ^=)
Change-Id: I9869d9709f28b68ef7b518527175589d80644668
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/control/scrbar.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/gdi/outdevnative.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/salgdilayout.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/salnativewidgets-none.cxx | 2 |
4 files changed, 6 insertions, 6 deletions
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 ); } |