diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-05-22 16:38:54 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-05-22 16:38:54 +0100 |
commit | bd32449e0b8016e9d4e2b14848780f4a641394f2 (patch) | |
tree | 48d984fd0ff6652acbfbd5e15b3c03584e6a0a67 /lotuswordpro/source/filter/lwpobjid.cxx | |
parent | 79787787d6ca1dd5a0c1aacfc401199771ce2c63 (diff) |
fix up endianness of lowhanging QuickReads
Diffstat (limited to 'lotuswordpro/source/filter/lwpobjid.cxx')
-rw-r--r-- | lotuswordpro/source/filter/lwpobjid.cxx | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/lotuswordpro/source/filter/lwpobjid.cxx b/lotuswordpro/source/filter/lwpobjid.cxx index 28f54ad494fe..e0d2a97830b2 100644 --- a/lotuswordpro/source/filter/lwpobjid.cxx +++ b/lotuswordpro/source/filter/lwpobjid.cxx @@ -90,8 +90,8 @@ sal_uInt32 LwpObjectID::Read(LwpSvStream *pStrm) */ sal_uInt32 LwpObjectID::Read(LwpObjectStream *pObj) { - pObj->QuickRead(&m_nLow, sizeof(m_nLow)); - pObj->QuickRead(&m_nHigh, sizeof(m_nHigh)); + m_nLow = pObj->QuickReaduInt32(); + m_nHigh = pObj->QuickReaduInt16(); return DiskSize(); } /** @@ -140,7 +140,7 @@ sal_uInt32 LwpObjectID::ReadIndexed(LwpObjectStream *pStrm) return Read(pStrm); } - pStrm->QuickRead(&m_nIndex, sizeof(m_nIndex)); + m_nIndex = pStrm->QuickReaduInt8(); if (m_nIndex) { m_bIsCompressed = sal_True; @@ -151,10 +151,8 @@ sal_uInt32 LwpObjectID::ReadIndexed(LwpObjectStream *pStrm) m_nLow = pIdxMgr->GetObjTime( (sal_uInt16)m_nIndex); } else - { - pStrm->QuickRead(&m_nLow, sizeof(m_nLow)); - } - pStrm->QuickRead(&m_nHigh, sizeof(m_nHigh)); + m_nLow = pStrm->QuickReaduInt32(); + m_nHigh = pStrm->QuickReaduInt16(); return DiskSizeIndexed(); } /** @@ -188,11 +186,8 @@ sal_uInt32 LwpObjectID::ReadCompressed( LwpSvStream* pStrm, LwpObjectID &prev ) */ sal_uInt32 LwpObjectID::ReadCompressed( LwpObjectStream* pObj, LwpObjectID &prev ) { - - sal_uInt32 len=0; - sal_uInt8 diff; - - len += pObj->QuickRead( &diff, sizeof(diff)); + sal_uInt8 diff = pObj->QuickReaduInt8(); + sal_uInt32 len=1; if (diff == 255) { |