writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit bfb93ffc6d72d22a833acf9d8c9d166153dad7c0 Author: Urmas <[email protected]> Date: Mon May 27 09:49:55 2013 +0200 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 diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index a5e3f75..fcd0ef5 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)) { _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
