Kaydet (Commit) 6e770b16 authored tarafından Miklos Vajna's avatar Miklos Vajna

n#764005 VML import of absolutely positioned pictures should not be opaque

Change-Id: I17a1a94ee92ce04ff6928a20c552b3a3408a0626
üst 0a412cc1
......@@ -308,6 +308,7 @@ NumberingLevel
NumberingRules
NumberingType
Offset
Opaque
OpCodeMap
Orientation
OutputPosition
......
......@@ -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" )
{
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment