From 5223f5f223f28c3795a443de6bb12c60b654f4ad Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@openoffice.org>
Date: Tue, 23 Mar 2010 13:58:19 +0200
Subject: [PATCH] ooxml10: oox-fix-list-style-apply.diff from ooo-build

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

diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 016857161696..a104a694350f 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -155,8 +155,10 @@ void PPTShape::addShape(
                     break;
                 }
             }
+
+            // use style from master slide for placeholders only, otherwise use slide's style, which might be the default style from presentation
             if ( !aMasterTextListStyle.get() )
-                aMasterTextListStyle = rSlidePersist.getMasterPersist().get() ? rSlidePersist.getMasterPersist()->getOtherTextStyle() : rSlidePersist.getOtherTextStyle();
+                    aMasterTextListStyle = ( mnSubType && rSlidePersist.getMasterPersist().get() ) ? rSlidePersist.getMasterPersist()->getOtherTextStyle() : rSlidePersist.getOtherTextStyle();
             setMasterTextListStyle( aMasterTextListStyle );
 
             Reference< XShape > xShape( createAndInsert( rFilterBase, sServiceName, pTheme, rxShapes, pShapeRect, bClearText ) );