diff options
Diffstat (limited to 'oox/source/drawingml/shape.cxx')
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 9bdb962787a9..be58314124a4 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -212,7 +212,7 @@ void Shape::addShape( if( !sServiceName.isEmpty() ) { basegfx::B2DHomMatrix aMatrix( aTransformation ); - Reference< XShape > xShape( createAndInsert( rFilterBase, sServiceName, pTheme, rxShapes, pShapeRect, sal_False, aMatrix ) ); + Reference< XShape > xShape( createAndInsert( rFilterBase, sServiceName, pTheme, rxShapes, pShapeRect, sal_False, sal_False, aMatrix ) ); if( pShapeMap && !msId.isEmpty() ) { @@ -327,6 +327,7 @@ Reference< XShape > Shape::createAndInsert( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, const awt::Rectangle* /* pShapeRect */, sal_Bool bClearText, + sal_Bool bDoNotInsertEmptyTextBody, basegfx::B2DHomMatrix& aParentTransformation ) { bool bIsEmbMedia = false; @@ -567,7 +568,7 @@ Reference< XShape > Shape::createAndInsert( getTextBody()->getTextProperties().pushVertSimulation(); // in some cases, we don't have any text body. - if( getTextBody() ) + if( getTextBody() && ( !bDoNotInsertEmptyTextBody || !mpTextBody->isEmpty() ) ) { Reference < XText > xText( mxShape, UNO_QUERY ); if ( xText.is() ) // not every shape is supporting an XText interface (e.g. GroupShape) |