Kaydet (Commit) 07a61ac3 authored tarafından Radek Doulik's avatar Radek Doulik

fix texbox vertical alignment, it was regression introduced by f1a2b0cb

üst e494bd26
...@@ -145,17 +145,15 @@ TextBodyPropertiesContext::TextBodyPropertiesContext( ContextHandler& rParent, ...@@ -145,17 +145,15 @@ TextBodyPropertiesContext::TextBodyPropertiesContext( ContextHandler& rParent,
default: default:
case XML_t : eVA = drawing::TextVerticalAdjust_TOP; break; case XML_t : eVA = drawing::TextVerticalAdjust_TOP; break;
} }
if( !xAttributes->hasAttribute( XML_vert ) ) if( xAttributes->hasAttribute( XML_vert ) &&
mrTextBodyProp.maPropertyMap[ PROP_TextVerticalAdjust ] <<= eVA; ( ( mrTextBodyProp.moVert.get( XML_horz ) == XML_vert && eVA == drawing::TextVerticalAdjust_TOP ) ||
else ( mrTextBodyProp.moVert.get( XML_horz ) == XML_vert270 && eVA == drawing::TextVerticalAdjust_BOTTOM ) ) )
{
if( ( mrTextBodyProp.moVert.get( XML_horz ) == XML_vert && eVA == drawing::TextVerticalAdjust_TOP ) ||
( mrTextBodyProp.moVert.get( XML_horz ) == XML_vert270 && eVA == drawing::TextVerticalAdjust_BOTTOM ) )
{ {
mrTextBodyProp.maPropertyMap[ PROP_TextHorizontalAdjust ] <<= mrTextBodyProp.maPropertyMap[ PROP_TextHorizontalAdjust ] <<=
TextHorizontalAdjust_RIGHT; TextHorizontalAdjust_RIGHT;
} }
} else
mrTextBodyProp.maPropertyMap[ PROP_TextVerticalAdjust ] <<= eVA;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment