ooo-build r15589 - in trunk: . patches/dev300

[rodo svn gnome org]

Author: rodo
Date: Fri Mar 20 10:13:52 2009
New Revision: 15589
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15589&view=rev

Log:
2009-03-20  Radek Doulik  <rodo novell com>

	* oox/source/ppt/pptshape.cxx: use style from master page only for
	placeholder shapes

	* patches/dev300/apply: added oox-fix--list-style-apply.diff




Added:
   trunk/patches/dev300/oox-fix-list-style-apply.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Mar 20 10:13:52 2009
@@ -2016,6 +2016,7 @@
 buildfix-oox-depends-on-unotools.diff
 
 oox-fix-placeholder-layout.diff, n#485316, n#480223, rodo
+oox-fix--list-style-apply.diff, n#485417, rodo
 
 [ CalcFixes  <= dev300-m42 <= ooo310-m1]
 # Support PHONETIC function to display asian phonetic guide.

Added: trunk/patches/dev300/oox-fix-list-style-apply.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/oox-fix-list-style-apply.diff	Fri Mar 20 10:13:52 2009
@@ -0,0 +1,15 @@
+diff -rup oox-orig/source/ppt/pptshape.cxx oox/source/ppt/pptshape.cxx
+--- oox-orig/source/ppt/pptshape.cxx	2009-03-20 10:32:46.000000000 +0100
++++ oox/source/ppt/pptshape.cxx	2009-03-20 10:36:24.000000000 +0100
+@@ -153,8 +153,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, rxTheme, rxShapes, pShapeRect ) );