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 /vcl/source/control/combobox.cxx | |
| 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 'vcl/source/control/combobox.cxx')
| -rw-r--r-- | vcl/source/control/combobox.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 3bd8197d13e0..c9f24b0eebfd 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -168,7 +168,7 @@ void ComboBox::ImplCalcEditHeight() Rectangle aCtrlRegion( Point( 0, 0 ), Size( 10, 10 ) ); Rectangle aBoundRegion, aContentRegion; ImplControlValue aControlValue; - ControlType aType = IsDropDownBox() ? CTRL_COMBOBOX : CTRL_EDITBOX; + ControlType aType = IsDropDownBox() ? ControlType::Combobox : ControlType::Editbox; if( GetNativeControlRegion( aType, PART_ENTIRE_CONTROL, aCtrlRegion, ControlState::ENABLED, @@ -1069,7 +1069,7 @@ long ComboBox::getMaxWidthScrollBarAndDownButton() const // use the full extent of the control Rectangle aArea( aPoint, pBorder->GetOutputSizePixel() ); - if ( GetNativeControlRegion(CTRL_COMBOBOX, PART_BUTTON_DOWN, + if ( GetNativeControlRegion(ControlType::Combobox, PART_BUTTON_DOWN, aArea, ControlState::NONE, aControlValue, OUString(), aBound, aContent) ) { nButtonDownWidth = aContent.getWidth(); @@ -1507,7 +1507,7 @@ ComboBoxBounds ComboBox::Impl::calcComboBoxDropDownComponentBounds( // use the full extent of the control Rectangle aArea( aPoint, rBorderOutSz ); - if (m_rThis.GetNativeControlRegion(CTRL_COMBOBOX, PART_BUTTON_DOWN, + if (m_rThis.GetNativeControlRegion(ControlType::Combobox, PART_BUTTON_DOWN, aArea, ControlState::NONE, aControlValue, OUString(), aBound, aContent) ) { // convert back from border space to local coordinates @@ -1518,7 +1518,7 @@ ComboBoxBounds ComboBox::Impl::calcComboBoxDropDownComponentBounds( aBounds.aButtonSize = Size(aContent.getWidth(), (nBottom-nTop)); // adjust the size of the edit field - if (m_rThis.GetNativeControlRegion(CTRL_COMBOBOX, PART_SUB_EDIT, + if (m_rThis.GetNativeControlRegion(ControlType::Combobox, PART_SUB_EDIT, aArea, ControlState::NONE, aControlValue, OUString(), aBound, aContent) ) { // convert back from border space to local coordinates |