diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-04-20 06:21:17 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-04-21 06:45:26 +0200 |
commit | 4c3cfe60ac05d5404e3f2a92fff7af2d2f38628a (patch) | |
tree | 47d5141591f3c93c138d5face9968c287f41ad16 /oox/inc/drawingml/chart | |
parent | 5fa0adf25cfcb71129e05e7218cde46874306c15 (diff) |
MSO 2007 vs OOXML default values
includes:
fix data label delete element handling
According to the xsd:
<xsd:choice>
<xsd:element name="delete" type="CT_Boolean" minOccurs="1" maxOccurs="1"/>
<xsd:group ref="Group_DLbl" minOccurs="1" maxOccurs="1"/>
</xsd:choice>
which is just insane. Therefore as soon as we hit a non-delete element
we assume that the entry is not deleted.
Change-Id: Ifa8a59fef200250b931dcb1559d4866cb26bd98f
Diffstat (limited to 'oox/inc/drawingml/chart')
-rw-r--r-- | oox/inc/drawingml/chart/seriesmodel.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/oox/inc/drawingml/chart/seriesmodel.hxx b/oox/inc/drawingml/chart/seriesmodel.hxx index 9e4fd7764c0e..d2fa53a5e50c 100644 --- a/oox/inc/drawingml/chart/seriesmodel.hxx +++ b/oox/inc/drawingml/chart/seriesmodel.hxx @@ -45,7 +45,7 @@ struct DataLabelModelBase OptValue< bool > mobShowVal; /// True = show data point value. bool mbDeleted; /// True = data label(s) deleted. - explicit DataLabelModelBase(); + explicit DataLabelModelBase(bool bMSO2007Doc); ~DataLabelModelBase(); }; @@ -58,7 +58,7 @@ struct DataLabelModel : public DataLabelModelBase TextRef mxText; /// Manual or linked text for this data point label. sal_Int32 mnIndex; /// Data point index for this data label. - explicit DataLabelModel(); + explicit DataLabelModel(bool bMSO2007Doc); ~DataLabelModel(); }; @@ -71,7 +71,7 @@ struct DataLabelsModel : public DataLabelModelBase ShapeRef mxLeaderLines; /// Formatting of connector lines between data points and labels. bool mbShowLeaderLines; /// True = show connector lines between data points and labels. - explicit DataLabelsModel(); + explicit DataLabelsModel(bool bMSO2007Doc); ~DataLabelsModel(); }; @@ -83,7 +83,7 @@ struct PictureOptionsModel bool mbApplyToSides; /// True = draw picture at left/right side of 3D data points. bool mbApplyToEnd; /// True = draw picture at top/bottom side of 3D data points. - explicit PictureOptionsModel(); + explicit PictureOptionsModel(bool bMSO2007Doc); ~PictureOptionsModel(); }; @@ -144,7 +144,7 @@ struct TrendlineModel bool mbDispEquation; /// True = show equation of the trendline. bool mbDispRSquared; /// True = show R-squared of the trendline. - explicit TrendlineModel(); + explicit TrendlineModel(bool bMSO2007Doc); ~TrendlineModel(); }; @@ -163,7 +163,7 @@ struct DataPointModel sal_Int32 mnIndex; /// Unique data point index. bool mbInvertNeg; /// True = invert negative data points (not derived from series!). - explicit DataPointModel(); + explicit DataPointModel(bool bMSO2007Doc); ~DataPointModel(); }; @@ -204,7 +204,7 @@ struct SeriesModel bool mbInvertNeg; /// True = invert negative data points. bool mbSmooth; /// True = smooth series line. - explicit SeriesModel(); + explicit SeriesModel(bool bMSO2007Doc); ~SeriesModel(); }; |