Kaydet (Commit) 229f6e18 authored tarafından Miklos Vajna's avatar Miklos Vajna

Related: fdo#46361 fix VML import of v:rect's fillcolor

Change-Id: I530e07bb89f231b10c9e6da2eb4e6b698ee9654a
üst b9ecec7c
...@@ -19,6 +19,7 @@ AttachedAxisIndex ...@@ -19,6 +19,7 @@ AttachedAxisIndex
AutoFilter AutoFilter
AutoShowInfo AutoShowInfo
Autocomplete Autocomplete
BackColor
BackGraphicLocation BackGraphicLocation
BackGraphicURL BackGraphicURL
Background Background
......
...@@ -354,6 +354,15 @@ void ShapeBase::convertShapeProperties( const Reference< XShape >& rxShape ) con ...@@ -354,6 +354,15 @@ void ShapeBase::convertShapeProperties( const Reference< XShape >& rxShape ) con
const GraphicHelper& rGraphicHelper = mrDrawing.getFilter().getGraphicHelper(); const GraphicHelper& rGraphicHelper = mrDrawing.getFilter().getGraphicHelper();
maTypeModel.maStrokeModel.pushToPropMap( aPropMap, rGraphicHelper ); maTypeModel.maStrokeModel.pushToPropMap( aPropMap, rGraphicHelper );
maTypeModel.maFillModel.pushToPropMap( aPropMap, rGraphicHelper ); maTypeModel.maFillModel.pushToPropMap( aPropMap, rGraphicHelper );
// TextFrames have FillColor, not BackColor
uno::Reference<lang::XServiceInfo> xSInfo(rxShape, uno::UNO_QUERY_THROW);
if (xSInfo->supportsService("com.sun.star.text.TextFrame") && aPropMap.hasProperty(PROP_FillColor))
{
aPropMap.setProperty(PROP_BackColor, aPropMap[PROP_FillColor]);
aPropMap.erase(PROP_FillColor);
}
PropertySet( rxShape ).setProperties( aPropMap ); PropertySet( rxShape ).setProperties( aPropMap );
} }
......
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