diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-11-17 15:36:54 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-17 15:39:34 +0000 |
commit | 9f072ee847164ae628d6378d30e27cb5022ce437 (patch) | |
tree | 458696df2898a357092920944206a2600aad24b8 /filter | |
parent | d93c89ddf564d0445f28e0ba552ba94975d40f2a (diff) |
don't reuse old var remnants
Change-Id: I1074d0431695ec21e22cdef334dbe419763e7ba2
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/graphicfilter/ios2met/ios2met.cxx | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index aa29380d5fd6..6b38be429195 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -773,20 +773,18 @@ Color OS2METReader::GetPaletteColor(sal_uInt32 nIndex) sal::static_int_cast< sal_uInt8 >(nIndex&0xff)); } - sal_uInt16 OS2METReader::ReadBigEndianWord() { - sal_uInt8 nLo,nHi; + sal_uInt8 nLo(0), nHi(0); pOS2MET->ReadUChar( nHi ).ReadUChar( nLo ); return (((sal_uInt16)nHi)<<8)|(((sal_uInt16)nLo)&0x00ff); } sal_uLong OS2METReader::ReadBigEndian3BytesLong() { - sal_uInt16 nLo; - sal_uInt8 nHi; + sal_uInt8 nHi(0); pOS2MET->ReadUChar( nHi ); - nLo=ReadBigEndianWord(); + sal_uInt16 nLo = ReadBigEndianWord(); return ((((sal_uLong)nHi)<<16)&0x00ff0000)|((sal_uLong)nLo); } @@ -2563,10 +2561,7 @@ void OS2METReader::ReadField(sal_uInt16 nFieldType, sal_uInt16 nFieldSize) void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaFile ) { - sal_uInt16 nFieldSize; - sal_uInt16 nFieldType; sal_uLong nPercent, nLastPercent; - sal_uInt8 nMagicByte; ErrorCode=0; @@ -2632,6 +2627,7 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF sal_uInt64 const nStartPos = pOS2MET->Tell(); sal_uInt64 const nRemaining = pOS2MET->remainingSize(); + Callback(0); nLastPercent=0; sal_uInt64 nPos = pOS2MET->Tell(); @@ -2644,15 +2640,17 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF nLastPercent=nPercent; } - nFieldSize=ReadBigEndianWord(); - + sal_uInt16 nFieldSize = ReadBigEndianWord(); + sal_uInt8 nMagicByte(0); pOS2MET->ReadUChar( nMagicByte ); if (nMagicByte!=0xd3) { pOS2MET->SetError(SVSTREAM_FILEFORMAT_ERROR); ErrorCode=7; break; } - pOS2MET->ReadUInt16( nFieldType ); + + sal_uInt16 nFieldType(0); + pOS2MET->ReadUInt16(nFieldType); pOS2MET->SeekRel(3); nPos+=8; nFieldSize-=8; |