[ooo-build-commit] .: patches/dev300

[Radek Doulík]

 patches/dev300/apply                                         |    4 -
 patches/dev300/oox-pptx-import-fix-subtitle-placeholder.diff |   32 +++++------
 2 files changed, 16 insertions(+), 20 deletions(-)

New commits:
commit 7b90dbff20baa4af477289781568442057e61b3b
Author: Radek Doulik <rodo at novell.com>
Date:   Wed Apr 21 16:26:52 2010 +0200

    updated oox-pptx-import-fix-subtitle-placeholder.diff to m15
    
    * patches/dev300/apply:
    * patches/dev300/oox-pptx-import-fix-subtitle-placeholder.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 59302c2..7c35fad 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2360,7 +2360,6 @@ oox-import-drawing-font-spacing-m14.diff, n#479822, rodo
 oox-import-text-vert-anchor-and-anchorctr-m14.diff, n#479829, rodo
 [ OOXML >= ooo320-m15 ]
 oox-import-drawing-font-spacing.diff, n#479822, rodo
-# FIXME_ 2010-04-20: need port to ooo320-m15, --pmladek
 oox-import-text-vert-anchor-and-anchorctr.diff, n#479829, rodo
 
 [ OOXML ]
@@ -2374,8 +2373,7 @@ oox-pptx-import-fix-transition-auto-advance.diff, n#480243, rodo
 oox-pptx-import-fix-subtitle-placeholder-m14.diff, n#480243, rodo
 oox-pptx-import-fix-text-body-vert-m14.diff, n#479829, rodo
 [ OOXML >= ooo320-m15 ]
-# FIXME_ 2010-04-20: another implementation is in ooo320-m15. --pmladek
-#oox-pptx-import-fix-subtitle-placeholder.diff, n#480243, rodo
+oox-pptx-import-fix-subtitle-placeholder.diff, n#480243, rodo
 # FIXME_ 2010-04-20: depends on the disabled oox-import-text-vert-anchor-and-anchorctr.diff, --pmladek
 #oox-pptx-import-fix-text-body-vert.diff, n#479829, rodo
 
diff --git a/patches/dev300/oox-pptx-import-fix-subtitle-placeholder.diff b/patches/dev300/oox-pptx-import-fix-subtitle-placeholder.diff
index ffaef15..e578ec8 100644
--- a/patches/dev300/oox-pptx-import-fix-subtitle-placeholder.diff
+++ b/patches/dev300/oox-pptx-import-fix-subtitle-placeholder.diff
@@ -1,17 +1,15 @@
-diff --git oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
-index 82d23c5..dc8799c 100644
---- oox/source/ppt/pptshape.cxx
-+++ oox/source/ppt/pptshape.cxx
-@@ -98,6 +98,12 @@ void PPTShape::addShape(
- 						aMasterTextListStyle = rSlidePersist.getMasterPersist().get() ? rSlidePersist.getMasterPersist()->getTitleTextStyle() : rSlidePersist.getTitleTextStyle();
- 					}
- 					break;
-+                    case XML_subTitle:
-+					{
-+						const rtl::OUString sTitleShapeService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.SubtitleShape" ) );
-+						sServiceName = sTitleShapeService;
-+						aMasterTextListStyle = rSlidePersist.getMasterPersist().get() ? rSlidePersist.getMasterPersist()->getTitleTextStyle() : rSlidePersist.getTitleTextStyle();
-+					}
- 					case XML_obj :
- 					{
- 						const rtl::OUString sOutlinerShapeService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.OutlinerShape" ) );
+diff -wrup oox-orig-2/source/ppt/pptshape.cxx oox/source/ppt/pptshape.cxx
+--- oox-orig-2/source/ppt/pptshape.cxx	2010-04-21 15:27:28.000000000 +0200
++++ oox/source/ppt/pptshape.cxx	2010-04-21 15:34:33.000000000 +0200
+@@ -99,6 +99,11 @@ void PPTShape::addShape(
+                     {
+                         if ( ( meShapeLocation == Master ) || ( meShapeLocation == Layout ) )
+                             sServiceName = rtl::OUString();
++			else {
++			    const rtl::OUString sTitleShapeService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.SubtitleShape" ) );
++			    sServiceName = sTitleShapeService;
++			    aMasterTextListStyle = rSlidePersist.getMasterPersist().get() ? rSlidePersist.getMasterPersist()->getTitleTextStyle() : rSlidePersist.getTitleTextStyle();
++			}
+                     }
+                     break;
+                     case XML_obj :