merge the formfield patch from ooo-build
[ooovba.git] / applied_patches / 0349-oox-pptx-import-fix-text-body-vert.diff
blobaa775554e500e67a50dd645292c8539dfacc9b81
1 diff -rup oox-orig-2/source/drawingml/textbodypropertiescontext.cxx oox/source/drawingml/textbodypropertiescontext.cxx
2 --- oox-orig-2/source/drawingml/textbodypropertiescontext.cxx 2009-10-12 15:31:28.000000000 +0200
3 +++ oox/source/drawingml/textbodypropertiescontext.cxx 2009-10-12 15:31:31.000000000 +0200
4 @@ -115,7 +115,8 @@ TextBodyPropertiesContext::TextBodyPrope
5 // ST_TextVerticalType
6 mrTextBodyProp.moVert = aAttribs.getToken( XML_vert );
7 bool bRtl = aAttribs.getBool( XML_rtl, false );
8 - if( mrTextBodyProp.moVert.get( XML_horz ) == XML_vert ) {
9 + sal_Int32 tVert = mrTextBodyProp.moVert.get( XML_horz );
10 + if( tVert == XML_vert || tVert == XML_eaVert || tVert == XML_vert270 || tVert == XML_mongolianVert ) {
11 mrTextBodyProp.maPropertyMap[ PROP_TextWritingMode ]
12 <<= ( bRtl ? WritingMode_RL_TB : WritingMode_LR_TB );
13 // workaround for TB_LR as using WritingMode2 doesn't work