diff options
Diffstat (limited to 'oox/source/ppt/pptgraphicshapecontext.cxx')
| -rw-r--r-- | oox/source/ppt/pptgraphicshapecontext.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/oox/source/ppt/pptgraphicshapecontext.cxx b/oox/source/ppt/pptgraphicshapecontext.cxx index 70fa5dd5ab20..e174b3f29fde 100644 --- a/oox/source/ppt/pptgraphicshapecontext.cxx +++ b/oox/source/ppt/pptgraphicshapecontext.cxx @@ -158,10 +158,14 @@ Reference< XFastContextHandler > PPTGraphicShapeContext::createFastChildContext( } if ( pPlaceholder.get() ) { - mpShapePtr->applyShapeReference( *pPlaceholder.get() ); + bool bUseText = true; + // TODO: Check if pPlaceholder->getSubType is none (i.e. none explicitly specified) + if( pPlaceholder->getSubType() == XML_obj ) + bUseText = false; + mpShapePtr->applyShapeReference( *pPlaceholder.get(), bUseText ); PPTShape* pPPTShape = dynamic_cast< PPTShape* >( pPlaceholder.get() ); if ( pPPTShape ) - pPPTShape->setReferenced( sal_True ); + pPPTShape->setReferenced( sal_True ); pPPTShapePtr->setPlaceholder( pPlaceholder ); } } |