From 7e765d5e001b945381afb54fc5852401ef516441 Mon Sep 17 00:00:00 2001 From: Szymon Kłos Date: Tue, 13 Mar 2018 20:57:52 +0100 Subject: tdf#104792 Double check for target shape MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-on: https://gerrit.libreoffice.org/51241 Tested-by: Jenkins Reviewed-by: Szymon Kłos Reviewed-on: https://gerrit.libreoffice.org/51397 Reviewed-by: Miklos Vajna (cherry picked from commit c7e58e9b93ea89b7f3aaeb7b4433686ea2ad5f96) Change-Id: Ibe23377c7752d9ce97c7b100af4b2759b3ce946f --- oox/source/ppt/animationspersist.cxx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'oox/source') diff --git a/oox/source/ppt/animationspersist.cxx b/oox/source/ppt/animationspersist.cxx index cd14fe43b374..2c1aaa2c88c7 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() ); -- cgit