diff options
| -rw-r--r-- | include/vcl/toolbox.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/toolbox.cxx | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 4589b2498ba3..2b535721cfcb 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -498,7 +498,7 @@ public: void SetOutStyle( sal_uInt16 nNewStyle ); sal_uInt16 GetOutStyle() const { return mnOutStyle; } - void EnableCustomize( sal_Bool bEnable = sal_True ); + void EnableCustomize( bool bEnable = true ); sal_Bool IsCustomize() { return mbCustomize; } sal_Bool IsInCustomizeMode() const { return mbCustomizeMode; } 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 ) { |