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 /scripting/source | |
| 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 'scripting/source')
| -rw-r--r-- | scripting/source/basprov/basmodnode.cxx | 8 | ||||
| -rw-r--r-- | scripting/source/basprov/basscript.cxx | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/scripting/source/basprov/basmodnode.cxx b/scripting/source/basprov/basmodnode.cxx index b5c3cf1a08e4..58d3ec65728d 100644 --- a/scripting/source/basprov/basmodnode.cxx +++ b/scripting/source/basprov/basmodnode.cxx @@ -80,11 +80,11 @@ namespace basprov SbxArray* pMethods = m_pModule->GetMethods().get(); if ( pMethods ) { - sal_uInt32 nCount = pMethods->Count32(); + sal_uInt32 nCount = pMethods->Count(); sal_Int32 nRealCount = 0; for ( sal_uInt32 i = 0; i < nCount; ++i ) { - SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Get32( i ) ); + SbMethod* pMethod = static_cast<SbMethod*>(pMethods->Get(i)); if ( pMethod && !pMethod->IsHidden() ) ++nRealCount; } @@ -94,7 +94,7 @@ namespace basprov sal_Int32 iTarget = 0; for ( sal_uInt32 i = 0; i < nCount; ++i ) { - SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Get32( i ) ); + SbMethod* pMethod = static_cast<SbMethod*>(pMethods->Get(i)); if ( pMethod && !pMethod->IsHidden() ) pChildNodes[iTarget++] = new BasicMethodNodeImpl( m_xContext, m_sScriptingContext, pMethod, m_bIsAppScript); @@ -114,7 +114,7 @@ namespace basprov if ( m_pModule ) { SbxArray* pMethods = m_pModule->GetMethods().get(); - if ( pMethods && pMethods->Count32() > 0 ) + if (pMethods && pMethods->Count() > 0) bReturn = true; } diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx index 4d6f2477ed92..a22cd82f343e 100644 --- a/scripting/source/basprov/basscript.cxx +++ b/scripting/source/basprov/basscript.cxx @@ -203,7 +203,7 @@ namespace basprov { SbxVariableRef xSbxVar = new SbxVariable( SbxVARIANT ); unoToSbxValue( xSbxVar.get(), pParams[i] ); - xSbxParams->Put32( xSbxVar.get(), static_cast< sal_uInt32 >( i ) + 1 ); + xSbxParams->Put(xSbxVar.get(), static_cast<sal_uInt32>(i) + 1); if (pInfo) { @@ -268,13 +268,13 @@ namespace basprov if ( pInfo_ ) { OutParamMap aOutParamMap; - for ( sal_uInt32 n = 1, nCount = xSbxParams->Count32(); n < nCount; ++n ) + for (sal_uInt32 n = 1, nCount = xSbxParams->Count(); n < nCount; ++n) { assert(nCount <= std::numeric_limits<sal_uInt16>::max()); const SbxParamInfo* pParamInfo = pInfo_->GetParam( sal::static_int_cast<sal_uInt16>(n) ); if ( pParamInfo && ( pParamInfo->eType & SbxBYREF ) != 0 ) { - SbxVariable* pVar = xSbxParams->Get32( n ); + SbxVariable* pVar = xSbxParams->Get(n); if ( pVar ) { SbxVariableRef xVar = pVar; |