[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - oox/source

[Heena Gupta]

 oox/source/drawingml/chart/chartspaceconverter.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit ef5814e564cc92ae005887ecedeea25243a29491
Author: Heena Gupta <heena.h.gupta at ericsson.com>
Date:   Tue Jul 22 22:18:19 2014 +0530

    fdo#54361: Chart background in XLSX is transparent instead of white
    
    Cherry-picked from
    53b9adc135f4abb086c740582e5f85cea710287d
    and
    6d3269ad94bbad8abae5703edc86d8888356bf14
    
    Change-Id: I96d86854484deb7b5c0b99739fed60a430f2f957
    Reviewed-on: https://gerrit.libreoffice.org/10468
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx
index e24388d..2238fe2 100644
--- a/oox/source/drawingml/chart/chartspaceconverter.cxx
+++ b/oox/source/drawingml/chart/chartspaceconverter.cxx
@@ -92,7 +92,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() );