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 /svtools | |
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 'svtools')
-rw-r--r-- | svtools/source/svhtml/parhtml.cxx | 24 | ||||
-rw-r--r-- | svtools/source/svrtf/svparser.cxx | 18 |
2 files changed, 21 insertions, 21 deletions
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; |