From 9957ebbc6f461733614f862efd89a7dee7ab869f Mon Sep 17 00:00:00 2001
From: Radek Doulik <rodo@novell.com>
Date: Mon, 3 May 2010 11:39:40 +0200
Subject: [PATCH] ooxml10: apply
 oox-pptx-import-fix-placeholder-text-style-1.diff from ooo-build

---
 oox/source/ppt/pptshape.cxx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index a03eeceb7d54..1e458385d7a2 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -173,9 +173,12 @@ void PPTShape::addShape(
             if( mnSubType && getIndex() && rSlidePersist.getMasterPersist().get() ) {
                 oox::drawingml::ShapePtr pPlaceholder = PPTShape::findPlaceholderByIndex( getIndex(), rSlidePersist.getMasterPersist()->getShapes()->getChildren() );
                 if( pPlaceholder.get() && pPlaceholder->getTextBody() ) {
-                TextListStylePtr pNewTextListStyle (new TextListStyle());
+                TextListStylePtr pNewTextListStyle ( new TextListStyle() );
 
                 pNewTextListStyle->apply( pPlaceholder->getTextBody()->getTextListStyle() );
+                if( pPlaceholder->getMasterTextListStyle().get() )
+                    pNewTextListStyle->apply( *pPlaceholder->getMasterTextListStyle() );
+
                 aMasterTextListStyle = pNewTextListStyle;
                 }
             }