[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source

[Andras Timar]

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 299387dab1b365427cc44d810026facd30e11a31
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Fri Apr 20 12:42:23 2012 +0200

    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 at suse.com>

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)
             {