diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-01-11 17:51:30 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-01-11 17:58:28 +0200 |
| commit | 90f194ea050db6e9414e0047282ce87a67735d82 (patch) | |
| tree | 653997a6d72daa6f7ce063611aa72af079664d9a /vcl | |
| parent | b4bff4a978247e19f2a9ff02718ef87148f78d01 (diff) | |
WaE: unsafe mix of type 'sal_Bool' and type 'bool'
Change-Id: I6d9910d33b34672d412f3346ee9dd131610215d0
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/toolbox.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index e78b6c181ba9..1b4a2beffead 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -707,7 +707,7 @@ Size ToolBox::ImplCalcSize( const ToolBox* pThis, sal_uInt16 nCalcLines, sal_uIn long nBottom = 0; Size aSize; WindowAlign eOldAlign = pThis->meAlign; - sal_Bool bOldHorz = pThis->mbHorz; + bool bOldHorz = pThis->mbHorz; sal_Bool bOldAssumeDocked = pThis->mpData->mbAssumeDocked; sal_Bool bOldAssumeFloating = pThis->mpData->mbAssumeFloating; @@ -1596,13 +1596,13 @@ void ToolBox::ImplLoadRes( const ResId& rResId ) if ( nObjMask & RSC_TOOLBOX_CUSTOMIZE ) { - sal_Bool bCust = (sal_Bool)ReadShortRes(); + bool bCust = ReadShortRes(); EnableCustomize( bCust ); } if ( nObjMask & RSC_TOOLBOX_MENUSTRINGS ) { - sal_Bool bCust = (sal_Bool)ReadShortRes(); + bool bCust = ReadShortRes(); EnableMenuStrings( bCust ); } @@ -3514,7 +3514,7 @@ sal_Bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, sal_Bool bRepeat if ( mbUpper ) { - sal_Bool bNewIn = maUpperRect.IsInside( aMousePos ); + bool bNewIn = maUpperRect.IsInside( aMousePos ); if ( bNewIn != mbIn ) { mbIn = bNewIn; @@ -3525,7 +3525,7 @@ sal_Bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, sal_Bool bRepeat if ( mbLower ) { - sal_Bool bNewIn = maLowerRect.IsInside( aMousePos ); + bool bNewIn = maLowerRect.IsInside( aMousePos ); if ( bNewIn != mbIn ) { mbIn = bNewIn; @@ -4582,7 +4582,7 @@ void ToolBox::ToggleFloatingMode() { DockingWindow::ToggleFloatingMode(); - sal_Bool mbOldHorz = mbHorz; + bool mbOldHorz = mbHorz; if ( ImplIsFloatingMode() ) { @@ -4934,7 +4934,7 @@ Size ToolBox::CalcMinimumWindowSizePixel() const // ----------------------------------------------------------------------- -void ToolBox::EnableCustomize( sal_Bool bEnable ) +void ToolBox::EnableCustomize( bool bEnable ) { if ( bEnable != mbCustomize ) { |