summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2013-06-07 11:49:10 +0200
committerMiklos Vajna <vmiklos@suse.cz>2013-06-07 12:46:20 +0200
commitde320f38621a879c7826b9280e3ff00121fbf80f (patch)
tree5b79aec46dcd4eefd77a577c5e8301d54d31b184 /oox
parent6d7dcfe75823e5c7e4b35ba9a05e76749546fe3c (diff)
bnc#820788 VML import of v:textbox's mso-fit-shape-to-text style property
Change-Id: I74a0ecd50ca61a4f5bf7ebdbf12743dc1fd9368a (cherry picked from commit a22ef599bd3fdcf0bd5c3616aa566a5922624ff3)
Diffstat (limited to 'oox')
-rw-r--r--oox/source/vml/vmltextboxcontext.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/oox/source/vml/vmltextboxcontext.cxx b/oox/source/vml/vmltextboxcontext.cxx
index ca124bcb4d18..0adf9431ff03 100644
--- a/oox/source/vml/vmltextboxcontext.cxx
+++ b/oox/source/vml/vmltextboxcontext.cxx
@@ -187,6 +187,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);
}
}
}