diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-27 16:24:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-31 09:09:13 +0000 |
| commit | 5c977a9ddff3c221c098a57855ede7c0ef4fe31f (patch) | |
| tree | 4f2904d4b9bce00344ddce0d17ed7d6dc63e6fcf /sc | |
| parent | 526ed1f7dbd9150734edcb03727d49e1b1306f56 (diff) | |
Convert ControlType to scoped enum
Change-Id: Iaa13c3e7030296a97bab144103745867d43b4b19
Reviewed-on: https://gerrit.libreoffice.org/25554
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/app/inputwin.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/cctrl/checklistmenu.cxx | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index dc46535a8ee9..904c4651af9a 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -102,7 +102,7 @@ enum ScNameInputType ScTextWndBase::ScTextWndBase( vcl::Window* pParent, WinBits nStyle ) : Window ( pParent, nStyle ) { - if ( IsNativeControlSupported( CTRL_EDITBOX, PART_ENTIRE_CONTROL ) ) + if ( IsNativeControlSupported( ControlType::Editbox, PART_ENTIRE_CONTROL ) ) { SetType( WINDOW_CALCINPUTLINE ); SetBorderStyle( WindowBorderStyle::NWF ); diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 2bf014a9ff09..ec519677f6b5 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -251,10 +251,10 @@ void ScMenuFloatingWindow::Paint(vcl::RenderContext& rRenderContext, const Recta // Window background bool bNativeDrawn = true; - if (rRenderContext.IsNativeControlSupported(CTRL_MENU_POPUP, PART_ENTIRE_CONTROL)) + if (rRenderContext.IsNativeControlSupported(ControlType::MenuPopup, PART_ENTIRE_CONTROL)) { rRenderContext.SetClipRegion(); - bNativeDrawn = rRenderContext.DrawNativeControl(CTRL_MENU_POPUP, PART_ENTIRE_CONTROL, aCtrlRect, + bNativeDrawn = rRenderContext.DrawNativeControl(ControlType::MenuPopup, PART_ENTIRE_CONTROL, aCtrlRect, ControlState::ENABLED, ImplControlValue(), OUString()); } else @@ -384,26 +384,26 @@ void ScMenuFloatingWindow::drawSeparator(vcl::RenderContext& rRenderContext, siz getMenuItemPosSize(nPos, aPos, aSize); Rectangle aRegion(aPos,aSize); - if (rRenderContext.IsNativeControlSupported(CTRL_MENU_POPUP, PART_ENTIRE_CONTROL)) + if (rRenderContext.IsNativeControlSupported(ControlType::MenuPopup, PART_ENTIRE_CONTROL)) { rRenderContext.Push(PushFlags::CLIPREGION); rRenderContext.IntersectClipRegion(aRegion); Rectangle aCtrlRect(Point(0,0), GetOutputSizePixel()); - rRenderContext.DrawNativeControl(CTRL_MENU_POPUP, PART_ENTIRE_CONTROL, aCtrlRect, + rRenderContext.DrawNativeControl(ControlType::MenuPopup, PART_ENTIRE_CONTROL, aCtrlRect, ControlState::ENABLED, ImplControlValue(), OUString()); rRenderContext.Pop(); } bool bNativeDrawn = false; - if (rRenderContext.IsNativeControlSupported(CTRL_MENU_POPUP, PART_MENU_SEPARATOR)) + if (rRenderContext.IsNativeControlSupported(ControlType::MenuPopup, PART_MENU_SEPARATOR)) { ControlState nState = ControlState::NONE; const MenuItemData& rData = maMenuItems[nPos]; if (rData.mbEnabled) nState |= ControlState::ENABLED; - bNativeDrawn = rRenderContext.DrawNativeControl(CTRL_MENU_POPUP, PART_MENU_SEPARATOR, + bNativeDrawn = rRenderContext.DrawNativeControl(ControlType::MenuPopup, PART_MENU_SEPARATOR, aRegion, nState, ImplControlValue(), OUString()); } @@ -677,23 +677,23 @@ void ScMenuFloatingWindow::highlightMenuItem(vcl::RenderContext& rRenderContext, getMenuItemPosSize(nPos, aPos, aSize); Rectangle aRegion(aPos,aSize); - if (rRenderContext.IsNativeControlSupported(CTRL_MENU_POPUP, PART_ENTIRE_CONTROL)) + if (rRenderContext.IsNativeControlSupported(ControlType::MenuPopup, PART_ENTIRE_CONTROL)) { rRenderContext.Push(PushFlags::CLIPREGION); rRenderContext.IntersectClipRegion(Rectangle(aPos, aSize)); Rectangle aCtrlRect(Point(0,0), GetOutputSizePixel()); - rRenderContext.DrawNativeControl(CTRL_MENU_POPUP, PART_ENTIRE_CONTROL, aCtrlRect, ControlState::ENABLED, + rRenderContext.DrawNativeControl(ControlType::MenuPopup, PART_ENTIRE_CONTROL, aCtrlRect, ControlState::ENABLED, ImplControlValue(), OUString()); rRenderContext.Pop(); } bool bNativeDrawn = true; - if (rRenderContext.IsNativeControlSupported(CTRL_MENU_POPUP, PART_MENU_ITEM)) + if (rRenderContext.IsNativeControlSupported(ControlType::MenuPopup, PART_MENU_ITEM)) { ControlState nState = bSelected ? ControlState::SELECTED : ControlState::NONE; if (maMenuItems[nPos].mbEnabled) nState |= ControlState::ENABLED; - bNativeDrawn = rRenderContext.DrawNativeControl(CTRL_MENU_POPUP, PART_MENU_ITEM, + bNativeDrawn = rRenderContext.DrawNativeControl(ControlType::MenuPopup, PART_MENU_ITEM, aRegion, nState, ImplControlValue(), OUString()); } else |