diff options
| -rw-r--r-- | oox/source/vml/vmlshape.cxx | 3 | ||||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 5 |
2 files changed, 6 insertions, 2 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) diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 26b0b56eacae..877bc929c4b2 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -568,8 +568,9 @@ DECLARE_OOXMLIMPORT_TEST(testGroupshapeChildRotation, "groupshape-child-rotation #if HAVE_MORE_FONTS xShape.set(xGroupShape->getByIndex(4), uno::UNO_QUERY); - // This was 887, i.e. border distances were included in the height. - CPPUNIT_ASSERT_EQUAL(sal_Int32(686), xShape->getSize().Height); + // This was true, a VML textbox without <v:textbox style="mso-fit-shape-to-text:t"> had + // auto-grow on. + CPPUNIT_ASSERT(!getProperty<bool>(xShape, "TextAutoGrowHeight")); #endif uno::Reference<drawing::XShapeDescriptor> xShapeDescriptor(xGroupShape->getByIndex(5), uno::UNO_QUERY); |