diff options
| -rw-r--r-- | basic/source/classes/sb.cxx | 2 | ||||
| -rw-r--r-- | basic/source/sbx/sbxarray.cxx | 9 | ||||
| -rw-r--r-- | include/basic/sbx.hxx | 3 |
3 files changed, 4 insertions, 10 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 9bf4cda4ae42..6d2aaa6c84d5 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -2267,7 +2267,7 @@ void BasicCollection::CollRemove( SbxArray* pPar_ ) sal_Int32 nIndex = implGetIndex( p ); if( nIndex >= 0 && nIndex < (sal_Int32)xItemArray->Count32() ) { - xItemArray->Remove32( nIndex ); + xItemArray->Remove( nIndex ); // Correct for stack if necessary SbiInstance* pInst = GetSbData()->pInst; diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx index b1cce09ea3e6..754bc5aa8211 100644 --- a/basic/source/sbx/sbxarray.cxx +++ b/basic/source/sbx/sbxarray.cxx @@ -283,7 +283,7 @@ void SbxArray::Insert( SbxVariable* pVar, sal_uInt16 nIdx ) Insert32( pVar, nIdx ); } -void SbxArray::Remove32( sal_uInt32 nIdx ) +void SbxArray::Remove( sal_uInt32 nIdx ) { if( nIdx < mpVarEntries->size() ) { @@ -292,11 +292,6 @@ void SbxArray::Remove32( sal_uInt32 nIdx ) } } -void SbxArray::Remove( sal_uInt16 nIdx ) -{ - Remove32(nIdx); -} - void SbxArray::Remove( SbxVariable* pVar ) { if( pVar ) @@ -305,7 +300,7 @@ void SbxArray::Remove( SbxVariable* pVar ) { if (&(*mpVarEntries)[i].mpVar == pVar) { - Remove32( i ); break; + Remove( i ); break; } } } diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx index a75a8d47d876..e304e0912551 100644 --- a/include/basic/sbx.hxx +++ b/include/basic/sbx.hxx @@ -147,7 +147,6 @@ public: SbxVariable* Get( sal_uInt16 ); void Put( SbxVariable*, sal_uInt16 ); void Insert( SbxVariable*, sal_uInt16 ); - void Remove( sal_uInt16 ); void Remove( SbxVariable* ); void Merge( SbxArray* ); OUString GetAlias( sal_uInt16 ); @@ -161,7 +160,7 @@ public: SbxVariable* Get32( sal_uInt32 ); void Put32( SbxVariable*, sal_uInt32 ); void Insert32( SbxVariable*, sal_uInt32 ); - void Remove32( sal_uInt32 ); + void Remove( sal_uInt32 ); }; // SbxDimArray is an array that can dimensioned using BASIC conventions. |