diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2015-03-10 14:42:26 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-03-16 14:56:21 +0100 |
| commit | 5da802443023e0a43cb6979b0fd82bc5b76311d8 (patch) | |
| tree | 33a479e9c91b1cd1b87076400a779a6defd8e2ee | |
| parent | b252b59f5cedaf8901d4622c10b0fd259b2e1a95 (diff) | |
handle one more place with MSO 2007 vs OOXML spec for charts
Change-Id: I7dbc3017f2bba7b186174be2e4fd8c9ce7005d34
(cherry picked from commit 708d201884c4940647dc65e43e887803f06dce87)
| -rw-r--r-- | oox/source/drawingml/chart/chartspacefragment.cxx | 6 | ||||
| -rw-r--r-- | oox/source/drawingml/chart/chartspacemodel.cxx | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/oox/source/drawingml/chart/chartspacefragment.cxx b/oox/source/drawingml/chart/chartspacefragment.cxx index 8df7f3b0e45d..cbcc905c829d 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 da86a4bc663e..7dee6a27bcca 100644 --- a/oox/source/drawingml/chart/chartspacemodel.cxx +++ b/oox/source/drawingml/chart/chartspacemodel.cxx @@ -26,7 +26,7 @@ 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 ), |