SmartArt: support cnt function

Desktop / LibreOffice - Grzegorz Araminowicz [gmail.com] - 17 August 2017 09:18 EDT

it was necessary to introduce in LayoutAtoms reference to containing LayoutNode passed by constructors, so that ConditionAtom can access LayoutNode's name and diagram data

Change-Id: I35c9cb9061f23eb15e7a9372476530e2ead5d0dc Reviewed-on: https://gerrit.libreoffice.org/41108

f1d65b1 SmartArt: support cnt function
.../drawingml/diagram/constraintlistcontext.cxx | 2 +-
oox/source/drawingml/diagram/diagram.cxx | 4 +-
oox/source/drawingml/diagram/diagram.hxx | 5 ++
.../drawingml/diagram/diagramdefinitioncontext.cxx | 2 +-
.../drawingml/diagram/diagramlayoutatoms.cxx | 71 +++++++++++++++++----
.../drawingml/diagram/diagramlayoutatoms.hxx | 33 +++++++---
.../drawingml/diagram/layoutatomvisitors.cxx | 19 ++----
.../drawingml/diagram/layoutatomvisitors.hxx | 2 -
oox/source/drawingml/diagram/layoutnodecontext.cxx | 12 ++--
sd/qa/unit/data/pptx/smartart-cnt.pptx | Bin 0 -> 47360 bytes
sd/qa/unit/import-tests.cxx | 19 ++++++
11 files changed, 122 insertions(+), 47 deletions(-)

Upstream: cgit.freedesktop.org


  • Share