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 /basic | |
| 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 'basic')
| -rw-r--r-- | basic/source/basmgr/basmgr.cxx | 2 | ||||
| -rw-r--r-- | basic/source/classes/image.cxx | 2 | ||||
| -rw-r--r-- | basic/source/runtime/iosys.cxx | 2 | ||||
| -rw-r--r-- | basic/source/runtime/methods.cxx | 10 | ||||
| -rw-r--r-- | basic/source/runtime/methods1.cxx | 2 |
5 files changed, 9 insertions, 9 deletions
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; } |