diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-06-05 09:43:49 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-06-05 17:23:19 +0200 |
| commit | eb65a8c54f56abc8ba66f9cbc779cd20e4740933 (patch) | |
| tree | 86ca2b4a7e66a40f0b6dc4bebcbc16289b5cd69d | |
| parent | 99add140a5e415e392ab909293609dcfd318fd9c (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)
Change-Id: Id894604ed9b2c19400eeabbd2966f104d8b34aab
Reviewed-on: https://gerrit.libreoffice.org/55335
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/tdf117843.docx | bin | 0 -> 26926 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport2.cxx | 12 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 |
3 files changed, 15 insertions, 1 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/tdf117843.docx b/sw/qa/extras/ooxmlimport/data/tdf117843.docx Binary files differnew file mode 100644 index 000000000000..501e85bfef96 --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/tdf117843.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx index eb3b42a31387..3de2c9bcb097 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx @@ -151,6 +151,18 @@ DECLARE_OOXMLIMPORT_TEST(testTdf111550, "tdf111550.docx") getCell(innerTable, "A1", "[outer:A2]\n[inner:A1]"); } +DECLARE_OOXMLIMPORT_TEST(testTdf117843, "tdf117843.docx") +{ + uno::Reference<container::XNameAccess> xPageStyles = getStyles("PageStyles"); + uno::Reference<style::XStyle> xPageStyle(xPageStyles->getByName("Standard"), uno::UNO_QUERY); + uno::Reference<text::XText> xHeaderText + = getProperty<uno::Reference<text::XText>>(xPageStyle, "HeaderText"); + // This was 4025, increased top paragraph margin was unexpected. + CPPUNIT_ASSERT_EQUAL( + static_cast<sal_Int32>(0), + getProperty<sal_Int32>(getParagraphOfText(1, xHeaderText), "ParaTopMargin")); +} + DECLARE_OOXMLIMPORT_TEST(testTdf43017, "tdf43017.docx") { uno::Reference<text::XTextRange> xParagraph = getParagraph(1); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index f84f37536f93..6521a08d0445 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1349,9 +1349,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; |