diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-01-20 21:21:17 +0100 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2020-01-28 10:50:19 +0100 |
| commit | 3fffc33d2569446a1e4d43d30bcf71a4e89c1ef9 (patch) | |
| tree | 000eecbd82bb5b7282fa3974e9f154d7f5a29f7f /oox | |
| parent | 548e1baac8c767ff51456b5bfeaa98a807fb61f4 (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).
(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í <xiscofauli@libreoffice.org>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/vml/vmlshape.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
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) |