diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2024-07-03 10:15:27 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2024-07-04 06:32:02 +0200 |
| commit | 0583a07e5fad562b7d404aa5d17579114c285219 (patch) | |
| tree | 0107d8c9f4b2afa0b2a407e2b0c543d66fa9a0bd | |
| parent | fed3e5d4ea03d12d17dd380359689e4f00c7f90e (diff) | |
tdf#161853 Drop SvxIconViewFlags::POS_MOVED
The flag is never set, so there's no need to
check or clear it either.
Change-Id: I63ab1272140a0d5386538e6b749ba0f652f49c38
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169910
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
| -rw-r--r-- | include/vcl/toolkit/ivctrl.hxx | 1 | ||||
| -rw-r--r-- | vcl/source/control/imivctl1.cxx | 11 |
2 files changed, 0 insertions, 12 deletions
diff --git a/include/vcl/toolkit/ivctrl.hxx b/include/vcl/toolkit/ivctrl.hxx index 1442904fa2f8..059494b5e05e 100644 --- a/include/vcl/toolkit/ivctrl.hxx +++ b/include/vcl/toolkit/ivctrl.hxx @@ -39,7 +39,6 @@ enum class SvxIconViewFlags NONE = 0x0000, SELECTED = 0x0001, FOCUSED = 0x0002, - POS_MOVED = 0x0004, // Moved by Drag and Drop, but not logged }; namespace o3tl { diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx index c647939ca4d6..f19978f7ff6e 100644 --- a/vcl/source/control/imivctl1.cxx +++ b/vcl/source/control/imivctl1.cxx @@ -296,7 +296,6 @@ void SvxIconChoiceCtrl_Impl::ResetVirtSize() for( size_t nCur = 0; nCur < nCount; nCur++ ) { SvxIconChoiceCtrlEntry* pCur = maEntries[ nCur ].get(); - pCur->ClearFlags( SvxIconViewFlags::POS_MOVED ); InvalidateBoundingRect(pCur->aRect); } @@ -361,8 +360,6 @@ void SvxIconChoiceCtrl_Impl::InitPredecessors() SvxIconChoiceCtrlEntry* pPrev = maEntries[ 0 ].get(); for( size_t nCur = 1; nCur <= nCount; nCur++ ) { - pPrev->ClearFlags(SvxIconViewFlags::POS_MOVED); - SvxIconChoiceCtrlEntry* pNext; if( nCur == nCount ) pNext = maEntries[ 0 ].get(); @@ -2096,7 +2093,6 @@ void SvxIconChoiceCtrl_Impl::SetPositionMode( SvxIconChoiceCtrlPositionMode eMod SvxIconChoiceCtrlPositionMode eOldMode = ePositionMode; ePositionMode = eMode; - size_t nCount = maEntries.size(); if( eOldMode == SvxIconChoiceCtrlPositionMode::AutoArrange ) { @@ -2110,13 +2106,6 @@ void SvxIconChoiceCtrl_Impl::SetPositionMode( SvxIconChoiceCtrlPositionMode eMod if( ePositionMode == SvxIconChoiceCtrlPositionMode::AutoArrange ) { - for( size_t nCur = 0; nCur < nCount; nCur++ ) - { - SvxIconChoiceCtrlEntry* pEntry = maEntries[ nCur ].get(); - if (pEntry->GetFlags() & SvxIconViewFlags::POS_MOVED) - SetEntryPos(pEntry, GetEntryBoundRect( pEntry ).TopLeft()); - } - if( maEntries.size() ) aAutoArrangeIdle.Start(); } |