summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Behrens <thorsten.behrens@allotropia.de>2024-10-30 11:48:23 +0100
committerThorsten Behrens <thorsten.behrens@allotropia.de>2024-10-31 11:47:57 +0100
commit5744ed30df088798e2d4dfb80c82d24a943d8672 (patch)
tree716a5093d0b069d6bdda7737918697f2e78c38e1
parentedc22ef4bee089104a2419386d3c609083370363 (diff)
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 <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport12.cxx8
-rw-r--r--sw/qa/extras/rtfexport/rtfexport5.cxx6
2 files changed, 14 insertions, 0 deletions
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();