diff options
| author | Grzegorz Araminowicz <grzegorz.araminowicz@collabora.com> | 2019-07-04 16:16:47 +0200 |
|---|---|---|
| committer | Grzegorz Araminowicz <grzegorz.araminowicz@collabora.com> | 2019-07-05 15:23:40 +0200 |
| commit | 329c814d28c7773e64e5902ffb1aa4877e4131f1 (patch) | |
| tree | dc5ce6b55b9490596bb36259d181993dfb4d4687 /sd | |
| parent | 4b557c96597a9bbb51677fd83bac98a2edbb9db1 (diff) | |
SmartArt: remove calculateHierChildOffsetScale() from org chart algorithm
Its purpose was to center subtree if sibling parent has no children.
It was not working correctly for complex charts causing shapes to overlap.
Without it chart is still readable (just sometimes not centered).
Remove it for now until more universal solution is found.
Change-Id: I397bd4264d6ce0fadf5c5fa1352f22e72d5d163a
Reviewed-on: https://gerrit.libreoffice.org/75092
Tested-by: Jenkins
Reviewed-by: Grzegorz Araminowicz <grzegorz.araminowicz@collabora.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/import-tests-smartart.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sd/qa/unit/import-tests-smartart.cxx b/sd/qa/unit/import-tests-smartart.cxx index fde35bd0a48d..e40b364d6b58 100644 --- a/sd/qa/unit/import-tests-smartart.cxx +++ b/sd/qa/unit/import-tests-smartart.cxx @@ -832,7 +832,7 @@ void SdImportTestSmartArt::testOrgChart() CPPUNIT_ASSERT(xEmployee2Shape.is()); awt::Point aEmployee2Pos = xEmployee2Shape->getPosition(); - awt::Size aEmployee2Size = xEmployee2Shape->getSize(); + //awt::Size aEmployee2Size = xEmployee2Shape->getSize(); CPPUNIT_ASSERT_GREATER(aEmployeePos.X, aEmployee2Pos.X); // Make sure that assistant is above employees. @@ -875,7 +875,8 @@ void SdImportTestSmartArt::testOrgChart() // Make sure the employee nodes use the free space on the right, since // manager2 has no assistants / employees. - CPPUNIT_ASSERT_GREATER(aManagerSize.Width, aEmployeeSize.Width + aEmployee2Size.Width); + //CPPUNIT_ASSERT_GREATER(aManagerSize.Width, aEmployeeSize.Width + aEmployee2Size.Width); + // currently disabled as causes problems in complex charts // Without the accompanying fix in place, this test would have failed: an // employee was exactly the third of the total height, without any spacing. |