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 /sc | |
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 'sc')
-rw-r--r-- | sc/source/filter/dif/difimp.cxx | 4 | ||||
-rw-r--r-- | sc/source/filter/lotus/lotread.cxx | 4 | ||||
-rw-r--r-- | sc/source/filter/qpro/qpro.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/dbgui/scuiasciiopt.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/docshell/impex.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/unoobj/scdetect.cxx | 2 |
6 files changed, 14 insertions, 14 deletions
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; |