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 /basic/source/sbx/sbxstr.cxx | |
| 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 'basic/source/sbx/sbxstr.cxx')
| -rw-r--r-- | basic/source/sbx/sbxstr.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/basic/source/sbx/sbxstr.cxx b/basic/source/sbx/sbxstr.cxx index 65fdb906daf9..8edfb9d7ab2b 100644 --- a/basic/source/sbx/sbxstr.cxx +++ b/basic/source/sbx/sbxstr.cxx @@ -282,7 +282,7 @@ SbxArray* StringToByteArray(const OUString& rStr) } else { - pArray->unoAddDim( 0, -1 ); + pArray->unoAddDim32( 0, -1 ); } for( sal_Int32 i=0; i< nArraySize; i++) @@ -291,7 +291,7 @@ SbxArray* StringToByteArray(const OUString& rStr) sal_uInt8 aByte = static_cast< sal_uInt8 >( (i%2) ? ((*pSrc) >> 8) & 0xff : (*pSrc) & 0xff ); pNew->PutByte( aByte ); pNew->SetFlag( SbxFlagBits::Write ); - pArray->Put( pNew, i ); + pArray->Put32( pNew, i ); if( i%2 ) pSrc++; } @@ -301,12 +301,12 @@ SbxArray* StringToByteArray(const OUString& rStr) // Convert an array of bytes to string (2bytes per character) OUString ByteArrayToString(SbxArray* pArr) { - sal_uInt16 nCount = pArr->Count(); + sal_uInt32 nCount = pArr->Count32(); OUStringBuffer aStrBuf; sal_Unicode aChar = 0; - for( sal_uInt16 i = 0 ; i < nCount ; i++ ) + for( sal_uInt32 i = 0 ; i < nCount ; i++ ) { - sal_Unicode aTempChar = pArr->Get(i)->GetByte(); + sal_Unicode aTempChar = pArr->Get32(i)->GetByte(); if( i%2 ) { aChar = (aTempChar << 8 ) | aChar; |