summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2012-04-20 12:42:23 +0200
committerAndras Timar <atimar@suse.com>2012-04-20 15:43:52 +0200
commit299387dab1b365427cc44d810026facd30e11a31 (patch)
tree29eba056b13741729afa1a74e9dc889ebd64b874
parente435a78af84f04e1ea8907c70447a87841aa1186 (diff)
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. Signed-off-by: Andras Timar <atimar@suse.com>
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 9633176478b5..016943d022fd 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)
{