summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2015-04-28 12:12:38 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2015-04-30 08:13:17 +0200
commite31805548f78e26c6d98317554449b891193155a (patch)
treee109150cd418dab530dad17aa76d1df69e62249c
parent58ba2e1942044307742d5be275ea4c38f3fdfbdd (diff)
fix showDLblsOverMax MSO2007 vs OOXML default value
Change-Id: Iee541f180d9c569246e7ca8271b65f0717877e4f
-rw-r--r--oox/source/drawingml/chart/chartspacefragment.cxx3
-rw-r--r--oox/source/drawingml/chart/chartspacemodel.cxx2
2 files changed, 2 insertions, 3 deletions
diff --git a/oox/source/drawingml/chart/chartspacefragment.cxx b/oox/source/drawingml/chart/chartspacefragment.cxx
index 8c98ad6a37e3..b3587515222a 100644
--- a/oox/source/drawingml/chart/chartspacefragment.cxx
+++ b/oox/source/drawingml/chart/chartspacefragment.cxx
@@ -105,8 +105,7 @@ ContextHandlerRef ChartSpaceFragment::onCreateContext( sal_Int32 nElement, const
mrModel.mbPlotVisOnly = rAttribs.getBool( XML_val, !bMSO2007Document );
return 0;
case C_TOKEN( showDLblsOverMax ):
- // default is 'false', not 'true' as specified
- mrModel.mbShowLabelsOverMax = rAttribs.getBool( XML_val, false );
+ mrModel.mbShowLabelsOverMax = rAttribs.getBool( XML_val, !bMSO2007Document );
return 0;
case C_TOKEN( sideWall ):
return new WallFloorContext( *this, mrModel.mxSideWall.create() );
diff --git a/oox/source/drawingml/chart/chartspacemodel.cxx b/oox/source/drawingml/chart/chartspacemodel.cxx
index 1e05dff65c87..85ebc8e84a41 100644
--- a/oox/source/drawingml/chart/chartspacemodel.cxx
+++ b/oox/source/drawingml/chart/chartspacemodel.cxx
@@ -29,7 +29,7 @@ ChartSpaceModel::ChartSpaceModel(bool bMSO2007Doc) :
mnStyle( 2 ),
mbAutoTitleDel( !bMSO2007Doc ), // difference between OOXML spec and MSO 2007
mbPlotVisOnly( !bMSO2007Doc ),
- mbShowLabelsOverMax( false ),
+ mbShowLabelsOverMax( !bMSO2007Doc ),
mbPivotChart( false )
{
}