diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-06-05 09:43:49 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-06-27 06:42:44 +0200 |
| commit | 409f204caeb398847dba75ec3680b53602d25dfc (patch) | |
| tree | 6ff1dace0ef02d8fcede20a926385dcd0a1c769d /writerfilter | |
| parent | 4ffc53ee9aac5c5db31ef959c13ddaa00a2c3a5d (diff) | |
tdf#117843 DOCX import: disable compat increased spacing in header/footer
It's only relevant for the body text.
(cherry picked from commit 09a37fe50f36ced755bc326fb6b4c1b6fdf61f86)
Reviewed-on: https://gerrit.libreoffice.org/55335
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit eb65a8c54f56abc8ba66f9cbc779cd20e4740933)
Change-Id: Id894604ed9b2c19400eeabbd2966f104d8b34aab
Reviewed-on: https://gerrit.libreoffice.org/56053
Tested-by: Jenkins
Reviewed-by: Aron Budea <aron.budea@collabora.com>
(cherry picked from commit 6dcf475d5cda984ce0d1035e36267cedc3019e50)
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index b5ec69a98304..f65d2166cc01 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1258,9 +1258,11 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap ) xTextRange = xTextAppend->finishParagraph( comphelper::containerToSequence(aProperties) ); m_xPreviousParagraph.set(xTextRange, uno::UNO_QUERY); - if (!rAppendContext.m_aAnchoredObjects.empty()) + if (!rAppendContext.m_aAnchoredObjects.empty() && !IsInHeaderFooter()) { // Remember what objects are anchored to this paragraph. + // That list is only used for Word compat purposes, and + // it is only relevant for body text. AnchoredObjectInfo aInfo; aInfo.m_xParagraph = xTextRange; aInfo.m_aAnchoredObjects = rAppendContext.m_aAnchoredObjects; |