From 0583a07e5fad562b7d404aa5d17579114c285219 Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Wed, 3 Jul 2024 10:15:27 +0200 Subject: 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 Tested-by: Jenkins --- vcl/source/control/imivctl1.cxx | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'vcl/source/control') 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(); } -- cgit