[ooo-build-commit] patches/dev300

[Radek Doulík]

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

New commits:
commit fb039f6e030217d10f29a06cc0de71c48c647c98
Author: Radek Doulik <rodo at novell.com>
Date:   Wed Jun 3 12:12:16 2009 +0200

    fix more vertical text cases
    
    * patches/dev300/apply:
    * patches/dev300/oox-pptx-import-fix-text-body-vert.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index bbb7fda..447de37 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1881,6 +1881,7 @@ oox-pptx-import-fix-transition-auto-advance.diff, n#480243, rodo
 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
+oox-pptx-import-fix-text-body-vert.diff, n#479829, rodo
 
 [ CalcFixes ]
 # Support PHONETIC function to display asian phonetic guide.
diff --git a/patches/dev300/oox-pptx-import-fix-text-body-vert.diff b/patches/dev300/oox-pptx-import-fix-text-body-vert.diff
new file mode 100644
index 0000000..588ca1b
--- /dev/null
+++ b/patches/dev300/oox-pptx-import-fix-text-body-vert.diff
@@ -0,0 +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
+ 
+     // ST_TextVerticalType
+     mrTextBodyProp.moVert = aAttribs.getToken( XML_vert );
+-    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;
+ 	// workaround for TB_LR as using WritingMode2 doesn't work