diff options
| author | Radek Doulik <rodo@novell.com> | 2012-07-02 18:24:04 +0200 |
|---|---|---|
| committer | Radek Doulik <rodo@novell.com> | 2012-07-02 18:26:04 +0200 |
| commit | fa0e9cf0d13b9b426dd9a3636a0866d0fb220c51 (patch) | |
| tree | 6ce144b34f74862237fb2aabca66f25326a3ce74 /oox/inc | |
| parent | b3017b864291abee67dea605df90598364c3b13d (diff) | |
use master's shape position/size for layout shapes when needed (n#760997)
Change-Id: I2a9d4f6b134817bda84645df3ab6fa217186e1d2
Diffstat (limited to 'oox/inc')
| -rw-r--r-- | oox/inc/oox/ppt/pptshape.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/oox/inc/oox/ppt/pptshape.hxx b/oox/inc/oox/ppt/pptshape.hxx index e171f24fd6a8..d0b31a632330 100644 --- a/oox/inc/oox/ppt/pptshape.hxx +++ b/oox/inc/oox/ppt/pptshape.hxx @@ -50,7 +50,7 @@ public: // addShape is creating and inserting the corresponding XShape. void addShape( oox::core::XmlFilterBase& rFilterBase, - const SlidePersist& rPersist, + SlidePersist& rPersist, const oox::drawingml::Theme* pTheme, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, basegfx::B2DHomMatrix& aTransformation, @@ -65,8 +65,8 @@ public: void setReferenced( sal_Bool bReferenced ){ mbReferenced = bReferenced; }; void setPlaceholder( oox::drawingml::ShapePtr pPlaceholder ) { mpPlaceholder = pPlaceholder; } - static oox::drawingml::ShapePtr findPlaceholder( const sal_Int32 nMasterPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes ); - static oox::drawingml::ShapePtr findPlaceholderByIndex( const sal_Int32 nIdx, std::vector< oox::drawingml::ShapePtr >& rShapes ); + static oox::drawingml::ShapePtr findPlaceholder( const sal_Int32 nMasterPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes, bool bMasterOnly = false ); + static oox::drawingml::ShapePtr findPlaceholderByIndex( const sal_Int32 nIdx, std::vector< oox::drawingml::ShapePtr >& rShapes, bool bMasterOnly = false ); static oox::drawingml::TextListStylePtr getSubTypeTextListStyle( const SlidePersist& rSlidePersist, sal_Int32 nSubType ); |