diff options
| author | Muthu Subramanian <sumuthu@suse.com> | 2012-03-02 18:01:45 +0530 |
|---|---|---|
| committer | Muthu Subramanian <sumuthu@suse.com> | 2012-03-02 18:01:45 +0530 |
| commit | 77901e53ecd99aed59e5c8697461ab4d241388a4 (patch) | |
| tree | d06b26712186b8e61619c04f50c222df86853b75 /oox | |
| parent | f97c9c25396fb6487da3b9b5284c6250c7927156 (diff) | |
n657904: Styling information isn't applied to grpSp.
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 4 | ||||
| -rw-r--r-- | oox/source/ppt/pptshape.cxx | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index a6e86c3d4e52..5e3aa738577c 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -299,8 +299,10 @@ void Shape::addChildren( aChildTransformation.get(2, 2)); std::vector< ShapePtr >::iterator aIter( rMaster.maChildren.begin() ); - while( aIter != rMaster.maChildren.end() ) + while( aIter != rMaster.maChildren.end() ) { + (*aIter)->setMasterTextListStyle( mpMasterTextListStyle ); (*aIter++)->addShape( rFilterBase, pTheme, rxShapes, aChildTransformation, NULL, pShapeMap ); + } } Reference< XShape > Shape::createAndInsert( diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index 0bd2ce453886..a72a10c54c4b 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -310,7 +310,7 @@ void PPTShape::addShape( { if ( !aMasterTextListStyle.get() ) { - bool isOther = !getTextBody().get(); + bool isOther = !getTextBody().get() && !sServiceName.equalsAscii("com.sun.star.drawing.GroupShape"); TextListStylePtr aSlideStyle = isOther ? rSlidePersist.getOtherTextStyle() : rSlidePersist.getDefaultTextStyle(); // Combine from MasterSlide details as well. if( rSlidePersist.getMasterPersist().get() ) |