diff options
| author | László Németh <nemeth@numbertext.org> | 2018-08-01 16:44:00 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2018-08-01 20:58:40 +0200 |
| commit | 58e266ae808dbf3e157b38eb2c8f24774131e0f8 (patch) | |
| tree | f3ac0a01c34bf3be103179883ce96d2ce0c9c028 /sw | |
| parent | 45f4d02dd0129d20accc62b889d4e36968ee27b0 (diff) | |
tdf#118949 don't set zero auto top margin in every first paragraph
of sections, only in table cells.
Partially revert of the commit 0307a62790b33ee0c02c2323a8f759e53e2035a4.
Change-Id: I1daf1bc49ce1acf42a55857c1b6b92c7cbcb8e00
Reviewed-on: https://gerrit.libreoffice.org/58431
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 3 | ||||
| -rw-r--r-- | sw/qa/extras/rtfexport/rtfexport.cxx | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx index b3551e52ae89..fca3263616b9 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx @@ -1225,7 +1225,8 @@ DECLARE_OOXMLEXPORT_TEST(testTdf104354_2, "tdf104354-2.docx") // bottom margin is not auto spacing uno::Reference<text::XTextRange> xCell3(xTable->getCellByName("A3"), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), getProperty<sal_Int32>(getParagraphOfText(1, xCell3->getText()), "ParaTopMargin")); + // FIXME next top margin will be 0 after fixing this, too + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(494), getProperty<sal_Int32>(getParagraphOfText(1, xCell3->getText()), "ParaTopMargin")); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(847), getProperty<sal_Int32>(getParagraphOfText(1, xCell3->getText()), "ParaBottomMargin")); // auto spacing, if the paragraph contains footnotes diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx index 5ebaa354112b..78a2c77a9e80 100644 --- a/sw/qa/extras/rtfexport/rtfexport.cxx +++ b/sw/qa/extras/rtfexport/rtfexport.cxx @@ -982,8 +982,8 @@ DECLARE_RTFEXPORT_TEST(testNumOverrideStart, "num-override-start.rtf") DECLARE_RTFEXPORT_TEST(testFdo82006, "fdo82006.rtf") { // These were 176 (100 twips), as \sbauto and \sbbefore were ignored. - // Exception: first paragraph gets zero top margin, see also tdf#104354. - CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(0)), + // FIXME Exception: first paragraph gets zero top margin, see tdf#118533. + CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(280)), getProperty<sal_Int32>(getParagraph(1), "ParaTopMargin")); CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(280)), getProperty<sal_Int32>(getParagraph(1), "ParaBottomMargin")); @@ -1425,8 +1425,8 @@ DECLARE_RTFEXPORT_TEST(testTdf112507, "tdf112507.rtf") DECLARE_RTFEXPORT_TEST(testTdf107480, "tdf107480.rtf") { // These were 176 (100 twips), as \htmautsp was parsed too late. - // Exception: first paragraph gets zero top margin, see also tdf#104354. - CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(0)), + // FIXME Exception: first paragraph gets zero top margin, see tdf#118533. + CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(280)), getProperty<sal_Int32>(getParagraph(1), "ParaTopMargin")); CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(280)), getProperty<sal_Int32>(getParagraph(1), "ParaBottomMargin")); |