diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-11-22 09:47:52 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-11-22 13:33:25 +0100 |
commit | 2161d04688be77112c281a1ada5263b963677c43 (patch) | |
tree | 252d975d79b429a6c7ea0a8c777f8403e5481c62 /filter | |
parent | 041e1ba3185fd73930129c19739ee62ba88826cc (diff) |
drop duplicate method
Change-Id: Idadd0a64e41cd02f5167b275081c3576a6224b12
Reviewed-on: https://gerrit.libreoffice.org/45075
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/graphicfilter/ios2met/ios2met.cxx | 2 | ||||
-rw-r--r-- | filter/source/graphicfilter/ipbm/ipbm.cxx | 12 | ||||
-rw-r--r-- | filter/source/graphicfilter/ipict/ipict.cxx | 10 | ||||
-rw-r--r-- | filter/source/graphicfilter/itiff/ccidecom.cxx | 2 | ||||
-rw-r--r-- | filter/source/graphicfilter/itiff/itiff.cxx | 4 | ||||
-rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 4 |
6 files changed, 17 insertions, 17 deletions
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index f861ce1c7c35..8870797d151e 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -2712,7 +2712,7 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF if (nFieldType==EndDocumnMagic) break; - if (pOS2MET->IsEof() || nFieldSize < 8) + if (pOS2MET->eof() || nFieldSize < 8) { pOS2MET->SetError(SVSTREAM_FILEFORMAT_ERROR); ErrorCode=8; diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx index 8e8181ae526f..ca63bb570b3e 100644 --- a/filter/source/graphicfilter/ipbm/ipbm.cxx +++ b/filter/source/graphicfilter/ipbm/ipbm.cxx @@ -281,7 +281,7 @@ bool PBMReader::ImplReadBody() case 0 : while ( nHeight != mnHeight ) { - if ( mrPBM.IsEof() || mrPBM.GetError() ) + if ( mrPBM.eof() || mrPBM.GetError() ) return false; if ( --nShift < 0 ) @@ -303,7 +303,7 @@ bool PBMReader::ImplReadBody() case 1 : while ( nHeight != mnHeight ) { - if ( mrPBM.IsEof() || mrPBM.GetError() ) + if ( mrPBM.eof() || mrPBM.GetError() ) return false; mrPBM.ReadUChar( nDat ); @@ -321,7 +321,7 @@ bool PBMReader::ImplReadBody() case 2 : while ( nHeight != mnHeight ) { - if ( mrPBM.IsEof() || mrPBM.GetError() ) + if ( mrPBM.eof() || mrPBM.GetError() ) return false; sal_uInt8 nR, nG, nB; @@ -346,7 +346,7 @@ bool PBMReader::ImplReadBody() case 0 : while ( !bFinished ) { - if ( mrPBM.IsEof() || mrPBM.GetError() ) + if ( mrPBM.eof() || mrPBM.GetError() ) return false; mrPBM.ReadUChar( nDat ); @@ -405,7 +405,7 @@ bool PBMReader::ImplReadBody() continue; } - if ( mrPBM.IsEof() || mrPBM.GetError() ) + if ( mrPBM.eof() || mrPBM.GetError() ) return false; mrPBM.ReadUChar( nDat ); @@ -478,7 +478,7 @@ bool PBMReader::ImplReadBody() continue; } - if ( mrPBM.IsEof() || mrPBM.GetError() ) + if ( mrPBM.eof() || mrPBM.GetError() ) return false; mrPBM.ReadUChar( nDat ); diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index 5da3e1a8844b..b5d88979f7c8 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -1213,7 +1213,7 @@ void PictReader::ReadHeader() // a small test to check if versionOp code exists after the bdbox ( with no extra NOP codes) pPict->Seek(nOffset+10); pPict->ReadBytes(sBuf, 2); - if (pPict->IsEof() || pPict->GetError()) break; + if (pPict->eof() || pPict->GetError()) break; if (sBuf[0] == 0x11 || (sBuf[0] == 0x00 && sBuf[1] == 0x11)) ; // maybe ok else continue; } @@ -1231,7 +1231,7 @@ void PictReader::ReadHeader() if (st >= 3 && actualConfid != 20) continue; aBoundingRect=tools::Rectangle( x1,y1, x2, y2 ); - if (pPict->IsEof() || pPict->GetError()) continue; + if (pPict->eof() || pPict->GetError()) continue; // read version pPict->ReadBytes(sBuf, 2); // version 1 file @@ -1250,7 +1250,7 @@ void PictReader::ReadHeader() } while ( sBuf[0] == 0x00 && numZero < 10); actualConfid -= (numZero-1); // extra nop are dubious - if (pPict->IsEof() || pPict->GetError()) continue; + if (pPict->eof() || pPict->GetError()) continue; if (sBuf[0] != 0x11) continue; // not a version opcode // abnormal version 1 file if (sBuf[1] == 0x01 ) { @@ -1265,7 +1265,7 @@ void PictReader::ReadHeader() // 3 Bytes ignored : end of version arg 0x02FF (ie: 0xFF), HeaderOp : 0x0C00 pPict->SeekRel( 3 ); pPict->ReadInt16( nExtVer ).ReadInt16( nReserved ); - if (pPict->IsEof() || pPict->GetError()) continue; + if (pPict->eof() || pPict->GetError()) continue; if ( nExtVer == -2 ) // extended version 2 picture { @@ -1960,7 +1960,7 @@ void PictReader::ReadPict( SvStream & rStreamPict, GDIMetaFile & rGDIMetaFile ) if (pPict->GetError()) break; - if (pPict->IsEof()) + if (pPict->eof()) { pPict->SetError(SVSTREAM_FILEFORMAT_ERROR); break; diff --git a/filter/source/graphicfilter/itiff/ccidecom.cxx b/filter/source/graphicfilter/itiff/ccidecom.cxx index c119d640e7d4..815a75e5deba 100644 --- a/filter/source/graphicfilter/itiff/ccidecom.cxx +++ b/filter/source/graphicfilter/itiff/ccidecom.cxx @@ -769,7 +769,7 @@ bool CCIDecompressor::ReadEOL() while ( nInputBitsBufSize < 12 ) { pIStream->ReadUChar( nByte ); - if ( pIStream->IsEof() ) + if ( pIStream->eof() ) return false; if ( pIStream->Tell() > nMaxPos ) return false; diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index 696c13b6b26b..988e791a6431 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -1234,7 +1234,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) nMaxPos = std::max(nOrigPos + nOffset + DataTypeSize() * nDataLen, nMaxPos); } pTIFF->ReadUInt32( nOffset ); - if ( pTIFF->IsEof() ) + if ( pTIFF->eof() ) nOffset = 0; nMaxPos = std::max( pTIFF->Tell(), nMaxPos ); @@ -1325,7 +1325,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) break; } pTIFF->ReadUInt32( nNextIfd ); - if ( pTIFF->IsEof() ) + if ( pTIFF->eof() ) nNextIfd = 0; } if ( !nBitsPerSample || ( nBitsPerSample > 32 ) ) diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 4b7f8e36b81d..ebc214ef36fb 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -6774,7 +6774,7 @@ bool SvxMSDffManager::ConvertToOle2( SvStream& rStm, sal_uInt32 nReadLen, nBytesRead += 6 * sizeof( sal_uInt32 ) + nStrLen + nDataLen; - if( !rStm.IsEof() && nReadLen > nBytesRead && nDataLen ) + if( !rStm.eof() && nReadLen > nBytesRead && nDataLen ) { if( xOle10Stm.is() ) { @@ -6828,7 +6828,7 @@ bool SvxMSDffManager::ConvertToOle2( SvStream& rStm, sal_uInt32 nReadLen, else rStm.SeekRel( nDataLen ); } - } while( !rStm.IsEof() && nReadLen >= nBytesRead ); + } while( !rStm.eof() && nReadLen >= nBytesRead ); if( !bMtfRead && pMtf ) { |