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/comp | |
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/comp')
-rw-r--r-- | basic/source/comp/codegen.cxx | 10 | ||||
-rw-r--r-- | basic/source/comp/dim.cxx | 12 | ||||
-rw-r--r-- | basic/source/comp/sbcomp.cxx | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx index f821c15aece6..565fafe6c079 100644 --- a/basic/source/comp/codegen.cxx +++ b/basic/source/comp/codegen.cxx @@ -165,7 +165,7 @@ void SbiCodeGen::Save() SbxVariable* pIfaceVar = new SbxVariable( SbxVARIANT ); pIfaceVar->SetName( rIfaceName ); SbxArray* pIfaces = rMod.pClassData->mxIfaces.get(); - pIfaces->Insert32( pIfaceVar, pIfaces->Count32() ); + pIfaces->Insert( pIfaceVar, pIfaces->Count() ); } } @@ -372,16 +372,16 @@ void SbiCodeGen::Save() p->AddString( pPool->Find( i ) ); } // Insert types - sal_uInt32 nCount = pParser->rTypeArray->Count32(); + sal_uInt32 nCount = pParser->rTypeArray->Count(); for (i = 0; i < nCount; i++) { - p->AddType(static_cast<SbxObject *>(pParser->rTypeArray->Get32(i))); + p->AddType(static_cast<SbxObject *>(pParser->rTypeArray->Get(i))); } // Insert enum objects - nCount = pParser->rEnumArray->Count32(); + nCount = pParser->rEnumArray->Count(); for (i = 0; i < nCount; i++) { - p->AddEnum(static_cast<SbxObject *>(pParser->rEnumArray->Get32(i))); + p->AddEnum(static_cast<SbxObject *>(pParser->rEnumArray->Get(i))); } if( !p->IsError() ) { diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx index e95e8ee88054..20396cd729ad 100644 --- a/basic/source/comp/dim.cxx +++ b/basic/source/comp/dim.cxx @@ -641,12 +641,12 @@ void SbiParser::DefType() } else if ( !bCompatible ) ub += nBase; - pArray->AddDim32( lb, ub ); + pArray->AddDim(lb, ub); } pArray->setHasFixedSize( true ); } else - pArray->unoAddDim32( 0, -1 ); // variant array + pArray->unoAddDim(0, -1); // variant array SbxFlagBits nSavFlags = pTypeElem->GetFlags(); // need to reset the FIXED flag // when calling PutObject ( because the type will not match Object ) @@ -669,7 +669,7 @@ void SbiParser::DefType() } } } - pTypeMembers->Insert32( pTypeElem, pTypeMembers->Count32() ); + pTypeMembers->Insert(pTypeElem, pTypeMembers->Count()); } } } @@ -677,7 +677,7 @@ void SbiParser::DefType() pType->Remove( "Name", SbxClassType::DontCare ); pType->Remove( "Parent", SbxClassType::DontCare ); - rTypeArray->Insert32 (pType,rTypeArray->Count32()); + rTypeArray->Insert(pType, rTypeArray->Count()); } @@ -801,14 +801,14 @@ void SbiParser::DefEnum( bool bPrivate ) pEnumElem->PutLong( nCurrentEnumValue ); pEnumElem->ResetFlag( SbxFlagBits::Write ); pEnumElem->SetFlag( SbxFlagBits::Const ); - pEnumMembers->Insert32( pEnumElem, pEnumMembers->Count32() ); + pEnumMembers->Insert(pEnumElem, pEnumMembers->Count()); } } pEnum->Remove( "Name", SbxClassType::DontCare ); pEnum->Remove( "Parent", SbxClassType::DontCare ); - rEnumArray->Insert32( pEnum, rEnumArray->Count32() ); + rEnumArray->Insert(pEnum, rEnumArray->Count()); } diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx index bc8db7e3442a..1a6a52b22850 100644 --- a/basic/source/comp/sbcomp.cxx +++ b/basic/source/comp/sbcomp.cxx @@ -62,9 +62,9 @@ bool SbModule::Compile() pBasic->ClearAllModuleVars(); RemoveVars(); // remove 'this' Modules variables // clear all method statics - for( sal_uInt32 i = 0; i < pMethods->Count32(); i++ ) + for (sal_uInt32 i = 0; i < pMethods->Count(); i++) { - SbMethod* p = dynamic_cast<SbMethod*>( pMethods->Get32( i ) ); + SbMethod* p = dynamic_cast<SbMethod*>(pMethods->Get(i)); if( p ) p->ClearStatics(); } |