From 87ebf8183142cd136046f7c923ac5477d6c05ee3 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@suse.cz>
Date: Fri, 7 Jun 2013 11:49:10 +0200
Subject: bnc#820788 VML import of v:textbox's mso-fit-shape-to-text style
 property

(cherry picked from commit a22ef599bd3fdcf0bd5c3616aa566a5922624ff3)

Conflicts:
	sw/qa/extras/ooxmlimport/ooxmlimport.cxx

Change-Id: I74a0ecd50ca61a4f5bf7ebdbf12743dc1fd9368a
---
 oox/source/vml/vmltextboxcontext.cxx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/oox/source/vml/vmltextboxcontext.cxx b/oox/source/vml/vmltextboxcontext.cxx
index 108b9f9b3b9c..d83dcc9051d6 100644
--- a/oox/source/vml/vmltextboxcontext.cxx
+++ b/oox/source/vml/vmltextboxcontext.cxx
@@ -197,6 +197,10 @@ TextBoxContext::TextBoxContext( ContextHandler2Helper& rParent, TextBox& rTextBo
         if( ConversionHelper::separatePair( aName, aValue, sStyle.getToken( 0, ';', nIndex ), ':' ) )
         {
             if( aName == "layout-flow" )      rTextBox.maLayoutFlow = aValue;
+            else if (aName == "mso-fit-shape-to-text")
+                rTextBox.mrTypeModel.mbAutoHeight = true;
+            else
+                SAL_WARN("oox", "unhandled style property: " << aName);
         }
     }
 }
-- 
cgit v1.2.3