diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-04-13 20:04:27 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-04-14 18:54:14 +0200 |
| commit | 3d64587c53eea47674d51e84622a167db1635909 (patch) | |
| tree | e0e93ad13857417238563f999b802f4005f85c74 /sw/qa/extras/ooxmlimport | |
| parent | b9b3c4abb5172503723e6189f994dddf71c62933 (diff) | |
sw: layout dump: sorted_objs of SwPageFrame
Change-Id: I2bf8493744d054c513ab9b65136b6e29e9aa07f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114065
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'sw/qa/extras/ooxmlimport')
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 2 | ||||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport2.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 59a2688232c8..fe15ef8d94de 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1444,7 +1444,7 @@ DECLARE_OOXMLIMPORT_TEST(testTdf122717, "tdf122717.docx") DECLARE_OOXMLIMPORT_TEST(testTdf98882, "tdf98882.docx") { - sal_Int32 nFlyHeight = parseDump("//fly/infos/bounds", "height").toInt32(); + sal_Int32 nFlyHeight = parseDump("//anchored/fly/infos/bounds", "height").toInt32(); sal_Int32 nContentHeight = parseDump("//notxt/infos/bounds", "height").toInt32(); // The content height was 600, not 360, so the frame and the content height did not match. CPPUNIT_ASSERT_EQUAL(nFlyHeight, nContentHeight); diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx index fcfaccafb774..ed3b0cd153dc 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx @@ -128,7 +128,7 @@ DECLARE_OOXMLIMPORT_TEST(testTdf114212, "tdf114212.docx") // Without the accompanying fix in place, this test would have failed with: // - Expected: 1427 // - Actual : 387 - OUString aTop = parseDump("//fly[1]/infos/bounds", "top"); + OUString aTop = parseDump("//anchored/fly[1]/infos/bounds", "top"); CPPUNIT_ASSERT_EQUAL(OUString("1427"), aTop); } @@ -446,7 +446,7 @@ DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx") getShape(1)->getSize().Width, getShape(1)->getSize().Height); CPPUNIT_ASSERT_MESSAGE("The textframe must be off-page!", !aPageRect.IsInside(aShapeRect)); - //OUString aTop = parseDump("//fly[1]/infos/bounds", "top"); + //OUString aTop = parseDump("//anchored/fly[1]/infos/bounds", "top"); //CPPUNIT_ASSERT_EQUAL(sal_Int32(30624), aTop.toInt32() ); } |