diff options
| author | Rafael Dominguez <venccsralph@gmail.com> | 2011-05-21 14:16:06 -0430 |
|---|---|---|
| committer | Joseph Powers <jpowers27@cox.net> | 2011-05-22 21:17:05 -0700 |
| commit | e263e48bdb3df9a83259f1ba348783917df9e7e1 (patch) | |
| tree | 1b65ddec9c5474b284f25e0df89aed7719273fdc /svl | |
| parent | 048b7f0f99f057da3d065ccfa4b662c21f145745 (diff) | |
Remove uneeded parameter for Sort function.
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/inc/svl/slstitm.hxx | 2 | ||||
| -rw-r--r-- | svl/source/items/slstitm.cxx | 16 |
2 files changed, 5 insertions, 13 deletions
diff --git a/svl/inc/svl/slstitm.hxx b/svl/inc/svl/slstitm.hxx index e72a5ffde911..c758bb5f9ccb 100644 --- a/svl/inc/svl/slstitm.hxx +++ b/svl/inc/svl/slstitm.hxx @@ -75,7 +75,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const; virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const; - void Sort( sal_Bool bAscending = sal_True, List* pParallelList = 0 ); + void Sort( sal_Bool bAscending = sal_True); virtual bool PutValue ( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index e001bf1e23f2..455f93e5a197 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -51,7 +51,7 @@ public: SfxImpStringList() { nRefCount = 1; } ~SfxImpStringList(); - void Sort( sal_Bool bAscending, List* ); + void Sort( sal_Bool bAscending); }; //------------------------------------------------------------------------ @@ -70,9 +70,8 @@ SfxImpStringList::~SfxImpStringList() //------------------------------------------------------------------------ -void SfxImpStringList::Sort( sal_Bool bAscending, List* pParallelList ) +void SfxImpStringList::Sort( sal_Bool bAscending) { - DBG_ASSERT(!pParallelList || pParallelList->Count() >= aList.Count(),"Sort:ParallelList too small"); sal_uLong nCount = aList.Count(); if( nCount > 1 ) { @@ -102,13 +101,6 @@ void SfxImpStringList::Sort( sal_Bool bAscending, List* pParallelList ) bSwapped = sal_True; aList.Replace( pStr1, nCur + 1 ); aList.Replace( pStr2, nCur ); - if( pParallelList ) - { - void* p1 = pParallelList->GetObject( nCur ); - void* p2 = pParallelList->GetObject( nCur + 1 ); - pParallelList->Replace( p1, nCur + 1 ); - pParallelList->Replace( p2, nCur ); - } } } } @@ -355,11 +347,11 @@ int SfxStringListItem::IsPoolable() const //------------------------------------------------------------------------ -void SfxStringListItem::Sort( sal_Bool bAscending, List* pParallelList ) +void SfxStringListItem::Sort( sal_Bool bAscending) { DBG_ASSERT(GetRefCount()==0,"Sort:RefCount!=0"); if( pImp ) - pImp->Sort( bAscending, pParallelList ); + pImp->Sort( bAscending); } //---------------------------------------------------------------------------- |