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:23:32 -0500 |
| commit | 65b8df84370617b080f20fb0aa18ebe84eb0af3e (patch) | |
| tree | f01781f4b73441c139d21ad500d7ce06b4587c8b /oox | |
| parent | 2c57f8b716a5e8e378ac4fe85ef1d62a4fc65dce (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
(cherry picked from commit d068f13596f6d1023a70d98ec2059d38ad6fd777)
Reviewed-on: https://gerrit.libreoffice.org/10541
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'oox')
| -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 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 |