oox smartart, org chart: implement support for hierBranch conditions

Desktop / LibreOffice - Miklos Vajna [collabora.com] - 18 January 2019 17:14 EST

The relevant part of the layout is the element that has a with two branches:



The connectors were missing as we took the first branch (ConditionAtom::getDecision() returned true if the arg was hierBranch), even hierBranch on the parent layout node was set to "init".

With this, the correct number of connectors are created, previously all employee connectors were missing. Their size / position is still incorrect, though.

Change-Id: I74a705b13f82a065fc0b9b9d306bfb0dcaf0f7f4 Reviewed-on: https://gerrit.libreoffice.org/66579

ae34f4710308 oox smartart, org chart: implement support for hierBranch conditions
oox/source/drawingml/diagram/datamodelcontext.cxx | 2 +-
oox/source/drawingml/diagram/diagram.hxx | 3 +-
.../drawingml/diagram/diagramlayoutatoms.cxx | 41 +++++++++++++++++++++-
sd/qa/unit/import-tests-smartart.cxx | 9 +++--
4 files changed, 46 insertions(+), 9 deletions(-)

Upstream: cgit.freedesktop.org


  • Share