summaryrefslogtreecommitdiff
path: root/basic/source/classes/sbunoobj.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'basic/source/classes/sbunoobj.cxx')
-rw-r--r--basic/source/classes/sbunoobj.cxx156
1 files changed, 78 insertions, 78 deletions
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 259cd5ae88f4..9f00a8f231c9 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -592,9 +592,9 @@ static void implSequenceToMultiDimArray( SbxDimArray*& pArray, Sequence< sal_Int
for ( sal_Int32 index = 0; index < nIndexLen; ++index )
{
if ( bIsZeroIndex )
- pArray->unoAddDim32( 0, sizes[ index ] - 1);
+ pArray->unoAddDim(0, sizes[index] - 1);
else
- pArray->unoAddDim32( 1, sizes[ index ] );
+ pArray->unoAddDim(1, sizes[index]);
}
}
@@ -605,7 +605,7 @@ static void implSequenceToMultiDimArray( SbxDimArray*& pArray, Sequence< sal_Int
unoToSbxValue( xVar.get(), aValue );
sal_Int32* pIndices = indices.getArray();
- pArray->Put32( xVar.get(), pIndices );
+ pArray->Put(xVar.get(), pIndices);
}
}
@@ -768,7 +768,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
xArray = new SbxDimArray( eSbxElementType );
if( nLen > 0 )
{
- xArray->unoAddDim32( 0, nLen - 1 );
+ xArray->unoAddDim(0, nLen - 1);
// register the elements as variables
for( i = 0 ; i < nLen ; i++ )
@@ -779,12 +779,12 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
unoToSbxValue( xVar.get(), aElementAny );
// put into the Array
- xArray->Put32( xVar.get(), &i );
+ xArray->Put(xVar.get(), &i);
}
}
else
{
- xArray->unoAddDim32( 0, -1 );
+ xArray->unoAddDim(0, -1);
}
// return the Array
@@ -873,13 +873,13 @@ static Type getUnoTypeForSbxValue( const SbxValue* pVal )
if( auto pArray = dynamic_cast<SbxDimArray*>( xObj.get() ) )
{
- sal_Int32 nDims = pArray->GetDims32();
+ sal_Int32 nDims = pArray->GetDims();
Type aElementType = getUnoTypeForSbxBaseType( static_cast<SbxDataType>(pArray->GetType() & 0xfff) );
TypeClass eElementTypeClass = aElementType.getTypeClass();
// Normal case: One dimensional array
sal_Int32 nLower, nUpper;
- if( nDims == 1 && pArray->GetDim32( 1, nLower, nUpper ) )
+ if (nDims == 1 && pArray->GetDim(1, nLower, nUpper))
{
if( eElementTypeClass == TypeClass_VOID || eElementTypeClass == TypeClass_ANY )
{
@@ -889,7 +889,7 @@ static Type getUnoTypeForSbxValue( const SbxValue* pVal )
for (sal_Int32 aIdx[1] = { nLower }; aIdx[0] <= nUpper; ++aIdx[0])
{
- SbxVariableRef xVar = pArray->Get32(aIdx);
+ SbxVariableRef xVar = pArray->Get(aIdx);
Type aType = getUnoTypeForSbxValue( xVar.get() );
if( bNeedsInit )
{
@@ -921,12 +921,12 @@ static Type getUnoTypeForSbxValue( const SbxValue* pVal )
if( eElementTypeClass == TypeClass_VOID || eElementTypeClass == TypeClass_ANY )
{
// For this check the array's dim structure does not matter
- sal_uInt32 nFlatArraySize = pArray->Count32();
+ sal_uInt32 nFlatArraySize = pArray->Count();
bool bNeedsInit = true;
for( sal_uInt32 i = 0 ; i < nFlatArraySize ; i++ )
{
- SbxVariableRef xVar = pArray->SbxArray::Get32( i );
+ SbxVariableRef xVar = pArray->SbxArray::Get(i);
Type aType = getUnoTypeForSbxValue( xVar.get() );
if( bNeedsInit )
{
@@ -1118,7 +1118,7 @@ static Any implRekMultiDimArrayToSequence( SbxDimArray* pArray,
}
else
{
- SbxVariable* pSource = pArray->Get32( pActualIndices );
+ SbxVariable* pSource = pArray->Get(pActualIndices);
aElementVal = sbxToUnoValue( pSource, aElemType );
}
@@ -1304,11 +1304,11 @@ Any sbxToUnoValue( const SbxValue* pVar, const Type& rType, Property const * pUn
SbxBaseRef xObj = pVar->GetObject();
if( auto pArray = dynamic_cast<SbxDimArray*>( xObj.get() ) )
{
- sal_Int32 nDims = pArray->GetDims32();
+ sal_Int32 nDims = pArray->GetDims();
// Normal case: One dimensional array
sal_Int32 nLower, nUpper;
- if( nDims == 1 && pArray->GetDim32( 1, nLower, nUpper ) )
+ if (nDims == 1 && pArray->GetDim(1, nLower, nUpper))
{
sal_Int32 nSeqSize = nUpper - nLower + 1;
@@ -1330,7 +1330,7 @@ Any sbxToUnoValue( const SbxValue* pVar, const Type& rType, Property const * pUn
aIdx[0] = nLower;
for (sal_Int32 i = 0 ; i < nSeqSize; ++i, ++aIdx[0])
{
- SbxVariableRef xVar = pArray->Get32(aIdx);
+ SbxVariableRef xVar = pArray->Get(aIdx);
// Convert the value of Sbx to Uno
Any aAnyValue = sbxToUnoValue( xVar.get(), aElemType );
@@ -1385,7 +1385,7 @@ Any sbxToUnoValue( const SbxValue* pVar, const Type& rType, Property const * pUn
for(sal_Int32 i = 1 ; i <= nDims ; i++ )
{
sal_Int32 lBound, uBound;
- pArray->GetDim32( i, lBound, uBound );
+ pArray->GetDim(i, lBound, uBound);
sal_Int32 j = i - 1;
pActualIndices[j] = pLowerBounds[j] = lBound;
@@ -1472,7 +1472,7 @@ static void processAutomationParams( SbxArray* pParams, Sequence< Any >& args, s
{
sal_uInt32 iSbx = i + 1;
- aValAny = sbxToUnoValueImpl( pParams->Get32( iSbx ),
+ aValAny = sbxToUnoValueImpl(pParams->Get(iSbx),
bBlockConversionToSmallestType );
OUString aParamName = pNames[iSbx];
@@ -1493,7 +1493,7 @@ static void processAutomationParams( SbxArray* pParams, Sequence< Any >& args, s
{
for( i = 0 ; i < nParamCount ; i++ )
{
- pAnyArgs[i] = sbxToUnoValueImpl(pParams->Get32(i + 1),
+ pAnyArgs[i] = sbxToUnoValueImpl(pParams->Get(i + 1),
bBlockConversionToSmallestType );
}
}
@@ -1541,7 +1541,7 @@ static Any invokeAutomationMethod( const OUString& Name, Sequence< Any > const &
sal_Int16 iTarget = pIndices[ j ];
if( iTarget >= static_cast<sal_Int16>(nParamCount) )
break;
- unoToSbxValue( pParams->Get32(j + 1), pNewValues[ j ] );
+ unoToSbxValue(pParams->Get(j + 1), pNewValues[j]);
}
}
return aRetAny;
@@ -1857,11 +1857,11 @@ static OUString Impl_DumpProperties(SbUnoObject& rUnoObj)
const Property* pUnoProps = props.getConstArray();
SbxArray* pProps = rUnoObj.GetProperties();
- sal_uInt32 nPropCount = pProps->Count32();
+ sal_uInt32 nPropCount = pProps->Count();
sal_uInt32 nPropsPerLine = 1 + nPropCount / 30;
for( sal_uInt32 i = 0; i < nPropCount; i++ )
{
- SbxVariable* pVar = pProps->Get32( i );
+ SbxVariable* pVar = pProps->Get(i);
if( pVar )
{
OUStringBuffer aPropStr;
@@ -1933,7 +1933,7 @@ static OUString Impl_DumpMethods(SbUnoObject& rUnoObj)
const Reference< XIdlMethod >* pUnoMethods = methods.getConstArray();
SbxArray* pMethods = rUnoObj.GetMethods();
- sal_uInt32 nMethodCount = pMethods->Count32();
+ sal_uInt32 nMethodCount = pMethods->Count();
if( !nMethodCount )
{
aRet.append( "\nNo methods found\n" );
@@ -1942,7 +1942,7 @@ static OUString Impl_DumpMethods(SbUnoObject& rUnoObj)
sal_uInt32 nPropsPerLine = 1 + nMethodCount / 30;
for( sal_uInt32 i = 0; i < nMethodCount; i++ )
{
- SbxVariable* pVar = pMethods->Get32( i );
+ SbxVariable* pVar = pMethods->Get(i);
if( pVar )
{
if( (i % nPropsPerLine) == 0 )
@@ -2089,7 +2089,7 @@ void SbUnoObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
try
{
- sal_uInt32 nParamCount = pParams ? (pParams->Count32() - 1) : 0;
+ sal_uInt32 nParamCount = pParams ? (pParams->Count() - 1) : 0;
bool bCanBeConsideredAMethod = mxInvocation->hasMethod( pProp->GetName() );
Any aRetAny;
if ( bCanBeConsideredAMethod && nParamCount )
@@ -2175,7 +2175,7 @@ void SbUnoObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
if( pHint->GetId() == SfxHintId::BasicDataWanted )
{
// number of Parameter -1 because of Param0 == this
- sal_uInt32 nParamCount = pParams ? (pParams->Count32() - 1) : 0;
+ sal_uInt32 nParamCount = pParams ? (pParams->Count() - 1) : 0;
Sequence<Any> args;
bool bOutParams = false;
@@ -2227,7 +2227,7 @@ void SbUnoObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
css::uno::Type aType( rxClass->getTypeClass(), rxClass->getName() );
// ATTENTION: Don't forget for Sbx-Parameter the offset!
- pAnyArgs[i] = sbxToUnoValue( pParams->Get32(i + 1), aType );
+ pAnyArgs[i] = sbxToUnoValue(pParams->Get(i + 1), aType);
// If it is not certain check whether the out-parameter are available.
if( !bOutParams )
@@ -2270,7 +2270,7 @@ void SbUnoObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
const ParamInfo& rInfo = pParamInfos[j];
ParamMode aParamMode = rInfo.aMode;
if( aParamMode != ParamMode_IN )
- unoToSbxValue( pParams->Get32(j + 1), pAnyArgs[ j ] );
+ unoToSbxValue(pParams->Get(j + 1), pAnyArgs[j]);
}
}
}
@@ -2924,14 +2924,14 @@ void createAllObjectProperties( SbxObject* pObj )
void RTL_Impl_CreateUnoStruct( SbxArray& rPar )
{
// We need 1 parameter minimum
- if ( rPar.Count32() < 2 )
+ if (rPar.Count() < 2)
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
return;
}
// get the name of the class of the struct
- OUString aClassName = rPar.Get32(1)->GetOUString();
+ OUString aClassName = rPar.Get(1)->GetOUString();
// try to create Struct with the same name
SbUnoObjectRef xUnoObj = Impl_CreateUnoStruct( aClassName );
@@ -2940,21 +2940,21 @@ void RTL_Impl_CreateUnoStruct( SbxArray& rPar )
return;
}
// return the object
- SbxVariableRef refVar = rPar.Get32(0);
+ SbxVariableRef refVar = rPar.Get(0);
refVar->PutObject( xUnoObj.get() );
}
void RTL_Impl_CreateUnoService( SbxArray& rPar )
{
// We need 1 Parameter minimum
- if ( rPar.Count32() < 2 )
+ if (rPar.Count() < 2)
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
return;
}
// get the name of the class of the struct
- OUString aServiceName = rPar.Get32(1)->GetOUString();
+ OUString aServiceName = rPar.Get(1)->GetOUString();
// search for the service and instantiate it
Reference< XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory() );
@@ -2968,7 +2968,7 @@ void RTL_Impl_CreateUnoService( SbxArray& rPar )
implHandleAnyException( ::cppu::getCaughtException() );
}
- SbxVariableRef refVar = rPar.Get32(0);
+ SbxVariableRef refVar = rPar.Get(0);
if( xInterface.is() )
{
// Create a SbUnoObject out of it and return it
@@ -2992,15 +2992,15 @@ void RTL_Impl_CreateUnoService( SbxArray& rPar )
void RTL_Impl_CreateUnoServiceWithArguments( SbxArray& rPar )
{
// We need 2 parameter minimum
- if ( rPar.Count32() < 3 )
+ if (rPar.Count() < 3)
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
return;
}
// get the name of the class of the struct
- OUString aServiceName = rPar.Get32(1)->GetOUString();
- Any aArgAsAny = sbxToUnoValue( rPar.Get32(2),
+ OUString aServiceName = rPar.Get(1)->GetOUString();
+ Any aArgAsAny = sbxToUnoValue(rPar.Get(2),
cppu::UnoType<Sequence<Any>>::get() );
Sequence< Any > aArgs;
aArgAsAny >>= aArgs;
@@ -3017,7 +3017,7 @@ void RTL_Impl_CreateUnoServiceWithArguments( SbxArray& rPar )
implHandleAnyException( ::cppu::getCaughtException() );
}
- SbxVariableRef refVar = rPar.Get32(0);
+ SbxVariableRef refVar = rPar.Get(0);
if( xInterface.is() )
{
// Create a SbUnoObject out of it and return it
@@ -3040,7 +3040,7 @@ void RTL_Impl_CreateUnoServiceWithArguments( SbxArray& rPar )
void RTL_Impl_GetProcessServiceManager( SbxArray& rPar )
{
- SbxVariableRef refVar = rPar.Get32(0);
+ SbxVariableRef refVar = rPar.Get(0);
// get the global service manager
Reference< XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory() );
@@ -3053,7 +3053,7 @@ void RTL_Impl_GetProcessServiceManager( SbxArray& rPar )
void RTL_Impl_HasInterfaces( SbxArray& rPar )
{
// We need 2 parameter minimum
- sal_uInt32 nParCount = rPar.Count32();
+ sal_uInt32 nParCount = rPar.Count();
if( nParCount < 3 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -3061,11 +3061,11 @@ void RTL_Impl_HasInterfaces( SbxArray& rPar )
}
// variable for the return value
- SbxVariableRef refVar = rPar.Get32(0);
+ SbxVariableRef refVar = rPar.Get(0);
refVar->PutBool( false );
// get the Uno-Object
- SbxBaseRef pObj = rPar.Get32( 1 )->GetObject();
+ SbxBaseRef pObj = rPar.Get(1)->GetObject();
auto obj = dynamic_cast<SbUnoObject*>( pObj.get() );
if( obj == nullptr )
{
@@ -3087,7 +3087,7 @@ void RTL_Impl_HasInterfaces( SbxArray& rPar )
for( sal_uInt32 i = 2 ; i < nParCount ; i++ )
{
// get the name of the interface of the struct
- OUString aIfaceName = rPar.Get32( i )->GetOUString();
+ OUString aIfaceName = rPar.Get(i)->GetOUString();
// search for the class
Reference< XIdlClass > xClass = xCoreReflection->forName( aIfaceName );
@@ -3111,18 +3111,18 @@ void RTL_Impl_HasInterfaces( SbxArray& rPar )
void RTL_Impl_IsUnoStruct( SbxArray& rPar )
{
// We need 1 parameter minimum
- if ( rPar.Count32() < 2 )
+ if (rPar.Count() < 2)
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
return;
}
// variable for the return value
- SbxVariableRef refVar = rPar.Get32(0);
+ SbxVariableRef refVar = rPar.Get(0);
refVar->PutBool( false );
// get the Uno-Object
- SbxVariableRef xParam = rPar.Get32( 1 );
+ SbxVariableRef xParam = rPar.Get(1);
if( !xParam->IsObject() )
{
return;
@@ -3144,18 +3144,18 @@ void RTL_Impl_IsUnoStruct( SbxArray& rPar )
void RTL_Impl_EqualUnoObjects( SbxArray& rPar )
{
- if ( rPar.Count32() < 3 )
+ if (rPar.Count() < 3)
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
return;
}
// variable for the return value
- SbxVariableRef refVar = rPar.Get32(0);
+ SbxVariableRef refVar = rPar.Get(0);
refVar->PutBool( false );
// get the Uno-Objects
- SbxVariableRef xParam1 = rPar.Get32( 1 );
+ SbxVariableRef xParam1 = rPar.Get(1);
if( !xParam1->IsObject() )
{
return;
@@ -3175,7 +3175,7 @@ void RTL_Impl_EqualUnoObjects( SbxArray& rPar )
Reference< XInterface > x1;
aAny1 >>= x1;
- SbxVariableRef xParam2 = rPar.Get32( 2 );
+ SbxVariableRef xParam2 = rPar.Get(2);
if( !xParam2->IsObject() )
{
return;
@@ -3541,7 +3541,7 @@ void SbUnoService::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
if( pUnoCtor && pHint->GetId() == SfxHintId::BasicDataWanted )
{
// Parameter count -1 because of Param0 == this
- sal_uInt32 nParamCount = pParams ? (pParams->Count32() - 1) : 0;
+ sal_uInt32 nParamCount = pParams ? (pParams->Count() - 1) : 0;
Sequence<Any> args;
Reference< XServiceConstructorDescription > xCtor = pUnoCtor->getServiceCtorDesc();
@@ -3572,7 +3572,7 @@ void SbUnoService::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
// Check if first parameter is a context and use it
// then in createInstanceWithArgumentsAndContext
- Any aArg0 = sbxToUnoValue( pParams->Get32( nSbxParameterOffset ) );
+ Any aArg0 = sbxToUnoValue(pParams->Get(nSbxParameterOffset));
if( (aArg0 >>= xFirstParamContext) && xFirstParamContext.is() )
nParameterOffsetByContext = 1;
}
@@ -3624,7 +3624,7 @@ void SbUnoService::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
css::uno::Type aType( xParamTypeDesc->getTypeClass(), xParamTypeDesc->getName() );
// sbx parameter needs offset 1
- pAnyArgs[i] = sbxToUnoValue( pParams->Get32( iSbx ), aType );
+ pAnyArgs[i] = sbxToUnoValue(pParams->Get(iSbx), aType);
// Check for out parameter if not already done
if( !bOutParams && xParam->isOut() )
@@ -3632,7 +3632,7 @@ void SbUnoService::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
}
else
{
- pAnyArgs[i] = sbxToUnoValue( pParams->Get32( iSbx ) );
+ pAnyArgs[i] = sbxToUnoValue(pParams->Get(iSbx));
}
}
}
@@ -3670,7 +3670,7 @@ void SbUnoService::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
continue;
if( xParam->isOut() )
- unoToSbxValue( pParams->Get32(j + 1), pAnyArgs[ j ] );
+ unoToSbxValue(pParams->Get(j + 1), pAnyArgs[j]);
}
}
}
@@ -3735,7 +3735,7 @@ void SbUnoSingleton::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
SbxVariable* pVar = pHint->GetVar();
SbxArray* pParams = pVar->GetParameters();
- sal_uInt32 nParamCount = pParams ? (pParams->Count32() - 1) : 0;
+ sal_uInt32 nParamCount = pParams ? (pParams->Count() - 1) : 0;
sal_uInt32 nAllowedParamCount = 1;
Reference < XComponentContext > xContextToUse;
@@ -3743,7 +3743,7 @@ void SbUnoSingleton::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
// Check if first parameter is a context and use it then
Reference < XComponentContext > xFirstParamContext;
- Any aArg1 = sbxToUnoValue( pParams->Get32( 1 ) );
+ Any aArg1 = sbxToUnoValue(pParams->Get(1));
if( (aArg1 >>= xFirstParamContext) && xFirstParamContext.is() )
xContextToUse = xFirstParamContext;
}
@@ -3831,7 +3831,7 @@ void BasicAllListener_Impl::firing_impl( const AllEventObject& Event, Any* pRet
// Convert elements
SbxVariableRef xVar = new SbxVariable( SbxVARIANT );
unoToSbxValue( xVar.get(), pArgs[i] );
- xSbxArray->Put32( xVar.get(), i + 1 );
+ xSbxArray->Put(xVar.get(), i + 1);
}
pLib->Call( aMethodName, xSbxArray.get() );
@@ -3839,7 +3839,7 @@ void BasicAllListener_Impl::firing_impl( const AllEventObject& Event, Any* pRet
// get the return value from the Param-Array, if requested
if( pRet )
{
- SbxVariable* pVar = xSbxArray->Get32( 0 );
+ SbxVariable* pVar = xSbxArray->Get(0);
if( pVar )
{
// #95792 Avoid a second call
@@ -4021,15 +4021,15 @@ sal_Bool SAL_CALL InvocationToAllListenerMapper::hasProperty(const OUString& Nam
void SbRtl_CreateUnoListener(StarBASIC * pBasic, SbxArray & rPar, bool)
{
// We need 2 parameters
- if ( rPar.Count32() != 3 )
+ if (rPar.Count() != 3)
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
return;
}
// get the name of the class of the struct
- OUString aPrefixName = rPar.Get32(1)->GetOUString();
- OUString aListenerClassName = rPar.Get32(2)->GetOUString();
+ OUString aPrefixName = rPar.Get(1)->GetOUString();
+ OUString aListenerClassName = rPar.Get(2)->GetOUString();
// get the CoreReflection
Reference< XIdlReflection > xCoreReflection = getCoreReflection_Impl();
@@ -4066,10 +4066,10 @@ void SbRtl_CreateUnoListener(StarBASIC * pBasic, SbxArray & rPar, bool)
// #100326 Register listener object to set Parent NULL in Dtor
SbxArrayRef xBasicUnoListeners = pBasic->getUnoListeners();
- xBasicUnoListeners->Insert32( pUnoObj, xBasicUnoListeners->Count32() );
+ xBasicUnoListeners->Insert(pUnoObj, xBasicUnoListeners->Count());
// return the object
- SbxVariableRef refVar = rPar.Get32(0);
+ SbxVariableRef refVar = rPar.Get(0);
refVar->PutObject( xAllLst->xSbxObj.get() );
}
@@ -4078,7 +4078,7 @@ void SbRtl_CreateUnoListener(StarBASIC * pBasic, SbxArray & rPar, bool)
// in the Basic runtime system.
void RTL_Impl_GetDefaultContext( SbxArray& rPar )
{
- SbxVariableRef refVar = rPar.Get32(0);
+ SbxVariableRef refVar = rPar.Get(0);
Any aContextAny( comphelper::getProcessComponentContext() );
@@ -4092,15 +4092,15 @@ void RTL_Impl_GetDefaultContext( SbxArray& rPar )
void RTL_Impl_CreateUnoValue( SbxArray& rPar )
{
// 2 parameters needed
- if ( rPar.Count32() != 3 )
+ if (rPar.Count() != 3)
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
return;
}
// get the name of the class of the struct
- OUString aTypeName = rPar.Get32(1)->GetOUString();
- SbxVariable* pVal = rPar.Get32(2);
+ OUString aTypeName = rPar.Get(1)->GetOUString();
+ SbxVariable* pVal = rPar.Get(2);
if( aTypeName == "type" )
{
@@ -4132,7 +4132,7 @@ void RTL_Impl_CreateUnoValue( SbxArray& rPar )
if( bSuccess )
{
Any aTypeAny( aType );
- SbxVariableRef refVar = rPar.Get32(0);
+ SbxVariableRef refVar = rPar.Get(0);
SbxObjectRef xUnoAnyObject = new SbUnoAnyObject( aTypeAny );
refVar->PutObject( xUnoAnyObject.get() );
}
@@ -4162,7 +4162,7 @@ void RTL_Impl_CreateUnoValue( SbxArray& rPar )
Any aVal = sbxToUnoValueImpl( pVal );
Any aConvertedVal = convertAny( aVal, aDestType );
- SbxVariableRef refVar = rPar.Get32(0);
+ SbxVariableRef refVar = rPar.Get(0);
SbxObjectRef xUnoAnyObject = new SbUnoAnyObject( aConvertedVal );
refVar->PutObject( xUnoAnyObject.get() );
}
@@ -4239,7 +4239,7 @@ void SAL_CALL ModuleInvocationProxy::setValue(const OUString& rProperty, const A
SbxArrayRef xArray = new SbxArray;
SbxVariableRef xVar = new SbxVariable( SbxVARIANT );
unoToSbxValue( xVar.get(), rValue );
- xArray->Put32( xVar.get(), 1 );
+ xArray->Put(xVar.get(), 1);
// Call property method
SbxVariableRef xValue = new SbxVariable;
@@ -4339,7 +4339,7 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const OUString& rFunction,
{
SbxVariableRef xVar = new SbxVariable( SbxVARIANT );
unoToSbxValue( xVar.get(), pArgs[i] );
- xArray->Put32( xVar.get(), sal::static_int_cast< sal_uInt16 >(i+1) );
+ xArray->Put(xVar.get(), sal::static_int_cast<sal_uInt16>(i + 1));
}
}
@@ -4463,7 +4463,7 @@ void registerComListenerVariableForBasic( SbxVariable* pVar, StarBASIC* pBasic )
{
StarBasicDisposeItem* pItem = lcl_getOrCreateItemForBasic( pBasic );
SbxArray* pArray = pItem->m_pRegisteredVariables.get();
- pArray->Put32( pVar, pArray->Count32() );
+ pArray->Put(pVar, pArray->Count());
}
void disposeComVariablesForBasic( StarBASIC const * pBasic )
@@ -4475,10 +4475,10 @@ void disposeComVariablesForBasic( StarBASIC const * pBasic )
StarBasicDisposeItem* pItem = *it;
SbxArray* pArray = pItem->m_pRegisteredVariables.get();
- sal_uInt32 nCount = pArray->Count32();
+ sal_uInt32 nCount = pArray->Count();
for( sal_uInt32 i = 0 ; i < nCount ; ++i )
{
- SbxVariable* pVar = pArray->Get32( i );
+ SbxVariable* pVar = pArray->Get(i);
pVar->ClearComListener();
}
@@ -4515,10 +4515,10 @@ bool SbModule::createCOMWrapperForIface( Any& o_rRetAny, SbClassModuleObject* pP
bool bSuccess = false;
SbxArray* pModIfaces = pClassData->mxIfaces.get();
- sal_uInt32 nCount = pModIfaces->Count32();
+ sal_uInt32 nCount = pModIfaces->Count();
for( sal_uInt32 i = 0 ; i < nCount ; ++i )
{
- SbxVariable* pVar = pModIfaces->Get32( i );
+ SbxVariable* pVar = pModIfaces->Get(i);
const OUString& aIfaceName = pVar->GetName();
if( !aIfaceName.isEmpty() )
@@ -4771,11 +4771,11 @@ OUString SbUnoStructRefObject::Impl_DumpProperties()
aRet.append("Properties of object ");
aRet.append( getDbgObjectName() );
- sal_uInt32 nPropCount = pProps->Count32();
+ sal_uInt32 nPropCount = pProps->Count();
sal_uInt32 nPropsPerLine = 1 + nPropCount / 30;
for( sal_uInt32 i = 0; i < nPropCount; i++ )
{
- SbxVariable* pVar = pProps->Get32( i );
+ SbxVariable* pVar = pProps->Get(i);
if( pVar )
{
OUStringBuffer aPropStr;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 03:52:35 +0000