diff options
| author | Noel Grandin <noel@peralex.com> | 2016-09-02 13:54:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-09-05 08:21:46 +0200 |
| commit | a1cd62bcd589a7c1050e327f4cb0ad95f9ea19d1 (patch) | |
| tree | 4564ea2be6311b5e44e67d9036bafab0c501ccb8 /vcl | |
| parent | 256654c26fa0d474891809d30d0004c3d87a5841 (diff) | |
convert ToolBoxButtonSize to scoped enum
Change-Id: I365b0e34361eb339b04e5f4792f54eff5bf582a5
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/toolbox.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/toolbox2.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 4bdca1b3a41a..5ca7454cb166 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -1982,7 +1982,7 @@ bool ToolBox::ImplCalcItem() ImplAddButtonBorder( nMaxWidth, nMaxHeight, mpData->mbNativeButtons ); } - if( !ImplIsFloatingMode() && GetToolboxButtonSize() != TOOLBOX_BUTTONSIZE_DONTCARE + if( !ImplIsFloatingMode() && GetToolboxButtonSize() != ToolBoxButtonSize::DontCare && ( meTextPosition == ToolBoxTextPosition::Right ) ) { // make sure all vertical toolbars have the same width and horizontal have the same height diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index a584a55f84a4..fedc41c7ccfa 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -48,7 +48,7 @@ using namespace vcl; ImplToolBoxPrivateData::ImplToolBoxPrivateData() : m_pLayoutData( nullptr ) { - meButtonSize = TOOLBOX_BUTTONSIZE_DONTCARE; + meButtonSize = ToolBoxButtonSize::DontCare; mpMenu = VclPtr<PopupMenu>::Create(); mnEventId = nullptr; @@ -519,7 +519,7 @@ void ToolBox::InsertItem(const OUString& rCommand, const css::uno::Reference<css OUString aLabel(vcl::CommandInfoProvider::Instance().GetLabelForCommand(rCommand, rFrame)); OUString aTooltip(vcl::CommandInfoProvider::Instance().GetTooltipForCommand(rCommand, rFrame)); Image aImage(vcl::CommandInfoProvider::Instance().GetImageForCommand( - rCommand, (GetToolboxButtonSize() == TOOLBOX_BUTTONSIZE_LARGE), rFrame)); + rCommand, (GetToolboxButtonSize() == ToolBoxButtonSize::Large), rFrame)); sal_uInt16 nItemId = GetItemCount() + 1; InsertItem(nItemId, aImage, aLabel, nBits, nPos); @@ -722,7 +722,7 @@ ToolBoxButtonSize ToolBox::GetToolboxButtonSize() const Size ToolBox::GetDefaultImageSize() const { - return GetDefaultImageSize( GetToolboxButtonSize() == TOOLBOX_BUTTONSIZE_LARGE ); + return GetDefaultImageSize( GetToolboxButtonSize() == ToolBoxButtonSize::Large ); } void ToolBox::SetAlign( WindowAlign eNewAlign ) |