diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-06-07 19:57:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-08 06:39:48 +0000 |
| commit | 7fb70ff650ce3a1e4a39bd1b936f511d6be8986c (patch) | |
| tree | 9e5cbb12d215ca22bd1d1500a0d378b197dcdf04 /svtools/source/contnr | |
| parent | c941b5a103b5f2105106834c74842a3909216f9a (diff) | |
Convert ButtonValue to scoped enum
Change-Id: Ia882914fb99844f21ce89d7218321933ef084b22
Reviewed-on: https://gerrit.libreoffice.org/26036
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svtools/source/contnr')
| -rw-r--r-- | svtools/source/contnr/svlbitm.cxx | 8 | ||||
| -rw-r--r-- | svtools/source/contnr/treelistbox.cxx | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index 341827fd2615..9392dce6f052 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -353,11 +353,11 @@ void SvLBoxButton::Paint( if (nStyle != DrawImageFlags::Disable) nState |= ControlState::ENABLED; if (IsStateChecked()) - aControlValue.setTristateVal(BUTTONVALUE_ON); + aControlValue.setTristateVal(ButtonValue::On); else if (IsStateUnchecked()) - aControlValue.setTristateVal(BUTTONVALUE_OFF); + aControlValue.setTristateVal(ButtonValue::Off); else if (IsStateTristate()) - aControlValue.setTristateVal( BUTTONVALUE_MIXED ); + aControlValue.setTristateVal( ButtonValue::Mixed ); if (isVis) bNativeOK = rRenderContext.DrawNativeControl(eCtrlType, PART_ENTIRE_CONTROL, @@ -386,7 +386,7 @@ void SvLBoxButton::ImplAdjustBoxSize(Size& io_rSize, ControlType i_eType, vcl::R Rectangle aCtrlRegion( Point( 0, 0 ), io_rSize ); ControlState nState = ControlState::ENABLED; - aControlValue.setTristateVal( BUTTONVALUE_ON ); + aControlValue.setTristateVal( ButtonValue::On ); Rectangle aNativeBounds, aNativeContent; bool bNativeOK = rRenderContext.GetNativeControlRegion( i_eType, diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index da643635b20f..29b5ee1d0ba5 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -3041,18 +3041,18 @@ void SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, long nLine, vcl::Render nState |= ControlState::ENABLED; if (IsExpanded(&rEntry)) - aControlValue.setTristateVal(BUTTONVALUE_ON); //expanded node + aControlValue.setTristateVal(ButtonValue::On); //expanded node else { if ((!rEntry.HasChildren()) && rEntry.HasChildrenOnDemand() && (!(rEntry.GetFlags() & SvTLEntryFlags::HAD_CHILDREN)) && pImpl->GetDontKnowNodeBmp().GetSizePixel().Width()) { - aControlValue.setTristateVal( BUTTONVALUE_DONTKNOW ); //don't know + aControlValue.setTristateVal( ButtonValue::DontKnow ); //don't know } else { - aControlValue.setTristateVal( BUTTONVALUE_OFF ); //collapsed node + aControlValue.setTristateVal( ButtonValue::Off ); //collapsed node } } |