Skip to content

C
core
Kaydet (Commit) a51300bc authored tarafından Markus Mohrhard's avatar Markus Mohrhard Kaydeden (comit) Markus Mohrhard
Dosyalara gözat
Seçenekler

implement fill based on style also for chart area, tdf#89451 

Change-Id: I7b488e222cd44e75d1e0ff7f8e545e9399f418b5
üst 6106d99a
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 5 deletions
oox/source/drawingml/chart/chartspaceconverter.cxx
Dosyayı görüntüle @ a51300bc
...@@ -80,10 +80,7 @@ void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExtern ...@@ -80,10 +80,7 @@ void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExtern
PROP_FillStyle, PROP_FillStyle,
uno::makeAny(getFilter().getGraphicHelper().getDefaultChartAreaFillStyle())); uno::makeAny(getFilter().getGraphicHelper().getDefaultChartAreaFillStyle()));
if( mrModel.mxShapeProp.is() ) getFormatter().convertFrameFormatting( aBackPropSet, mrModel.mxShapeProp, OBJECTTYPE_CHARTSPACE );
{
getFormatter().convertFrameFormatting( aBackPropSet, mrModel.mxShapeProp, OBJECTTYPE_CHARTSPACE );
}
// convert plot area (container of all chart type groups) // convert plot area (container of all chart type groups)
PlotAreaConverter aPlotAreaConv( *this, mrModel.mxPlotArea.getOrCreate() ); PlotAreaConverter aPlotAreaConv( *this, mrModel.mxPlotArea.getOrCreate() );
......
oox/source/drawingml/chart/objectformatter.cxx
Dosyayı görüntüle @ a51300bc
...@@ -167,6 +167,14 @@ static const AutoFormatEntry spNoFormats[] = ...@@ -167,6 +167,14 @@ static const AutoFormatEntry spNoFormats[] =
AUTOFORMAT_END() AUTOFORMAT_END()
}; };
static const AutoFormatEntry spChartSpaceFill[] =
{
AUTOFORMAT_COLOR( 1, 32, THEMED_STYLE_SUBTLE, XML_bg1 ),
AUTOFORMAT_COLOR( 33, 40, THEMED_STYLE_SUBTLE, XML_lt1 ),
AUTOFORMAT_COLOR( 41, 48, THEMED_STYLE_SUBTLE, XML_dk1 ),
AUTOFORMAT_END()
};
static const AutoFormatEntry spDataTableLines[] = static const AutoFormatEntry spDataTableLines[] =
{ {
AUTOFORMAT_COLORMOD( 1, 32, THEMED_STYLE_SUBTLE, XML_tx1, XML_tint, 75000 ), AUTOFORMAT_COLORMOD( 1, 32, THEMED_STYLE_SUBTLE, XML_tx1, XML_tint, 75000 ),
...@@ -536,7 +544,7 @@ struct ObjectTypeFormatEntry ...@@ -536,7 +544,7 @@ struct ObjectTypeFormatEntry
static const ObjectTypeFormatEntry spObjTypeFormatEntries[] = static const ObjectTypeFormatEntry spObjTypeFormatEntries[] =
{ {
// object type property info auto text auto line auto fill auto effect // object type property info auto text auto line auto fill auto effect
TYPEFORMAT_FRAME( OBJECTTYPE_CHARTSPACE, &saCommonPropInfo, 0, spNoFormats, spNoFormats, 0 /* eq to Ch2 */ ), TYPEFORMAT_FRAME( OBJECTTYPE_CHARTSPACE, &saCommonPropInfo, 0, spNoFormats, spChartSpaceFill, 0 /* eq to Ch2 */ ),
TYPEFORMAT_FRAME( OBJECTTYPE_CHARTTITLE, &saCommonPropInfo, spChartTitleTexts, 0 /* eq to Ch2 */, 0 /* eq to Ch2 */, 0 /* eq to Ch2 */ ), TYPEFORMAT_FRAME( OBJECTTYPE_CHARTTITLE, &saCommonPropInfo, spChartTitleTexts, 0 /* eq to Ch2 */, 0 /* eq to Ch2 */, 0 /* eq to Ch2 */ ),
TYPEFORMAT_FRAME( OBJECTTYPE_LEGEND, &saCommonPropInfo, spOtherTexts, spNoFormats, spNoFormats, 0 /* eq to Ch2 */ ), TYPEFORMAT_FRAME( OBJECTTYPE_LEGEND, &saCommonPropInfo, spOtherTexts, spNoFormats, spNoFormats, 0 /* eq to Ch2 */ ),
TYPEFORMAT_FRAME( OBJECTTYPE_PLOTAREA2D, &saCommonPropInfo, 0, 0 /* eq to Ch2 */, spPlotArea2dFills, 0 /* eq to Ch2 */ ), TYPEFORMAT_FRAME( OBJECTTYPE_PLOTAREA2D, &saCommonPropInfo, 0, 0 /* eq to Ch2 */, spPlotArea2dFills, 0 /* eq to Ch2 */ ),
......
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