summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2014-07-24 20:03:43 +0200
committerMatúš Kukan <matus.kukan@collabora.com>2014-07-24 20:31:19 +0200
commitd068f13596f6d1023a70d98ec2059d38ad6fd777 (patch)
tree6dc261aa535e4a928c79f765ce18b50e6219fcc7 /oox
parentb0cdd038ee192dcc0d83182a33fc8c0242ceb1dd (diff)
bnc#887227: Do not set TextAutoGrowHeight for vertical text.
It's horribly broken and it would resize text box horizontally which is not supposed to happen. Change-Id: I201ec8dbcddca56d21bf46ea8ee838d01923c442
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/textbodypropertiescontext.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx b/oox/source/drawingml/textbodypropertiescontext.cxx
index 315f679ed3c7..80d82a0d6174 100644
--- a/oox/source/drawingml/textbodypropertiescontext.cxx
+++ b/oox/source/drawingml/textbodypropertiescontext.cxx
@@ -123,7 +123,11 @@ ContextHandlerRef TextBodyPropertiesContext::onCreateContext( sal_Int32 aElement
mrTextBodyProp.maPropertyMap.setProperty( PROP_TextAutoGrowHeight, false);
break;
case A_TOKEN( spAutoFit ):
- mrTextBodyProp.maPropertyMap.setProperty( PROP_TextAutoGrowHeight, true);
+ {
+ const sal_Int32 tVert = mrTextBodyProp.moVert.get( XML_horz );
+ if( tVert != XML_vert && tVert != XML_eaVert && tVert != XML_vert270 && tVert != XML_mongolianVert )
+ mrTextBodyProp.maPropertyMap.setProperty( PROP_TextAutoGrowHeight, true);
+ }
break;
case A_TOKEN( scene3d ): // CT_Scene3D