diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2020-07-31 11:04:02 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2020-07-31 11:56:23 +0200 |
commit | 0024c48b4822062995effed7db4f1281196384bb (patch) | |
tree | d12ca396ee0fcb4a7d4c3b750188d44b89d53159 /sd | |
parent | 22a77cb83a3769a8b43d80565282988a74214866 (diff) |
oox smartart: consider rules when scaling in linear layout
The bugdoc has an arrow shape which is 100% wide, and there are multiple
shapes before it, which also have a 100% wide constraint. The reason
PowerPoint scales down the shapes (but not the arrow) is because rules
declare it should happen this way.
So start taking rules into account in linear layouts.
Change-Id: I352443277e88be0eb711659489587127727a258f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99855
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'sd')
-rw-r--r-- | sd/qa/unit/data/pptx/smartart-linear-rule.pptx | bin | 0 -> 43353 bytes | |||
-rw-r--r-- | sd/qa/unit/import-tests-smartart.cxx | 19 |
2 files changed, 19 insertions, 0 deletions
diff --git a/sd/qa/unit/data/pptx/smartart-linear-rule.pptx b/sd/qa/unit/data/pptx/smartart-linear-rule.pptx Binary files differnew file mode 100644 index 000000000000..f5fbb5c87a54 --- /dev/null +++ b/sd/qa/unit/data/pptx/smartart-linear-rule.pptx diff --git a/sd/qa/unit/import-tests-smartart.cxx b/sd/qa/unit/import-tests-smartart.cxx index bbbe6880d8a8..cbe1507cd33c 100644 --- a/sd/qa/unit/import-tests-smartart.cxx +++ b/sd/qa/unit/import-tests-smartart.cxx @@ -110,6 +110,7 @@ public: void testTdf131553(); void testFillColorList(); void testTdf134221(); + void testLinearRule(); CPPUNIT_TEST_SUITE(SdImportTestSmartArt); @@ -157,6 +158,7 @@ public: CPPUNIT_TEST(testTdf131553); CPPUNIT_TEST(testFillColorList); CPPUNIT_TEST(testTdf134221); + CPPUNIT_TEST(testLinearRule); CPPUNIT_TEST_SUITE_END(); }; @@ -1525,6 +1527,23 @@ void SdImportTestSmartArt::testTdf134221() xDocShRef->DoClose(); } +void SdImportTestSmartArt::testLinearRule() +{ + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-linear-rule.pptx"), PPTX); + + uno::Reference<drawing::XShape> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); + // Last child, then again last child. + uno::Reference<drawing::XShape> xShape = getChildShape(getChildShape(xGroup, 1), 3); + + // Without the accompanying fix in place, this test would have failed with: + // - Expected greater than: 17500 (19867) + // - Actual : 4966 + // i.e. the width of the background arrow was too small. + CPPUNIT_ASSERT_GREATER(static_cast<sal_Int32>(17500), xShape->getSize().Width); + + xDocShRef->DoClose(); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTestSmartArt); CPPUNIT_PLUGIN_IMPLEMENT(); |