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 /writerfilter | |
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 'writerfilter')
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtflookahead.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtftokenizer.cxx | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index e88f85afd17e..9f53f85f0a07 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -1126,7 +1126,7 @@ RTFError RTFDocumentImpl::resolveChars(char ch) bool bUnicodeChecked = false; bool bSkipped = false; - while (!Strm().IsEof() + while (!Strm().eof() && (m_aStates.top().nInternalState == RTFInternalState::HEX || (ch != '{' && ch != '}' && ch != '\\'))) { @@ -1179,7 +1179,7 @@ RTFError RTFDocumentImpl::resolveChars(char ch) Strm().ReadChar(ch); } - if (m_aStates.top().nInternalState != RTFInternalState::HEX && !Strm().IsEof()) + if (m_aStates.top().nInternalState != RTFInternalState::HEX && !Strm().eof()) Strm().SeekRel(-1); if (m_aStates.top().nInternalState == RTFInternalState::HEX diff --git a/writerfilter/source/rtftok/rtflookahead.cxx b/writerfilter/source/rtftok/rtflookahead.cxx index 2861f362e0a3..e99919b8feb4 100644 --- a/writerfilter/source/rtftok/rtflookahead.cxx +++ b/writerfilter/source/rtftok/rtflookahead.cxx @@ -53,9 +53,9 @@ RTFError RTFLookahead::dispatchValue(RTFKeyword /*nKeyword*/, int /*nParam*/) RTFError RTFLookahead::resolveChars(char ch) { - while (!m_rStream.IsEof() && (ch != '{' && ch != '}' && ch != '\\')) + while (!m_rStream.eof() && (ch != '{' && ch != '}' && ch != '\\')) m_rStream.ReadChar(ch); - if (!m_rStream.IsEof()) + if (!m_rStream.eof()) m_rStream.SeekRel(-1); return RTFError::OK; } diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx index 31ab72129694..b2acac10b2db 100644 --- a/writerfilter/source/rtftok/rtftokenizer.cxx +++ b/writerfilter/source/rtftok/rtftokenizer.cxx @@ -79,7 +79,7 @@ RTFError RTFTokenizer::resolveParse() m_xStatusIndicator->setValue(nLastPos = nCurrentPos); } - while ((Strm().ReadChar(ch), !Strm().IsEof())) + while ((Strm().ReadChar(ch), !Strm().eof())) { //SAL_INFO("writerfilter", OSL_THIS_FUNC << ": parsing character '" << ch << "'"); @@ -198,7 +198,7 @@ RTFError RTFTokenizer::resolveKeyword() int nParam = 0; Strm().ReadChar(ch); - if (Strm().IsEof()) + if (Strm().eof()) return RTFError::UNEXPECTED_EOF; if (!rtl::isAsciiAlpha(static_cast<unsigned char>(ch))) @@ -213,7 +213,7 @@ RTFError RTFTokenizer::resolveKeyword() { aBuf.append(ch); Strm().ReadChar(ch); - if (Strm().IsEof()) + if (Strm().eof()) { ch = ' '; break; @@ -229,7 +229,7 @@ RTFError RTFTokenizer::resolveKeyword() // in case we'll have a parameter, that will be negative bNeg = true; Strm().ReadChar(ch); - if (Strm().IsEof()) + if (Strm().eof()) return RTFError::UNEXPECTED_EOF; } if (rtl::isAsciiDigit(static_cast<unsigned char>(ch))) @@ -242,7 +242,7 @@ RTFError RTFTokenizer::resolveKeyword() { aParameter.append(ch); Strm().ReadChar(ch); - if (Strm().IsEof()) + if (Strm().eof()) { ch = ' '; break; |