diff options
Diffstat (limited to 'lotuswordpro/source/filter/lwpobjstrm.cxx')
| -rw-r--r-- | lotuswordpro/source/filter/lwpobjstrm.cxx | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/lotuswordpro/source/filter/lwpobjstrm.cxx b/lotuswordpro/source/filter/lwpobjstrm.cxx index 6c9c09a9c15f..7dc67e747656 100644 --- a/lotuswordpro/source/filter/lwpobjstrm.cxx +++ b/lotuswordpro/source/filter/lwpobjstrm.cxx @@ -202,12 +202,10 @@ void LwpObjectStream::Seek( sal_uInt16 pos) /** * @descr Quick read sal_Bool */ -bool LwpObjectStream::QuickReadBool(bool *pFailure) +bool LwpObjectStream::QuickReadBool() { SVBT16 aValue = {0}; - sal_uInt16 nRead = QuickRead(aValue, sizeof(aValue)); - if (pFailure) - *pFailure = (nRead != sizeof(aValue)); + QuickRead(aValue, sizeof(aValue)); return static_cast<bool>(SVBT16ToShort(aValue)); } /** @@ -235,23 +233,19 @@ sal_uInt16 LwpObjectStream::QuickReaduInt16(bool *pFailure) /** * @descr Quick read sal_Int32 */ -sal_Int32 LwpObjectStream::QuickReadInt32(bool *pFailure) +sal_Int32 LwpObjectStream::QuickReadInt32() { SVBT32 aValue = {0}; - sal_uInt16 nRead = QuickRead(aValue, sizeof(aValue)); - if (pFailure) - *pFailure = (nRead != sizeof(aValue)); + QuickRead(aValue, sizeof(aValue)); return static_cast<sal_Int32>(SVBT32ToUInt32(aValue)); } /** * @descr Quick read sal_Int16 */ -sal_Int16 LwpObjectStream::QuickReadInt16(bool *pFailure) +sal_Int16 LwpObjectStream::QuickReadInt16() { SVBT16 aValue = {0}; - sal_uInt16 nRead = QuickRead(aValue, sizeof(aValue)); - if (pFailure) - *pFailure = (nRead != sizeof(aValue)); + QuickRead(aValue, sizeof(aValue)); return static_cast<sal_Int16>(SVBT16ToShort(aValue)); } @@ -269,7 +263,7 @@ sal_uInt8 LwpObjectStream::QuickReaduInt8(bool *pFailure) /** * @descr Quick read double */ -double LwpObjectStream::QuickReadDouble(bool *pFailure) +double LwpObjectStream::QuickReadDouble() { union { @@ -277,9 +271,7 @@ double LwpObjectStream::QuickReadDouble(bool *pFailure) sal_uInt8 c[8]; } s; memset(s.c, 0, sizeof(s.c)); - sal_uInt16 nRead = QuickRead(s.c, sizeof(s.c)); - if (pFailure) - *pFailure = (nRead != sizeof(s.c)); + QuickRead(s.c, sizeof(s.c)); #if defined(OSL_BIGENDIAN) for (size_t i = 0; i < 4; ++i) std::swap(s.c[i], s.c[7-i]); |