From 970eaaf1bdade63fd651db591c683e36e662f8f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20N=C3=A9meth?= Date: Tue, 10 Jul 2018 13:03:58 +0200 Subject: [PATCH] tdf#118533 fix shape import: zero top margin only in first paragraph MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 0307a62790b33ee0c02c2323a8f759e53e2035a4 fixed the top margin import of the paragraphs of document sections, and import of first paragraph of the text frames with beforeAutospacing, but nullified all other paragraph top margins in frames. Note: there is no visible margin difference in the unit test (extended by this commit) before and after the fix, because the first paragraph uses also afterAutospacing, resulting still 14pt paragraph space. But the tested beforeAutospacing value of the next paragraph checks the fix correctly. Change-Id: I0ab3b8bbff33c5488f4b4af1ea4dabf7105103f2 Reviewed-on: https://gerrit.libreoffice.org/57231 Reviewed-by: László Németh Tested-by: László Németh --- sw/qa/extras/ooxmlexport/data/tdf104354.docx | Bin 9412 -> 10182 bytes sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 3 +++ writerfilter/source/dmapper/DomainMapper.cxx | 5 +++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sw/qa/extras/ooxmlexport/data/tdf104354.docx b/sw/qa/extras/ooxmlexport/data/tdf104354.docx index 8645743f1fc1ce43d84373b86ce60d432fbdd46c..d8655f4e0874b1b1ff455aa143b6d29300973017 100644 GIT binary patch delta 7562 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 Ns{P3q#}v;-{tp6;7^DCI delta 6718 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 CpI%e| diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx index e6ac19f3df91..1b979bb79cb0 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx @@ -310,6 +310,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf104354, "tdf104354.docx") // margin for the first paragraph in a text frame. CPPUNIT_ASSERT_EQUAL(static_cast(0), getProperty(xShape->getStart(), "ParaTopMargin")); + // still 494 in the second paragraph + CPPUNIT_ASSERT_EQUAL(static_cast(494), + getProperty(xShape->getEnd(), "ParaTopMargin")); } DECLARE_OOXMLEXPORT_TEST(testTdf107035, "tdf107035.docx") diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index ce3508f4a90c..d3719e745b13 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -654,8 +654,9 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) default_spacing = 49; else { - // tdf#104354 fist paragraph has got zero top margin - if (m_pImpl->GetIsFirstParagraphInSection()) + // tdf#104354, tdf#118533 first paragraph of sections and shapes got zero top margin + if ((m_pImpl->GetIsFirstParagraphInSection() && !m_pImpl->IsInShape()) || + m_pImpl->GetIsFirstParagraphInShape()) default_spacing = 0; else default_spacing = 280;