diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2020-09-25 17:27:03 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2020-09-30 17:25:14 +0200 |
commit | 8e29b74a755ba9fd73d8b62667c70ce3d6552cf4 (patch) | |
tree | 8fee1932aa1f0e1a4a841cc72f80e8255c213572 /sd | |
parent | 9162014433f1c40b88e1093dfb458436e8ecf007 (diff) |
oox smartart: snake algo: consider child's aspect ratio request for cols/rows
If the child's aspect ratio request will shrink the width, then take
that into account when calculating how many rows / cols we need.
This reduces the number of columns for the bugdoc from 4 to 3, which is
needed, but not enough to render it correctly.
(cherry picked from commit acc9aead3cc5162379d34a455aa15f7b13907cf1)
Change-Id: I1d02df4834b8a2ce97d5e006db0e3135d3d42917
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103700
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/qa/unit/data/pptx/smartart-snake-rows.pptx | bin | 0 -> 52877 bytes | |||
-rw-r--r-- | sd/qa/unit/import-tests-smartart.cxx | 26 |
2 files changed, 26 insertions, 0 deletions
diff --git a/sd/qa/unit/data/pptx/smartart-snake-rows.pptx b/sd/qa/unit/data/pptx/smartart-snake-rows.pptx Binary files differnew file mode 100644 index 000000000000..7f5e82df3eaf --- /dev/null +++ b/sd/qa/unit/data/pptx/smartart-snake-rows.pptx diff --git a/sd/qa/unit/import-tests-smartart.cxx b/sd/qa/unit/import-tests-smartart.cxx index 4844afe5a84e..1746b7c58f4a 100644 --- a/sd/qa/unit/import-tests-smartart.cxx +++ b/sd/qa/unit/import-tests-smartart.cxx @@ -108,6 +108,7 @@ public: void testFillColorList(); void testLinearRule(); void testAutofitSync(); + void testSnakeRows(); CPPUNIT_TEST_SUITE(SdImportTestSmartArt); @@ -155,6 +156,7 @@ public: CPPUNIT_TEST(testFillColorList); CPPUNIT_TEST(testLinearRule); CPPUNIT_TEST(testAutofitSync); + CPPUNIT_TEST(testSnakeRows); CPPUNIT_TEST_SUITE_END(); }; @@ -1571,6 +1573,30 @@ void SdImportTestSmartArt::testAutofitSync() xDocShRef->DoClose(); } +void SdImportTestSmartArt::testSnakeRows() +{ + // Load a smartart which contains a snake algorithm. + // The expected layout of the 6 children is a 3x2 grid. + sd::DrawDocShellRef xDocShRef = loadURL( + m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-snake-rows.pptx"), PPTX); + + uno::Reference<drawing::XShapes> xDiagram(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); + std::set<sal_Int32> aYPositions; + for (sal_Int32 nChild = 0; nChild < xDiagram->getCount(); ++nChild) + { + uno::Reference<drawing::XShape> xChild(xDiagram->getByIndex(nChild), uno::UNO_QUERY); + aYPositions.insert(xChild->getPosition().Y); + } + + // Without the accompanying fix in place, this test would have failed with: + // - Expected: 3 + // - Actual : 4 + // i.e. one more unwanted row appeared. This is better, but the ideal would be just 2 rows. + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(3), aYPositions.size()); + + xDocShRef->DoClose(); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTestSmartArt); CPPUNIT_PLUGIN_IMPLEMENT(); |