diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-10-17 09:04:33 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-10-18 22:10:06 +0200 |
| commit | 366beabc786c004fc7ff1b2bb2f606b0ee257a95 (patch) | |
| tree | 656065b83156312eea817c37f7248254ab490b2c /writerfilter | |
| parent | b84cd7fb7610b0ad2c74c5a672bccc77b91a82f5 (diff) | |
tdf#104079 RTF import: fix handling fields inside TOC fields
The marker trick is not needed for these, but the paragraph margins are
lost when using it, so avoid it.
(cherry picked from commit 6ee33d0772f991f04e97b5b61d7b11810a1b8ac0)
Conflicts:
writerfilter/source/dmapper/DomainMapper_Impl.cxx
Change-Id: I3fc9644cb85138b5473cb1478196ae8538041fb1
Reviewed-on: https://gerrit.libreoffice.org/43501
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
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 525576fe9a77..2e32b7eb7f4b 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1191,10 +1191,11 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap ) else { uno::Reference<text::XTextCursor> xCursor; - if (m_bParaHadField && !m_bIsInComments) + if (m_bParaHadField && !m_bIsInComments && !xTOCMarkerCursor.is()) { // Workaround to make sure char props of the field are not lost. // Not relevant for editeng-based comments. + // Nor revelent for fields inside a TOC field. OUString sMarker("X"); xCursor = xTextAppend->getText()->createTextCursor(); if (xCursor.is()) |