From 2161d04688be77112c281a1ada5263b963677c43 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 22 Nov 2017 09:47:52 +0000 Subject: drop duplicate method MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Idadd0a64e41cd02f5167b275081c3576a6224b12 Reviewed-on: https://gerrit.libreoffice.org/45075 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- vcl/unx/generic/print/common_gfx.cxx | 2 +- vcl/unx/generic/printer/jobdata.cxx | 2 +- vcl/unx/generic/printer/ppdparser.cxx | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'vcl/unx/generic') 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("*") ) -- cgit