[Libreoffice-commits] core.git: basctl/source basic/source connectivity/source cui/source emfio/source filter/source idl/inc include/tools linguistic/source lotuswordpro/source sc/source sfx2/source sot/source starmath/source svtools/source svx/source sw/source tools/source unotools/source vcl/source vcl/unx writerfilter/source writerperfect/qa
Caolán McNamara
caolanm at redhat.com
Wed Nov 22 12:33:52 UTC 2017
basctl/source/basicide/bastypes.cxx | 2 -
basic/source/basmgr/basmgr.cxx | 2 -
basic/source/classes/image.cxx | 2 -
basic/source/runtime/iosys.cxx | 2 -
basic/source/runtime/methods.cxx | 10 ++---
basic/source/runtime/methods1.cxx | 2 -
connectivity/source/commontools/dbtools.cxx | 2 -
connectivity/source/drivers/dbase/DTable.cxx | 2 -
connectivity/source/drivers/flat/ETable.cxx | 4 +-
cui/source/options/personalization.cxx | 2 -
emfio/source/reader/wmfreader.cxx | 6 +--
filter/source/graphicfilter/ios2met/ios2met.cxx | 2 -
filter/source/graphicfilter/ipbm/ipbm.cxx | 12 +++---
filter/source/graphicfilter/ipict/ipict.cxx | 10 ++---
filter/source/graphicfilter/itiff/ccidecom.cxx | 2 -
filter/source/graphicfilter/itiff/itiff.cxx | 4 +-
filter/source/msfilter/msdffimp.cxx | 4 +-
idl/inc/lex.hxx | 2 -
include/tools/stream.hxx | 1
linguistic/source/dicimp.cxx | 6 +--
lotuswordpro/source/filter/LotusWordProImportFilter.cxx | 2 -
sc/source/filter/dif/difimp.cxx | 4 +-
sc/source/filter/lotus/lotread.cxx | 4 +-
sc/source/filter/qpro/qpro.cxx | 2 -
sc/source/ui/dbgui/scuiasciiopt.cxx | 6 +--
sc/source/ui/docshell/impex.cxx | 10 ++---
sc/source/ui/unoobj/scdetect.cxx | 2 -
sfx2/source/appl/xpackcreator.cxx | 2 -
sfx2/source/doc/docfile.cxx | 2 -
sot/source/base/filelist.cxx | 4 +-
sot/source/sdstor/storinfo.cxx | 2 -
sot/source/sdstor/ucbstorage.cxx | 2 -
starmath/source/mathtype.cxx | 2 -
svtools/source/svhtml/parhtml.cxx | 24 ++++++------
svtools/source/svrtf/svparser.cxx | 18 ++++-----
svx/source/gallery2/galtheme.cxx | 2 -
sw/source/core/edit/edtox.cxx | 2 -
sw/source/core/layout/laycache.cxx | 2 -
sw/source/filter/ascii/parasc.cxx | 6 +--
sw/source/filter/ww8/ww8graf2.cxx | 2 -
sw/source/ui/index/cnttab.cxx | 2 -
tools/source/zcodec/zcodec.cxx | 4 +-
unotools/source/streaming/streamwrap.cxx | 2 -
unotools/source/ucbhelper/xtempfile.cxx | 2 -
vcl/source/filter/graphicfilter2.cxx | 10 ++---
vcl/source/filter/igif/gifread.cxx | 8 ++--
vcl/source/filter/ipdf/pdfdocument.cxx | 30 ++++++++--------
vcl/source/gdi/gdimtf.cxx | 2 -
vcl/source/gdi/impgraph.cxx | 2 -
vcl/source/gdi/pngread.cxx | 4 +-
vcl/source/gdi/regionband.cxx | 2 -
vcl/unx/generic/print/common_gfx.cxx | 2 -
vcl/unx/generic/printer/jobdata.cxx | 2 -
vcl/unx/generic/printer/ppdparser.cxx | 8 ++--
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 4 +-
writerfilter/source/rtftok/rtflookahead.cxx | 4 +-
writerfilter/source/rtftok/rtftokenizer.cxx | 10 ++---
writerperfect/qa/unit/EPUBExportTest.cxx | 2 -
58 files changed, 139 insertions(+), 140 deletions(-)
New commits:
commit 2161d04688be77112c281a1ada5263b963677c43
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 22 09:47:52 2017 +0000
drop duplicate method
Change-Id: Idadd0a64e41cd02f5167b275081c3576a6224b12
Reviewed-on: https://gerrit.libreoffice.org/45075
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 951c25287a86..5e6cf568f1dd 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -623,7 +623,7 @@ sal_uLong CalcLineCount( SvStream& rStream )
rStream.Seek( 0 );
rStream.ReadChar( c );
- while ( !rStream.IsEof() )
+ while ( !rStream.eof() )
{
if ( c == '\n' )
nLFs++;
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 24120034aecd..8c9429324fe9 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -941,7 +941,7 @@ bool BasicManager::ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStora
xBasicStream->RefreshBuffer();
sal_uInt32 nPasswordMarker = 0;
xBasicStream->ReadUInt32( nPasswordMarker );
- if ( ( nPasswordMarker == PASSWORD_MARKER ) && !xBasicStream->IsEof() )
+ if ( ( nPasswordMarker == PASSWORD_MARKER ) && !xBasicStream->eof() )
{
OUString aPassword = xBasicStream->ReadUniOrByteString(
xBasicStream->GetStreamCharSet());
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index 7db708cdf349..a773acfb7d7c 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -73,7 +73,7 @@ void SbiImage::Clear()
bool SbiGood( SvStream const & r )
{
- return !r.IsEof() && r.GetError() == ERRCODE_NONE;
+ return !r.eof() && r.GetError() == ERRCODE_NONE;
}
// Open Record
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 4c625a749284..34ad8c28936b 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -546,7 +546,7 @@ ErrCode SbiStream::Read(OString& rBuf, sal_uInt16 n, bool bForceReadingPerByte)
rBuf = aBuffer.makeStringAndClear();
}
MapError();
- if( !nError && pStrm->IsEof() )
+ if( !nError && pStrm->eof() )
{
nError = ERRCODE_BASIC_READ_PAST_EOF;
}
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 1d966832a77c..6cbde3a5dcaa 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -3139,23 +3139,23 @@ void SbRtl_EOF(StarBASIC *, SbxArray & rPar, bool)
StarBASIC::Error( ERRCODE_BASIC_BAD_CHANNEL );
return;
}
- bool bIsEof;
+ bool beof;
SvStream* pSvStrm = pSbStrm->GetStrm();
if ( pSbStrm->IsText() )
{
char cBla;
(*pSvStrm).ReadChar( cBla ); // can we read another character?
- bIsEof = pSvStrm->IsEof();
- if ( !bIsEof )
+ beof = pSvStrm->eof();
+ if ( !beof )
{
pSvStrm->SeekRel( -1 );
}
}
else
{
- bIsEof = pSvStrm->IsEof(); // for binary data!
+ beof = pSvStrm->eof(); // for binary data!
}
- rPar.Get(0)->PutBool( bIsEof );
+ rPar.Get(0)->PutBool( beof );
}
}
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 14548fbb0cf1..5639bf08eef8 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -1016,7 +1016,7 @@ static bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
sal_uInt8 aByte;
pStrm->ReadUChar( aByte );
- if( bBinary && SbiRuntime::isVBAEnabled() && aByte == 1 && pStrm->IsEof() )
+ if( bBinary && SbiRuntime::isVBAEnabled() && aByte == 1 && pStrm->eof() )
{
aByte = 0;
}
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 861419a5c283..653c8dcc7717 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -2093,7 +2093,7 @@ namespace dbase
dbf_Stream->ReadUChar( nType );
dbf_Stream->Seek(STREAM_SEEK_TO_BEGIN + 29);
- if (dbf_Stream->IsEof())
+ if (dbf_Stream->eof())
{
return false;
}
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 116c47b56d60..22d9f441b1f0 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -2655,7 +2655,7 @@ bool ODbaseTable::ReadMemo(std::size_t nBlockNo, ORowSetValue& aVariable)
aBuf[i] = 0;
aBStr.append(aBuf);
- } while (!bReady && !m_pMemoStream->IsEof());
+ } while (!bReady && !m_pMemoStream->eof());
aVariable = OStringToOUString(aBStr.makeStringAndClear(),
m_eEncoding);
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 29a4db8b449c..5fc89925925c 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -876,7 +876,7 @@ bool OFlatTable::readLine(sal_Int32 * const pEndPos, sal_Int32 * const pStartPos
if (pStartPos)
*pStartPos = (sal_Int32)m_pFileStream->Tell();
m_pFileStream->ReadByteStringLine(m_aCurrentLine, nEncoding);
- if (m_pFileStream->IsEof())
+ if (m_pFileStream->eof())
return false;
QuotedTokenizedString sLine = m_aCurrentLine; // check if the string continues on next line
@@ -927,7 +927,7 @@ bool OFlatTable::readLine(sal_Int32 * const pEndPos, sal_Int32 * const pStartPos
{
nLastOffset = sLine.Len();
m_pFileStream->ReadByteStringLine(sLine,nEncoding);
- if ( !m_pFileStream->IsEof() )
+ if ( !m_pFileStream->eof() )
{
OUString aStr = m_aCurrentLine.GetString() + "\n" + sLine.GetString();
m_aCurrentLine.SetString(aStr);
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index a8f2c3952c37..d18d56b06fb6 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -419,7 +419,7 @@ void SvxPersonalizationTabPage::LoadDefaultImages()
Graphic aGraphic;
sal_Int32 nIndex = 0;
- while( aStream.IsOpen() && !aStream.IsEof() )
+ while( aStream.IsOpen() && !aStream.eof() )
{
OString aLine;
aStream.ReadLine( aLine );
diff --git a/emfio/source/reader/wmfreader.cxx b/emfio/source/reader/wmfreader.cxx
index 97861c225306..9f13b78db0c2 100644
--- a/emfio/source/reader/wmfreader.cxx
+++ b/emfio/source/reader/wmfreader.cxx
@@ -1367,10 +1367,10 @@ namespace emfio
|| (mnRecSize == 3
&& nFunction == 0
)
- || mpInputStream->IsEof()
+ || mpInputStream->eof()
)
{
- if( mpInputStream->IsEof() )
+ if( mpInputStream->eof() )
mpInputStream->SetError( SVSTREAM_FILEFORMAT_ERROR );
break;
@@ -1480,7 +1480,7 @@ namespace emfio
{
break;
}
- else if ( nRSize < 3 || pStm->IsEof() )
+ else if ( nRSize < 3 || pStm->eof() )
{
pStm->SetError( SVSTREAM_FILEFORMAT_ERROR );
bRet = false;
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 )
{
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index a32d863a7103..1da4c2f97ea8 100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -126,7 +126,7 @@ class SvTokenStream
void FillTokenList();
sal_uLong GetNumber();
bool MakeToken( SvToken & );
- bool IsEof() const { return pInStream->IsEof(); }
+ bool IsEof() const { return pInStream->eof(); }
void SetMax()
{
sal_uLong n = Tell();
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 726412825bf6..abf25b1e4a70 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -274,7 +274,6 @@ public:
// length between current (Tell()) pos and end of stream
virtual sal_uInt64 remainingSize();
void Flush();
- bool IsEof() const { return m_isEof; }
// next Tell() <= nSize
bool SetStreamSize( sal_uInt64 nSize );
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index b5b1e840e94c..911735ce3815 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -296,7 +296,7 @@ ErrCode DictionaryNeo::loadEntries(const OUString &rMainURL)
sal_Char aWordBuf[ BUFSIZE ];
// Read the first word
- if (!pStream->IsEof())
+ if (!pStream->eof())
{
pStream->ReadUInt16( nLen );
if (ERRCODE_NONE != (nErr = pStream->GetError()))
@@ -312,7 +312,7 @@ ErrCode DictionaryNeo::loadEntries(const OUString &rMainURL)
return SVSTREAM_READ_ERROR;
}
- while(!pStream->IsEof())
+ while(!pStream->eof())
{
// Read from file
// Paste in dictionary without converting
@@ -325,7 +325,7 @@ ErrCode DictionaryNeo::loadEntries(const OUString &rMainURL)
}
pStream->ReadUInt16( nLen );
- if (pStream->IsEof())
+ if (pStream->eof())
break;
if (ERRCODE_NONE != (nErr = pStream->GetError()))
return nErr;
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
index 525f057d7108..ef8c9cd42568 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
@@ -62,7 +62,7 @@ bool SAL_CALL LotusWordProImportFilter::importImpl( const Sequence< css::beans::
}
SvFileStream inputStream( sURL, StreamMode::READ );
- if ( inputStream.IsEof() || ( inputStream.GetError() != ERRCODE_NONE ) )
+ if ( inputStream.eof() || ( inputStream.GetError() != ERRCODE_NONE ) )
return false;
// An XML import service: what we push sax messages to..
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index a826325da01e..9b7dbc678457 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -546,7 +546,7 @@ DATASET DifParser::GetNextDataset()
while ( bContinue )
{
aData = aData + "\n";
- bContinue = !rIn.IsEof() && ReadNextLine( aLine );
+ bContinue = !rIn.eof() && ReadNextLine( aLine );
if( bContinue )
{
nLineLength = aLine.getLength();
@@ -576,7 +576,7 @@ DATASET DifParser::GetNextDataset()
if( eRet == D_UNKNOWN )
ReadNextLine( aLine );
- if( rIn.IsEof() )
+ if( rIn.eof() )
eRet = D_EOD;
return eRet;
diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx
index b39a6303fa6f..afb176ec7f19 100644
--- a/sc/source/filter/lotus/lotread.cxx
+++ b/sc/source/filter/lotus/lotread.cxx
@@ -61,7 +61,7 @@ ErrCode ImportLotus::Read()
{
pIn->ReadUInt16( nOp ).ReadUInt16( nRecLen );
- if( pIn->IsEof() || nNextRec > SAL_MAX_UINT32 - nRecLen - 4 )
+ if( pIn->eof() || nNextRec > SAL_MAX_UINT32 - nRecLen - 4 )
eAkt = S_END;
nNextRec += nRecLen + 4;
@@ -245,7 +245,7 @@ ErrCode ImportLotus::Read(SvStream& rIn)
{
pIn->ReadUInt16( nOp ).ReadUInt16( nRecLen );
- if( pIn->IsEof() || nNextRec > SAL_MAX_UINT32 - nRecLen - 4 )
+ if( pIn->eof() || nNextRec > SAL_MAX_UINT32 - nRecLen - 4 )
bRead = false;
else
{
diff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx
index 0cc2a7920dd1..6326aae08cf6 100644
--- a/sc/source/filter/qpro/qpro.cxx
+++ b/sc/source/filter/qpro/qpro.cxx
@@ -225,7 +225,7 @@ ErrCode ScQProReader::import( ScDocument *pDoc )
bool ScQProReader::recordsLeft()
{
- return mpStream && !mpStream->IsEof();
+ return mpStream && !mpStream->eof();
}
bool ScQProReader::nextRecord()
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 293213e2cb66..43418fc3aad2 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -532,7 +532,7 @@ bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString &rText )
{
if (!Seek( mpRowPosArray[mnRowPosCount]) ||
mpDatStream->GetError() != ERRCODE_NONE ||
- mpDatStream->IsEof())
+ mpDatStream->eof())
{
bRet = false;
break;
@@ -543,8 +543,8 @@ bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString &rText )
mpRowPosArray[++mnRowPosCount] = mnStreamPos;
} while (nLine >= mnRowPosCount &&
mpDatStream->GetError() == ERRCODE_NONE &&
- !mpDatStream->IsEof());
- if (mpDatStream->IsEof() &&
+ !mpDatStream->eof());
+ if (mpDatStream->eof() &&
mnStreamPos == mpRowPosArray[mnRowPosCount-1])
{
// the very end, not even an empty line read
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 864ddaf591ac..4167ce11c8b1 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -861,7 +861,7 @@ bool ScImportExport::Text2Doc( SvStream& rStrm )
for( ;; )
{
rStrm.ReadUniOrByteStringLine( aLine, rStrm.GetStreamCharSet(), nArbitraryLineLengthLimit );
- if( rStrm.IsEof() )
+ if( rStrm.eof() )
break;
SCCOL nCol = nStartCol;
const sal_Unicode* p = aLine.getStr();
@@ -1319,7 +1319,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm )
while(--nSkipLines>0)
{
aLine = ReadCsvLine(rStrm, !bFixed, rSeps, cStr); // content is ignored
- if ( rStrm.IsEof() )
+ if ( rStrm.eof() )
break;
}
@@ -1342,7 +1342,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm )
for( ;; )
{
aLine = ReadCsvLine(rStrm, !bFixed, rSeps, cStr);
- if ( rStrm.IsEof() && aLine.isEmpty() )
+ if ( rStrm.eof() && aLine.isEmpty() )
break;
if ( nRow > MAXROW )
@@ -1740,7 +1740,7 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm )
//! allow unicode
rStrm.ReadLine( aByteLine );
aLine = OStringToOUString(aByteLine, rStrm.GetStreamCharSet());
- if( rStrm.IsEof() )
+ if( rStrm.eof() )
break;
bool bInvalidCol = false;
bool bInvalidRow = false;
@@ -2354,7 +2354,7 @@ OUString ReadCsvLine( SvStream &rStream, bool bEmbeddedLineBreak,
sal_Int32 nLastOffset = 0;
sal_Int32 nQuotes = 0;
- while (!rStream.IsEof() && aStr.getLength() < nArbitraryLineLengthLimit)
+ while (!rStream.eof() && aStr.getLength() < nArbitraryLineLengthLimit)
{
const sal_Unicode *p, *pStart;
p = pStart = aStr.getStr();
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 8d0148113863..35458d103577 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -101,7 +101,7 @@ bool detectThisFormat(SvStream& rStr, const sal_uInt16* pSearch)
rStr.Seek( 0 ); // in the beginning everything was bad...
rStr.ReadUChar( nByte );
bool bSync = true;
- while( !rStr.IsEof() && bSync )
+ while( !rStr.eof() && bSync )
{
sal_uInt16 nMuster = *pSearch;
diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx
index 35972b1061d6..c862257a4f40 100644
--- a/sfx2/source/appl/xpackcreator.cxx
+++ b/sfx2/source/appl/xpackcreator.cxx
@@ -105,7 +105,7 @@ void SAL_CALL OPackageStructureCreator::convertToPackage( const OUString& aFolde
if ( nRead < 32000 )
aSeq.realloc( nRead );
xTargetStream->writeBytes( aSeq );
- } while( !pTempStream->IsEof() && !pTempStream->GetError() && nRead );
+ } while( !pTempStream->eof() && !pTempStream->GetError() && nRead );
if ( pTempStream->GetError() )
throw io::IOException();
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 02ceef29f9e7..757336c6ac1c 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -3446,7 +3446,7 @@ void SfxMedium::CreateTempFile( bool bReplace )
pImpl->m_pInStream->Seek(0);
pImpl->m_pOutStream->Seek(0);
- while( !pImpl->m_pInStream->IsEof() && nErr == ERRCODE_NONE )
+ while( !pImpl->m_pInStream->eof() && nErr == ERRCODE_NONE )
{
sal_uInt32 nRead = pImpl->m_pInStream->ReadBytes(pBuf, 8192);
nErr = pImpl->m_pInStream->GetError();
diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx
index 07558b17f0ae..6fe95dfab89d 100644
--- a/sot/source/base/filelist.cxx
+++ b/sot/source/base/filelist.cxx
@@ -42,7 +42,7 @@ SvStream& ReadFileList( SvStream& rIStm, FileList& rFileList )
OUStringBuffer sBuf(512);
sal_uInt16 c;
- while (!rIStm.IsEof())
+ while (!rIStm.eof())
{
// read first character of filepath; c==0 > reach end of stream
rIStm.ReadUInt16( c );
@@ -50,7 +50,7 @@ SvStream& ReadFileList( SvStream& rIStm, FileList& rFileList )
break;
// read string till c==0
- while (c && !rIStm.IsEof())
+ while (c && !rIStm.eof())
{
sBuf.append((sal_Unicode)c);
rIStm.ReadUInt16( c );
diff --git a/sot/source/sdstor/storinfo.cxx b/sot/source/sdstor/storinfo.cxx
index d7cc729e9262..080e41d3e83e 100644
--- a/sot/source/sdstor/storinfo.cxx
+++ b/sot/source/sdstor/storinfo.cxx
@@ -30,7 +30,7 @@ SotClipboardFormatId ReadClipboardFormat( SvStream & rStm )
SotClipboardFormatId nFormat = SotClipboardFormatId::NONE;
sal_Int32 nLen = 0;
rStm.ReadInt32( nLen );
- if( rStm.IsEof() )
+ if( rStm.eof() )
rStm.SetError( SVSTREAM_GENERALERROR );
if( nLen > 0 )
{
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index e60fc2f97a45..1f76f3f2d16f 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -172,7 +172,7 @@ sal_Int32 SAL_CALL FileStreamWrapper_Impl::readSomeBytes(Sequence< sal_Int8 >& a
if (nMaxBytesToRead < 0)
throw BufferSizeExceededException(OUString(),static_cast<XWeak*>(this));
- if (m_pSvStream->IsEof())
+ if (m_pSvStream->eof())
{
aData.realloc(0);
return 0;
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index f179b54f2e0d..20486fc9a922 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -1763,7 +1763,7 @@ bool MathType::HandleRecords(int nLevel, sal_uInt8 nSelector,
break;
}
}
- while (nRecord != END && !pS->IsEof());
+ while (nRecord != END && !pS->eof());
while (nSetSize)
{
rRet += "}";
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index 727247803e09..1eb82b6bb788 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -442,9 +442,9 @@ HtmlTokenId HTMLParser::ScanText( const sal_Unicode cBreak )
nNextCh = GetNextChar();
}
while( nPos < MAX_ENTITY_LEN && rtl::isAsciiAlphanumeric( nNextCh ) &&
- !rInput.IsEof() );
+ !rInput.eof() );
- if( IsParserWorking() && !rInput.IsEof() )
+ if( IsParserWorking() && !rInput.eof() )
{
OUString sEntity(sEntityBuffer.getStr(), nPos);
cChar = GetHTMLCharName( sEntity );
@@ -619,7 +619,7 @@ HtmlTokenId HTMLParser::ScanText( const sal_Unicode cBreak )
break;
case sal_Unicode(EOF):
- if( rInput.IsEof() )
+ if( rInput.eof() )
{
bContinue = false;
}
@@ -690,7 +690,7 @@ HtmlTokenId HTMLParser::ScanText( const sal_Unicode cBreak )
// Reduce sequences of Blanks/Tabs/CR/LF to a single blank
do {
if( sal_Unicode(EOF) == (nNextCh = GetNextChar()) &&
- rInput.IsEof() )
+ rInput.eof() )
{
if( !aToken.isEmpty() || sTmpBuffer.getLength() > 1 )
{
@@ -724,7 +724,7 @@ HtmlTokenId HTMLParser::ScanText( const sal_Unicode cBreak )
aToken += sTmpBuffer.makeStringAndClear();
}
if( ( sal_Unicode(EOF) == (nNextCh = GetNextChar()) &&
- rInput.IsEof() ) ||
+ rInput.eof() ) ||
!IsParserWorking() )
{
if( !sTmpBuffer.isEmpty() )
@@ -927,7 +927,7 @@ HtmlTokenId HTMLParser::GetNextRawToken()
case sal_Unicode(EOF):
// eof closes the current text token and behaves like having read
// an end token
- if( rInput.IsEof() )
+ if( rInput.eof() )
{
bContinue = false;
if( !aToken.isEmpty() || !sTmpBuffer.isEmpty() )
@@ -1031,7 +1031,7 @@ HtmlTokenId HTMLParser::GetNextToken_()
aToken += sTmpBuffer.makeStringAndClear();
nNextCh = GetNextChar();
} while( '>' != nNextCh && '/' != nNextCh && !rtl::isAsciiWhiteSpace( nNextCh ) &&
- IsParserWorking() && !rInput.IsEof() );
+ IsParserWorking() && !rInput.eof() );
if( !sTmpBuffer.isEmpty() )
aToken += sTmpBuffer.makeStringAndClear();
@@ -1084,7 +1084,7 @@ HtmlTokenId HTMLParser::GetNextToken_()
bool bDone = false;
// Read until closing -->. If not found restart at first >
- while( !bDone && !rInput.IsEof() && IsParserWorking() )
+ while( !bDone && !rInput.eof() && IsParserWorking() )
{
if( '>'==nNextCh )
{
@@ -1134,7 +1134,7 @@ HtmlTokenId HTMLParser::GetNextToken_()
mnPendingOffToken = (HtmlTokenId)((int)nRet + 1); // HtmlTokenId::<TOKEN>_ON -> HtmlTokenId::<TOKEN>_OFF
aToken = aToken.replaceAt( aToken.getLength()-1, 1, ""); // remove trailing '/'
}
- if( sal_Unicode(EOF) == nNextCh && rInput.IsEof() )
+ if( sal_Unicode(EOF) == nNextCh && rInput.eof() )
{
// Move back in front of < and restart there.
// Return < as text.
@@ -1159,7 +1159,7 @@ HtmlTokenId HTMLParser::GetNextToken_()
{
// simply throw away everything
ScanText( '>' );
- if( sal_Unicode(EOF) == nNextCh && rInput.IsEof() )
+ if( sal_Unicode(EOF) == nNextCh && rInput.eof() )
{
// Move back in front of < and restart there.
// Return < as text.
@@ -1187,7 +1187,7 @@ HtmlTokenId HTMLParser::GetNextToken_()
bool bDone = false;
// Read until closing %>. If not found restart at first >.
- while( !bDone && !rInput.IsEof() && IsParserWorking() )
+ while( !bDone && !rInput.eof() && IsParserWorking() )
{
bDone = '>'==nNextCh && aToken.endsWith("%");
if( !bDone )
@@ -1260,7 +1260,7 @@ HtmlTokenId HTMLParser::GetNextToken_()
break;
case sal_Unicode(EOF):
- if( rInput.IsEof() )
+ if( rInput.eof() )
{
eState = SvParserState::Accepted;
nRet = HtmlTokenId(nNextCh);
diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx
index 6b2d8a9683a0..a83cf8e85da4 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -193,14 +193,14 @@ sal_uInt32 SvParser<T>::GetNextChar()
bool bSeekBack = true;
rInput.ReadUChar( c1 );
- bErr = rInput.IsEof() || rInput.GetError();
+ bErr = rInput.eof() || rInput.GetError();
if( !bErr )
{
if( 0xff == c1 || 0xfe == c1 )
{
unsigned char c2;
rInput.ReadUChar( c2 );
- bErr = rInput.IsEof() || rInput.GetError();
+ bErr = rInput.eof() || rInput.GetError();
if( !bErr )
{
if( 0xfe == c1 && 0xff == c2 )
@@ -221,14 +221,14 @@ sal_uInt32 SvParser<T>::GetNextChar()
{
unsigned char c2;
rInput.ReadUChar( c2 );
- bErr = rInput.IsEof() || rInput.GetError();
+ bErr = rInput.eof() || rInput.GetError();
if( !bErr )
{
if( ( 0xef == c1 && 0xbb == c2 ) || ( 0xbb == c1 && 0xef == c2 ) )
{
unsigned char c3(0);
rInput.ReadUChar( c3 );
- bErr = rInput.IsEof() || rInput.GetError();
+ bErr = rInput.eof() || rInput.GetError();
if( !bErr && ( 0xbf == c3 ) )
{
SetSrcEncoding(RTL_TEXTENCODING_UTF8);
@@ -253,12 +253,12 @@ sal_uInt32 SvParser<T>::GetNextChar()
rInput.ReadUChar( c1 ).ReadUChar( c2 );
if( 2 == rInput.Tell() &&
- !(rInput.IsEof() || rInput.GetError()) &&
+ !(rInput.eof() || rInput.GetError()) &&
( (bUCS2BSrcEnc && 0xfe == c1 && 0xff == c2) ||
(!bUCS2BSrcEnc && 0xff == c1 && 0xfe == c2) ) )
rInput.ReadUChar( c1 ).ReadUChar( c2 );
- bErr = rInput.IsEof() || rInput.GetError();
+ bErr = rInput.eof() || rInput.GetError();
if( !bErr )
{
if( bUCS2BSrcEnc )
@@ -279,7 +279,7 @@ sal_uInt32 SvParser<T>::GetNextChar()
{
sal_Char c1; // signed, that's the text converter expects
rInput.ReadChar( c1 );
- bErr = rInput.IsEof() || rInput.GetError();
+ bErr = rInput.eof() || rInput.GetError();
if( !bErr )
{
if (
@@ -315,7 +315,7 @@ sal_uInt32 SvParser<T>::GetNextChar()
while( (nInfo&RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL) != 0 )
{
rInput.ReadChar( c1 );
- bErr = rInput.IsEof() || rInput.GetError();
+ bErr = rInput.eof() || rInput.GetError();
if( bErr )
break;
@@ -361,7 +361,7 @@ sal_uInt32 SvParser<T>::GetNextChar()
nLen < 10 )
{
rInput.ReadChar( c1 );
- bErr = rInput.IsEof() || rInput.GetError();
+ bErr = rInput.eof() || rInput.GetError();
if( bErr )
break;
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 0a64e17f8bc2..84b693fc6851 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -1463,7 +1463,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
// In newer versions a 512 byte reserve buffer is located at the end,
// the data is located at the beginning of this buffer and are clamped
// by a VersionCompat.
- if( !rIStm.IsEof() &&
+ if( !rIStm.eof() &&
nId1 == COMPAT_FORMAT( 'G', 'A', 'L', 'R' ) &&
nId2 == COMPAT_FORMAT( 'E', 'S', 'R', 'V' ) )
{
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index f6919179af0f..0e109d9d87d9 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -320,7 +320,7 @@ void SwEditShell::ApplyAutoMark()
SearchAlgorithms2::ABSOLUTE,
'\\' );
- while( !rStrm.GetError() && !rStrm.IsEof() )
+ while( !rStrm.GetError() && !rStrm.eof() )
{
OString aRdLine;
rStrm.ReadLine( aRdLine );
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index 8c973912e99f..b6dfe8daa4cf 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -1069,7 +1069,7 @@ bool SwLayCacheIoImpl::OpenRec( sal_uInt8 cType )
pStream->ReadUInt32( nVal );
sal_uInt8 cRecTyp = (sal_uInt8)nVal;
if( !nVal || cRecTyp != cType ||
- pStream->GetErrorCode() != ERRCODE_NONE || pStream->IsEof() )
+ pStream->GetErrorCode() != ERRCODE_NONE || pStream->eof() )
{
OSL_ENSURE( nVal, "OpenRec: Record-Header is 0" );
OSL_ENSURE( cRecTyp == cType, "OpenRec: Wrong Record Type" );
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index 40784ad9a7bc..60f5e02759f6 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -371,7 +371,7 @@ ErrCode SwASCIIParser::ReadChars()
cLastCR = 0;
nLineLen = 0;
// We skip the last one at the end
- if( !rInput.IsEof() || !(pEnd == pStt ||
+ if( !rInput.eof() || !(pEnd == pStt ||
( !*pEnd && pEnd == pStt+1 ) ) )
pDoc->getIDocumentContentOperations().SplitNode( *pPam->GetPoint(), false );
}
@@ -388,7 +388,7 @@ ErrCode SwASCIIParser::ReadChars()
++pStt;
// We skip the last one at the end
- if( !rInput.IsEof() || pEnd != pStt )
+ if( !rInput.eof() || pEnd != pStt )
bSplitNode = true;
}
break;
@@ -414,7 +414,7 @@ ErrCode SwASCIIParser::ReadChars()
bChkSplit = true;
// We skip the last one at the end
- if( bChkSplit && ( !rInput.IsEof() || pEnd != pStt ))
+ if( bChkSplit && ( !rInput.eof() || pEnd != pStt ))
bSplitNode = true;
}
break;
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index 5e1527eda9fb..fde01e6ad296 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -413,7 +413,7 @@ SwFrameFormat* SwWW8ImplReader::ImportGraf1(WW8_PIC const & rPic, SvStream* pSt,
sal_uLong nFilePos )
{
SwFrameFormat* pRet = nullptr;
- if( pSt->IsEof() || rPic.fError || rPic.MFP.mm == 99 )
+ if( pSt->eof() || rPic.fError || rPic.MFP.mm == 99 )
return nullptr;
OUString aFileName;
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 7cbb0ab13632..d99014941c60 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -4095,7 +4095,7 @@ void SwEntryBrowseBox::ReadEntries(SvStream& rInStr)
{
AutoMarkEntry* pToInsert = nullptr;
rtl_TextEncoding eTEnc = osl_getThreadTextEncoding();
- while( !rInStr.GetError() && !rInStr.IsEof() )
+ while( !rInStr.GetError() && !rInStr.eof() )
{
OUString sLine;
rInStr.ReadByteStringLine( sLine, eTEnc );
diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx
index ca75de1b4c02..385ad7b04b58 100644
--- a/tools/source/zcodec/zcodec.cxx
+++ b/tools/source/zcodec/zcodec.cxx
@@ -366,7 +366,7 @@ void ZCodec::InitDecompress(SvStream & inStream)
{
inStream.ReadUChar( j );
}
- while ( j && !inStream.IsEof() );
+ while ( j && !inStream.eof() );
}
/* skip the .gz file comment */
if ( nFlags & GZ_COMMENT )
@@ -375,7 +375,7 @@ void ZCodec::InitDecompress(SvStream & inStream)
{
inStream.ReadUChar( j );
}
- while ( j && !inStream.IsEof() );
+ while ( j && !inStream.eof() );
}
/* skip the header crc */
if ( nFlags & GZ_HEAD_CRC )
diff --git a/unotools/source/streaming/streamwrap.cxx b/unotools/source/streaming/streamwrap.cxx
index cf54a1cf48ce..64a3a85058bb 100644
--- a/unotools/source/streaming/streamwrap.cxx
+++ b/unotools/source/streaming/streamwrap.cxx
@@ -78,7 +78,7 @@ sal_Int32 SAL_CALL OInputStreamWrapper::readSomeBytes(css::uno::Sequence< sal_In
if (nMaxBytesToRead < 0)
throw css::io::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this));
- if (m_pSvStream->IsEof())
+ if (m_pSvStream->eof())
{
aData.realloc(0);
return 0;
diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx
index eee00a7dde51..9964a4099c41 100644
--- a/unotools/source/ucbhelper/xtempfile.cxx
+++ b/unotools/source/ucbhelper/xtempfile.cxx
@@ -179,7 +179,7 @@ sal_Int32 SAL_CALL OTempFileService::readSomeBytes( css::uno::Sequence< sal_Int8
if (nMaxBytesToRead < 0)
throw css::io::BufferSizeExceededException( OUString(), static_cast < css::uno::XWeak * >( this ) );
- if (mpStream->IsEof())
+ if (mpStream->eof())
{
aData.realloc(0);
return 0;
diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx
index aa4925d81a81..2f846029bb9b 100644
--- a/vcl/source/filter/graphicfilter2.cxx
+++ b/vcl/source/filter/graphicfilter2.cxx
@@ -221,14 +221,14 @@ sal_uInt8 ImpDetectJPG_GetNextMarker( SvStream& rStm )
do
{
rStm.ReadUChar( nByte );
- if ( rStm.IsEof() || rStm.GetError() ) // as 0 is not allowed as marker,
+ if ( rStm.eof() || rStm.GetError() ) // as 0 is not allowed as marker,
return 0; // we can use it as errorcode
}
while ( nByte != 0xff );
do
{
rStm.ReadUChar( nByte );
- if ( rStm.IsEof() || rStm.GetError() )
+ if ( rStm.eof() || rStm.GetError() )
return 0;
}
while( nByte == 0xff );
@@ -263,7 +263,7 @@ bool GraphicDescriptor::ImpDetectJPG( SvStream& rStm, bool bExtendedInfo )
bool bScanFailure = false;
bool bScanFinished = false;
- while( !bScanFailure && !bScanFinished && !rStm.IsEof() && !rStm.GetError() )
+ while( !bScanFailure && !bScanFinished && !rStm.eof() && !rStm.GetError() )
{
sal_uInt8 nMarker = ImpDetectJPG_GetNextMarker( rStm );
switch( nMarker )
@@ -555,7 +555,7 @@ bool GraphicDescriptor::ImpDetectPNG( SvStream& rStm, bool bExtendedInfo )
rStm.ReadUInt32( nLen32 );
rStm.ReadUInt32( nTemp32 );
while( ( nTemp32 != 0x70485973 ) && ( nTemp32 != 0x49444154 )
- && !rStm.IsEof() && !rStm.GetError() )
+ && !rStm.eof() && !rStm.GetError() )
{
rStm.SeekRel( 4 + nLen32 );
rStm.ReadUInt32( nLen32 );
@@ -563,7 +563,7 @@ bool GraphicDescriptor::ImpDetectPNG( SvStream& rStm, bool bExtendedInfo )
}
if ( nTemp32 == 0x70485973
- && !rStm.IsEof() && !rStm.GetError() )
+ && !rStm.eof() && !rStm.GetError() )
{
sal_uLong nXRes;
sal_uLong nYRes;
diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx
index bcdfa1d252e8..9695f09d8784 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -413,7 +413,7 @@ bool GIFReader::ReadExtension()
if ( bOverreadDataBlocks )
{
bRet = true;
- while( cSize && bStatus && !rIStm.IsEof() )
+ while( cSize && bStatus && !rIStm.eof() )
{
sal_uInt16 nCount = (sal_uInt16) cSize + 1;
const sal_uInt64 nMaxPossible = rIStm.remainingSize();
@@ -491,7 +491,7 @@ sal_uLong GIFReader::ReadNextBlock()
rIStm.ReadUChar( cBlockSize );
- if ( rIStm.IsEof() )
+ if ( rIStm.eof() )
nRet = 4;
else if ( NO_PENDING( rIStm ) )
{
@@ -717,7 +717,7 @@ bool GIFReader::ProcessGIF()
rIStm.ReadUChar( cByte );
- if( rIStm.IsEof() )
+ if( rIStm.eof() )
eActAction = END_READING;
else if( NO_PENDING( rIStm ) )
{
@@ -775,7 +775,7 @@ bool GIFReader::ProcessGIF()
rIStm.ReadUChar( cDataSize );
- if( rIStm.IsEof() )
+ if( rIStm.eof() )
eActAction = ABORT_READING;
else if( cDataSize > 12 )
bStatus = false;
diff --git a/vcl/source/filter/ipdf/pdfdocument.cxx b/vcl/source/filter/ipdf/pdfdocument.cxx
index 7689597699a4..56e90cf7adf3 100644
--- a/vcl/source/filter/ipdf/pdfdocument.cxx
+++ b/vcl/source/filter/ipdf/pdfdocument.cxx
@@ -874,7 +874,7 @@ bool PDFDocument::Tokenize(SvStream& rStream, TokenizeMode eMode, std::vector< s
{
char ch;
rStream.ReadChar(ch);
- if (rStream.IsEof())
+ if (rStream.eof())
break;
switch (ch)
@@ -1286,13 +1286,13 @@ OString PDFDocument::ReadKeyword(SvStream& rStream)
OStringBuffer aBuf;
char ch;
rStream.ReadChar(ch);
- if (rStream.IsEof())
+ if (rStream.eof())
return OString();
while (rtl::isAsciiAlpha(static_cast<unsigned char>(ch)))
{
aBuf.append(ch);
rStream.ReadChar(ch);
- if (rStream.IsEof())
+ if (rStream.eof())
return aBuf.toString();
}
rStream.SeekRel(-1);
@@ -1334,7 +1334,7 @@ size_t PDFDocument::FindStartXRef(SvStream& rStream)
}
rStream.SeekRel(itLastValid - aBuf.begin() + aPrefix.getLength());
- if (rStream.IsEof())
+ if (rStream.eof())
{
SAL_WARN("vcl.filter", "PDFDocument::FindStartXRef: unexpected end of stream after startxref");
return 0;
@@ -1702,7 +1702,7 @@ void PDFDocument::SkipWhitespace(SvStream& rStream)
while (true)
{
rStream.ReadChar(ch);
- if (rStream.IsEof())
+ if (rStream.eof())
break;
if (!rtl::isAsciiWhiteSpace(static_cast<unsigned char>(ch)))
@@ -1720,7 +1720,7 @@ void PDFDocument::SkipLineBreaks(SvStream& rStream)
while (true)
{
rStream.ReadChar(ch);
- if (rStream.IsEof())
+ if (rStream.eof())
break;
if (ch != '\n' && ch != '\r')
@@ -1899,7 +1899,7 @@ bool PDFCommentElement::Read(SvStream& rStream)
rStream.ReadChar(ch);
while (true)
{
- if (ch == '\n' || ch == '\r' || rStream.IsEof())
+ if (ch == '\n' || ch == '\r' || rStream.eof())
{
m_aComment = aBuf.makeStringAndClear();
@@ -1924,7 +1924,7 @@ bool PDFNumberElement::Read(SvStream& rStream)
m_nOffset = rStream.Tell();
char ch;
rStream.ReadChar(ch);
- if (rStream.IsEof())
+ if (rStream.eof())
{
return false;
}
@@ -1934,7 +1934,7 @@ bool PDFNumberElement::Read(SvStream& rStream)
rStream.SeekRel(-1);
return false;
}
- while (!rStream.IsEof())
+ while (!rStream.eof())
{
if (!rtl::isAsciiDigit(static_cast<unsigned char>(ch)) && ch != '-'
&& ch != '.')
@@ -1988,7 +1988,7 @@ bool PDFHexStringElement::Read(SvStream& rStream)
rStream.ReadChar(ch);
OStringBuffer aBuf;
- while (!rStream.IsEof())
+ while (!rStream.eof())
{
if (ch == '>')
{
@@ -2022,7 +2022,7 @@ bool PDFLiteralStringElement::Read(SvStream& rStream)
rStream.ReadChar(ch);
OStringBuffer aBuf;
- while (!rStream.IsEof())
+ while (!rStream.eof())
{
if (ch == ')' && nPrevCh != '\\')
{
@@ -2797,7 +2797,7 @@ bool PDFDictionaryElement::Read(SvStream& rStream)
return false;
}
- if (rStream.IsEof())
+ if (rStream.eof())
{
SAL_WARN("vcl.filter", "PDFDictionaryElement::Read: unexpected end of file");
return false;
@@ -2835,7 +2835,7 @@ bool PDFEndDictionaryElement::Read(SvStream& rStream)
return false;
}
- if (rStream.IsEof())
+ if (rStream.eof())
{
SAL_WARN("vcl.filter", "PDFEndDictionaryElement::Read: unexpected end of file");
return false;
@@ -2866,7 +2866,7 @@ bool PDFNameElement::Read(SvStream& rStream)
}
m_nLocation = rStream.Tell();
- if (rStream.IsEof())
+ if (rStream.eof())
{
SAL_WARN("vcl.filter", "PDFNameElement::Read: unexpected end of file");
return false;
@@ -2875,7 +2875,7 @@ bool PDFNameElement::Read(SvStream& rStream)
// Read till the first white-space.
OStringBuffer aBuf;
rStream.ReadChar(ch);
- while (!rStream.IsEof())
+ while (!rStream.eof())
{
if (rtl::isAsciiWhiteSpace(static_cast<unsigned char>(ch)) || ch == '/'
|| ch == '[' || ch == ']' || ch == '<' || ch == '>' || ch == '(')
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index ca9df62fdc36..a9c24b8c4843 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -2703,7 +2703,7 @@ SvStream& ReadGDIMetaFile( SvStream& rIStm, GDIMetaFile& rGDIMetaFile )
ImplMetaReadData aReadData;
aReadData.meActualCharSet = rIStm.GetStreamCharSet();
- for( sal_uInt32 nAction = 0; ( nAction < nCount ) && !rIStm.IsEof(); nAction++ )
+ for( sal_uInt32 nAction = 0; ( nAction < nCount ) && !rIStm.eof(); nAction++ )
{
MetaAction* pAction = MetaAction::ReadMetaAction( rIStm, &aReadData );
if( pAction )
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 485a38b378e7..5ee08a2f21c7 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1444,7 +1444,7 @@ void ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic )
// reading which will create VDevs and other stuff, just to
// read nothing. CAUTION: Eof is only true AFTER reading another
// byte, a speciality of SvMemoryStream (!)
- if (rIStm.GetError() || rIStm.IsEof())
+ if (rIStm.GetError() || rIStm.eof())
return;
if (NATIVE_FORMAT_50 == nTmp)
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index 619a12aaa0cd..ff34bd129eb6 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -263,7 +263,7 @@ bool PNGReaderImpl::ReadNextChunk()
// get the next chunk from the stream
// unless we are at the end of the PNG stream
- if( mrPNGStream.IsEof() || (mrPNGStream.GetError() != ERRCODE_NONE) )
+ if( mrPNGStream.eof() || (mrPNGStream.GetError() != ERRCODE_NONE) )
return false;
if( !maChunkSeq.empty() && (maChunkSeq.back().nType == PNGCHUNK_IEND) )
return false;
@@ -289,7 +289,7 @@ bool PNGReaderImpl::ReadNextChunk()
sal_uInt32 nCRC32 = rtl_crc32( 0, &nChunkType, 4 );
// read the chunk data and check the CRC
- if( mnChunkLen && !mrPNGStream.IsEof() )
+ if( mnChunkLen && !mrPNGStream.eof() )
{
rChunkData.aData.resize( mnChunkLen );
diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx
index 2e54cd89194e..e14029548202 100644
--- a/vcl/source/gdi/regionband.cxx
+++ b/vcl/source/gdi/regionband.cxx
@@ -255,7 +255,7 @@ void RegionBand::load(SvStream& rIStrm)
}
}
- if( rIStrm.IsEof() )
+ if( rIStrm.eof() )
{
OSL_ENSURE(false, "premature end of region stream" );
implReset();
diff --git a/vcl/unx/generic/print/common_gfx.cxx b/vcl/unx/generic/print/common_gfx.cxx
index 2dcea675dcf1..40894081cbd1 100644
--- a/vcl/unx/generic/print/common_gfx.cxx
+++ b/vcl/unx/generic/print/common_gfx.cxx
@@ -1067,7 +1067,7 @@ PrinterGfx::DrawEPS( const tools::Rectangle& rBoundingBox, void* pPtr, sal_uInt3
OString aDocTitle;
double fLeft = 0, fRight = 0, fTop = 0, fBottom = 0;
bool bEndComments = false;
- while( ! aStream.IsEof()
+ while( ! aStream.eof()
&& ( ( fLeft == 0 && fRight == 0 && fTop == 0 && fBottom == 0 ) ||
( aDocTitle.isEmpty() && !bEndComments ) )
)
diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx
index 3091063c9a98..b5a6b113f9d6 100644
--- a/vcl/unx/generic/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
@@ -211,7 +211,7 @@ bool JobData::constructFromStreamBuffer( const void* pData, sal_uInt32 bytes, Jo
const char pslevelEquals[] = "pslevel=";
const char pdfdeviceEquals[] = "pdfdevice=";
- while( ! aStream.IsEof() )
+ while( ! aStream.eof() )
{
aStream.ReadLine( aLine );
if (aLine.startsWith("JobData"))
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index a2d8f45c8c42..b81359c8fea5 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -269,7 +269,7 @@ public:
~PPDDecompressStream();
bool IsOpen() const;
- bool IsEof() const;
+ bool eof() const;
OString ReadLine();
void Open( const OUString& i_rFile );
void Close();
@@ -345,9 +345,9 @@ bool PPDDecompressStream::IsOpen() const
return (mpMemStream || (mpFileStream && mpFileStream->IsOpen()));
}
-bool PPDDecompressStream::IsEof() const
+bool PPDDecompressStream::eof() const
{
- return ( mpMemStream ? mpMemStream->IsEof() : ( mpFileStream == nullptr || mpFileStream->IsEof() ) );
+ return ( mpMemStream ? mpMemStream->eof() : ( mpFileStream == nullptr || mpFileStream->eof() ) );
}
OString PPDDecompressStream::ReadLine()
@@ -726,7 +726,7 @@ PPDParser::PPDParser( const OUString& rFile ) :
if( aStream.IsOpen() )
{
bool bLanguageEncoding = false;
- while( ! aStream.IsEof() )
+ while( ! aStream.eof() )
{
OString aCurLine = aStream.ReadLine();
if( aCurLine.startsWith("*") )
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index e88f85afd17e..9f53f85f0a07 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1126,7 +1126,7 @@ RTFError RTFDocumentImpl::resolveChars(char ch)
bool bUnicodeChecked = false;
bool bSkipped = false;
- while (!Strm().IsEof()
+ while (!Strm().eof()
&& (m_aStates.top().nInternalState == RTFInternalState::HEX
|| (ch != '{' && ch != '}' && ch != '\\')))
{
@@ -1179,7 +1179,7 @@ RTFError RTFDocumentImpl::resolveChars(char ch)
Strm().ReadChar(ch);
}
- if (m_aStates.top().nInternalState != RTFInternalState::HEX && !Strm().IsEof())
+ if (m_aStates.top().nInternalState != RTFInternalState::HEX && !Strm().eof())
Strm().SeekRel(-1);
if (m_aStates.top().nInternalState == RTFInternalState::HEX
diff --git a/writerfilter/source/rtftok/rtflookahead.cxx b/writerfilter/source/rtftok/rtflookahead.cxx
index 2861f362e0a3..e99919b8feb4 100644
--- a/writerfilter/source/rtftok/rtflookahead.cxx
+++ b/writerfilter/source/rtftok/rtflookahead.cxx
@@ -53,9 +53,9 @@ RTFError RTFLookahead::dispatchValue(RTFKeyword /*nKeyword*/, int /*nParam*/)
RTFError RTFLookahead::resolveChars(char ch)
{
- while (!m_rStream.IsEof() && (ch != '{' && ch != '}' && ch != '\\'))
+ while (!m_rStream.eof() && (ch != '{' && ch != '}' && ch != '\\'))
m_rStream.ReadChar(ch);
- if (!m_rStream.IsEof())
+ if (!m_rStream.eof())
m_rStream.SeekRel(-1);
return RTFError::OK;
}
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx
index 31ab72129694..b2acac10b2db 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -79,7 +79,7 @@ RTFError RTFTokenizer::resolveParse()
m_xStatusIndicator->setValue(nLastPos = nCurrentPos);
}
- while ((Strm().ReadChar(ch), !Strm().IsEof()))
+ while ((Strm().ReadChar(ch), !Strm().eof()))
{
//SAL_INFO("writerfilter", OSL_THIS_FUNC << ": parsing character '" << ch << "'");
@@ -198,7 +198,7 @@ RTFError RTFTokenizer::resolveKeyword()
int nParam = 0;
Strm().ReadChar(ch);
- if (Strm().IsEof())
+ if (Strm().eof())
return RTFError::UNEXPECTED_EOF;
if (!rtl::isAsciiAlpha(static_cast<unsigned char>(ch)))
@@ -213,7 +213,7 @@ RTFError RTFTokenizer::resolveKeyword()
{
aBuf.append(ch);
Strm().ReadChar(ch);
- if (Strm().IsEof())
+ if (Strm().eof())
{
ch = ' ';
break;
@@ -229,7 +229,7 @@ RTFError RTFTokenizer::resolveKeyword()
// in case we'll have a parameter, that will be negative
bNeg = true;
Strm().ReadChar(ch);
- if (Strm().IsEof())
+ if (Strm().eof())
return RTFError::UNEXPECTED_EOF;
}
if (rtl::isAsciiDigit(static_cast<unsigned char>(ch)))
@@ -242,7 +242,7 @@ RTFError RTFTokenizer::resolveKeyword()
{
aParameter.append(ch);
Strm().ReadChar(ch);
- if (Strm().IsEof())
+ if (Strm().eof())
{
ch = ' ';
break;
diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx b/writerperfect/qa/unit/EPUBExportTest.cxx
index e9f1ee8743df..74edf831b84b 100644
--- a/writerperfect/qa/unit/EPUBExportTest.cxx
+++ b/writerperfect/qa/unit/EPUBExportTest.cxx
@@ -168,7 +168,7 @@ void EPUBExportTest::parseCssExport(const OUString &rName, std::map< OString, st
// Minimal CSS handler till orcus is up to our needs.
OString aLine;
OString aRuleName;
- while (!pStream->IsEof())
+ while (!pStream->eof())
{
pStream->ReadLine(aLine);
if (aLine.endsWith("{"))
More information about the Libreoffice-commits
mailing list