import data point symbol color

Change-Id: I27ebd67a535f8617a6f535414ee8426fae6614b9

2 files changed, 2 insertions, 21 deletions

diff --git a/include/oox/drawingml/chart/seriesmodel.hxx b/include/oox/drawingml/chart/seriesmodel.hxx
index e6e8a01639a5..b9c2c3c3ff17 100644
--- a/include/oox/drawingml/chart/seriesmodel.hxx
+++ b/include/oox/drawingml/chart/seriesmodel.hxx
@@ -27,8 +27,6 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 struct DataLabelModelBase
 {
     typedef ModelRef< Shape >       ShapeRef;
@@ -51,8 +49,6 @@ struct DataLabelModelBase
                         ~DataLabelModelBase();
 };
 
-
-
 struct DataLabelModel : public DataLabelModelBase
 {
     typedef ModelRef< LayoutModel > LayoutRef;
@@ -66,8 +62,6 @@ struct DataLabelModel : public DataLabelModelBase
                         ~DataLabelModel();
 };
 
-
-
 struct DataLabelsModel : public DataLabelModelBase
 {
     typedef ModelVector< DataLabelModel >   DataLabelVector;
@@ -81,8 +75,6 @@ struct DataLabelsModel : public DataLabelModelBase
                         ~DataLabelsModel();
 };
 
-
-
 struct PictureOptionsModel
 {
     double              mfStackUnit;        /// Bitmap stacking unit.
@@ -95,8 +87,6 @@ struct PictureOptionsModel
                         ~PictureOptionsModel();
 };
 
-
-
 struct ErrorBarModel
 {
     enum SourceType
@@ -120,8 +110,6 @@ struct ErrorBarModel
                         ~ErrorBarModel();
 };
 
-
-
 struct TrendlineLabelModel
 {
     typedef ModelRef< Shape >       ShapeRef;
@@ -139,8 +127,6 @@ struct TrendlineLabelModel
                         ~TrendlineLabelModel();
 };
 
-
-
 struct TrendlineModel
 {
     typedef ModelRef< Shape >               ShapeRef;
@@ -162,8 +148,6 @@ struct TrendlineModel
                         ~TrendlineModel();
 };
 
-
-
 struct DataPointModel
 {
     typedef ModelRef< Shape >               ShapeRef;
@@ -183,8 +167,6 @@ struct DataPointModel
                         ~DataPointModel();
 };
 
-
-
 struct SeriesModel
 {
     enum SourceType
@@ -226,8 +208,6 @@ struct SeriesModel
                         ~SeriesModel();
 };
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/include/oox/drawingml/chart/typegroupconverter.hxx b/include/oox/drawingml/chart/typegroupconverter.hxx
index e61f81fdcf0a..16c8271677a0 100644
--- a/include/oox/drawingml/chart/typegroupconverter.hxx
+++ b/include/oox/drawingml/chart/typegroupconverter.hxx
@@ -153,7 +153,8 @@ public:
                             sal_Int32 nAxesSetIdx, bool bSupportsVaryColorsByPoint );
 
     /** Sets the passed OOXML marker style at the passed property set. */
-    void                convertMarker( PropertySet& rPropSet, sal_Int32 nOoxSymbol, sal_Int32 nOoxSize ) const;
+    void                convertMarker( PropertySet& rPropSet, sal_Int32 nOoxSymbol, sal_Int32 nOoxSize,
+            ModelRef< Shape > xShapeProps ) const;
     /** Sets the passed OOXML line smoothing at the passed property set. */
     void                convertLineSmooth( PropertySet& rPropSet, bool bOoxSmooth ) const;
     /** Sets the passed OOXML bar 3D geometry at the passed property set. */