SmartArt: support diagram background

Desktop / LibreOffice - Grzegorz Araminowicz [collabora.com] - 10 May 2019 10:18 EDT

Solved by adding additional shape filling whole diagram. MS PowerPoint does the same when converting SmartArt to shapes.

Background shape is also copied when loading from drawingML fallback, appearently there is no background information.

Corrected SmartArt import tests, so that they are aware of extra shape.

Change-Id: I6154f8e1b34e5867ab582d6fc54459c7c93edbac Reviewed-on: https://gerrit.libreoffice.org/72012

c86cf2aaa075 SmartArt: support diagram background
include/oox/drawingml/shape.hxx | 2 +
oox/source/drawingml/diagram/diagram.cxx | 11 +
oox/source/drawingml/shape.cxx | 9 +
oox/source/shape/ShapeContextHandler.cxx | 8 +
.../smartart-background-drawingml-fallback.pptx | Bin 0 -> 40964 bytes
sd/qa/unit/data/pptx/smartart-background.pptx | Bin 0 -> 50424 bytes
sd/qa/unit/data/xml/n819614_0.xml | 69 +++++-
sd/qa/unit/export-tests-ooxml1.cxx | 4 +-
sd/qa/unit/export-tests-ooxml2.cxx | 8 +-
sd/qa/unit/import-tests-smartart.cxx | 255 ++++++++++++++-------
sd/qa/unit/import-tests.cxx | 7 +-
sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 8 +-
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 4 +-
13 files changed, 278 insertions(+), 107 deletions(-)

Upstream: cgit.freedesktop.org


  • Share