[Libreoffice-commits] core.git: oox/source

[Markus Mohrhard]

 oox/source/drawingml/chart/typegroupconverter.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 7a54eddd4353b463e7b9a16ecc5a700726d3641f
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Apr 6 14:16:01 2014 +0200

    maybe that helps the tinderboxes
    
    Change-Id: Ie392fb37da7f05490b4b7f6169b90a18fdc44b36

diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx
index a57c218..3ca777f 100644
--- a/oox/source/drawingml/chart/typegroupconverter.cxx
+++ b/oox/source/drawingml/chart/typegroupconverter.cxx
@@ -481,8 +481,11 @@ void TypeGroupConverter::convertMarker( PropertySet& rPropSet, sal_Int32 nOoxSym
         sal_Int32 nSize = static_cast< sal_Int32 >( nOoxSize * (2540.0 / 72.0) + 0.5 );
         aSymbol.Size.Width = aSymbol.Size.Height = nSize;
 
-        Color aFillColor = xShapeProps->getFillProperties().maFillColor;
-        aSymbol.FillColor = aFillColor.getColor(getFilter().getGraphicHelper());
+        if(xShapeProps.is())
+        {
+            Color aFillColor = xShapeProps->getFillProperties().maFillColor;
+            aSymbol.FillColor = aFillColor.getColor(getFilter().getGraphicHelper());
+        }
 
         // set the property
         rPropSet.setProperty( PROP_Symbol, aSymbol );