diff options
author | Noel Grandin <noel@peralex.com> | 2012-06-28 08:21:54 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-07-04 23:23:21 +0200 |
commit | 2c09f1c0a7747a625c375028d02a30c0c0e1a893 (patch) | |
tree | bc46147200bf2259f9b36f50fd4cafb5d6757cd0 /svtools/source/contnr/imivctl1.cxx | |
parent | a6edbee5f827c8b8f1dde87933f54aae18dc2863 (diff) |
Convert SvPtrarr to std::vector<SvxIconChoiceCtrlEntry*>
Change-Id: I70a3907f659f26817bca5c7049a0f301ae5f10ed
Diffstat (limited to 'svtools/source/contnr/imivctl1.cxx')
-rw-r--r-- | svtools/source/contnr/imivctl1.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index e7622537a2e8..b52607fa2bcf 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -2983,19 +2983,19 @@ IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, EditTimeoutHdl) // else: align all entries of the row from pStart on (including pStart) void SvxIconChoiceCtrl_Impl::AdjustEntryAtGrid( SvxIconChoiceCtrlEntry* pStart ) { - SvPtrarr aLists; + IconChoiceMap aLists; pImpCursor->CreateGridAjustData( aLists, pStart ); - const sal_uInt16 nCount = aLists.Count(); + const sal_uInt16 nCount = aLists.size(); for( sal_uInt16 nCur = 0; nCur < nCount; nCur++ ) - AdjustAtGrid( *(SvPtrarr*)aLists[ nCur ], pStart ); + AdjustAtGrid( aLists[ nCur ], pStart ); IcnCursor_Impl::DestroyGridAdjustData( aLists ); CheckScrollBars(); } // align a row, might expand width, doesn't break the line -void SvxIconChoiceCtrl_Impl::AdjustAtGrid( const SvPtrarr& rRow, SvxIconChoiceCtrlEntry* pStart ) +void SvxIconChoiceCtrl_Impl::AdjustAtGrid( const SvxIconChoiceCtrlEntryPtrVec& rRow, SvxIconChoiceCtrlEntry* pStart ) { - if( !rRow.Count() ) + if( rRow.empty() ) return; sal_Bool bGo; @@ -3005,9 +3005,9 @@ void SvxIconChoiceCtrl_Impl::AdjustAtGrid( const SvPtrarr& rRow, SvxIconChoiceCt bGo = sal_False; long nCurRight = 0; - for( sal_uInt16 nCur = 0; nCur < rRow.Count(); nCur++ ) + for( sal_uInt16 nCur = 0; nCur < rRow.size(); nCur++ ) { - SvxIconChoiceCtrlEntry* pCur = (SvxIconChoiceCtrlEntry*)rRow[ nCur ]; + SvxIconChoiceCtrlEntry* pCur = rRow[ nCur ]; if( !bGo && pCur == pStart ) bGo = sal_True; |