diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-14 14:46:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-15 08:33:37 +0200 |
| commit | 89c24a380a8fb5dd94ba595ce421abafa9004b9a (patch) | |
| tree | b7485b29940a38029e25d34a24dc44700dba2ce9 /svtools | |
| parent | Typo: lenghten->lengthen (diff) | |
| download | core-89c24a380a8fb5dd94ba595ce421abafa9004b9a.tar.gz core-89c24a380a8fb5dd94ba595ce421abafa9004b9a.zip | |
convert SvxIconChoiceCtrlPositionMode to scoped enum
and drop unused AutoAdjust enumerator
Change-Id: Ie900f89241947cb93a16f0223071846fecfef09c
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/contnr/imivctl.hxx | 2 | ||||
| -rw-r--r-- | svtools/source/contnr/imivctl1.cxx | 10 | ||||
| -rw-r--r-- | svtools/source/contnr/ivctrl.cxx | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index b9b79754db23..444a37a2f937 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -294,7 +294,7 @@ class SvxIconChoiceCtrl_Impl void SetDefaultTextSize(); bool IsAutoArrange() const { - return (ePositionMode == IcnViewPositionModeAutoArrange); + return (ePositionMode == SvxIconChoiceCtrlPositionMode::AutoArrange); } void DocRectChanged() { aDocRectChangedIdle.Start(); } void VisRectChanged() { aVisRectChangedIdle.Start(); } diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index f1454f591480..9069a1fd56de 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -118,7 +118,7 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl( eSelectionMode = SelectionMode::Multiple; pView = pCurView; pZOrderList = new SvxIconChoiceCtrlEntryList_impl(); - ePositionMode = IcnViewPositionModeFree; + ePositionMode = SvxIconChoiceCtrlPositionMode::Free; SetStyle( nWinStyle ); nFlags = IconChoiceFlags::NONE; nUserEventAdjustScrBars = nullptr; @@ -3232,7 +3232,7 @@ void SvxIconChoiceCtrl_Impl::SetPositionMode( SvxIconChoiceCtrlPositionMode eMod ePositionMode = eMode; size_t nCount = aEntries.size(); - if( eOldMode == IcnViewPositionModeAutoArrange ) + if( eOldMode == SvxIconChoiceCtrlPositionMode::AutoArrange ) { // when positioning moved entries "hard", there are problems with // unwanted overlaps, as these entries aren't taken into account in @@ -3242,7 +3242,7 @@ void SvxIconChoiceCtrl_Impl::SetPositionMode( SvxIconChoiceCtrlPositionMode eMod return; } - if( ePositionMode == IcnViewPositionModeAutoArrange ) + if( ePositionMode == SvxIconChoiceCtrlPositionMode::AutoArrange ) { for( size_t nCur = 0; nCur < nCount; nCur++ ) { @@ -3254,10 +3254,6 @@ void SvxIconChoiceCtrl_Impl::SetPositionMode( SvxIconChoiceCtrlPositionMode eMod if( aEntries.size() ) aAutoArrangeIdle.Start(); } - else if( ePositionMode == IcnViewPositionModeAutoAdjust ) - { - AdjustEntryAtGrid(); - } } void SvxIconChoiceCtrl_Impl::SetEntryPredecessor( SvxIconChoiceCtrlEntry* pEntry, diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index 198184505a1e..b93f1cf105d1 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -75,7 +75,7 @@ SvtIconChoiceCtrl::SvtIconChoiceCtrl( vcl::Window* pParent, WinBits nWinStyle ) { SetLineColor(); _pImpl->InitSettings(); - _pImpl->SetPositionMode( IcnViewPositionModeAutoArrange ); + _pImpl->SetPositionMode( SvxIconChoiceCtrlPositionMode::AutoArrange ); } SvtIconChoiceCtrl::~SvtIconChoiceCtrl() |