summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeena Gupta <heena.h.gupta@ericsson.com>2014-07-15 16:11:02 +0530
committerMuthu Subramanian K <muthusuba@gmail.com>2014-07-15 15:46:37 +0000
commit6d3269ad94bbad8abae5703edc86d8888356bf14 (patch)
tree9b4e69cb9e7f3bac8457a4ecfc08c392f31bb101
parentb409aaa7d65151106236058d3c478bd7f87dd296 (diff)
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 <muthusuba@gmail.com> Tested-by: Muthu Subramanian K <muthusuba@gmail.com>
-rw-r--r--oox/source/drawingml/chart/chartspaceconverter.cxx5
-rw-r--r--oox/source/drawingml/chart/objectformatter.cxx1
2 files changed, 5 insertions, 1 deletions
diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx
index 26624c900e7d..b0b5f9cca92c 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 8fd7dc4ffb4f..b919e6bf414c 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;