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/lwpparaproperty.cxx | |
parent | 79787787d6ca1dd5a0c1aacfc401199771ce2c63 (diff) |
fix up endianness of lowhanging QuickReads
Diffstat (limited to 'lotuswordpro/source/filter/lwpparaproperty.cxx')
-rw-r--r-- | lotuswordpro/source/filter/lwpparaproperty.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lotuswordpro/source/filter/lwpparaproperty.cxx b/lotuswordpro/source/filter/lwpparaproperty.cxx index dee3323cfb0c..d250f1922083 100644 --- a/lotuswordpro/source/filter/lwpparaproperty.cxx +++ b/lotuswordpro/source/filter/lwpparaproperty.cxx @@ -67,25 +67,23 @@ LwpParaProperty* LwpParaProperty::ReadPropertyList(LwpObjectStream* pFile,LwpObject* Whole) { - sal_uInt32 tag; LwpParaProperty* Prop= NULL; LwpParaProperty* NewProp= NULL; - sal_uInt16 Len; for(;;) { - sal_uInt16 nRead; + bool bFailure; - nRead = pFile->QuickRead(&tag,sizeof(sal_uInt32)); + sal_uInt32 tag = pFile->QuickReaduInt32(&bFailure); // Keep reading properties until we hit the end tag or // the stream ends - if (tag == TAG_ENDSUBOBJ || nRead != sizeof(sal_uInt32)) + if (bFailure || tag == TAG_ENDSUBOBJ) break; // Get the length of this property - nRead = pFile->QuickRead(&Len,sizeof(sal_uInt16)); + sal_uInt16 Len = pFile->QuickReaduInt16(&bFailure); - if (nRead != sizeof(sal_uInt16)) + if (bFailure) break; // Create whatever kind of tag we just found |