diff options
| author | Radek Doulik <rodo@novell.com> | 2011-04-19 10:19:19 +0200 |
|---|---|---|
| committer | Radek Doulik <rodo@novell.com> | 2011-04-19 10:21:19 +0200 |
| commit | 63b85869a5cbe661cb3e417837ea4ef89c9e419b (patch) | |
| tree | 649fa2587a730bca8e74808e9b1287e63a1edd5a /oox/source/drawingml | |
| parent | 9ce284013dd180302e379d91225ec700b3401909 (diff) | |
clean a bit the patch for fdo#36203, reset the text body pointer
- it also fixes n#593611
Diffstat (limited to 'oox/source/drawingml')
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 86dea33d8eac..3aee4e919975 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -198,7 +198,10 @@ void Shape::addShape( void Shape::applyShapeReference( const Shape& rReferencedShape ) { - mpTextBody = TextBodyPtr( rReferencedShape.mpTextBody.get() ? new TextBody( *rReferencedShape.mpTextBody.get() ) : new TextBody() ); + if ( rReferencedShape.mpTextBody.get() ) + mpTextBody = TextBodyPtr( new TextBody( *rReferencedShape.mpTextBody.get() ) ); + else + mpTextBody.reset(); maShapeProperties = rReferencedShape.maShapeProperties; mpLinePropertiesPtr = LinePropertiesPtr( new LineProperties( *rReferencedShape.mpLinePropertiesPtr.get() ) ); mpFillPropertiesPtr = FillPropertiesPtr( new FillProperties( *rReferencedShape.mpFillPropertiesPtr.get() ) ); |