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 | |
parent | Fixed template dimension problem on Impress. (diff) | |
download | core-dee4142489bb287bb8d506d3549957dea46a72c0.tar.gz core-dee4142489bb287bb8d506d3549957dea46a72c0.zip |
fixed regression of a57a4078fcd9a0490bd661e3ced6fcbbe69fae73
- fixes bnc#705991
Diffstat (limited to 'oox')
-rw-r--r-- | oox/inc/oox/drawingml/textliststyle.hxx | 4 | ||||
-rw-r--r-- | oox/source/drawingml/shape.cxx | 5 | ||||
-rw-r--r-- | oox/source/drawingml/textliststyle.cxx | 11 | ||||
-rw-r--r-- | oox/source/ppt/pptshape.cxx | 6 |
4 files changed, 23 insertions, 3 deletions
diff --git a/oox/inc/oox/drawingml/textliststyle.hxx b/oox/inc/oox/drawingml/textliststyle.hxx index 29d8f29a48ce..5ce8ef7d2e05 100644 --- a/oox/inc/oox/drawingml/textliststyle.hxx +++ b/oox/inc/oox/drawingml/textliststyle.hxx @@ -51,6 +51,10 @@ public: inline const TextParagraphPropertiesVector& getAggregationListStyle() const { return maAggregationListStyle; }; inline TextParagraphPropertiesVector& getAggregationListStyle() { return maAggregationListStyle; }; +#if OSL_DEBUG_LEVEL > 0 + void dump() const; +#endif + protected: TextParagraphPropertiesVector maListStyle; diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index dd68c3c56109..656df0b07eb2 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -232,6 +232,8 @@ void Shape::addShape( void Shape::applyShapeReference( const Shape& rReferencedShape ) { + OSL_TRACE("apply shape reference: %s to shape id: %s", rtl::OUStringToOString(rReferencedShape.msId, RTL_TEXTENCODING_UTF8 ).getStr(), rtl::OUStringToOString(msId, RTL_TEXTENCODING_UTF8 ).getStr()); + if ( rReferencedShape.mpTextBody.get() ) mpTextBody = TextBodyPtr( new TextBody( *rReferencedShape.mpTextBody.get() ) ); else @@ -534,6 +536,7 @@ Reference< XShape > Shape::createAndInsert( if( pTheme ) if( const TextCharacterProperties* pCharProps = pTheme->getFontStyle( pFontRef->mnThemedIdx ) ) aCharStyleProperties.assignUsed( *pCharProps ); + OSL_TRACE("use font color"); aCharStyleProperties.maCharColor.assignIfUsed( pFontRef->maPhClr ); } @@ -576,6 +579,8 @@ TextBodyPtr Shape::getTextBody() void Shape::setMasterTextListStyle( const TextListStylePtr& pMasterTextListStyle ) { + OSL_TRACE("set master text list style to shape id: %s", rtl::OUStringToOString(msId, RTL_TEXTENCODING_UTF8 ).getStr()); + mpMasterTextListStyle = pMasterTextListStyle; } diff --git a/oox/source/drawingml/textliststyle.cxx b/oox/source/drawingml/textliststyle.cxx index 520c5d6b73d1..edd50f0e04ff 100644 --- a/oox/source/drawingml/textliststyle.cxx +++ b/oox/source/drawingml/textliststyle.cxx @@ -66,6 +66,17 @@ void TextListStyle::apply( const TextListStyle& rTextListStyle ) applyStyleList( rTextListStyle.getListStyle(), getListStyle() ); } +#if OSL_DEBUG_LEVEL > 0 +void TextListStyle::dump() const +{ + for ( int i = 0; i < 9; i++ ) + { + OSL_TRACE("text list style level: %d", i); + maListStyle[i]->dump(); + } +} +#endif + } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ 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", |