Kaydet (Commit) 9b099543 authored tarafından Arnaud Versini's avatar Arnaud Versini Kaydeden (comit) Noel Grandin

BASIC : Remove useless 16bits Remove function from SbxArray

Change-Id: I050a034437d3370a28c9e5ab47abee369e634f7d
Reviewed-on: https://gerrit.libreoffice.org/27089Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst f41eb663
...@@ -2267,7 +2267,7 @@ void BasicCollection::CollRemove( SbxArray* pPar_ ) ...@@ -2267,7 +2267,7 @@ void BasicCollection::CollRemove( SbxArray* pPar_ )
sal_Int32 nIndex = implGetIndex( p ); sal_Int32 nIndex = implGetIndex( p );
if( nIndex >= 0 && nIndex < (sal_Int32)xItemArray->Count32() ) if( nIndex >= 0 && nIndex < (sal_Int32)xItemArray->Count32() )
{ {
xItemArray->Remove32( nIndex ); xItemArray->Remove( nIndex );
// Correct for stack if necessary // Correct for stack if necessary
SbiInstance* pInst = GetSbData()->pInst; SbiInstance* pInst = GetSbData()->pInst;
......
...@@ -283,7 +283,7 @@ void SbxArray::Insert( SbxVariable* pVar, sal_uInt16 nIdx ) ...@@ -283,7 +283,7 @@ void SbxArray::Insert( SbxVariable* pVar, sal_uInt16 nIdx )
Insert32( pVar, nIdx ); Insert32( pVar, nIdx );
} }
void SbxArray::Remove32( sal_uInt32 nIdx ) void SbxArray::Remove( sal_uInt32 nIdx )
{ {
if( nIdx < mpVarEntries->size() ) if( nIdx < mpVarEntries->size() )
{ {
...@@ -292,11 +292,6 @@ void SbxArray::Remove32( sal_uInt32 nIdx ) ...@@ -292,11 +292,6 @@ void SbxArray::Remove32( sal_uInt32 nIdx )
} }
} }
void SbxArray::Remove( sal_uInt16 nIdx )
{
Remove32(nIdx);
}
void SbxArray::Remove( SbxVariable* pVar ) void SbxArray::Remove( SbxVariable* pVar )
{ {
if( pVar ) if( pVar )
...@@ -305,7 +300,7 @@ void SbxArray::Remove( SbxVariable* pVar ) ...@@ -305,7 +300,7 @@ void SbxArray::Remove( SbxVariable* pVar )
{ {
if (&(*mpVarEntries)[i].mpVar == pVar) if (&(*mpVarEntries)[i].mpVar == pVar)
{ {
Remove32( i ); break; Remove( i ); break;
} }
} }
} }
......
...@@ -147,7 +147,6 @@ public: ...@@ -147,7 +147,6 @@ public:
SbxVariable* Get( sal_uInt16 ); SbxVariable* Get( sal_uInt16 );
void Put( SbxVariable*, sal_uInt16 ); void Put( SbxVariable*, sal_uInt16 );
void Insert( SbxVariable*, sal_uInt16 ); void Insert( SbxVariable*, sal_uInt16 );
void Remove( sal_uInt16 );
void Remove( SbxVariable* ); void Remove( SbxVariable* );
void Merge( SbxArray* ); void Merge( SbxArray* );
OUString GetAlias( sal_uInt16 ); OUString GetAlias( sal_uInt16 );
...@@ -161,7 +160,7 @@ public: ...@@ -161,7 +160,7 @@ public:
SbxVariable* Get32( sal_uInt32 ); SbxVariable* Get32( sal_uInt32 );
void Put32( SbxVariable*, sal_uInt32 ); void Put32( SbxVariable*, sal_uInt32 );
void Insert32( 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. // SbxDimArray is an array that can dimensioned using BASIC conventions.
......
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