diff options
| author | Muthu Subramanian <sumuthu@suse.com> | 2012-02-10 14:44:40 +0530 |
|---|---|---|
| committer | Muthu Subramanian <sumuthu@suse.com> | 2012-02-10 14:54:46 +0530 |
| commit | 1ae7ac2a031b037174f03f170af013e0d4736424 (patch) | |
| tree | 87e75674463b722dc3fa451926a522c6c151f36d /oox/source | |
| parent | a647b5b80d68f12b5680da5b6ca9d5a4d6905e3a (diff) | |
Code review fixes.
Diffstat (limited to 'oox/source')
| -rw-r--r-- | oox/source/drawingml/textbodyproperties.cxx | 4 | ||||
| -rw-r--r-- | oox/source/drawingml/textbodypropertiescontext.cxx | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/oox/source/drawingml/textbodyproperties.cxx b/oox/source/drawingml/textbodyproperties.cxx index 7a7461064096..43acd8c19bfd 100644 --- a/oox/source/drawingml/textbodyproperties.cxx +++ b/oox/source/drawingml/textbodyproperties.cxx @@ -42,10 +42,6 @@ TextBodyProperties::TextBodyProperties() void TextBodyProperties::pushToPropMap( PropertyMap& rPropMap ) const { rPropMap.insert( maPropertyMap.begin(), maPropertyMap.end() ); - - // #160799# fake different vertical text modes by top-bottom writing mode - if( moVert.get( XML_horz ) != XML_horz ) - rPropMap[ PROP_TextWritingMode ] <<= ::com::sun::star::text::WritingMode_TB_RL; } // ============================================================================ diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx b/oox/source/drawingml/textbodypropertiescontext.cxx index ea84306a3bb9..f281c563c71b 100644 --- a/oox/source/drawingml/textbodypropertiescontext.cxx +++ b/oox/source/drawingml/textbodypropertiescontext.cxx @@ -119,6 +119,7 @@ TextBodyPropertiesContext::TextBodyPropertiesContext( ContextHandler& rParent, bool bRtl = aAttribs.getBool( XML_rtl, false ); sal_Int32 tVert = mrTextBodyProp.moVert.get( XML_horz ); if( tVert == XML_vert || tVert == XML_eaVert || tVert == XML_vert270 || tVert == XML_mongolianVert ) { + // #160799# fake different vertical text modes by top-bottom writing mode mrTextBodyProp.maPropertyMap[ PROP_TextWritingMode ] <<= WritingMode_TB_RL; // workaround for TB_LR as using WritingMode2 doesn't work @@ -154,6 +155,8 @@ TextBodyPropertiesContext::TextBodyPropertiesContext( ContextHandler& rParent, } else if( mrTextBodyProp.moVert.get( XML_horz ) == XML_horz ) mrTextBodyProp.maPropertyMap[ PROP_TextVerticalAdjust ] <<= eVA; + else if( eVA == drawing::TextVerticalAdjust_CENTER && xAttributes->hasAttribute( XML_vert ) ) + mrTextBodyProp.maPropertyMap[ PROP_TextHorizontalAdjust ] <<= TextHorizontalAdjust_CENTER; } } |