summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2015-03-10 14:42:26 +0100
committerMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2015-03-16 02:56:04 +0100
commit708d201884c4940647dc65e43e887803f06dce87 (patch)
treeb8b26e7270030bdcd942f1d74dccb667cc32e568
parente2981019cb7ec3befa79a7544cee3d402f458dbf (diff)
handle one more place with MSO 2007 vs OOXML spec for charts
Change-Id: I7dbc3017f2bba7b186174be2e4fd8c9ce7005d34
-rw-r--r--oox/source/drawingml/chart/chartspacefragment.cxx6
-rw-r--r--oox/source/drawingml/chart/chartspacemodel.cxx2
2 files changed, 6 insertions, 2 deletions
diff --git a/oox/source/drawingml/chart/chartspacefragment.cxx b/oox/source/drawingml/chart/chartspacefragment.cxx
index eb014ef9002c..159bc0e50243 100644
--- a/oox/source/drawingml/chart/chartspacefragment.cxx
+++ b/oox/source/drawingml/chart/chartspacefragment.cxx
@@ -91,8 +91,12 @@ ContextHandlerRef ChartSpaceFragment::onCreateContext( sal_Int32 nElement, const
case C_TOKEN( backWall ):
return new WallFloorContext( *this, mrModel.mxBackWall.create() );
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;
+ }
case C_TOKEN( floor ):
return new WallFloorContext( *this, mrModel.mxFloor.create() );
case C_TOKEN( legend ):
diff --git a/oox/source/drawingml/chart/chartspacemodel.cxx b/oox/source/drawingml/chart/chartspacemodel.cxx
index 7dab05808754..8a14bb03fa6c 100644
--- a/oox/source/drawingml/chart/chartspacemodel.cxx
+++ b/oox/source/drawingml/chart/chartspacemodel.cxx
@@ -25,7 +25,7 @@ namespace drawingml {
namespace chart {
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 ),
mbAutoTitleDel( !bMSO2007Doc ), // difference between OOXML spec and MSO 2007
mbPlotVisOnly( false ),