diff options
| author | Noel Grandin <noel@peralex.com> | 2014-12-30 16:26:11 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-01-06 10:59:43 +0200 |
| commit | abe670157b69aa7fe4b478f1fd13757d7b7fcc4b (patch) | |
| tree | aa3fbd80e0fbc9ac3d1674d37c0fcb01ffa595f5 /sc | |
| parent | a48d8465c3f9f36a02fb3c6a79f5dbb5851174f7 (diff) | |
fdo#84938: convert CTRL_STATE_ #defines to 'enum class'
Change-Id: I1451180d258315a310a048b27510b4b58fa9145c
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/cctrl/checklistmenu.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 3c932256cf33..811f80481533 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -243,7 +243,7 @@ void ScMenuFloatingWindow::Paint(const Rectangle& /*rRect*/) { SetClipRegion(); bNativeDrawn = DrawNativeControl( - CTRL_MENU_POPUP, PART_ENTIRE_CONTROL, aCtrlRect, CTRL_STATE_ENABLED, + CTRL_MENU_POPUP, PART_ENTIRE_CONTROL, aCtrlRect, ControlState::ENABLED, ImplControlValue(), OUString()); } else @@ -380,7 +380,7 @@ void ScMenuFloatingWindow::drawSeparator(size_t nPos) IntersectClipRegion(aRegion); Rectangle aCtrlRect(Point(0,0), GetOutputSizePixel()); DrawNativeControl( - CTRL_MENU_POPUP, PART_ENTIRE_CONTROL, aCtrlRect, CTRL_STATE_ENABLED, + CTRL_MENU_POPUP, PART_ENTIRE_CONTROL, aCtrlRect, ControlState::ENABLED, ImplControlValue(), OUString()); Pop(); @@ -389,10 +389,10 @@ void ScMenuFloatingWindow::drawSeparator(size_t nPos) bool bNativeDrawn = false; if (IsNativeControlSupported(CTRL_MENU_POPUP, PART_MENU_SEPARATOR)) { - ControlState nState = 0; + ControlState nState = ControlState::NONE; const MenuItemData& rData = maMenuItems[nPos]; if (rData.mbEnabled) - nState |= CTRL_STATE_ENABLED; + nState |= ControlState::ENABLED; bNativeDrawn = DrawNativeControl( CTRL_MENU_POPUP, PART_MENU_SEPARATOR, @@ -670,7 +670,7 @@ void ScMenuFloatingWindow::highlightMenuItem(size_t nPos, bool bSelected) IntersectClipRegion(Rectangle(aPos, aSize)); Rectangle aCtrlRect(Point(0,0), GetOutputSizePixel()); DrawNativeControl( - CTRL_MENU_POPUP, PART_ENTIRE_CONTROL, aCtrlRect, CTRL_STATE_ENABLED, + CTRL_MENU_POPUP, PART_ENTIRE_CONTROL, aCtrlRect, ControlState::ENABLED, ImplControlValue(), OUString()); Pop(); @@ -679,9 +679,9 @@ void ScMenuFloatingWindow::highlightMenuItem(size_t nPos, bool bSelected) bool bNativeDrawn = true; if (IsNativeControlSupported(CTRL_MENU_POPUP, PART_MENU_ITEM)) { - ControlState nState = bSelected ? CTRL_STATE_SELECTED : 0; + ControlState nState = bSelected ? ControlState::SELECTED : ControlState::NONE; if (maMenuItems[nPos].mbEnabled) - nState |= CTRL_STATE_ENABLED; + nState |= ControlState::ENABLED; bNativeDrawn = DrawNativeControl( CTRL_MENU_POPUP, PART_MENU_ITEM, aRegion, nState, ImplControlValue(), OUString()); } |