diff options
| author | Noel Grandin <noel@peralex.com> | 2016-03-18 11:22:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-03-18 12:46:35 +0200 |
| commit | 1c73135493e844c04446f58e7001920381787317 (patch) | |
| tree | 99bef7055d1af5d64d9b3556834ac8409bead81d /svtools | |
| parent | 0d3d8af033fa11730abf6a0fac13f23eb0b0403b (diff) | |
convert SvLBoxButtonKind to scoped enum
Change-Id: Ia8e19473132cf95837acc499c5831b5ca8786a68
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/contnr/svlbitm.cxx | 10 | ||||
| -rw-r--r-- | svtools/source/contnr/treelistbox.cxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index 9690e664bf23..787bfd0d1676 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -299,7 +299,7 @@ SvLBoxButton::SvLBoxButton() : SvLBoxItem() , isVis(false) , pData(nullptr) - , eKind(SvLBoxButtonKind_enabledCheckbox) + , eKind(SvLBoxButtonKind::EnabledCheckbox) , nItemFlags(SvItemStateFlags::NONE) { SetStateUnchecked(); @@ -332,8 +332,8 @@ void SvLBoxButton::Paint( const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext, const SvViewDataEntry* /*pView*/, const SvTreeListEntry& /*rEntry*/) { - SvBmp nIndex = eKind == SvLBoxButtonKind_staticImage ? SvBmp::STATICIMAGE : SvLBoxButtonData::GetIndex(nItemFlags); - DrawImageFlags nStyle = eKind != SvLBoxButtonKind_disabledCheckbox && rDev.IsEnabled() ? DrawImageFlags::NONE : DrawImageFlags::Disable; + SvBmp nIndex = eKind == SvLBoxButtonKind::StaticImage ? SvBmp::STATICIMAGE : SvLBoxButtonData::GetIndex(nItemFlags); + DrawImageFlags nStyle = eKind != SvLBoxButtonKind::DisabledCheckbox && rDev.IsEnabled() ? DrawImageFlags::NONE : DrawImageFlags::Disable; //Native drawing bool bNativeOK = false; @@ -416,14 +416,14 @@ void SvLBoxButton::InitViewData(SvTreeListBox* pView,SvTreeListEntry* pEntry, Sv Size aSize( pData->Width(), pData->Height() ); ControlType eCtrlType = (pData->IsRadio())? CTRL_RADIOBUTTON : CTRL_CHECKBOX; - if ( eKind != SvLBoxButtonKind_staticImage && pView ) + if ( eKind != SvLBoxButtonKind::StaticImage && pView ) ImplAdjustBoxSize(aSize, eCtrlType, *pView); pViewData->maSize = aSize; } bool SvLBoxButton::CheckModification() const { - return eKind == SvLBoxButtonKind_enabledCheckbox; + return eKind == SvLBoxButtonKind::EnabledCheckbox; } void SvLBoxButton::SetStateInvisible() diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 40127142d607..f0bec8a23d77 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -1980,7 +1980,7 @@ SvTreeListEntry* SvTreeListBox::CloneEntry( SvTreeListEntry* pSource ) OUString aStr; Image aCollEntryBmp; Image aExpEntryBmp; - SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox; + SvLBoxButtonKind eButtonKind = SvLBoxButtonKind::EnabledCheckbox; SvLBoxString* pStringItem = static_cast<SvLBoxString*>(pSource->GetFirstItem(SV_ITEM_ID_LBOXSTRING)); if( pStringItem ) |