diff options
| -rw-r--r-- | include/oox/ppt/pptshape.hxx | 2 | ||||
| -rw-r--r-- | oox/source/ppt/animationspersist.cxx | 8 | ||||
| -rw-r--r-- | oox/source/ppt/pptshape.cxx | 13 | ||||
| -rw-r--r-- | oox/source/ppt/pptshapegroupcontext.cxx | 3 | ||||
| -rw-r--r-- | oox/source/ppt/timetargetelementcontext.cxx | 6 |
5 files changed, 28 insertions, 4 deletions
diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx index aa485adf9347..2a15dcdc17ca 100644 --- a/include/oox/ppt/pptshape.hxx +++ b/include/oox/ppt/pptshape.hxx @@ -27,6 +27,7 @@ namespace oox { namespace ppt { class PPTShape : public oox::drawingml::Shape { + OUString msModelId; // fallback dgs smartart shape reference ShapeLocation meShapeLocation; // placeholdershapes (mnSubType != 0) on Master are never displayed sal_Bool mbReferenced; // placeholdershapes on Layout are displayed only, if they are not referenced // placeholdershapes on Slide are displayed always @@ -55,6 +56,7 @@ public: sal_Bool isReferenced() const { return mbReferenced; }; void setReferenced( sal_Bool bReferenced ){ mbReferenced = bReferenced; }; void setPlaceholder( oox::drawingml::ShapePtr pPlaceholder ) { mpPlaceholder = pPlaceholder; } + void setModelId( const OUString& rId ) { msModelId = rId; } static oox::drawingml::ShapePtr findPlaceholder( const sal_Int32 nMasterPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes, bool bMasterOnly = false ); static oox::drawingml::ShapePtr findPlaceholderByIndex( const sal_Int32 nIdx, std::vector< oox::drawingml::ShapePtr >& rShapes, bool bMasterOnly = false ); diff --git a/oox/source/ppt/animationspersist.cxx b/oox/source/ppt/animationspersist.cxx index d905c0e2bb9d..1405a6ecc376 100644 --- a/oox/source/ppt/animationspersist.cxx +++ b/oox/source/ppt/animationspersist.cxx @@ -97,8 +97,14 @@ namespace oox { namespace ppt { break; case XML_spTgt: { + OUString sShapeName = msValue; + + // bnc#705982 - catch referenced diagram fallback shapes + if( maShapeTarget.mnType == XML_dgm ) + sShapeName = maShapeTarget.msSubShapeId; + Any rTarget; - ::oox::drawingml::ShapePtr pShape = pSlide->getShape(msValue); + ::oox::drawingml::ShapePtr pShape = pSlide->getShape(sShapeName); SAL_WARN_IF( !pShape, "oox.ppt", "failed to locate Shape"); if( pShape ) { diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index a91ecbb2ae6f..740858e53406 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -347,9 +347,18 @@ void PPTShape::addShape( } } - if( pShapeMap && !msId.isEmpty() ) + if( pShapeMap ) { - (*pShapeMap)[ msId ] = shared_from_this(); + // bnc#705982 - if optional model id reference is + // there, use that to obtain target shape + if( !msModelId.isEmpty() ) + { + (*pShapeMap)[ msModelId ] = shared_from_this(); + } + else if( !msId.isEmpty() ) + { + (*pShapeMap)[ msId ] = shared_from_this(); + } } // if this is a group shape, we have to add also each child shape diff --git a/oox/source/ppt/pptshapegroupcontext.cxx b/oox/source/ppt/pptshapegroupcontext.cxx index c77353cff448..ad5267e247a9 100644 --- a/oox/source/ppt/pptshapegroupcontext.cxx +++ b/oox/source/ppt/pptshapegroupcontext.cxx @@ -101,7 +101,7 @@ Reference< XFastContextHandler > PPTShapeGroupContext::createFastChildContext( s case PPT_TOKEN( sp ): // Shape { AttributeList aAttribs( xAttribs ); - oox::drawingml::ShapePtr pShape = oox::drawingml::ShapePtr( new PPTShape( meShapeLocation, "com.sun.star.drawing.CustomShape" ) ); + boost::shared_ptr<PPTShape> pShape( new PPTShape( meShapeLocation, "com.sun.star.drawing.CustomShape" ) ); if( aAttribs.getBool( XML_useBgFill, false ) ) { ::oox::drawingml::FillProperties &aFill = pShape->getFillProperties(); @@ -110,6 +110,7 @@ Reference< XFastContextHandler > PPTShapeGroupContext::createFastChildContext( s // TODO: We are using white here, because thats the closest we can assume (?) aFill.maFillColor.setSrgbClr( API_RGB_WHITE ); } + pShape->setModelId(xAttribs->getOptionalValue( XML_modelId )); xRet.set( new PPTShapeContext( *this, mpSlidePersistPtr, mpGroupShapePtr, pShape ) ); } break; diff --git a/oox/source/ppt/timetargetelementcontext.cxx b/oox/source/ppt/timetargetelementcontext.cxx index 388a88d4e93b..e8c59a8913df 100644 --- a/oox/source/ppt/timetargetelementcontext.cxx +++ b/oox/source/ppt/timetargetelementcontext.cxx @@ -65,6 +65,12 @@ namespace oox { namespace ppt { maShapeTarget.msSubShapeId = rAttribs.getString( XML_spid, OUString() ); return this; case PPT_TOKEN( graphicEl ): + return this; // needs a:dgm for the target + case A_TOKEN( dgm ): + bTargetSet = true; + maShapeTarget.mnType = XML_dgm; + maShapeTarget.msSubShapeId = rAttribs.getString( XML_id, OUString() ); + return this; case PPT_TOKEN( oleChartEl ): bTargetSet = true; // TODO |