diff options
| author | Balazs Varga <balazs.varga991@gmail.com> | 2019-06-28 12:30:19 +0200 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2019-07-01 17:28:03 +0200 |
| commit | 157fd297127081abfa11f205d378bdabacf2f8df (patch) | |
| tree | 589d411c7956bb1ab14201f67784754382110a17 /oox/source | |
| parent | b3ee043d469cd1b67fd66e929df58a42a8f12015 (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>
(cherry picked from commit 0970a47ae926bb47458b846e9dc8ff6f3607250c)
Reviewed-on: https://gerrit.libreoffice.org/74958
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Diffstat (limited to 'oox/source')
| -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 ffb7f8042179..8b41e216dede 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -1931,7 +1931,7 @@ void ChartExport::exportSeries( const Reference<chart2::XChartType>& xChartType, break; case chart::TYPEID_LINE: { - exportMarker(xDataSeries); + exportMarker(xOldPropSet); break; } case chart::TYPEID_PIE: @@ -1948,12 +1948,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; } } @@ -3223,12 +3223,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 ) ); } @@ -3434,9 +3442,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; |