From 0197a2ca1602c3ea13fecabd9de7499971830e21 Mon Sep 17 00:00:00 2001 From: Mark Hung Date: Wed, 18 Jul 2018 00:28:06 +0800 Subject: tdf#118806 sd: specify the motion path origin for pptx. Motion path animation created by Impress always take the position of the shape as the origin, so set origin=layout. Change-Id: I8b4b579f3a2fc282b41a68c4c8d7573d01ad1aa9 Reviewed-on: https://gerrit.libreoffice.org/57583 Tested-by: Jenkins Reviewed-by: Mark Hung --- sd/qa/unit/data/odp/tdf118806.odp | Bin 0 -> 11999 bytes sd/qa/unit/export-tests-ooxml2.cxx | 14 ++++++++++++++ 2 files changed, 14 insertions(+) create mode 100755 sd/qa/unit/data/odp/tdf118806.odp (limited to 'sd/qa') diff --git a/sd/qa/unit/data/odp/tdf118806.odp b/sd/qa/unit/data/odp/tdf118806.odp new file mode 100755 index 000000000000..7120fd968542 Binary files /dev/null and b/sd/qa/unit/data/odp/tdf118806.odp differ diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index b18810b232db..49f43fe0b8ed 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -139,6 +139,7 @@ public: int testTdf115005_FallBack_Images(bool bAddReplacementImages); void testTdf115005_FallBack_Images_On(); void testTdf115005_FallBack_Images_Off(); + void testTdf118806(); void testTdf111789(); /// SmartArt animated elements void testTdf104792(); @@ -208,6 +209,7 @@ public: CPPUNIT_TEST(testTdf115005); CPPUNIT_TEST(testTdf115005_FallBack_Images_On); CPPUNIT_TEST(testTdf115005_FallBack_Images_Off); + CPPUNIT_TEST(testTdf118806); CPPUNIT_TEST(testTdf111789); CPPUNIT_TEST(testTdf104792); CPPUNIT_TEST(testTdf90627); @@ -1597,6 +1599,18 @@ void SdOOXMLExportTest2::testTdf115005_FallBack_Images_Off() CPPUNIT_ASSERT_EQUAL(0, nPNGFiles); } +void SdOOXMLExportTest2::testTdf118806() +{ + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf118806.odp"), ODP); + utl::TempFile tempFile; + xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); + + xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml"); + assertXPath(pXmlDocContent, "//p:animMotion", "origin", "layout"); + + xDocShRef->DoClose(); +} + void SdOOXMLExportTest2::testTdf111789() { // Shadow properties were not exported for text shapes. -- cgit