diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-07-24 20:03:43 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-08-12 05:24:24 -0500 |
| commit | ca51beb73336b3a19364df02aab82d56a2a63e74 (patch) | |
| tree | 8eb59a79bc69f2b7af06671ced56e8bab1a73ac4 | |
| parent | 1e7502f3c8b8d751dd851c3f146debf2678781ec (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.
(cherry picked from commit d068f13596f6d1023a70d98ec2059d38ad6fd777)
Change-Id: I201ec8dbcddca56d21bf46ea8ee838d01923c442
Reviewed-on: https://gerrit.libreoffice.org/10585
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | oox/source/drawingml/textbodypropertiescontext.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx b/oox/source/drawingml/textbodypropertiescontext.cxx index b580be35fa6c..166ecd0b1142 100644 --- a/oox/source/drawingml/textbodypropertiescontext.cxx +++ b/oox/source/drawingml/textbodypropertiescontext.cxx @@ -132,7 +132,11 @@ ContextHandlerRef TextBodyPropertiesContext::onCreateContext( sal_Int32 aElement mrTextBodyProp.maPropertyMap[ PROP_TextAutoGrowHeight ] <<= false; break; case A_TOKEN( spAutoFit ): - mrTextBodyProp.maPropertyMap[ 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[ PROP_TextAutoGrowHeight ] <<= true; + } break; case A_TOKEN( scene3d ): // CT_Scene3D |