[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - writerfilter/source

[Miklos Vajna]

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 285c71000aece675f982e8c637f202e606522daf
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Sun Feb 3 14:37:38 2013 +0100

    fdo#59419 fix RTF import of hex form of \r and \n
    
    (cherry picked from commits a5e885df24eb11c028a94ac709966b3ce2976db9 and
    927de8786850936bb42c5595c41a4353c076fdea)
    
    Conflicts:
    	sw/qa/extras/rtfimport/rtfimport.cxx
    
    Change-Id: Ic700cdc67f756cafc454c326b73f680a8a47a6e8
    Reviewed-on: https://gerrit.libreoffice.org/1974
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index c961c7d..37d0376 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -944,6 +944,14 @@ void RTFDocumentImpl::singleChar(sal_uInt8 nValue, bool bRunProps)
 
 void RTFDocumentImpl::text(OUString& rString)
 {
+    if (rString.getLength() == 1 && m_aStates.top().nDestinationState != DESTINATION_DOCCOMM)
+    {
+        // No cheating! Tokenizer ignores bare \r and \n, their hex \'0d / \'0a form doesn't count, either.
+        sal_Unicode ch = rString.getStr()[0];
+        if (ch == 0x0d || ch == 0x0a)
+            return;
+    }
+
     bool bRet = true;
     switch (m_aStates.top().nDestinationState)
     {