SmartArt: add nested shapes only if they are node's children

Desktop / LibreOffice - Grzegorz Araminowicz [gmail.com] - 10 August 2017 10:51 EDT

Change-Id: I6527fc4166001ffc1e1e170b179cd4eadf55305c Reviewed-on: https://gerrit.libreoffice.org/40870

93a3739 SmartArt: add nested shapes only if they are node's children
oox/source/drawingml/diagram/diagram.cxx | 10 +
oox/source/drawingml/diagram/diagram.hxx | 1 +
.../drawingml/diagram/diagramlayoutatoms.cxx | 226 ++++++++++-----------
.../drawingml/diagram/diagramlayoutatoms.hxx | 2 +-
.../drawingml/diagram/layoutatomvisitors.cxx | 26 ++-
.../drawingml/diagram/layoutatomvisitors.hxx | 4 +-
sd/qa/unit/data/pptx/smartart-children.pptx | Bin 0 -> 53014 bytes
sd/qa/unit/import-tests.cxx | 39 ++++
8 files changed, 182 insertions(+), 126 deletions(-)

Upstream: cgit.freedesktop.org


  • Share