[Libreoffice-commits] .: oox/source

[Muthu Subramanian]

 oox/source/drawingml/shape.cxx |    4 +++-
 oox/source/ppt/pptshape.cxx    |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 77901e53ecd99aed59e5c8697461ab4d241388a4
Author: Muthu Subramanian <sumuthu at suse.com>
Date:   Fri Mar 2 18:01:45 2012 +0530

    n657904: Styling information isn't applied to grpSp.

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index a6e86c3..5e3aa73 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 0bd2ce4..a72a10c 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() )