From 3fffc33d2569446a1e4d43d30bcf71a4e89c1ef9 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 20 Jan 2020 21:21:17 +0100 Subject: tdf#103983 VML import: handle MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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). (cherry picked from commit b92293b3943423324064a8513c2e114d18817179) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: Ie39408b7da53f4923a2ade503e520c704a86bcf4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87120 Tested-by: Jenkins Reviewed-by: Xisco Faulí --- oox/source/vml/vmlshape.cxx | 3 +++ 1 file changed, 3 insertions(+) (limited to 'oox') diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index 1078fd330a64..0771d9ecda61 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -793,6 +793,9 @@ Reference< XShape > SimpleShape::implConvertAndInsert( const Reference< XShapes xShape->setSize(aSize); } } + + PropertySet(xShape).setAnyProperty(PROP_TextAutoGrowHeight, + makeAny(maTypeModel.mbAutoHeight)); } // Import Legacy Fragments (if any) -- cgit