diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-05-31 12:24:12 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-05-31 14:45:55 +0200 |
| commit | 6e770b161959e909edf600ee2a7f84ba138e6955 (patch) | |
| tree | d150ff3b01493804a170fd2bfbe32a91019cad28 | |
| parent | 0a412cc13edf0904524ee2cf1e38ccc36b713065 (diff) | |
n#764005 VML import of absolutely positioned pictures should not be opaque
Change-Id: I17a1a94ee92ce04ff6928a20c552b3a3408a0626
| -rw-r--r-- | oox/source/token/properties.txt | 1 | ||||
| -rw-r--r-- | oox/source/vml/vmlshape.cxx | 1 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 7 |
3 files changed, 6 insertions, 3 deletions
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt index c476fde6c0ae..2af9c8e6237b 100644 --- a/oox/source/token/properties.txt +++ b/oox/source/token/properties.txt @@ -308,6 +308,7 @@ NumberingLevel NumberingRules NumberingType Offset +Opaque OpCodeMap Orientation OutputPosition diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index 0a10e07c0a9e..91e3d6315e9d 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -591,6 +591,7 @@ Reference< XShape > ComplexShape::implConvertAndInsert( const Reference< XShapes { aPropSet.setProperty(PROP_HoriOrientPosition, rShapeRect.X); aPropSet.setProperty(PROP_VertOrientPosition, rShapeRect.Y); + aPropSet.setProperty(PROP_Opaque, sal_False); } if ( maTypeModel.maPositionVerticalRelative == "page" ) { diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 3faf817d4bbd..5aa51ef135b4 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1529,9 +1529,10 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape if (nAnchorType == text::TextContentAnchorType_AT_PAGE) bIsGraphic = false; - xProps->setPropertyValue( - rPropNameSupplier.GetName( PROP_OPAQUE ), - uno::makeAny( true ) ); + if (nAnchorType != text::TextContentAnchorType_AT_PAGE) + xProps->setPropertyValue( + rPropNameSupplier.GetName( PROP_OPAQUE ), + uno::makeAny( true ) ); if (xSInfo->supportsService(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextFrame")))) { uno::Reference<text::XTextContent> xTextContent(xShape, uno::UNO_QUERY_THROW); |