[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - writerfilter/source

[Miklos Vajna]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 57c986a5e680ca3b3b7d9446418ed70869b0d797
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Nov 22 16:34:18 2013 +0100

    cp#1000016 DOCX/RTF import: fix RemoveLastParagraph() on Windows
    
    (cherry picked from commit a56bfe734a7bed40a175e0eeb7e86e7006a83f83)
    
    Conflicts:
    	sw/qa/extras/rtfimport/rtfimport.cxx
    	writerfilter/source/dmapper/DomainMapper_Impl.cxx
    
    Change-Id: I3f9d69ddbb2144c60a724e4242128b65ae167455

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 8e053fb..f633101 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -313,7 +313,11 @@ void DomainMapper_Impl::RemoveLastParagraph( )
             xCursor->goLeft( 1, true );
             // If this is a text on a shape, possibly the text has the trailing
             // newline removed already.
+#if defined(UNX)
             if (xCursor->getString() == "\n")
+#else
+            if (xCursor->getString() == "\r\n")
+#endif
                 xCursor->setString(OUString());
         }
     }