diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-12-09 13:06:03 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-12-09 14:18:25 +0100 |
| commit | 62f3f3d92aa204eaaa063b30d7ade44df501b997 (patch) | |
| tree | b241ad744abad62cf898947757e88617811b309c /sc | |
| parent | 6303f8ac291233b1f6888a8d71e769debe0f9fb0 (diff) | |
SbxArray: drop 16-bit indices
Change-Id: I43b478187636b9bb53fdf7ab938436ae364bd7a7
Reviewed-on: https://gerrit.libreoffice.org/84733
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/validat.cxx | 6 | ||||
| -rw-r--r-- | sc/source/core/tool/interpr4.cxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/vba/vbaapplication.cxx | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 4fd89ccb206f..655588a5a841 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -324,13 +324,13 @@ bool ScValidationData::DoMacro( const ScAddress& rPos, const OUString& rInput, aValStr = pCell->GetString().getString(); } if ( bIsValue ) - refPar->Get(1)->PutDouble( nValue ); + refPar->Get32(1)->PutDouble( nValue ); else - refPar->Get(1)->PutString( aValStr ); + refPar->Get32(1)->PutString( aValStr ); // 2) Position of the cell OUString aPosStr(rPos.Format(ScRefFlags::VALID | ScRefFlags::TAB_3D, pDocument, pDocument->GetAddressConvention())); - refPar->Get(2)->PutString( aPosStr ); + refPar->Get32(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 eb3fb987c034..1e112c386043 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -3263,9 +3263,9 @@ void ScInterpreter::ScMacro() SbxArrayRef refPar = new SbxArray; bool bOk = true; - for( short i = nParamCount; i && bOk ; i-- ) + for( sal_uInt32 i = nParamCount; i && bOk ; i-- ) { - SbxVariable* pPar = refPar->Get( static_cast<sal_uInt16>(i) ); + SbxVariable* pPar = refPar->Get32(i); switch( GetStackType() ) { case svDouble: @@ -3442,7 +3442,7 @@ void ScInterpreter::ScMacro() { SbxBase* pElemObj = refRes->GetObject(); SbxDimArray* pDimArray = dynamic_cast<SbxDimArray*>(pElemObj); - short nDim = pDimArray ? pDimArray->GetDims() : 0; + sal_Int32 nDim = pDimArray ? pDimArray->GetDims32() : 0; if ( 1 <= nDim && nDim <= 2 ) { sal_Int32 nCs, nCe, nRs, nRe; diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 877020e061c5..93b32a408d5b 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->Put( aRef.get(), 1 ); + aArgs->Put32( aRef.get(), 1 ); SbMethod* pMeth = static_cast<SbMethod*>(pBasic->GetRtl()->Find( "WaitUntil", SbxClassType::Method )); if ( pMeth ) |