mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#126115 Chart OOXML Export: fix individual marker

Browse Source 
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>
This commit is contained in:
Balazs Varga
2019-06-28 12:30:19 +02:00
committed by László Németh
parent 1ec6de1cff
commit 0970a47ae9
4 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
chart2/qa/extras/chart2export.cxx
View File

@@ -73,6 +73,7 @@ public:
void testFdo78290LineChartMarkerX();
void testFdo78290ScatterChartMarkerX();
void testFdo78290CombinationChartMarkerX();
void testTdf126115IndividualMarker();
void testAxisNumberFormatODS();
void testAxisNumberFormatXLS();
void testDataLabelBordersDOCX();
@@ -170,6 +171,7 @@ public:
CPPUNIT_TEST(testFdo78290LineChartMarkerX);
CPPUNIT_TEST(testFdo78290ScatterChartMarkerX);
CPPUNIT_TEST(testFdo78290CombinationChartMarkerX);
CPPUNIT_TEST(testTdf126115IndividualMarker);
CPPUNIT_TEST(testAxisNumberFormatODS);
CPPUNIT_TEST(testAxisNumberFormatXLS);
CPPUNIT_TEST(testDataLabelBordersDOCX);
@@ -801,6 +803,22 @@ void Chart2ExportTest::testFdo78290CombinationChartMarkerX()
assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:size[1]","val","7");
}
void Chart2ExportTest::testTdf126115IndividualMarker()
{
// Check individual marker properties.
load("/chart2/qa/extras/data/xlsx/", "tdf126115.xlsx");
xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
// 1. series
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dPt/c:marker/c:symbol", "val", "square");
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dPt/c:marker/c:size", "val", "8");
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dPt/c:marker/c:spPr/a:solidFill/a:srgbClr", "val", "ff0000");
// 2. series
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:symbol", "val", "x");
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:size", "val", "15");
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:spPr/a:solidFill/a:srgbClr", "val", "7030a0");
}
void Chart2ExportTest::testAxisNumberFormatODS()
{
struct

BIN
chart2/qa/extras/data/xlsx/tdf126115.xlsx Normal file
View File

Binary file not shown.

2
include/oox/export/chartexport.hxx
View File

@@ -182,7 +182,7 @@ private:
void exportDataLabels( const css::uno::Reference<css::chart2::XDataSeries>& xSeries, sal_Int32 nSeriesLength, sal_Int32 eChartType );
void exportGrouping( bool isBar = false );
void exportTrendlines( const css::uno::Reference< css::chart2::XDataSeries >& xSeries );
void exportMarker( const css::uno::Reference< css::chart2::XDataSeries >& xSeries );
void exportMarker( const css::uno::Reference< css::beans::XPropertySet >& xPropSet );
void exportSmooth();
void exportFirstSliceAng();

25
oox/source/export/chartexport.cxx
View File

@@ -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;