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 /svtools/source/contnr | |
| 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 'svtools/source/contnr')
| -rw-r--r-- | svtools/source/contnr/svimpbox.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/contnr/svlbitm.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/contnr/treelistbox.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index fd412c930640..10e0cd7b468f 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -1026,11 +1026,11 @@ void SvImpLBox::DrawNet(vcl::RenderContext& rRenderContext) // for platforms that don't have nets, DrawNativeControl does nothing and returns true // so that SvImpLBox::DrawNet() doesn't draw anything either - if (rRenderContext.IsNativeControlSupported(CTRL_LISTNET, PART_ENTIRE_CONTROL)) + if (rRenderContext.IsNativeControlSupported(ControlType::ListNet, PART_ENTIRE_CONTROL)) { ImplControlValue aControlValue; ControlState nState = ControlState::ENABLED; - if (rRenderContext.DrawNativeControl(CTRL_LISTNET, PART_ENTIRE_CONTROL, + if (rRenderContext.DrawNativeControl(ControlType::ListNet, PART_ENTIRE_CONTROL, Rectangle(), nState, aControlValue, OUString())) { return; diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index 353ff604882d..341827fd2615 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -337,7 +337,7 @@ void SvLBoxButton::Paint( //Native drawing bool bNativeOK = false; - ControlType eCtrlType = (pData->IsRadio())? CTRL_RADIOBUTTON : CTRL_CHECKBOX; + ControlType eCtrlType = (pData->IsRadio())? ControlType::Radiobutton : ControlType::Checkbox; if ( nIndex != SvBmp::STATICIMAGE && rRenderContext.IsNativeControlSupported( eCtrlType, PART_ENTIRE_CONTROL) ) { @@ -415,7 +415,7 @@ void SvLBoxButton::InitViewData(SvTreeListBox* pView,SvTreeListEntry* pEntry, Sv pViewData = pView->GetViewDataItem( pEntry, this ); Size aSize( pData->Width(), pData->Height() ); - ControlType eCtrlType = (pData->IsRadio())? CTRL_RADIOBUTTON : CTRL_CHECKBOX; + ControlType eCtrlType = (pData->IsRadio())? ControlType::Radiobutton : ControlType::Checkbox; if ( eKind != SvLBoxButtonKind::StaticImage && pView ) ImplAdjustBoxSize(aSize, eCtrlType, *pView); pViewData->maSize = aSize; diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index fc7225292953..7a931b840b7c 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -3034,7 +3034,7 @@ void SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, long nLine, vcl::Render //native bool bNativeOK = false; - if (rRenderContext.IsNativeControlSupported(CTRL_LISTNODE, PART_ENTIRE_CONTROL)) + if (rRenderContext.IsNativeControlSupported(ControlType::ListNode, PART_ENTIRE_CONTROL)) { ImplControlValue aControlValue; Rectangle aCtrlRegion(aPos, pImg->GetSizePixel()); @@ -3059,7 +3059,7 @@ void SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, long nLine, vcl::Render } } - bNativeOK = rRenderContext.DrawNativeControl(CTRL_LISTNODE, PART_ENTIRE_CONTROL, aCtrlRegion, nState, aControlValue, OUString()); + bNativeOK = rRenderContext.DrawNativeControl(ControlType::ListNode, PART_ENTIRE_CONTROL, aCtrlRegion, nState, aControlValue, OUString()); } if (!bNativeOK) |