diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-05-14 12:05:03 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-14 14:34:11 +0100 |
commit | bd04c1d896f3213a7cce66829b0ab408e59a2401 (patch) | |
tree | dff5e21ad09d4a11976266c7a559cdcd77656742 /svtools | |
parent | 2368d3403a57be2e13ef478f00b6981212de0db7 (diff) |
WaE: unsafe mix of bool and sal_Bool
Change-Id: I3854a9958f49dbbabe7a604e4604d5d8f79adc11
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/inc/svtools/tabbar.hxx | 12 | ||||
-rw-r--r-- | svtools/source/control/tabbar.cxx | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/svtools/inc/svtools/tabbar.hxx b/svtools/inc/svtools/tabbar.hxx index 1478b0e690dd..7a71ef490ad0 100644 --- a/svtools/inc/svtools/tabbar.hxx +++ b/svtools/inc/svtools/tabbar.hxx @@ -376,7 +376,7 @@ private: sal_Bool mbInSelect; sal_Bool mbSelColor; sal_Bool mbSelTextColor; - sal_Bool mbMirrored; + bool mbMirrored; bool mbHasInsertTab; // if true, the tab bar has an extra tab at the end. Link maSelectHdl; Link maDoubleClickHdl; @@ -496,16 +496,16 @@ public: @param bMirrored sal_True = the control will draw itself RTL in LTR GUI, and vice versa; sal_False = the control behaves according to the current direction of the GUI. */ - void SetMirrored( sal_Bool bMirrored = sal_True ); + void SetMirrored(bool bMirrored = true); /** Returns sal_True, if the control is set to mirrored mode (see SetMirrored()). */ - sal_Bool IsMirrored() const { return mbMirrored; } + bool IsMirrored() const { return mbMirrored; } /** Sets the control to LTR or RTL mode regardless of the GUI direction. @param bRTL sal_False = the control will draw from left to right; sal_True = the control will draw from right to left. */ - void SetEffectiveRTL( sal_Bool bRTL ); - /** Returns sal_True, if the control draws from right to left (see SetEffectiveRTL()). */ - sal_Bool IsEffectiveRTL() const; + void SetEffectiveRTL( bool bRTL ); + /** Returns true, if the control draws from right to left (see SetEffectiveRTL()). */ + bool IsEffectiveRTL() const; sal_Bool StartDrag( const CommandEvent& rCEvt, Region& rRegion ); sal_uInt16 ShowDropPos( const Point& rPos ); diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index fb25b442eb1e..a922241b2b44 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -2413,24 +2413,24 @@ void TabBar::EndEditMode( sal_Bool bCancel ) // ----------------------------------------------------------------------- -void TabBar::SetMirrored( sal_Bool bMirrored ) +void TabBar::SetMirrored(bool bMirrored) { if( mbMirrored != bMirrored ) { mbMirrored = bMirrored; - mbSizeFormat = sal_True; + mbSizeFormat = true; ImplInitControls(); // for button images Resize(); // recalculates control positions Mirror(); } } -void TabBar::SetEffectiveRTL( sal_Bool bRTL ) +void TabBar::SetEffectiveRTL( bool bRTL ) { SetMirrored( bRTL != Application::GetSettings().GetLayoutRTL() ); } -sal_Bool TabBar::IsEffectiveRTL() const +bool TabBar::IsEffectiveRTL() const { return IsMirrored() != Application::GetSettings().GetLayoutRTL(); } |