diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2018-03-13 20:57:52 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-03-27 13:45:36 +0200 |
| commit | 03a5a78a78808e1ec0c1cd4ee41c05cfa49143bd (patch) | |
| tree | 25b9c3a59e10744c19b0ba2cc4e19cfa2284b7f5 /oox | |
| parent | tdf#116489 - fix ucb TaskManager deadlock. (diff) | |
| download | core-03a5a78a78808e1ec0c1cd4ee41c05cfa49143bd.tar.gz core-03a5a78a78808e1ec0c1cd4ee41c05cfa49143bd.zip | |
tdf#104792 Double check for target shape
Change-Id: Ibe23377c7752d9ce97c7b100af4b2759b3ce946f
Reviewed-on: https://gerrit.libreoffice.org/51241
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/51454
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ppt/animationspersist.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/oox/source/ppt/animationspersist.cxx b/oox/source/ppt/animationspersist.cxx index 0173d3794105..8a2a2bff6521 100644 --- a/oox/source/ppt/animationspersist.cxx +++ b/oox/source/ppt/animationspersist.cxx @@ -141,8 +141,14 @@ namespace oox { namespace ppt { sShapeName = maShapeTarget.msSubShapeId; Any rTarget; - ::oox::drawingml::ShapePtr pShape = pSlide->getShape(sShapeName); - SAL_WARN_IF( !pShape, "oox.ppt", "failed to locate Shape"); + ::oox::drawingml::ShapePtr pShape = pSlide->getShape( sShapeName ); + SAL_WARN_IF( !pShape, "oox.ppt", "failed to locate Shape" ); + + if( !pShape && maShapeTarget.mnType == XML_dgm ) + { + pShape = pSlide->getShape( msValue ); + } + if( pShape ) { Reference< XShape > xShape( pShape->getXShape() ); |