summaryrefslogtreecommitdiff
path: root/sw/qa/extras
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2022-09-22 16:05:44 +0100
committerCaolán McNamara <caolanm@redhat.com>2022-09-22 20:41:57 +0200
commit40a428fde0a33e7127dfa30845d65c698e408053 (patch)
treef23af1bce5b3f9a38787777722ffd88eab24d75e /sw/qa/extras
parent10d1e6ff6b3a10b673696524ad59297f4e5a1c2c (diff)
Related: tdf#151107 make "sloppy" paper fit up to 1.25pt
This reverts commit 0b6d45056ab6e1c47b4ed62eedaad02249439444. Change-Id: Ifbc0e286be4ab3dffd0d66228fd1abe2dfc0fde0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140445 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/qa/extras')
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport15.cxx4
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport3.cxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index 0878ce515e2e..d7c0c5404677 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -676,9 +676,9 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf132149_pgBreak)
assertXPath(pDump, "//page[2]/infos/prtBounds", "left", "2268"); //Left page style
assertXPath(pDump, "//page[1]/infos/bounds", "width", "8391"); //landscape
- assertXPath(pDump, "//page[2]/infos/bounds", "width", "5953"); //portrait
+ assertXPath(pDump, "//page[2]/infos/bounds", "width", "5940"); //portrait
// This two-line 3rd page ought not to exist. DID YOU FIX ME? The real page 3 should be "8391" landscape.
- assertXPath(pDump, "//page[3]/infos/bounds", "width", "5953");
+ assertXPath(pDump, "//page[3]/infos/bounds", "width", "5940");
// This really ought to be on odd page 3, but now it is on odd page 5.
assertXPath(pDump, "//page[5]/infos/bounds", "width", "8391");
assertXPath(pDump, "//page[5]/infos/prtBounds", "right", "6122"); //Left page style
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index b6d4af1fe739..f15b2c1f3ca9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -322,7 +322,7 @@ DECLARE_OOXMLEXPORT_TEST(testCalendar3, "calendar3.docx")
// Both Word and LO display it as landscape, so ensure that it round-trips with landscape dimensions.
uno::Reference<beans::XPropertySet> xPageStyle(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Page Width (mm) ", sal_Int32(148), getProperty<sal_Int32>(xPageStyle, "Width") / 100);
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Page Height (mm)", sal_Int32(105), getProperty<sal_Int32>(xPageStyle, "Height") / 100);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Page Height (mm)", sal_Int32(104), getProperty<sal_Int32>(xPageStyle, "Height") / 100);
}
DECLARE_OOXMLEXPORT_TEST(testCalendar4, "calendar4.docx")