Kaydet (Commit) 3b887c8d authored tarafından Rafael Dominguez's avatar Rafael Dominguez

Replace deprecated List for std::vector.

üst a9a05a06
...@@ -3558,25 +3558,13 @@ void SvxIconChoiceCtrl_Impl::SetPositionMode( SvxIconChoiceCtrlPositionMode eMod ...@@ -3558,25 +3558,13 @@ void SvxIconChoiceCtrl_Impl::SetPositionMode( SvxIconChoiceCtrlPositionMode eMod
if( ePositionMode == IcnViewPositionModeAutoArrange ) if( ePositionMode == IcnViewPositionModeAutoArrange )
{ {
List aMovedEntries;
for( size_t nCur = 0; nCur < nCount; nCur++ ) for( size_t nCur = 0; nCur < nCount; nCur++ )
{ {
SvxIconChoiceCtrlEntry* pEntry = aEntries[ nCur ]; SvxIconChoiceCtrlEntry* pEntry = aEntries[ nCur ];
if( pEntry->GetFlags() & (ICNVIEW_FLAG_POS_LOCKED | ICNVIEW_FLAG_POS_MOVED)) if( pEntry->GetFlags() & (ICNVIEW_FLAG_POS_LOCKED | ICNVIEW_FLAG_POS_MOVED))
{ SetEntryPos(pEntry, GetEntryBoundRect( pEntry ).TopLeft());
SvxIconChoiceCtrlEntry_Impl* pE = new SvxIconChoiceCtrlEntry_Impl(
pEntry, GetEntryBoundRect( pEntry ));
aMovedEntries.Insert( pE, LIST_APPEND );
}
} }
nCount = aMovedEntries.Count();
for( size_t nCur = 0; nCur < nCount; nCur++ )
{
SvxIconChoiceCtrlEntry_Impl* pE = (SvxIconChoiceCtrlEntry_Impl*)aMovedEntries.GetObject(nCur);
SetEntryPos( pE->_pEntry, pE->_aPos );
}
for( size_t nCur = 0; nCur < nCount; nCur++ )
delete (SvxIconChoiceCtrlEntry_Impl*)aMovedEntries.GetObject( nCur );
if( aEntries.size() ) if( aEntries.size() )
aAutoArrangeTimer.Start(); aAutoArrangeTimer.Start();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment