diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-04-20 12:42:23 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-04-23 07:12:02 +0200 |
| commit | 8b8d2680ca96254c606c4be023b3f0e8caacae9b (patch) | |
| tree | e44c615f7f0766276f8a908179169ebefafb47ca | |
| parent | 51648779ccf76bc7c6b6ff1ed4cd32eb75af9a5a (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>
Signed-off-by: Caolán McNamara <caolanm@redhat.com>
Signed-off-by: David Tardon <dtardon@redhat.com>
| -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 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) { |