summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-04-06 14:16:01 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-04-06 14:16:01 +0200
commit7a54eddd4353b463e7b9a16ecc5a700726d3641f (patch)
tree554e0d7d9e3365fab995d54e00d02cdd6f2369c1 /oox
parentc8e7bae4da31ca7ed0a30ad476b7733f3c770bf9 (diff)
maybe that helps the tinderboxes
Change-Id: Ie392fb37da7f05490b4b7f6169b90a18fdc44b36
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/chart/typegroupconverter.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx
index a57c2188c648..3ca777f5c163 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 );