[PATCH] fdo#48356 fix RTF import of special unicode characters

[Miklos Vajna]

The \'0d string should not be an exception when ignoring characters
after the \u control word.
---
 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 9633176..016943d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -784,7 +784,7 @@ int RTFDocumentImpl::resolveChars(char ch)
     bool bSkipped = false;
     while(!Strm().IsEof() && ch != '{' && ch != '}' && ch != '\\')
     {
-        if (ch != 0x0d && ch != 0x0a)
+        if (m_aStates.top().nInternalState == INTERNAL_HEX || (ch != 0x0d && ch != 0x0a))
         {
             if (m_aStates.top().nCharsToSkip == 0)
             {
-- 
1.7.7


--k1lZvvs/B4yU6o8G--