diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2013-05-28 16:11:38 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-05-30 16:51:54 +0200 |
commit | a481759a903e077bc09a7160ff658f5afa9379c8 (patch) | |
tree | 31dfe85fc6f615cd6531e5cb7f9f16b1eb05770c | |
parent | b532f43821d83134e413186d385060a75d851cf7 (diff) |
bnc#817956 DOCX import: missing last character of shape text
Make sure writerfilter only removes the last character of the text if
it's a newline.
Change-Id: I96980e2d148ced93363b3147545afdd0dd070e5d
(cherry picked from commit 4eaabc45f76aefe82558b283975ab9df3aea7fce)
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 827b72a4ed81..ccabf6b5bcad 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -321,7 +321,10 @@ void DomainMapper_Impl::RemoveLastParagraph( ) else { xCursor->goLeft( 1, true ); - xCursor->setString(OUString()); + // If this is a text on a shape, possibly the text has the trailing + // newline removed already. + if (xCursor->getString() == "\n") + xCursor->setString(OUString()); } } catch( const uno::Exception& rEx) |