diff options
| author | Balazs Varga <balazs.varga991@gmail.com> | 2019-06-28 12:30:19 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2019-06-28 13:51:43 +0200 |
| commit | 0970a47ae926bb47458b846e9dc8ff6f3607250c (patch) | |
| tree | 1a1c9222d8e288494183cadf8fe8ff81d68116bf /oox | |
| parent | 1ec6de1cff6a5f2c15aa85c12c6e327282ca8703 (diff) | |
tdf#126115 Chart OOXML Export: fix individual marker
Export linechart custom (individual) datapoint marker
settings into a <dPt> tag, as the OOXML Standard requires.
Change-Id: I939196c9ea6e091ac9dadb4d62dd85d5408d599c
Reviewed-on: https://gerrit.libreoffice.org/74837
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/chartexport.cxx | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 65b7bd3c3e23..b6c764ddbd8c 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -1930,7 +1930,7 @@ void ChartExport::exportSeries( const Reference<chart2::XChartType>& xChartType, break; case chart::TYPEID_LINE: { - exportMarker(xDataSeries); + exportMarker(xOldPropSet); break; } case chart::TYPEID_PIE: @@ -1947,12 +1947,12 @@ void ChartExport::exportSeries( const Reference<chart2::XChartType>& xChartType, } case chart::TYPEID_SCATTER: { - exportMarker(xDataSeries); + exportMarker(xOldPropSet); break; } case chart::TYPEID_RADARLINE: { - exportMarker(xDataSeries); + exportMarker(xOldPropSet); break; } } @@ -3222,12 +3222,20 @@ void ChartExport::exportDataPoints( case chart::TYPEID_BUBBLE: case chart::TYPEID_HORBAR: case chart::TYPEID_BAR: - { pFS->singleElement(FSNS(XML_c, XML_invertIfNegative), XML_val, "0"); - } - break; + exportShapeProps(xPropSet); + break; + + case chart::TYPEID_LINE: + case chart::TYPEID_SCATTER: + case chart::TYPEID_RADARLINE: + exportMarker(xPropSet); + break; + + default: + exportShapeProps(xPropSet); + break; } - exportShapeProps( xPropSet ); pFS->endElement( FSNS( XML_c, XML_dPt ) ); } @@ -3433,9 +3441,8 @@ void ChartExport::exportTrendlines( const Reference< chart2::XDataSeries >& xSer } } -void ChartExport::exportMarker(const Reference< chart2::XDataSeries >& xSeries) +void ChartExport::exportMarker(const Reference< XPropertySet >& xPropSet) { - Reference< XPropertySet > xPropSet( xSeries, uno::UNO_QUERY ); chart2::Symbol aSymbol; if( GetProperty( xPropSet, "Symbol" ) ) mAny >>= aSymbol; |