diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-19 09:27:19 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2016-02-15 08:03:54 +0100 |
commit | f0afa3037c82482db605406b9384ec1b511ae1a3 (patch) | |
tree | 0960a03925ebae60d68299d807e75783c349c913 /writerfilter | |
parent | 5e05953487a9e0804f728c1a3a87b6c07cd59e7e (diff) |
tdf#85523 DOCX import: fix unexpected extra char at comment end
Change-Id: Ic3eb073d11a395a81b90fd1a9292d6ecf2940c09
(cherry picked from commit 39969defa29948d77565a7cd8a3471baaec8f35d)
Reviewed-on: https://gerrit.libreoffice.org/22306
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 10a142356a4cdb487da10d83857e4b50a0452a5b)
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 363d300fca2a..02a965a682d1 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1139,9 +1139,10 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap ) else { uno::Reference<text::XTextCursor> xCursor; - if (m_bParaHadField) + if (m_bParaHadField && !m_bIsInComments) { // Workaround to make sure char props of the field are not lost. + // Not relevant for editeng-based comments. OUString sMarker("X"); xCursor = xTextAppend->getText()->createTextCursor(); if (xCursor.is()) |