diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-04-28 12:16:30 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-04-30 08:13:17 +0200 |
| commit | 7a8ef88e177618a75cb51e31b31d6295aad3f7b1 (patch) | |
| tree | 1982836ebfadfe5228c38e4088d2c474a1f17766 /oox/source | |
| parent | e31805548f78e26c6d98317554449b891193155a (diff) | |
fix grouping MSO 2007 vs OOXML default value
Change-Id: Idee9ce707d852efb56657eff7d565893f99e4da3
Diffstat (limited to 'oox/source')
| -rw-r--r-- | oox/source/drawingml/chart/typegroupcontext.cxx | 7 | ||||
| -rw-r--r-- | oox/source/drawingml/chart/typegroupmodel.cxx | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/oox/source/drawingml/chart/typegroupcontext.cxx b/oox/source/drawingml/chart/typegroupcontext.cxx index b55ad96c9b0d..2dc3d35e30d4 100644 --- a/oox/source/drawingml/chart/typegroupcontext.cxx +++ b/oox/source/drawingml/chart/typegroupcontext.cxx @@ -83,7 +83,7 @@ ContextHandlerRef AreaTypeGroupContext::onCreateContext( sal_Int32 nElement, con mrModel.mnGapDepth = rAttribs.getInteger( XML_val, 150 ); return 0; case C_TOKEN( grouping ): - mrModel.mnGrouping = rAttribs.getToken( XML_val, XML_standard ); + mrModel.mnGrouping = rAttribs.getToken( XML_val, bMSO2007Doc ? XML_standard : XML_clustered ); return 0; case C_TOKEN( ser ): return new AreaSeriesContext( *this, mrModel.maSeries.create(bMSO2007Doc) ); @@ -123,8 +123,7 @@ ContextHandlerRef BarTypeGroupContext::onCreateContext( sal_Int32 nElement, cons mrModel.mnGapWidth = rAttribs.getInteger( XML_val, 150 ); return 0; case C_TOKEN( grouping ): - // default is 'standard', not 'clustered' as specified - mrModel.mnGrouping = rAttribs.getToken( XML_val, XML_standard ); + mrModel.mnGrouping = rAttribs.getToken( XML_val, bMSO2007Doc ? XML_standard : XML_clustered ); return 0; case C_TOKEN( overlap ): mrModel.mnOverlap = rAttribs.getInteger( XML_val, 0 ); @@ -208,7 +207,7 @@ ContextHandlerRef LineTypeGroupContext::onCreateContext( sal_Int32 nElement, con mrModel.mnGapDepth = rAttribs.getInteger( XML_val, 150 ); return 0; case C_TOKEN( grouping ): - mrModel.mnGrouping = rAttribs.getToken( XML_val, XML_standard ); + mrModel.mnGrouping = rAttribs.getToken( XML_val, bMSO2007Doc ? XML_standard : XML_clustered ); return 0; case C_TOKEN( hiLowLines ): return new ShapePrWrapperContext( *this, mrModel.mxHiLowLines.create() ); diff --git a/oox/source/drawingml/chart/typegroupmodel.cxx b/oox/source/drawingml/chart/typegroupmodel.cxx index e8b3d11f5218..9d5e96053e32 100644 --- a/oox/source/drawingml/chart/typegroupmodel.cxx +++ b/oox/source/drawingml/chart/typegroupmodel.cxx @@ -40,7 +40,7 @@ TypeGroupModel::TypeGroupModel( sal_Int32 nTypeId, bool bMSO2007Doc ) : mnFirstAngle( 0 ), mnGapDepth( 150 ), mnGapWidth( 150 ), - mnGrouping( XML_standard ), + mnGrouping( bMSO2007Doc ? XML_standard : XML_clustered ), mnHoleSize( 10 ), mnOfPieType( XML_pie ), mnOverlap( 0 ), |