Kaydet (Commit) 2161d046 authored tarafından Caolán McNamara's avatar Caolán McNamara

drop duplicate method

Change-Id: Idadd0a64e41cd02f5167b275081c3576a6224b12
Reviewed-on: https://gerrit.libreoffice.org/45075Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 041e1ba3
......@@ -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++;
......
......@@ -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());
......
......@@ -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
......
......@@ -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;
}
......
......@@ -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 );
}
}
......
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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);
......
......@@ -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);
......
......@@ -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 );
......
......@@ -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;
......
......@@ -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;
......
......@@ -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 );
......
......@@ -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;
......
......@@ -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;
......
......@@ -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 ) )
......
......@@ -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 )
{
......
......@@ -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();
......
......@@ -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 );
......
......@@ -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;
......
......@@ -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..
......
......@@ -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;
......
......@@ -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
{
......
......@@ -225,7 +225,7 @@ ErrCode ScQProReader::import( ScDocument *pDoc )
bool ScQProReader::recordsLeft()
{
return mpStream && !mpStream->IsEof();
return mpStream && !mpStream->eof();
}
bool ScQProReader::nextRecord()
......
......@@ -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
......
......@@ -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();
......
......@@ -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;
......
......@@ -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();
......
......@@ -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();
......
......@@ -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 );
......
......@@ -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 )
{
......
......@@ -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;
......
......@@ -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 += "}";
......
......@@ -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);
......
......@@ -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()) &&