diff options
| author | László Németh <laszlo.nemeth@collabora.com> | 2015-05-06 23:26:50 +0200 |
|---|---|---|
| committer | László Németh <laszlo.nemeth@collabora.com> | 2015-05-07 00:21:39 +0200 |
| commit | 3f1cbf94cb3ef743295eb7dcc8ed97e6252828ec (patch) | |
| tree | 6dfd8348d5dcb8b0af767de989563534b72f5af8 | |
| parent | dae152ac6b38065f8a102e8981749c98bdfe9869 (diff) | |
tdf#91122 docx import: fix wrong vertical position of OLE object shape
Change-Id: I34cdae7182631ca2d6e86f94f244e9362fe9dc6b
| -rw-r--r-- | oox/source/vml/vmlshape.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index 988923c2eaab..6342140dc49a 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -1076,8 +1076,13 @@ Reference< XShape > ComplexShape::implConvertAndInsert( const Reference< XShapes // try to create a picture object if( !aGraphicPath.isEmpty() ) - return SimpleShape::createPictureObject(rxShapes, rShapeRect, aGraphicPath); - + { + Reference< XShape > xShape = SimpleShape::createPictureObject(rxShapes, rShapeRect, aGraphicPath); + // AS_CHARACTER shape: vertical orientation default is bottom, MSO default is top. + if ( maTypeModel.maPosition != "absolute" && maTypeModel.maPosition != "relative" ) + PropertySet( xShape ).setAnyProperty( PROP_VertOrient, makeAny(text::VertOrientation::TOP)); + return xShape; + } // default: try to create a custom shape return CustomShape::implConvertAndInsert( rxShapes, rShapeRect ); } |