[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - oox/source

[Markus Mohrhard]

 oox/source/drawingml/chart/chartspacefragment.cxx |    6 +++++-
 oox/source/drawingml/chart/chartspacemodel.cxx    |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 5da802443023e0a43cb6979b0fd82bc5b76311d8
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Tue Mar 10 14:42:26 2015 +0100

    handle one more place with MSO 2007 vs OOXML spec for charts
    
    Change-Id: I7dbc3017f2bba7b186174be2e4fd8c9ce7005d34
    (cherry picked from commit 708d201884c4940647dc65e43e887803f06dce87)

diff --git a/oox/source/drawingml/chart/chartspacefragment.cxx b/oox/source/drawingml/chart/chartspacefragment.cxx
index 8df7f3b..cbcc905 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 da86a4b..7dee6a2 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 ),