summaryrefslogtreecommitdiff
path: root/oox/source/drawingml
diff options
context:
space:
mode:
Diffstat (limited to 'oox/source/drawingml')
-rw-r--r--oox/source/drawingml/chart/chartspacefragment.cxx7
-rw-r--r--oox/source/drawingml/chart/chartspacemodel.cxx8
-rw-r--r--oox/source/drawingml/shape.cxx3
3 files changed, 11 insertions, 7 deletions
diff --git a/oox/source/drawingml/chart/chartspacefragment.cxx b/oox/source/drawingml/chart/chartspacefragment.cxx
index eec0f1c79bb7..4818bad0a7cb 100644
--- a/oox/source/drawingml/chart/chartspacefragment.cxx
+++ b/oox/source/drawingml/chart/chartspacefragment.cxx
@@ -85,8 +85,13 @@ ContextHandlerRef ChartSpaceFragment::onCreateContext( sal_Int32 nElement, const
switch( nElement )
{
case C_TOKEN( autoTitleDeleted ):
- mrModel.mbAutoTitleDel = rAttribs.getBool( XML_val, true );
+ {
+ bool bMSO2007Document = getFilter().isMSO2007Document();
+
+ // default value is false for MSO 2007 and true in OOXML
+ mrModel.mbAutoTitleDel = rAttribs.getBool( XML_val, !bMSO2007Document );
return 0;
+ }
case C_TOKEN( backWall ):
return new WallFloorContext( *this, mrModel.mxBackWall.create() );
case C_TOKEN( dispBlanksAs ):
diff --git a/oox/source/drawingml/chart/chartspacemodel.cxx b/oox/source/drawingml/chart/chartspacemodel.cxx
index d6e920d85488..b76a55c36a38 100644
--- a/oox/source/drawingml/chart/chartspacemodel.cxx
+++ b/oox/source/drawingml/chart/chartspacemodel.cxx
@@ -23,12 +23,10 @@ namespace oox {
namespace drawingml {
namespace chart {
-
-
-ChartSpaceModel::ChartSpaceModel() :
- mnDispBlanksAs( XML_gap ), // not zero as specified
+ChartSpaceModel::ChartSpaceModel(bool bMSO2007Doc) :
+ mnDispBlanksAs( XML_gap ), // not zero as specified, TODO: OOXML_spec
mnStyle( 2 ),
- mbAutoTitleDel( true ),
+ mbAutoTitleDel( !bMSO2007Doc ), // difference between OOXML spec and MSO 2007
mbPlotVisOnly( false ),
mbShowLabelsOverMax( false ),
mbPivotChart( false )
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index ef0feb770dbb..05bff1a927c9 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1249,7 +1249,8 @@ void Shape::finalizeXShape( XmlFilterBase& rFilter, const Reference< XShapes >&
Reference< chart2::XChartDocument > xChartDoc( xDocModel, UNO_QUERY_THROW );
// load the chart data from the XML fragment
- chart::ChartSpaceModel aModel;
+ bool bMSO2007Doc = rFilter.isMSO2007Document();
+ chart::ChartSpaceModel aModel(bMSO2007Doc);
chart::ChartSpaceFragment *pChartSpaceFragment = new chart::ChartSpaceFragment(
rFilter, mxChartShapeInfo->maFragmentPath, aModel );
const OUString aThemeOverrideFragmentPath( pChartSpaceFragment->