[Libreoffice-commits] core.git: oox/source

[Matúš Kukan]

 oox/source/drawingml/textbodypropertiescontext.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit d068f13596f6d1023a70d98ec2059d38ad6fd777
Author: Matúš Kukan <matus.ku...@collabora.com>
Date:   Thu Jul 24 20:03:43 2014 +0200

    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

diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx 
b/oox/source/drawingml/textbodypropertiescontext.cxx
index 315f679..80d82a0 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

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits