From e3c6f249c10f7f1bcc528e643f5723288c514b29 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 7 Feb 2019 16:26:31 +0100 Subject: oox smartart, cycle matrix: fix counting presentation children The markup is: Where PowerPoint evaluated the condition to true, but Impress evaluated to false. This means that the undocumented relation between the child lists is "OR" (not "AND"). Also, our code assumed that "node" has to be a data node (not presentation node), but it seems the only way this condition can be true if presentation children is also counted. (The presentation node in question is not a presentation of anything.) Change-Id: I094b44351aeb8058cd50753f46fcdac7a88b35cd Reviewed-on: https://gerrit.libreoffice.org/67510 Reviewed-by: Miklos Vajna Tested-by: Jenkins --- sd/qa/unit/data/pptx/smartart-cycle-matrix.pptx | Bin 0 -> 50333 bytes sd/qa/unit/import-tests-smartart.cxx | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 sd/qa/unit/data/pptx/smartart-cycle-matrix.pptx (limited to 'sd/qa') diff --git a/sd/qa/unit/data/pptx/smartart-cycle-matrix.pptx b/sd/qa/unit/data/pptx/smartart-cycle-matrix.pptx new file mode 100644 index 000000000000..0815df945b6d Binary files /dev/null and b/sd/qa/unit/data/pptx/smartart-cycle-matrix.pptx differ diff --git a/sd/qa/unit/import-tests-smartart.cxx b/sd/qa/unit/import-tests-smartart.cxx index 54dd57bc8615..22eda8b7f74d 100644 --- a/sd/qa/unit/import-tests-smartart.cxx +++ b/sd/qa/unit/import-tests-smartart.cxx @@ -66,6 +66,7 @@ public: void testAccentProcess(); void testContinuousBlockProcess(); void testOrgChart(); + void testCycleMatrix(); CPPUNIT_TEST_SUITE(SdImportTestSmartArt); @@ -97,6 +98,7 @@ public: CPPUNIT_TEST(testAccentProcess); CPPUNIT_TEST(testContinuousBlockProcess); CPPUNIT_TEST(testOrgChart); + CPPUNIT_TEST(testCycleMatrix); CPPUNIT_TEST_SUITE_END(); }; @@ -812,6 +814,27 @@ void SdImportTestSmartArt::testOrgChart() xDocShRef->DoClose(); } +void SdImportTestSmartArt::testCycleMatrix() +{ + sd::DrawDocShellRef xDocShRef = loadURL( + m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-cycle-matrix.pptx"), PPTX); + uno::Reference xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); + CPPUNIT_ASSERT(xGroup.is()); + + uno::Reference xA1(getChildShape(getChildShape(xGroup, 1), 0), uno::UNO_QUERY); + CPPUNIT_ASSERT(xA1.is()); + CPPUNIT_ASSERT_EQUAL(OUString("A1"), xA1->getString()); + + // Without the accompanying fix in place, this test would have failed: the + // content of the "A2" shape was lost. + uno::Reference xA2(getChildShape(getChildShape(getChildShape(xGroup, 0), 0), 1), + uno::UNO_QUERY); + CPPUNIT_ASSERT(xA2.is()); + CPPUNIT_ASSERT_EQUAL(OUString("A2"), xA2->getString()); + + xDocShRef->DoClose(); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTestSmartArt); CPPUNIT_PLUGIN_IMPLEMENT(); -- cgit