diff options
| author | Radek Doulik <rodo@novell.com> | 2011-08-17 10:39:00 +0200 |
|---|---|---|
| committer | Radek Doulik <rodo@novell.com> | 2011-08-17 13:14:54 +0200 |
| commit | dee4142489bb287bb8d506d3549957dea46a72c0 (patch) | |
| tree | 2db34305efeb5b5f8f3517fbae97b220abce69ae /oox/source/ppt/pptshape.cxx | |
| parent | fe3ad86423b6f14097bd9ac2d5c2d1f029635010 (diff) | |
fixed regression of a57a4078fcd9a0490bd661e3ced6fcbbe69fae73
- fixes bnc#705991
Diffstat (limited to 'oox/source/ppt/pptshape.cxx')
| -rw-r--r-- | oox/source/ppt/pptshape.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index fc3abfc51f62..8ea04c422de0 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -142,6 +142,7 @@ void PPTShape::addShape( if ( sServiceName != OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GraphicObjectShape")) && sServiceName != OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OLE2Shape")) ) { + OSL_TRACE("has master: %p", rSlidePersist.getMasterPersist().get()); switch( mnSubType ) { case XML_ctrTitle : @@ -228,9 +229,6 @@ void PPTShape::addShape( OSL_TRACE("shape service: %s", rtl::OUStringToOString(sServiceName, RTL_TEXTENCODING_UTF8 ).getStr()); - if( mnSubType && aMasterTextListStyle && getSubTypeIndex() != -1 ) - aMasterTextListStyle.reset(); - // use placeholder index if possible if( mnSubType && getSubTypeIndex() && getSubTypeIndex() != -1 && rSlidePersist.getMasterPersist().get() ) { oox::drawingml::ShapePtr pPlaceholder = PPTShape::findPlaceholderByIndex( getSubTypeIndex(), rSlidePersist.getMasterPersist()->getShapes()->getChildren() ); @@ -253,6 +251,8 @@ void PPTShape::addShape( // pPlaceholder->getMasterTextListStyle()->dump(); aMasterTextListStyle = pNewTextListStyle; + // OSL_TRACE("combined master text list style"); + // aMasterTextListStyle->dump(); } if( pPPTPlaceholder->mpPlaceholder.get() ) { OSL_TRACE("placeholder has parent placeholder: %s type: %s index: %d", |