diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2021-08-06 16:56:30 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2021-08-06 17:46:43 +0200 |
commit | 030cdbc7f8782eb196f09661bc2f116d790de9be (patch) | |
tree | 7e3ae713ff7468dcee835405f9d9a0b078b19d38 /oox/qa/unit/data | |
parent | 0ec10cff008eb2d8b2c4f5b5fa35b25162081e9e (diff) |
tdf#132696 PPTX import: fix missing SmartArt when it's part of a group shape
Regression from commit e9986153e44d7ec6ca9c5f1373971de74dcbacda (PPTX
import: import SmartArt drawing into single GroupShape, 2019-03-14), the
problem was that oox::ppt::PPTShape::addShape() and
oox::drawingml::Shape::addShape() were not in sync.
PPTShape unconditionally maps SmartArt to shapes, while the shared Shape
class defaults to converting it to a non-editable metafile. The above
commit changed the handling of in-groupshape SmartArts to go via
Shape::addShape() instead of PPTShape::addShape(), which exposed the
underlying problem that the convert-to-metafile mechanism is currently
only working in the DOCX case.
Fix the problem by again ignoring the convert-to-metafile flag for the
PPTX import case.
This also exposed a previously hidden problem:
make -C oox -sr CppunitTest_oox_drawingml CPPUNIT_TEST_NAME="testGroupShapeSmartArt testTdf131082"
started to make testTdf131082 fail. The tweak in
Shape::createAndInsert() fixes the testcase failure, but likely there is
a deeper problem there, unrelated to the regression.
Change-Id: I4e1e9645eaa266d0d7560767c3c59ba9549ccdb4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120122
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'oox/qa/unit/data')
-rw-r--r-- | oox/qa/unit/data/smartart-groupshape.pptx | bin | 0 -> 40995 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/oox/qa/unit/data/smartart-groupshape.pptx b/oox/qa/unit/data/smartart-groupshape.pptx Binary files differnew file mode 100644 index 000000000000..81dcee1e52a3 --- /dev/null +++ b/oox/qa/unit/data/smartart-groupshape.pptx |