[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/filter/ww8/ww8scan.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 665c06e2f0dfdb42162cc29d109d3a045a2e7faf
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 15 20:45:59 2016 +0000

    there want to be 32bit in size, not "long"
    
    Change-Id: I88c89b37c649247e886e523ea1d2c2fb7c3552c9

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 2be1b5b..8c56b6b 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -851,19 +851,19 @@ inline sal_uInt16 Get_UShort( sal_uInt8 *& p )
     return n;
 }
 
-inline short Get_Short( sal_uInt8 *& p )
+inline sal_Int16 Get_Short( sal_uInt8 *& p )
 {
     return Get_UShort(p);
 }
 
-inline sal_uLong Get_ULong( sal_uInt8 *& p )
+inline sal_uInt32 Get_ULong( sal_uInt8 *& p )
 {
-    sal_uLong n = SVBT32ToUInt32( *reinterpret_cast<SVBT32*>(p) );
+    sal_uInt32 n = SVBT32ToUInt32( *reinterpret_cast<SVBT32*>(p) );
     p += 4;
     return n;
 }
 
-inline long Get_Long( sal_uInt8 *& p )
+inline sal_Int32 Get_Long( sal_uInt8 *& p )
 {
     return Get_ULong(p);
 }