oox/source/drawingml/chart/chartspaceconverter.cxx | 5 ++++- oox/source/drawingml/chart/objectformatter.cxx | 1 + 2 files changed, 5 insertions(+), 1 deletion(-)
New commits: commit 6d3269ad94bbad8abae5703edc86d8888356bf14 Author: Heena Gupta <heena.h.gu...@ericsson.com> Date: Tue Jul 15 16:11:02 2014 +0530 fdo#80569:FILEOPEN:4.4 Regression .docx chart not rendered properly Change-Id: Ic3304c1bd11fcd372a0859a70a531675effe7af0 Reviewed-on: https://gerrit.libreoffice.org/10322 Reviewed-by: Muthu Subramanian K <muthus...@gmail.com> Tested-by: Muthu Subramanian K <muthus...@gmail.com> diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx index 26624c9..b0b5f9c 100644 --- a/oox/source/drawingml/chart/chartspaceconverter.cxx +++ b/oox/source/drawingml/chart/chartspaceconverter.cxx @@ -88,7 +88,10 @@ void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExtern // formatting of the chart background PropertySet aBackPropSet( getChartDocument()->getPageBackground() ); - getFormatter().convertFrameFormatting( aBackPropSet, mrModel.mxShapeProp, OBJECTTYPE_CHARTSPACE ); + if( mrModel.mxShapeProp.is() ) + { + getFormatter().convertFrameFormatting( aBackPropSet, mrModel.mxShapeProp, OBJECTTYPE_CHARTSPACE ); + } // convert plot area (container of all chart type groups) PlotAreaConverter aPlotAreaConv( *this, mrModel.mxPlotArea.getOrCreate() ); diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index 8fd7dc4..b919e6b 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -860,6 +860,7 @@ FillFormatter::FillFormatter( ObjectFormatterData& rData, const AutoFormatEntry* if( pAutoFormatEntry ) { mxAutoFill.reset( new FillProperties ); + mxAutoFill->moFillType = XML_noFill; if( const Theme* pTheme = mrData.mrFilter.getCurrentTheme() ) if( const FillProperties* pFillProps = pTheme->getFillStyle( pAutoFormatEntry->mnThemedIdx ) ) *mxAutoFill = *pFillProps; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits