diff options
| author | Muthu Subramanian <sumuthu@suse.com> | 2012-05-08 13:03:38 +0530 |
|---|---|---|
| committer | Muthu Subramanian <sumuthu@suse.com> | 2012-05-08 13:03:38 +0530 |
| commit | 90352e5f1e50291960c944f9a1f44ab3e91d6503 (patch) | |
| tree | c9568fb5ed2a71921750b3fca376011da4800a75 /oox/source/drawingml/shape.cxx | |
| parent | 3a35fd8f1c6b176e675b998a82526636aad5a00b (diff) | |
n759212: Text over images.
Default text may not make sense to be copied from the
master slide to the slides when there is an image.
Diffstat (limited to 'oox/source/drawingml/shape.cxx')
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 0019195b14d9..9bdb962787a9 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -230,11 +230,11 @@ void Shape::addShape( } } -void Shape::applyShapeReference( const Shape& rReferencedShape ) +void Shape::applyShapeReference( const Shape& rReferencedShape, bool bUseText ) { SAL_INFO("oox", "apply shape reference: " << rReferencedShape.msId << " to shape id: " << msId); - if ( rReferencedShape.mpTextBody.get() ) + if ( rReferencedShape.mpTextBody.get() && bUseText ) mpTextBody = TextBodyPtr( new TextBody( *rReferencedShape.mpTextBody.get() ) ); else mpTextBody.reset(); |