Kaydet (Commit) 708d2018 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

handle one more place with MSO 2007 vs OOXML spec for charts

Change-Id: I7dbc3017f2bba7b186174be2e4fd8c9ce7005d34
üst e2981019
...@@ -91,8 +91,12 @@ ContextHandlerRef ChartSpaceFragment::onCreateContext( sal_Int32 nElement, const ...@@ -91,8 +91,12 @@ ContextHandlerRef ChartSpaceFragment::onCreateContext( sal_Int32 nElement, const
case C_TOKEN( backWall ): case C_TOKEN( backWall ):
return new WallFloorContext( *this, mrModel.mxBackWall.create() ); return new WallFloorContext( *this, mrModel.mxBackWall.create() );
case C_TOKEN( dispBlanksAs ): case C_TOKEN( dispBlanksAs ):
mrModel.mnDispBlanksAs = rAttribs.getToken( XML_val, XML_zero ); {
bool bMSO2007Document = getFilter().isMSO2007Document();
// default value is XML_gap for MSO 2007 and XML_zero in OOXML
mrModel.mnDispBlanksAs = rAttribs.getToken( XML_val, bMSO2007Document ? XML_gap : XML_zero );
return 0; return 0;
}
case C_TOKEN( floor ): case C_TOKEN( floor ):
return new WallFloorContext( *this, mrModel.mxFloor.create() ); return new WallFloorContext( *this, mrModel.mxFloor.create() );
case C_TOKEN( legend ): case C_TOKEN( legend ):
......
...@@ -25,7 +25,7 @@ namespace drawingml { ...@@ -25,7 +25,7 @@ namespace drawingml {
namespace chart { namespace chart {
ChartSpaceModel::ChartSpaceModel(bool bMSO2007Doc) : ChartSpaceModel::ChartSpaceModel(bool bMSO2007Doc) :
mnDispBlanksAs( XML_gap ), // not zero as specified, TODO: OOXML_spec mnDispBlanksAs( bMSO2007Doc ? XML_gap : XML_zero ), // difference between OOXML spec and MSO 2007
mnStyle( 2 ), mnStyle( 2 ),
mbAutoTitleDel( !bMSO2007Doc ), // difference between OOXML spec and MSO 2007 mbAutoTitleDel( !bMSO2007Doc ), // difference between OOXML spec and MSO 2007
mbPlotVisOnly( false ), mbPlotVisOnly( false ),
......
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