summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2021-03-08 12:29:39 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2021-03-09 13:22:18 +0100
commitfbaf865ffc5db1ed1094fec608e6b2472437e066 (patch)
tree1740d009fae33b628286eda9b24c11f722723780 /sc
parent674bbddf720b14d1f7d173e6b5f3e08d65618ab9 (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 'sc')
-rw-r--r--sc/source/core/data/validat.cxx6
-rw-r--r--sc/source/core/tool/interpr4.cxx24
-rw-r--r--sc/source/ui/vba/vbaapplication.cxx2
3 files changed, 16 insertions, 16 deletions
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 0a79b37612d8..d467db7ccf0f 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -326,13 +326,13 @@ bool ScValidationData::DoMacro( const ScAddress& rPos, const OUString& rInput,
aValStr = pCell->GetString().getString();
}
if ( bIsValue )
- refPar->Get32(1)->PutDouble( nValue );
+ refPar->Get(1)->PutDouble(nValue);
else
- refPar->Get32(1)->PutString( aValStr );
+ refPar->Get(1)->PutString(aValStr);
// 2) Position of the cell
OUString aPosStr(rPos.Format(ScRefFlags::VALID | ScRefFlags::TAB_3D, pDocument, pDocument->GetAddressConvention()));
- refPar->Get32(2)->PutString( aPosStr );
+ refPar->Get(2)->PutString(aPosStr);
// use link-update flag to prevent closing the document
// while the macro is running
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 08c1c218748d..593165275288 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -3264,7 +3264,7 @@ void ScInterpreter::ScMacro()
bool bOk = true;
for( sal_uInt32 i = nParamCount; i && bOk ; i-- )
{
- SbxVariable* pPar = refPar->Get32(i);
+ SbxVariable* pPar = refPar->Get(i);
switch( GetStackType() )
{
case svDouble:
@@ -3332,8 +3332,8 @@ void ScInterpreter::ScMacro()
else
{
SbxDimArrayRef refArray = new SbxDimArray;
- refArray->AddDim32( 1, nRow2 - nRow1 + 1 );
- refArray->AddDim32( 1, nCol2 - nCol1 + 1 );
+ refArray->AddDim(1, nRow2 - nRow1 + 1);
+ refArray->AddDim(1, nCol2 - nCol1 + 1);
ScAddress aAdr( nCol1, nRow1, nTab1 );
for( SCROW nRow = nRow1; bOk && nRow <= nRow2; nRow++ )
{
@@ -3344,7 +3344,7 @@ void ScInterpreter::ScMacro()
{
aAdr.SetCol( nCol );
nIdx[ 1 ] = nCol-nCol1+1;
- SbxVariable* p = refArray->Get32( nIdx );
+ SbxVariable* p = refArray->Get(nIdx);
bOk = SetSbxVariable( p, aAdr );
}
}
@@ -3362,8 +3362,8 @@ void ScInterpreter::ScMacro()
{
pMat->GetDimensions(nC, nR);
SbxDimArrayRef refArray = new SbxDimArray;
- refArray->AddDim32( 1, static_cast<sal_Int32>(nR) );
- refArray->AddDim32( 1, static_cast<sal_Int32>(nC) );
+ refArray->AddDim(1, static_cast<sal_Int32>(nR));
+ refArray->AddDim(1, static_cast<sal_Int32>(nC));
for( SCSIZE nMatRow = 0; nMatRow < nR; nMatRow++ )
{
sal_Int32 nIdx[ 2 ];
@@ -3371,7 +3371,7 @@ void ScInterpreter::ScMacro()
for( SCSIZE nMatCol = 0; nMatCol < nC; nMatCol++ )
{
nIdx[ 1 ] = static_cast<sal_Int32>(nMatCol+1);
- SbxVariable* p = refArray->Get32( nIdx );
+ SbxVariable* p = refArray->Get(nIdx);
if (pMat->IsStringOrEmpty(nMatCol, nMatRow))
{
p->PutString( pMat->GetString(nMatCol, nMatRow).getString() );
@@ -3441,7 +3441,7 @@ void ScInterpreter::ScMacro()
{
SbxBase* pElemObj = refRes->GetObject();
SbxDimArray* pDimArray = dynamic_cast<SbxDimArray*>(pElemObj);
- sal_Int32 nDim = pDimArray ? pDimArray->GetDims32() : 0;
+ sal_Int32 nDim = pDimArray ? pDimArray->GetDims() : 0;
if ( 1 <= nDim && nDim <= 2 )
{
sal_Int32 nCs, nCe, nRs;
@@ -3450,7 +3450,7 @@ void ScInterpreter::ScMacro()
SCROW nRowIdx;
if ( nDim == 1 )
{ // array( cols ) one line, several columns
- pDimArray->GetDim32( 1, nCs, nCe );
+ pDimArray->GetDim(1, nCs, nCe);
nC = static_cast<SCSIZE>(nCe - nCs + 1);
nRs = 0;
nR = 1;
@@ -3460,9 +3460,9 @@ void ScInterpreter::ScMacro()
else
{ // array( rows, cols )
sal_Int32 nRe;
- pDimArray->GetDim32( 1, nRs, nRe );
+ pDimArray->GetDim(1, nRs, nRe);
nR = static_cast<SCSIZE>(nRe - nRs + 1);
- pDimArray->GetDim32( 2, nCs, nCe );
+ pDimArray->GetDim(2, nCs, nCe);
nC = static_cast<SCSIZE>(nCe - nCs + 1);
nColIdx = 1;
nRowIdx = 0;
@@ -3480,7 +3480,7 @@ void ScInterpreter::ScMacro()
for ( SCSIZE i=0; i < nC; i++ )
{
nIdx[ nColIdx ] = nCs + static_cast<sal_Int32>(i);
- pV = pDimArray->Get32( nIdx );
+ pV = pDimArray->Get(nIdx);
if ( lcl_isNumericResult( fVal, pV) )
{
pMat->PutDouble( fVal, i, j );
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index 4d94fe494478..7c6e56dbf529 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -519,7 +519,7 @@ ScVbaApplication::wait( double time )
SbxArrayRef aArgs = new SbxArray;
SbxVariableRef aRef = new SbxVariable;
aRef->PutDouble( time );
- aArgs->Put32( aRef.get(), 1 );
+ aArgs->Put(aRef.get(), 1);
SbMethod* pMeth = static_cast<SbMethod*>(pBasic->GetRtl()->Find( "WaitUntil", SbxClassType::Method ));
if ( pMeth )