diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-08-03 09:57:57 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-08-05 11:26:17 +0200 |
| commit | d5bff7f5e4b10ec42395efa3cd0520c40c06a356 (patch) | |
| tree | 6d7fc0434e979e2cc5c527b56edfbca0a9b71f4b /sd | |
| parent | 14e664db5211f8c398ee58dded853e12ac9142de (diff) | |
oox smartart, linear layout: fix scaling of spacing without rules
With this, finally the arrow shape has the correct horizontal position
and width, even if the markup is as complex as the PowerPoint UI
generates it (the previous version was a more minimal version).
(cherry picked from commit 880673412143a7db7ea1bf4766040662dfc085dc)
Change-Id: I59f237c582053067e890180a1ae40471e5f46dea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100104
Tested-by: Jenkins
Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/data/pptx/smartart-linear-rule.pptx | bin | 43760 -> 43743 bytes | |||
| -rw-r--r-- | sd/qa/unit/import-tests-smartart.cxx | 5 |
2 files changed, 5 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 differindex e76dfd9ee770..05905299ed27 100644 --- a/sd/qa/unit/data/pptx/smartart-linear-rule.pptx +++ 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 556b1562c584..1a4818e8474a 100644 --- a/sd/qa/unit/import-tests-smartart.cxx +++ b/sd/qa/unit/import-tests-smartart.cxx @@ -1529,6 +1529,11 @@ void SdImportTestSmartArt::testLinearRule() // - Expected: 3160 // - Actual : 8770 // i.e. there was unexpected spacing on the left of the arrow. + // Then the imporoved version of the test document failed with: + // - Expected: 3160 + // - Actual : 19828 + // i.e. the spacing on the left of the arrow was so large that the shape was mostly outside the + // slide. sal_Int32 nGroupLeft = xGroup->getPosition().X; sal_Int32 nArrowLeft = xShape->getPosition().X; CPPUNIT_ASSERT_EQUAL(nGroupLeft, nArrowLeft); |