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/inc | |
| 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/inc')
| -rw-r--r-- | oox/inc/oox/drawingml/shape.hxx | 2 | ||||
| -rw-r--r-- | oox/inc/oox/ppt/pptshape.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/oox/inc/oox/drawingml/shape.hxx b/oox/inc/oox/drawingml/shape.hxx index 6989edeb95be..f2553fb0eef4 100644 --- a/oox/inc/oox/drawingml/shape.hxx +++ b/oox/inc/oox/drawingml/shape.hxx @@ -174,7 +174,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & getXShape() const { return mxShape; } - virtual void applyShapeReference( const Shape& rReferencedShape ); + virtual void applyShapeReference( const Shape& rReferencedShape, bool bUseText = true ); const ::std::vector<rtl::OUString>& getExtDrawings() { return maExtDrawings; } void addExtDrawingRelId( const ::rtl::OUString &rRelId ) { maExtDrawings.push_back( rRelId ); } diff --git a/oox/inc/oox/ppt/pptshape.hxx b/oox/inc/oox/ppt/pptshape.hxx index 07ab72373b47..e171f24fd6a8 100644 --- a/oox/inc/oox/ppt/pptshape.hxx +++ b/oox/inc/oox/ppt/pptshape.hxx @@ -57,7 +57,7 @@ public: const com::sun::star::awt::Rectangle* pShapeRect = 0, ::oox::drawingml::ShapeIdMap* pShapeMap = 0 ); - virtual void applyShapeReference( const oox::drawingml::Shape& rReferencedShape ); + virtual void applyShapeReference( const oox::drawingml::Shape& rReferencedShape, bool bUseText = true ); void setShapeLocation( const oox::ppt::ShapeLocation eShapeLocation ) { meShapeLocation = eShapeLocation; }; ShapeLocation getShapeLocation() const { return meShapeLocation; }; |