diff options
| author | Ravindra Vidhate <ravindra.vidhate@synerzip.com> | 2014-04-16 15:32:43 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-04-17 10:10:37 +0200 |
| commit | 2496eaa5c4535b88b44e4ac034aae6af0c08de0e (patch) | |
| tree | ad85d6763a1dabf1316de727c223db49dddfd11c /oox | |
| parent | 7bda5f04a693c7943bc4201c11e73ca45bead661 (diff) | |
fdo#77219 Image property Z-index [behindDoc] not preserved after RT
Problem description:
For the images who has the "Text wrapping" property set as Behind Text
is not preserved after saving the file in DOCX format using LO.
Reviewed on:
https://gerrit.libreoffice.org/9065
Change-Id: Ic8555103909c0f1ed1cb58fba4dc2ef2f84cc9dd
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/vml/vmlshape.cxx | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index d4bdbcfb1ea9..6167a19e4208 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -336,6 +336,20 @@ Reference< XShape > ShapeBase::convertAndInsert( const Reference< XShapes >& rxS aGrabBag[length].Value = uno::makeAny( maTypeModel.maZIndex.toInt32() ); propertySet->setPropertyValue( "FrameInteropGrabBag", uno::makeAny(aGrabBag) ); } + else + { + if( maTypeModel.maZIndex.toInt32() ) + { + uno::Sequence<beans::PropertyValue> aGrabBag; + uno::Reference<beans::XPropertySet> propertySet (xShape, uno::UNO_QUERY); + propertySet->getPropertyValue("InteropGrabBag") >>= aGrabBag; + sal_Int32 length = aGrabBag.getLength(); + aGrabBag.realloc( length+1 ); + aGrabBag[length].Name = "VML-Z-ORDER"; + aGrabBag[length].Value = uno::makeAny( maTypeModel.maZIndex.toInt32() ); + propertySet->setPropertyValue( "InteropGrabBag", uno::makeAny(aGrabBag) ); + } + } Reference< XControlShape > xControlShape( xShape, uno::UNO_QUERY ); if ( xControlShape.is() && !getTypeModel().mbVisible ) { |