diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-10-17 09:04:33 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-10-17 11:33:49 +0200 |
| commit | 6ee33d0772f991f04e97b5b61d7b11810a1b8ac0 (patch) | |
| tree | 2c919e716dec28d0a9e54ca61047861241deb086 /writerfilter | |
| parent | 899a656870f916e97944f2d74977177cb1032f33 (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.
Change-Id: I3fc9644cb85138b5473cb1478196ae8538041fb1
Reviewed-on: https://gerrit.libreoffice.org/43446
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
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 3ae08a1f56cf..545a003bb3e3 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1182,10 +1182,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 const sMarker("X"); xCursor = xTextAppend->getText()->createTextCursor(); if (xCursor.is()) |