diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-05-22 21:15:05 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-05-22 21:15:05 +0100 |
commit | 580544213509feb73bd2dbc6403c233194da6be0 (patch) | |
tree | 482757ff61e6050a832cee86723f46ad76fa29b7 /lotuswordpro/source/filter/lwpcharacterstyle.cxx | |
parent | fix up endianness of lowhanging QuickReads (diff) | |
download | core-580544213509feb73bd2dbc6403c233194da6be0.tar.gz core-580544213509feb73bd2dbc6403c233194da6be0.zip |
fix up endianness of higher-hanging QuickReads
Diffstat (limited to 'lotuswordpro/source/filter/lwpcharacterstyle.cxx')
-rw-r--r-- | lotuswordpro/source/filter/lwpcharacterstyle.cxx | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/lotuswordpro/source/filter/lwpcharacterstyle.cxx b/lotuswordpro/source/filter/lwpcharacterstyle.cxx index d1c24b1b9dab..8b57de456b0d 100644 --- a/lotuswordpro/source/filter/lwpcharacterstyle.cxx +++ b/lotuswordpro/source/filter/lwpcharacterstyle.cxx @@ -115,10 +115,10 @@ LwpTextStyle::~LwpTextStyle() void LwpTextStyle::ReadCommon() { - m_pObjStrm->QuickRead(&m_nFontID, 4); - m_pObjStrm->QuickRead(&m_nFinalFontID, 4); - m_pObjStrm->QuickRead(&m_nCSFlags, 2); - m_pObjStrm->QuickRead(&m_nUseCount, 4); + m_nFontID = m_pObjStrm->QuickReaduInt32(); + m_nFinalFontID = m_pObjStrm->QuickReaduInt32(); + m_nCSFlags = m_pObjStrm->QuickReaduInt16(); + m_nUseCount = m_pObjStrm->QuickReaduInt32(); m_pDescription->Read(m_pObjStrm); @@ -138,9 +138,7 @@ void LwpTextStyle::ReadCommon() //#endif sal_uInt16 nCount = 6; if (LwpFileHeader::m_nFileRevision > 0x0005) - { - m_pObjStrm->QuickRead(&nCount, 2); - } + nCount = m_pObjStrm->QuickReaduInt16(); m_FaceStyle.ReadIndexed(m_pObjStrm); @@ -155,11 +153,11 @@ void LwpTextStyle::ReadCommon() if (m_pObjStrm->CheckExtra()) { - m_pObjStrm->QuickRead(&m_nStyleDefinition, 4); + m_nStyleDefinition = m_pObjStrm->QuickReaduInt32(); if (m_pObjStrm->CheckExtra()) { - m_pObjStrm->QuickRead(&m_nKey, 2); + m_nKey = m_pObjStrm->QuickReaduInt16(); m_pObjStrm->SkipExtra(); } } |