diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-11-22 16:34:18 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2013-11-24 16:42:39 +0100 |
| commit | aac5c47f45bed2c8a6376280f9b5248233336500 (patch) | |
| tree | bddd41b0318bc870e6d3cf515a775ed96383529d | |
| parent | 1f38670b11f7d49505603852f6e259cfc2b7710e (diff) | |
cp#1000016 DOCX/RTF import: fix RemoveLastParagraph() on Windows
(cherry picked from commit a56bfe734a7bed40a175e0eeb7e86e7006a83f83)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx
Change-Id: I3f9d69ddbb2144c60a724e4242128b65ae167455
Signed-off-by: Andras Timar <andras.timar@collabora.com>
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 45cc5fe10a0c..ded106d238e5 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()); } } |