diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-08-07 13:25:51 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-08-11 11:12:49 +0000 |
| commit | 64157c4598606b094f5783804b38cfb4c901a88a (patch) | |
| tree | de4dd9392979762acb204863ddad7877d017a292 /include | |
| parent | 712a286d1d430f91148600b52b6fc3d03881cf78 (diff) | |
bnc#821916: Better algorithm to find placeholder shape.
Placeholder type seems to be more relevant than index.
Change-Id: I9d6c6cad8e0a51b2385801f65d7d1c697ad7998e
Reviewed-on: https://gerrit.libreoffice.org/10844
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/ppt/pptshape.hxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx index 41941fdec708..18126d36fbfc 100644 --- a/include/oox/ppt/pptshape.hxx +++ b/include/oox/ppt/pptshape.hxx @@ -58,8 +58,11 @@ public: void setPlaceholder( oox::drawingml::ShapePtr pPlaceholder ) { mpPlaceholder = pPlaceholder; } void setModelId( const OUString& rId ) { msModelId = rId; } - 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::ShapePtr findPlaceholder( const sal_Int32 nFirstSubType, + const sal_Int32 nSecondSubType, const OptValue< sal_Int32 >& oSubTypeIndex, + 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 ); |