[ooo-build-commit] patches/dev300

[Radek Doulík]

 patches/dev300/apply                                   |    6 +-----
 patches/dev300/oox-pptx-import-fix-text-body-vert.diff |   14 +++++++-------
 2 files changed, 8 insertions(+), 12 deletions(-)

New commits:
commit 01f3e686d270922d37a7e66b0077f340605a0c2e
Author: Radek Doulik <rodo at novell.com>
Date:   Mon Oct 12 15:34:08 2009 +0200

    fixed and re-enabled patch
    
    * patches/dev300/apply:
    * patches/dev300/oox-pptx-import-fix-text-body-vert.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7cd249f..1f2dd0d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2057,7 +2057,6 @@ oox-custom-shape-polygons.diff, n#485418, rodo
 # significantly restructured. --tml
 # oox-fix-slide-background-gradients.diff, n#383555, rodo
 
-# FIXME: 2009-09-02: Apply but cause compilation errors. --tml
 oox-import-drawing-font-spacing.diff, n#479822, rodo
 oox-import-text-vert-anchor-and-anchorctr.diff, n#479829, rodo
 
@@ -2074,10 +2073,7 @@ oox-pptx-import-fix-subtitle-placeholder.diff, n#480243, rodo
 # oox-pptx-import-fix-header-footer-visibility.diff, n#480243, rodo
 # oox-pptx-import-fix-hidden-slides.diff, n#480229, rodo
 
-# FIXME: 2009-09-02: Does not apply when
-# oox-import-text-vert-anchor-and-anchorctr.diff has been commented
-# out. --tml
-# oox-pptx-import-fix-text-body-vert.diff, n#479829, rodo
+oox-pptx-import-fix-text-body-vert.diff, n#479829, rodo
 
 
 [ OOXML ]
diff --git a/patches/dev300/oox-pptx-import-fix-text-body-vert.diff b/patches/dev300/oox-pptx-import-fix-text-body-vert.diff
index 588ca1b..aa77555 100644
--- a/patches/dev300/oox-pptx-import-fix-text-body-vert.diff
+++ b/patches/dev300/oox-pptx-import-fix-text-body-vert.diff
@@ -1,13 +1,13 @@
-diff -rup oox-orig-1/source/drawingml/textbodypropertiescontext.cxx oox/source/drawingml/textbodypropertiescontext.cxx
---- oox-orig-1/source/drawingml/textbodypropertiescontext.cxx	2009-06-03 11:36:03.000000000 +0200
-+++ oox/source/drawingml/textbodypropertiescontext.cxx	2009-06-03 11:55:15.000000000 +0200
-@@ -121,7 +121,8 @@ TextBodyPropertiesContext::TextBodyPrope
- 
+diff -rup oox-orig-2/source/drawingml/textbodypropertiescontext.cxx oox/source/drawingml/textbodypropertiescontext.cxx
+--- oox-orig-2/source/drawingml/textbodypropertiescontext.cxx	2009-10-12 15:31:28.000000000 +0200
++++ oox/source/drawingml/textbodypropertiescontext.cxx	2009-10-12 15:31:31.000000000 +0200
+@@ -115,7 +115,8 @@ TextBodyPropertiesContext::TextBodyPrope
      // ST_TextVerticalType
      mrTextBodyProp.moVert = aAttribs.getToken( XML_vert );
+     bool bRtl = aAttribs.getBool( XML_rtl, false );
 -    if( mrTextBodyProp.moVert.get( XML_horz ) == XML_vert ) {
 +    sal_Int32 tVert = mrTextBodyProp.moVert.get( XML_horz );
 +    if( tVert == XML_vert || tVert == XML_eaVert || tVert == XML_vert270 || tVert == XML_mongolianVert ) {
- 	mrTextBodyProp.maPropertyMap[ CREATE_OUSTRING( "TextWritingMode" ) ]
- 	    <<= WritingMode_TB_RL;
+ 	mrTextBodyProp.maPropertyMap[ PROP_TextWritingMode ]
+ 	    <<= ( bRtl ? WritingMode_RL_TB : WritingMode_LR_TB );
  	// workaround for TB_LR as using WritingMode2 doesn't work