diff options
| author | Urmas <davian818@gmail.com> | 2013-05-27 09:49:55 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-05-27 09:55:10 +0200 |
| commit | bfb93ffc6d72d22a833acf9d8c9d166153dad7c0 (patch) | |
| tree | 7a483a1b49ee483e50e2eb5be2cba0a27e80fcd0 | |
| parent | 6e6b028164176e39219dccbe1b84380b10b6e64f (diff) | |
fdo#64671 Some special RTF characters were not skipped correctly
Some special characters, like { and }, were not skipped when they
occured as a replacement character for \uN keyword.
Change-Id: I19b66a290cd9880924774fa89bb29df280e44a3c
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index a5e3f755cda4..fcd0ef5db2b1 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -887,7 +887,7 @@ int RTFDocumentImpl::resolveChars(char ch) bool bUnicodeChecked = false; bool bSkipped = false; - while(!Strm().IsEof() && ch != '{' && ch != '}' && ch != '\\') + while(!Strm().IsEof() && (m_aStates.top().nInternalState == INTERNAL_HEX || (ch != '{' && ch != '}' && ch != '\\'))) { if (m_aStates.top().nInternalState == INTERNAL_HEX || (ch != 0x0d && ch != 0x0a)) { |