sw/qa/extras/ooxmlexport/ooxmlexport12.cxx | 8 ++++++++ sw/qa/extras/rtfexport/rtfexport5.cxx | 6 ++++++ 2 files changed, 14 insertions(+)
New commits: commit 5744ed30df088798e2d4dfb80c82d24a943d8672 Author: Thorsten Behrens <[email protected]> AuthorDate: Wed Oct 30 11:48:23 2024 +0100 Commit: Thorsten Behrens <[email protected]> CommitDate: Thu Oct 31 11:47:57 2024 +0100 Revert "Disable tdf#107413 and tdf#77417 tests" This reverts commit b4ae24eada55e408acce250f6e11565f97997b44. Change-Id: Ie3b47645d5f555331be672fef0e474823ddb4db4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175820 Tested-by: Thorsten Behrens <[email protected]> Reviewed-by: Thorsten Behrens <[email protected]> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx index e3ebfb384fb9..f9c84c09a3ed 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx @@ -1873,6 +1873,14 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf88496) // invalidates 1105 again. } +CPPUNIT_TEST_FIXTURE(Test, testTdf77417) +{ + loadAndReload("tdf77417.docx"); + // MSO 2010 compatibility mode: terminating white spaces are ignored in tables. + // This was 3 pages with the first invisible blank page. + CPPUNIT_ASSERT_EQUAL(2, getPages()); +} + CPPUNIT_TEST_FIXTURE(Test, testTdf130494) { loadAndSave("tdf130494.docx"); diff --git a/sw/qa/extras/rtfexport/rtfexport5.cxx b/sw/qa/extras/rtfexport/rtfexport5.cxx index 344a7a267701..27f685b67c3b 100644 --- a/sw/qa/extras/rtfexport/rtfexport5.cxx +++ b/sw/qa/extras/rtfexport/rtfexport5.cxx @@ -674,6 +674,8 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf107413) = getXPath(pDump, "/root/page[1]/footer/infos/bounds"_ostr, "left"_ostr).toDouble(); const double nRightFooter = getXPath(pDump, "/root/page[1]/footer/infos/bounds"_ostr, "right"_ostr).toDouble(); + const double nTopFooter + = getXPath(pDump, "/root/page[1]/footer/infos/bounds"_ostr, "top"_ostr).toDouble(); const double nBottomFooter = getXPath(pDump, "/root/page[1]/footer/infos/bounds"_ostr, "bottom"_ostr).toDouble(); @@ -689,6 +691,9 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf107413) = getXPath(pDump, "/root/page[1]/footer/txt/anchored/fly/infos/bounds"_ostr, "right"_ostr) .toDouble(); + const double nTopFly + = getXPath(pDump, "/root/page[1]/footer/txt/anchored/fly/infos/bounds"_ostr, "top"_ostr) + .toDouble(); const double nBottomFly = getXPath(pDump, "/root/page[1]/footer/txt/anchored/fly/infos/bounds"_ostr, "bottom"_ostr) @@ -697,6 +702,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf107413) CPPUNIT_ASSERT_EQUAL(nLeftFooter, nLeftFly); CPPUNIT_ASSERT_EQUAL(nRightFooter, nRightFly); CPPUNIT_ASSERT_EQUAL(nBottomFooter, nBottomFly); + CPPUNIT_ASSERT_EQUAL(nTopFooter + 1056.0, nTopFly); }; createSwDoc("tdf107413.rtf"); verify();
