Skip to content

C
core
Kaydet (Commit) 7a8ef88e authored tarafından Markus Mohrhard's avatar Markus Mohrhard
Dosyalara gözat
Seçenekler

fix grouping MSO 2007 vs OOXML default value 

Change-Id: Idee9ce707d852efb56657eff7d565893f99e4da3
üst e3180554
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
oox/source/drawingml/chart/typegroupcontext.cxx
Dosyayı görüntüle @ 7a8ef88e
...@@ -83,7 +83,7 @@ ContextHandlerRef AreaTypeGroupContext::onCreateContext( sal_Int32 nElement, con ...@@ -83,7 +83,7 @@ ContextHandlerRef AreaTypeGroupContext::onCreateContext( sal_Int32 nElement, con
mrModel.mnGapDepth = rAttribs.getInteger( XML_val, 150 ); mrModel.mnGapDepth = rAttribs.getInteger( XML_val, 150 );
return 0; return 0;
case C_TOKEN( grouping ): 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; return 0;
case C_TOKEN( ser ): case C_TOKEN( ser ):
return new AreaSeriesContext( *this, mrModel.maSeries.create(bMSO2007Doc) ); return new AreaSeriesContext( *this, mrModel.maSeries.create(bMSO2007Doc) );
...@@ -123,8 +123,7 @@ ContextHandlerRef BarTypeGroupContext::onCreateContext( sal_Int32 nElement, cons ...@@ -123,8 +123,7 @@ ContextHandlerRef BarTypeGroupContext::onCreateContext( sal_Int32 nElement, cons
mrModel.mnGapWidth = rAttribs.getInteger( XML_val, 150 ); mrModel.mnGapWidth = rAttribs.getInteger( XML_val, 150 );
return 0; return 0;
case C_TOKEN( grouping ): case C_TOKEN( grouping ):
// default is 'standard', not 'clustered' as specified mrModel.mnGrouping = rAttribs.getToken( XML_val, bMSO2007Doc ? XML_standard : XML_clustered );
mrModel.mnGrouping = rAttribs.getToken( XML_val, XML_standard );
return 0; return 0;
case C_TOKEN( overlap ): case C_TOKEN( overlap ):
mrModel.mnOverlap = rAttribs.getInteger( XML_val, 0 ); mrModel.mnOverlap = rAttribs.getInteger( XML_val, 0 );
...@@ -208,7 +207,7 @@ ContextHandlerRef LineTypeGroupContext::onCreateContext( sal_Int32 nElement, con ...@@ -208,7 +207,7 @@ ContextHandlerRef LineTypeGroupContext::onCreateContext( sal_Int32 nElement, con
mrModel.mnGapDepth = rAttribs.getInteger( XML_val, 150 ); mrModel.mnGapDepth = rAttribs.getInteger( XML_val, 150 );
return 0; return 0;
case C_TOKEN( grouping ): 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; return 0;
case C_TOKEN( hiLowLines ): case C_TOKEN( hiLowLines ):
return new ShapePrWrapperContext( *this, mrModel.mxHiLowLines.create() ); return new ShapePrWrapperContext( *this, mrModel.mxHiLowLines.create() );
......
oox/source/drawingml/chart/typegroupmodel.cxx
Dosyayı görüntüle @ 7a8ef88e
...@@ -40,7 +40,7 @@ TypeGroupModel::TypeGroupModel( sal_Int32 nTypeId, bool bMSO2007Doc ) : ...@@ -40,7 +40,7 @@ TypeGroupModel::TypeGroupModel( sal_Int32 nTypeId, bool bMSO2007Doc ) :
mnFirstAngle( 0 ), mnFirstAngle( 0 ),
mnGapDepth( 150 ), mnGapDepth( 150 ),
mnGapWidth( 150 ), mnGapWidth( 150 ),
mnGrouping( XML_standard ), mnGrouping( bMSO2007Doc ? XML_standard : XML_clustered ),
mnHoleSize( 10 ), mnHoleSize( 10 ),
mnOfPieType( XML_pie ), mnOfPieType( XML_pie ),
mnOverlap( 0 ), mnOverlap( 0 ),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment