Update ooo320-m1
[ooovba.git] / applied_patches / 0341-oox-fix-list-style-apply.diff
blob7b87ef87337054403367e300d444385b779bd6c2
1 diff -rup oox-orig/source/ppt/pptshape.cxx oox/source/ppt/pptshape.cxx
2 --- oox-orig/source/ppt/pptshape.cxx 2009-03-20 10:32:46.000000000 +0100
3 +++ oox/source/ppt/pptshape.cxx 2009-03-20 10:36:24.000000000 +0100
4 @@ -153,8 +153,10 @@ void PPTShape::addShape(
5 break;
9 + // use style from master slide for placeholders only, otherwise use slide's style, which might be the default style from presentation
10 if ( !aMasterTextListStyle.get() )
11 - aMasterTextListStyle = rSlidePersist.getMasterPersist().get() ? rSlidePersist.getMasterPersist()->getOtherTextStyle() : rSlidePersist.getOtherTextStyle();
12 + aMasterTextListStyle = ( mnSubType && rSlidePersist.getMasterPersist().get() ) ? rSlidePersist.getMasterPersist()->getOtherTextStyle() : rSlidePersist.getOtherTextStyle();
13 setMasterTextListStyle( aMasterTextListStyle );
15 Reference< XShape > xShape( createAndInsert( rFilterBase, sServiceName, rxTheme, rxShapes, pShapeRect ) );