diff options
Diffstat (limited to 'sc/source/core')
| -rw-r--r-- | sc/source/core/data/validat.cxx | 6 | ||||
| -rw-r--r-- | sc/source/core/tool/interpr4.cxx | 24 |
2 files changed, 15 insertions, 15 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 ); |