diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-03-08 12:29:39 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-03-09 13:22:18 +0100 |
commit | fbaf865ffc5db1ed1094fec608e6b2472437e066 (patch) | |
tree | 1740d009fae33b628286eda9b24c11f722723780 /basic/source/sbx/sbxcoll.cxx | |
parent | 674bbddf720b14d1f7d173e6b5f3e08d65618ab9 (diff) |
Drop "32" from names of SbxArray methods taking 32-bit indices
... a leftover from times when there were methods for 16-bit
as well as for 32-bit indices. 16-bit indices were removed in
commit 62f3f3d92aa204eaaa063b30d7ade44df501b997.
Change-Id: Idf8b1160e68e8b303cf75ea79dd7dbb3bd00275d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112187
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'basic/source/sbx/sbxcoll.cxx')
-rw-r--r-- | basic/source/sbx/sbxcoll.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx index 7c186b4767aa..ea4eb4cdea14 100644 --- a/basic/source/sbx/sbxcoll.cxx +++ b/basic/source/sbx/sbxcoll.cxx @@ -120,7 +120,7 @@ void SbxCollection::Notify( SfxBroadcaster& rCst, const SfxHint& rHint ) else if( pVar->GetHashCode() == nCountHash && aVarName.equalsIgnoreAsciiCase( pCount ) ) { - pVar->PutLong( sal::static_int_cast<sal_Int32>(pObjs->Count32()) ); + pVar->PutLong(sal::static_int_cast<sal_Int32>(pObjs->Count())); } else if( pVar->GetHashCode() == nAddHash && aVarName.equalsIgnoreAsciiCase( pAdd ) ) @@ -151,13 +151,13 @@ void SbxCollection::Notify( SfxBroadcaster& rCst, const SfxHint& rHint ) void SbxCollection::CollAdd( SbxArray* pPar_ ) { - if( pPar_->Count32() != 2 ) + if (pPar_->Count() != 2) { SetError( ERRCODE_BASIC_WRONG_ARGS ); } else { - SbxBase* pObj = pPar_->Get32( 1 )->GetObject(); + SbxBase* pObj = pPar_->Get(1)->GetObject(); if( !pObj || dynamic_cast<const SbxObject*>(pObj) == nullptr ) { SetError( ERRCODE_BASIC_BAD_ARGUMENT ); @@ -173,14 +173,14 @@ void SbxCollection::CollAdd( SbxArray* pPar_ ) void SbxCollection::CollItem( SbxArray* pPar_ ) { - if( pPar_->Count32() != 2 ) + if (pPar_->Count() != 2) { SetError( ERRCODE_BASIC_WRONG_ARGS ); } else { SbxVariable* pRes = nullptr; - SbxVariable* p = pPar_->Get32( 1 ); + SbxVariable* p = pPar_->Get(1); if( p->GetType() == SbxSTRING ) { pRes = Find( p->GetOUString(), SbxClassType::Object ); @@ -188,16 +188,16 @@ void SbxCollection::CollItem( SbxArray* pPar_ ) else { short n = p->GetInteger(); - if( n >= 1 && n <= static_cast<sal_Int32>(pObjs->Count32()) ) + if (n >= 1 && n <= static_cast<sal_Int32>(pObjs->Count())) { - pRes = pObjs->Get32( static_cast<sal_uInt32>(n) - 1 ); + pRes = pObjs->Get(static_cast<sal_uInt32>(n) - 1); } } if( !pRes ) { SetError( ERRCODE_BASIC_BAD_INDEX ); } - pPar_->Get32( 0 )->PutObject( pRes ); + pPar_->Get(0)->PutObject(pRes); } } @@ -205,15 +205,15 @@ void SbxCollection::CollItem( SbxArray* pPar_ ) void SbxCollection::CollRemove( SbxArray* pPar_ ) { - if( pPar_->Count32() != 2 ) + if (pPar_->Count() != 2) SetError( ERRCODE_BASIC_WRONG_ARGS ); else { - short n = pPar_->Get32( 1 )->GetInteger(); - if( n < 1 || n > static_cast<sal_Int32>(pObjs->Count32()) ) + short n = pPar_->Get(1)->GetInteger(); + if (n < 1 || n > static_cast<sal_Int32>(pObjs->Count())) SetError( ERRCODE_BASIC_BAD_INDEX ); else - Remove( pObjs->Get32( static_cast<sal_uInt32>(n) - 1 ) ); + Remove(pObjs->Get(static_cast<sal_uInt32>(n) - 1)); } } |