diff options
| author | Justin Luth <justin_luth@sil.org> | 2017-07-06 09:46:06 -0400 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-07-07 11:15:16 +0200 |
| commit | a75477101510e7a8e60db03edbf2d253f504d70d (patch) | |
| tree | 44550714254547b2e62892eb35d5a10af654367a /writerfilter | |
| parent | 868d8c8f0fdf376b0a3eb545ee841c9c12ffee3b (diff) | |
tdf#77219 writerfilter: allow shapes to be in front of text
In LO4.3, commit 2496eaa5c4535b88b44e4ac034aae6af0c08de0e
forced every shape to be "in background". That is not correct.
Word appears to use negative z-indexes to indicate behind-text
zordering and positive numbers for in-front placement.
Change-Id: I4083ae67ef76152e1c0a894d810950d249ac13b4
Reviewed-on: https://gerrit.libreoffice.org/39670
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 8b8a78995b8a..bc15fc347fcf 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2081,7 +2081,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape aGrabBag[i].Value >>= zOrder; xShapePropertySet->setPropertyValue( "ZOrder", uno::makeAny(pZOrderHelper->findZOrder(zOrder))); pZOrderHelper->addItem(xShapePropertySet, zOrder); - xShapePropertySet->setPropertyValue(getPropertyName( PROP_OPAQUE ), uno::makeAny( false ) ); + xShapePropertySet->setPropertyValue(getPropertyName( PROP_OPAQUE ), uno::makeAny( zOrder >= 0 ) ); checkZOrderStatus = true; } else if ( aGrabBag[i].Name == "TxbxHasLink" ) |