From d66dbe0f9de76405052352d6bfc369a7c2b0a8e3 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 4 Mar 2019 14:10:05 +0100
Subject: 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>
---
 lotuswordpro/source/filter/lwpobjstrm.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lotuswordpro')

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
-- 
cgit