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 /lotuswordpro | |
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 'lotuswordpro')
-rw-r--r-- | lotuswordpro/source/filter/lwpobjstrm.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lotuswordpro/source/filter/lwpobjstrm.cxx b/lotuswordpro/source/filter/lwpobjstrm.cxx index 86444146818b..5cd37f191fa3 100644 --- a/lotuswordpro/source/filter/lwpobjstrm.cxx +++ b/lotuswordpro/source/filter/lwpobjstrm.cxx @@ -187,7 +187,7 @@ bool LwpObjectStream::QuickReadBool() { SVBT16 aValue = {0}; QuickRead(aValue, sizeof(aValue)); - return static_cast<bool>(SVBT16ToShort(aValue)); + return static_cast<bool>(SVBT16ToUInt16(aValue)); } /** * @descr Quick read sal_uInt32 @@ -209,7 +209,7 @@ sal_uInt16 LwpObjectStream::QuickReaduInt16(bool *pFailure) sal_uInt16 nRead = QuickRead(aValue, sizeof(aValue)); if (pFailure) *pFailure = (nRead != sizeof(aValue)); - return SVBT16ToShort(aValue); + return SVBT16ToUInt16(aValue); } /** * @descr Quick read sal_Int32 @@ -228,7 +228,7 @@ sal_Int16 LwpObjectStream::QuickReadInt16() SVBT16 aValue = {0}; QuickRead(aValue, sizeof(aValue)); - return static_cast<sal_Int16>(SVBT16ToShort(aValue)); + return static_cast<sal_Int16>(SVBT16ToUInt16(aValue)); } /** * @descr Quick read sal_uInt8 |