diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-12-15 20:45:59 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-16 10:31:31 +0000 |
commit | 665c06e2f0dfdb42162cc29d109d3a045a2e7faf (patch) | |
tree | dff06114303a8aa27d50f348b17aeeefd079902e /sw | |
parent | dbbfb3766519a61eba1cd00066a363069e0884aa (diff) |
there want to be 32bit in size, not "long"
Change-Id: I88c89b37c649247e886e523ea1d2c2fb7c3552c9
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/filter/ww8/ww8scan.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 2be1b5bd1911..8c56b6b3da5b 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); } |