summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorMark Hung <marklh9@gmail.com>2021-01-16 23:48:56 +0800
committerXisco Fauli <xiscofauli@libreoffice.org>2021-01-21 15:30:11 +0100
commitd56e4aea5fd5d777204f9f4e4b14cf0047348beb (patch)
treee3a8d04ef19dfbdfaeb4980011fb5047e17bc869 /sd
parent6d49ac8214b7d084d07469a6ce2414788f8ef9e0 (diff)
tdf#128550 set sub item on the ancestor node.
The target of a animation node may resolved to a subitem. However it only has effect on a iterate container or animate node, not on any other containers. Subitem setting like background and paragraph got ignored, so everything were shown together. The patch find the ancestor node that is iterate container or animate, and set the subitem on it. Change-Id: Iaaa52aed3a34eb2d70b3b318b8336246e17e1e98 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109444 Tested-by: Jenkins Reviewed-by: Mark Hung <marklh9@gmail.com> (cherry picked from commit 9b19bf0283b569a5c134de6b5cce1d72d8f37879) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109679 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109754
Diffstat (limited to 'sd')
-rwxr-xr-xsd/qa/unit/data/pptx/tdf128550.pptxbin0 -> 30230 bytes
-rw-r--r--sd/qa/unit/export-tests.cxx14
2 files changed, 14 insertions, 0 deletions
diff --git a/sd/qa/unit/data/pptx/tdf128550.pptx b/sd/qa/unit/data/pptx/tdf128550.pptx
new file mode 100755
index 000000000000..e2be342b2e51
--- /dev/null
+++ b/sd/qa/unit/data/pptx/tdf128550.pptx
Binary files differ
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index a2186fae62af..b5db56f0bf7a 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -76,6 +76,7 @@ public:
void testTdf126761();
void testGlow();
void testSoftEdges();
+ void testTdf128550();
CPPUNIT_TEST_SUITE(SdExportTest);
@@ -112,6 +113,7 @@ public:
CPPUNIT_TEST(testTdf126761);
CPPUNIT_TEST(testGlow);
CPPUNIT_TEST(testSoftEdges);
+ CPPUNIT_TEST(testTdf128550);
CPPUNIT_TEST_SUITE_END();
@@ -1307,6 +1309,18 @@ void SdExportTest::testSoftEdges()
xDocShRef->DoClose();
}
+void SdExportTest::testTdf128550()
+{
+ utl::TempFile tempFile;
+ sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf128550.pptx"), PPTX);
+ xDocShRef = saveAndReload(xDocShRef.get(), ODP, &tempFile);
+ xmlDocUniquePtr pXmlDoc = parseExport(tempFile, "content.xml");
+ assertXPath( pXmlDoc, "//anim:iterate[@anim:sub-item='background']", 1);
+ assertXPath( pXmlDoc, "//anim:iterate[@anim:sub-item='text']", 4);
+ xDocShRef->DoClose();
+
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();