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

tdf#126076 XLSX export: fix automatic line chart markers

Browse Source 
The default automatic line chart markers in XLSX spreadsheets
created with Microsoft Excel 2010 became squares after export.

Change-Id: I58a3e10212608a356eef8fbd1e100eda4dbebaca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88461
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
This commit is contained in:
Tünde Tóth
2020-02-11 15:16:34 +01:00
committed by László Németh
parent 796aeeb0f4
commit bae73c0726
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -156,6 +156,7 @@ public:
void testTdf123206_customLabelText();
void testDeletedLegendEntries();
void testTdf130225();
void testTdf126076();
CPPUNIT_TEST_SUITE(Chart2ExportTest);
CPPUNIT_TEST(testErrorBarXLSX);
@@ -275,6 +276,7 @@ public:
CPPUNIT_TEST(testTdf123206_customLabelText);
CPPUNIT_TEST(testDeletedLegendEntries);
CPPUNIT_TEST(testTdf130225);
CPPUNIT_TEST(testTdf126076);
CPPUNIT_TEST_SUITE_END();
@@ -2516,6 +2518,18 @@ void Chart2ExportTest::testTdf130225()
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), deletedLegendEntriesSeq[0]);
}
void Chart2ExportTest::testTdf126076()
{
load("/chart2/qa/extras/data/xlsx/", "auto_marker_excel10.xlsx");
xmlDocPtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
// This was 12: all series exported with square markers
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:marker/c:symbol[@val='square']", 0);
// instead of skipping markers
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:marker", 0);
}
CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();

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

Binary file not shown.

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

@@ -3810,7 +3810,7 @@ void ChartExport::exportMarker(const Reference< XPropertySet >& xPropSet)
if( GetProperty( xPropSet, "Symbol" ) )
mAny >>= aSymbol;
if(aSymbol.Style != chart2::SymbolStyle_STANDARD && aSymbol.Style != chart2::SymbolStyle_AUTO && aSymbol.Style != chart2::SymbolStyle_NONE)
if(aSymbol.Style != chart2::SymbolStyle_STANDARD && aSymbol.Style != chart2::SymbolStyle_NONE)
return;
FSHelperPtr pFS = GetFS();