summaryrefslogtreecommitdiff
path: root/oox/source/vml
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2020-01-20 21:21:17 +0100
committerMiklos Vajna <vmiklos@collabora.com>2020-01-21 08:41:42 +0100
commitb92293b3943423324064a8513c2e114d18817179 (patch)
tree21132cbf0d10e2da7ecf1c02075a6502dcc82cca /oox/source/vml
parent7e6f8085dcafa811a72ad47dbaeca9090d9f22e7 (diff)
tdf#103983 VML import: handle <v:textbox style="mso-fit-shape-to-text:t">
We used to always always set TextAutoGrowHeight to true, only do that when the matching VML attribute is detected, default to false. This helps the exporter, so it writes the correct markup on save of the bugdoc. Also adapt testGroupshapeChildRotation, which in practice tested the automatic height of the shape. The point of "auto" is that it changes as needed, hardcoding that value in a test is not a great idea. Rather test that the height is no longer automatic (there is no explicit markup in the file, and the default is false). Change-Id: Ie39408b7da53f4923a2ade503e520c704a86bcf4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87104 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'oox/source/vml')
-rw-r--r--oox/source/vml/vmlshape.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 15972cd0ff08..70b673258dc6 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -792,6 +792,9 @@ Reference< XShape > SimpleShape::implConvertAndInsert( const Reference< XShapes
xShape->setSize(aSize);
}
}
+
+ PropertySet(xShape).setAnyProperty(PROP_TextAutoGrowHeight,
+ makeAny(maTypeModel.mbAutoHeight));
}
// Import Legacy Fragments (if any)