[REVIEW:3-5] fdo#48356 fix RTF import of special unicode characters

Hi,

See
http://cgit.freedesktop.org/libreoffice/core/commit/?id=69259c6

Regression from 3.4; backported patch attached.

Thanks,

Miklos

From 29f455fc582a609b00a8c8143dd6a420913ebe83 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@suse.cz>
Date: Fri, 20 Apr 2012 12:42:23 +0200
Subject: [PATCH] fdo#48356 fix RTF import of special unicode characters

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