summaryrefslogtreecommitdiff
path: root/svtools/source
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2016-06-07 19:57:39 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-06-08 06:39:48 +0000
commit7fb70ff650ce3a1e4a39bd1b936f511d6be8986c (patch)
tree9e5cbb12d215ca22bd1d1500a0d378b197dcdf04 /svtools/source
parentc941b5a103b5f2105106834c74842a3909216f9a (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')
-rw-r--r--svtools/source/contnr/svlbitm.cxx8
-rw-r--r--svtools/source/contnr/treelistbox.cxx6
-rw-r--r--svtools/source/control/headbar.cxx2
-rw-r--r--svtools/source/control/toolbarmenu.cxx2
4 files changed, 9 insertions, 9 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
}
}
diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx
index cd35991e4179..3007ab0aa807 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -335,7 +335,7 @@ void HeaderBar::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos
if (rRenderContext.IsNativeControlSupported(ControlType::ListHeader, PART_BUTTON))
{
aCtrlRegion = aRect;
- aControlValue.setTristateVal(BUTTONVALUE_ON);
+ aControlValue.setTristateVal(ButtonValue::On);
nState |= ControlState::ENABLED;
if (bHigh)
nState |= ControlState::PRESSED;
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index 58cc7d8d5afd..c919c6b51e2e 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -1173,7 +1173,7 @@ static void ImplPaintCheckBackground(vcl::RenderContext& rRenderContext, vcl::Wi
ImplControlValue aControlValue;
ControlState nState = ControlState::PRESSED | ControlState::ENABLED;
- aControlValue.setTristateVal(BUTTONVALUE_ON);
+ aControlValue.setTristateVal(ButtonValue::On);
bNativeOk = rRenderContext.DrawNativeControl(ControlType::Toolbar, PART_BUTTON,
i_rRect, nState, aControlValue, OUString());