From 7df4ebf9a658681d02842b14187722ae8161cd7e Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Tue, 28 Apr 2020 14:42:29 +0200 Subject: tdf#132282: Revert fix for tdf#131554 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 912217285b3058efa54c2336f91fda4efdad6ff0 fixed the root cause of tdf#131554 and 69b83dc2d3014dd9b18402534e15c937dc082464 is no longer needed The unittest still passes Change-Id: I7c723b0c3cc2b56022978bbeb8bf6b3f6f93f1c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93063 Tested-by: Jenkins Reviewed-by: Xisco Faulí Signed-off-by: Xisco Fauli Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93073 Reviewed-by: Thorsten Behrens --- sd/qa/unit/data/pptx/tdf132282.pptx | Bin 0 -> 56323 bytes sd/qa/unit/export-tests-ooxml2.cxx | 14 ++++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 sd/qa/unit/data/pptx/tdf132282.pptx (limited to 'sd') diff --git a/sd/qa/unit/data/pptx/tdf132282.pptx b/sd/qa/unit/data/pptx/tdf132282.pptx new file mode 100644 index 000000000000..cc1d7df4cd8f Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf132282.pptx differ diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index f12ad87e9abc..6bac3cca9584 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -184,6 +184,7 @@ public: void testTdf98603(); void testTdf119087(); void testTdf131554(); + void testTdf132282(); CPPUNIT_TEST_SUITE(SdOOXMLExportTest2); @@ -286,6 +287,7 @@ public: CPPUNIT_TEST(testTdf98603); CPPUNIT_TEST(testTdf119087); CPPUNIT_TEST(testTdf131554); + CPPUNIT_TEST(testTdf132282); CPPUNIT_TEST_SUITE_END(); @@ -2653,6 +2655,18 @@ void SdOOXMLExportTest2::testTdf131554() CPPUNIT_ASSERT_EQUAL(static_cast(13251), xShape->getPosition().Y); } +void SdOOXMLExportTest2::testTdf132282() +{ + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf132282.pptx"), PPTX); + xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); + uno::Reference xShape(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); + // Without the fix in place, the position would be 0,0, height = 1 and width = 1 + CPPUNIT_ASSERT_EQUAL(static_cast(1736), xShape->getPosition().X); + CPPUNIT_ASSERT_EQUAL(static_cast(763), xShape->getPosition().Y); + CPPUNIT_ASSERT_EQUAL(static_cast(30523), xShape->getSize().Width); + CPPUNIT_ASSERT_EQUAL(static_cast(2604), xShape->getSize().Height); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest2); CPPUNIT_PLUGIN_IMPLEMENT(); -- cgit