diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-03-04 14:10:05 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-03-04 16:37:27 +0100 |
| commit | d66dbe0f9de76405052352d6bfc369a7c2b0a8e3 (patch) | |
| tree | 5fb12117dada35c79eeee4713977d4bb1afb1b00 /sc | |
| parent | d515aaa11c42a9d5698380c2288ca7eb65228371 (diff) | |
Rename SVBT16ToShort to SVBT16ToUInt16
For one, it that way matches reality (as it returns sal_uInt16, not short or
sal_Int16) and its SVBT32ToUInt32 counterpart. For another, I plan a follow-up
commit of introducing an additional SVBT16ToInt16 to explicitly return
sal_Int16.
Change-Id: I28915e6593ccdca0c11d7b2fa593e96e359a9532
Reviewed-on: https://gerrit.libreoffice.org/68686
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/xistream.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx index f58e53282690..6decac3d88ce 100644 --- a/sc/source/filter/excel/xistream.cxx +++ b/sc/source/filter/excel/xistream.cxx @@ -636,7 +636,7 @@ sal_Int16 XclImpStream::ReadInt16() { SVBT16 pnBuffer; mxDecrypter->Read( mrStrm, pnBuffer, 2 ); - nValue = static_cast< sal_Int16 >( SVBT16ToShort( pnBuffer ) ); + nValue = static_cast< sal_Int16 >( SVBT16ToUInt16( pnBuffer ) ); } else mrStrm.ReadInt16( nValue ); @@ -654,7 +654,7 @@ sal_uInt16 XclImpStream::ReaduInt16() { SVBT16 pnBuffer; mxDecrypter->Read( mrStrm, pnBuffer, 2 ); - nValue = SVBT16ToShort( pnBuffer ); + nValue = SVBT16ToUInt16( pnBuffer ); } else mrStrm.ReadUInt16( nValue ); |