summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorRadek Doulik <rodo@novell.com>2011-01-12 20:46:37 +0100
committerRadek Doulik <rodo@novell.com>2011-01-12 20:53:37 +0100
commit1fda89a99e47cca896b7414daa3c01be4e9877a1 (patch)
tree04b8e47948fd89f4b4b23704c42247adad690d65 /oox
parenta216757e8c26ce1c97461dc02930cb63531e5cb0 (diff)
fix placeholder styles, n#656934
- do not lookup ph indexes which are set to -1
Diffstat (limited to 'oox')
-rw-r--r--oox/source/ppt/pptshape.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 6dad447de605..5757feaeaa7c 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -177,7 +177,7 @@ void PPTShape::addShape(
aMasterTextListStyle.reset();
// use placeholder index if possible
- if( mnSubType && getSubTypeIndex() && rSlidePersist.getMasterPersist().get() ) {
+ if( mnSubType && getSubTypeIndex() && getSubTypeIndex() != -1 && rSlidePersist.getMasterPersist().get() ) {
oox::drawingml::ShapePtr pPlaceholder = PPTShape::findPlaceholderByIndex( getSubTypeIndex(), rSlidePersist.getMasterPersist()->getShapes()->getChildren() );
if( pPlaceholder.get() ) {
if( pPlaceholder->getTextBody() ) {