chart2/qa/extras/PivotChartTest.cxx | 2 chart2/qa/extras/chart2export.cxx | 116 ++++---- chart2/qa/extras/chart2export2.cxx | 154 +++++------ chart2/qa/extras/chart2export3.cxx | 102 +++---- chart2/qa/extras/chart2geometry.cxx | 30 +- chart2/qa/extras/chart2import2.cxx | 2 filter/qa/unit/svg.cxx | 24 - include/test/unoapi_test.hxx | 92 ++++++ oox/qa/unit/drawingml.cxx | 8 oox/qa/unit/export.cxx | 94 +++--- oox/qa/unit/mcgr.cxx | 10 oox/qa/unit/testscene3d.cxx | 4 oox/qa/unit/vml.cxx | 2 sc/qa/extras/htmlexporttest.cxx | 6 sc/qa/extras/macros-test.cxx | 18 - sc/qa/extras/scsolverobj.cxx | 2 sc/qa/unit/PivotTableFormatsImportExport.cxx | 32 +- sc/qa/unit/SparklineImportExportTest.cxx | 12 sc/qa/unit/ThemeImportExportTest.cxx | 16 - sc/qa/unit/cond_format.cxx | 38 +- sc/qa/unit/helper/qahelper.cxx | 6 sc/qa/unit/helper/qahelper.hxx | 2 sc/qa/unit/jumbosheets-test.cxx | 24 - sc/qa/unit/pivottable_filters_test.cxx | 94 +++--- sc/qa/unit/scshapetest.cxx | 38 +- sc/qa/unit/subsequent_export_test.cxx | 129 ++++----- sc/qa/unit/subsequent_export_test2.cxx | 148 +++++----- sc/qa/unit/subsequent_export_test3.cxx | 127 ++++----- sc/qa/unit/subsequent_export_test4.cxx | 199 +++++++------- sc/qa/unit/subsequent_filters_test.cxx | 6 sc/qa/unit/subsequent_filters_test2.cxx | 5 sc/qa/unit/subsequent_filters_test5.cxx | 4 sc/qa/unit/tiledrendering/SheetViewTest.cxx | 4 sc/qa/unit/tiledrendering/tiledrendering.cxx | 10 sc/qa/unit/tiledrendering/tiledrendering2.cxx | 4 sc/qa/unit/ucalc_solver.cxx | 2 sc/qa/unit/uicalc/uicalc.cxx | 18 - sd/qa/filter/eppt/eppt.cxx | 6 sd/qa/unit/FontEmbeddingTest.cxx | 6 sd/qa/unit/HtmlExportTest.cxx | 4 sd/qa/unit/SVGExportTests.cxx | 16 - sd/qa/unit/ShapeImportExportTest.cxx | 4 sd/qa/unit/export-tests-ooxml1.cxx | 150 +++++------ sd/qa/unit/export-tests-ooxml2.cxx | 144 +++++----- sd/qa/unit/export-tests-ooxml3.cxx | 96 +++---- sd/qa/unit/export-tests-ooxml4.cxx | 136 ++++----- sd/qa/unit/export-tests.cxx | 171 ++++++------ sd/qa/unit/import-tests-smartart.cxx | 2 sd/qa/unit/import-tests.cxx | 40 +- sd/qa/unit/import-tests2.cxx | 8 sd/qa/unit/layout-tests.cxx | 8 sd/qa/unit/misc-tests.cxx | 20 - sd/qa/unit/tiledrendering/tiledrendering.cxx | 2 sd/qa/unit/uiimpress.cxx | 4 starmath/qa/extras/mmlexport-test.cxx | 12 svx/qa/unit/customshapes.cxx | 2 svx/qa/unit/svdraw.cxx | 2 sw/qa/core/draw/draw.cxx | 2 sw/qa/core/header_footer/HeaderFooterTest.cxx | 46 +-- sw/qa/core/layout/flycnt.cxx | 2 sw/qa/core/macros-test.cxx | 6 sw/qa/core/text/itrform2.cxx | 8 sw/qa/core/text/text.cxx | 40 +- sw/qa/core/unocore/unocore.cxx | 6 sw/qa/extras/docbookexport/docbookexport.cxx | 4 sw/qa/extras/embedded_fonts/embedded_fonts.cxx | 22 - sw/qa/extras/fodfexport/fodfexport.cxx | 6 sw/qa/extras/globalfilter/globalfilter.cxx | 300 +++++++++++----------- sw/qa/extras/htmlexport/htmlexport.cxx | 76 ++--- sw/qa/extras/htmlexport/htmlexport2.cxx | 12 sw/qa/extras/htmlexport/htmlmodeltestbase.hxx | 2 sw/qa/extras/htmlexport/xhtmlexport.cxx | 18 - sw/qa/extras/layout/layout.cxx | 2 sw/qa/extras/layout/layout2.cxx | 2 sw/qa/extras/layout/layout3.cxx | 8 sw/qa/extras/layout/layout4.cxx | 4 sw/qa/extras/layout/layout5.cxx | 12 sw/qa/extras/odfexport/odfexport.cxx | 56 ++-- sw/qa/extras/odfexport/odfexport2.cxx | 46 +-- sw/qa/extras/odfexport/odfexport3.cxx | 30 +- sw/qa/extras/odfexport/odfexport4.cxx | 84 +++--- sw/qa/extras/odfimport/odfimport.cxx | 2 sw/qa/extras/ooxmlexport/ooxmlencryption.cxx | 8 sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 72 ++--- sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 24 - sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 34 +- sw/qa/extras/ooxmlexport/ooxmlexport12.cxx | 140 +++++----- sw/qa/extras/ooxmlexport/ooxmlexport13.cxx | 78 ++--- sw/qa/extras/ooxmlexport/ooxmlexport14.cxx | 58 ++-- sw/qa/extras/ooxmlexport/ooxmlexport15.cxx | 86 +++--- sw/qa/extras/ooxmlexport/ooxmlexport16.cxx | 76 ++--- sw/qa/extras/ooxmlexport/ooxmlexport17.cxx | 52 +-- sw/qa/extras/ooxmlexport/ooxmlexport18.cxx | 68 ++-- sw/qa/extras/ooxmlexport/ooxmlexport19.cxx | 46 +-- sw/qa/extras/ooxmlexport/ooxmlexport2.cxx | 50 +-- sw/qa/extras/ooxmlexport/ooxmlexport20.cxx | 112 ++++---- sw/qa/extras/ooxmlexport/ooxmlexport21.cxx | 54 +-- sw/qa/extras/ooxmlexport/ooxmlexport22.cxx | 42 +-- sw/qa/extras/ooxmlexport/ooxmlexport23.cxx | 74 ++--- sw/qa/extras/ooxmlexport/ooxmlexport24.cxx | 44 +-- sw/qa/extras/ooxmlexport/ooxmlexport25.cxx | 24 - sw/qa/extras/ooxmlexport/ooxmlexport3.cxx | 88 +++--- sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 132 ++++----- sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 100 +++---- sw/qa/extras/ooxmlexport/ooxmlexport6.cxx | 80 ++--- sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 94 +++--- sw/qa/extras/ooxmlexport/ooxmlexport8.cxx | 8 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 42 +-- sw/qa/extras/ooxmlexport/ooxmlexport_template.cxx | 2 sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx | 140 +++++----- sw/qa/extras/ooxmlexport/ooxmllinks.cxx | 16 - sw/qa/extras/ooxmlexport/ooxmlw14export.cxx | 20 - sw/qa/extras/ooxmlimport/ooxmlimport2.cxx | 2 sw/qa/extras/rtfexport/rtfexport.cxx | 118 ++++---- sw/qa/extras/rtfexport/rtfexport2.cxx | 150 +++++------ sw/qa/extras/rtfexport/rtfexport3.cxx | 86 +++--- sw/qa/extras/rtfexport/rtfexport4.cxx | 78 ++--- sw/qa/extras/rtfexport/rtfexport5.cxx | 120 ++++---- sw/qa/extras/rtfexport/rtfexport6.cxx | 120 ++++---- sw/qa/extras/rtfexport/rtfexport7.cxx | 114 ++++---- sw/qa/extras/rtfexport/rtfexport8.cxx | 86 +++--- sw/qa/extras/txtencexport/txtencexport.cxx | 4 sw/qa/extras/txtexport/txtexport.cxx | 12 sw/qa/extras/txtimport/txtimport.cxx | 2 sw/qa/extras/uiwriter/uiwriter.cxx | 2 sw/qa/extras/uiwriter/uiwriter10.cxx | 16 - sw/qa/extras/uiwriter/uiwriter2.cxx | 12 sw/qa/extras/uiwriter/uiwriter4.cxx | 14 - sw/qa/extras/uiwriter/uiwriter5.cxx | 4 sw/qa/extras/uiwriter/uiwriter6.cxx | 16 - sw/qa/extras/uiwriter/uiwriter7.cxx | 6 sw/qa/extras/uiwriter/uiwriter8.cxx | 8 sw/qa/extras/uiwriter/uiwriter9.cxx | 6 sw/qa/extras/unowriter/unowriter.cxx | 2 sw/qa/extras/ww8export/ww8export.cxx | 40 +- sw/qa/extras/ww8export/ww8export2.cxx | 46 +-- sw/qa/extras/ww8export/ww8export3.cxx | 54 +-- sw/qa/extras/ww8export/ww8export4.cxx | 44 +-- sw/qa/filter/html/html.cxx | 8 sw/qa/filter/md/md.cxx | 38 +- sw/qa/filter/ww8/ww8.cxx | 24 - sw/qa/filter/xml/xml.cxx | 2 sw/qa/inc/swmodeltestbase.hxx | 10 sw/qa/uibase/uiview/uiview.cxx | 2 sw/qa/unit/swmodeltestbase.cxx | 6 test/source/unoapi_test.cxx | 17 - unoxml/qa/unit/rdftest.cxx | 4 vcl/qa/cppunit/pdfexport/pdfexport2.cxx | 2 xmloff/qa/unit/draw.cxx | 60 ++-- xmloff/qa/unit/style.cxx | 40 +- xmloff/qa/unit/text.cxx | 54 +-- xmloff/qa/unit/text/txtparae.cxx | 2 xmloff/qa/unit/text/txtprmap.cxx | 2 xmlsecurity/qa/unit/signing/signing.cxx | 88 +++--- xmlsecurity/qa/unit/signing/signing2.cxx | 10 xmlsecurity/qa/xmlsec/xmlsec.cxx | 2 156 files changed, 3343 insertions(+), 3267 deletions(-)
New commits: commit 801dc48c6f7df686574c76e8ca67ac59dd1604f8 Author: Xisco Fauli <[email protected]> AuthorDate: Tue Nov 18 12:54:02 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Tue Nov 18 21:11:02 2025 +0100 UnoApiTest: Add enum for filter names and use it in save/saveAndReload Change-Id: I3d82ab54119ab6c35587ea706c82254a5c39dbd3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194158 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/chart2/qa/extras/PivotChartTest.cxx b/chart2/qa/extras/PivotChartTest.cxx index 30cd8c656526..d20660e331ad 100644 --- a/chart2/qa/extras/PivotChartTest.cxx +++ b/chart2/qa/extras/PivotChartTest.cxx @@ -351,7 +351,7 @@ void PivotChartTest::testRoundtrip() CPPUNIT_ASSERT_EQUAL(u"Total"_ustr, xLabelDataSequence->getData()[0].get<OUString>()); } - saveAndReload(u"calc8"_ustr); + saveAndReload(TestFilter::ODS); xChartDoc = getPivotChartDocFromSheet(1 ); CPPUNIT_ASSERT(xChartDoc.is()); diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 032cfaf47e69..4e8b149af20c 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -208,7 +208,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testErrorBarXLSX) testErrorBar(xErrorBarYProps); } - saveAndReload(u"Calc Office Open XML"_ustr); + saveAndReload(TestFilter::XLSX); { uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0 ); CPPUNIT_ASSERT(xChartDoc.is()); @@ -228,7 +228,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testErrorBarXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testErrorBarPropXLSX) { loadFromFile(u"xlsx/testErrorBarProp.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -252,7 +252,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testTrendline) skipValidation(); loadFromFile(u"ods/trendline.ods"); checkTrendlinesInChart(getDataSeriesFromDoc( getChartDocFromSheet( 0), 0 )); - saveAndReload(u"calc8"_ustr); + saveAndReload(TestFilter::ODS); checkTrendlinesInChart(getDataSeriesFromDoc( getChartDocFromSheet( 0), 0 )); } @@ -260,7 +260,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testTrendlineOOXML) { loadFromFile(u"ods/trendline.ods"); checkTrendlinesInChart(getDataSeriesFromDoc( getChartDocFromSheet( 0), 0 )); - saveAndReload(u"Calc Office Open XML"_ustr); + saveAndReload(TestFilter::XLSX); checkTrendlinesInChart(getDataSeriesFromDoc( getChartDocFromSheet( 0), 0 )); } @@ -268,14 +268,14 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testTrendlineXLS) { loadFromFile(u"ods/trendline.ods"); checkTrendlinesInChart(getDataSeriesFromDoc( getChartDocFromSheet( 0), 0 )); - saveAndReload(u"MS Excel 97"_ustr); + saveAndReload(TestFilter::XLS); checkTrendlinesInChart(getDataSeriesFromDoc( getChartDocFromSheet( 0), 0 )); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testMovingAverage) { loadFromFile(u"ods/moving-type.ods"); - saveAndReload(u"calc8"_ustr); + saveAndReload(TestFilter::ODS); uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0); CPPUNIT_ASSERT(xChartDoc.is()); @@ -311,7 +311,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testStockChart) */ loadFromFile(u"docx/testStockChart.docx"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -326,7 +326,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testStockChart) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testBarChart) { loadFromFile(u"docx/testBarChart.docx"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -338,7 +338,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testCrosses) // test crosses val="autoZero" with DOCX { loadFromFile(u"docx/Bar_horizontal_cone.docx"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:crosses", "val", u"autoZero"); @@ -346,7 +346,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testCrosses) // tdf#142351: test crossesAt val="-50" with XLSX { loadFromFile(u"xlsx/tdf142351.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -396,7 +396,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testScatterChartTextXValues) CPPUNIT_ASSERT_EQUAL(5.0, aYValues[2][3]); // Test the export. - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -407,7 +407,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testScatterXAxisValues) { loadFromFile(u"odt/tdf114657.odt"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -422,7 +422,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testScatterXAxisCategories) { loadFromFile(u"odt/tdf131143.odt"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "//c:scatterChart/c:ser[1]/c:xVal/c:strRef/c:strCache/c:ptCount", "val", u"4"); @@ -434,7 +434,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testChartDataTable) { loadFromFile(u"docx/testChartDataTable.docx"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dTable/c:showHorzBorder", "val", u"1"); @@ -446,7 +446,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testChartExternalData) { loadFromFile(u"docx/testMultipleChart.docx"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:externalData"); @@ -498,7 +498,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testAreaChartLoad) // FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:areaChart/c:ser/c:dLbls/c:showVal", "val", u"1"); @@ -508,7 +508,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testAreaChartLoad) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testUpDownBars) { loadFromFile(u"docx/UpDownBars.docx"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:upDownBars", 0); @@ -517,7 +517,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testUpDownBars) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDoughnutChart) { loadFromFile(u"docx/doughnutChart.docx"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -527,7 +527,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDoughnutChart) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieOfPieChart) { loadFromFile(u"xlsx/pieOfPieChart.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -538,7 +538,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieOfPieChart) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testBarOfPieChart) { loadFromFile(u"xlsx/barOfPieChart.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -549,7 +549,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testBarOfPieChart) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieOfPieSplitPos) { loadFromFile(u"xlsx/pieOfPieChart2.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -560,7 +560,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieOfPieSplitPos) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testBarOfPieSplitPos) { loadFromFile(u"xlsx/barOfPieChart2.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -571,7 +571,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testBarOfPieSplitPos) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDisplayUnits) { loadFromFile(u"docx/DisplayUnits.docx"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -581,7 +581,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDisplayUnits) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo74115WallGradientFill) { loadFromFile(u"docx/fdo74115_WallGradientFill.docx"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -591,7 +591,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo74115WallGradientFill) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo74115WallBitmapFill) { loadFromFile(u"docx/fdo74115_WallBitmapFill.docx"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:blipFill"); @@ -604,7 +604,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieChartWallLineStyle) // FIXME: validation error in OOXML export: Errors: 9 skipValidation(); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:ln/a:noFill"); @@ -615,7 +615,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieChartWallLineStyle) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo78290LineChartMarkerX) { loadFromFile(u"docx/fdo78290_Line_Chart_Marker_x.docx"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:symbol[1]","val",u"x"); @@ -627,7 +627,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo78290LineChartMarkerX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo78290ScatterChartMarkerX) { loadFromFile(u"docx/fdo78290_Scatter_Chart_Marker_x.docx"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:scatterChart[1]/c:ser[1]/c:marker[1]/c:symbol[1]","val",u"x"); @@ -640,7 +640,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo78290ScatterChartMarkerX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo78290CombinationChartMarkerX) { loadFromFile(u"docx/fdo78290_Combination_Chart_Marker_x.docx"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:symbol[1]","val",u"x"); @@ -651,7 +651,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testTdf126115IndividualMarker) { // Check individual marker properties. loadFromFile(u"xlsx/tdf126115.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // 1. series @@ -703,7 +703,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testAxisNumberFormatODS) verify(xChartDoc); // Reload the document and make sure everything remains intact. - saveAndReload(u"calc8"_ustr); + saveAndReload(TestFilter::ODS); xChartDoc = getChartDocFromSheet(0); verify(xChartDoc); } @@ -752,7 +752,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testAxisNumberFormatXLS) xPS->setPropertyValue( CHART_UNONAME_NUMFMT, aAny ); // Write the document(xls) with changes made close it, load it and check if changes are intact - saveAndReload( u"MS Excel 97"_ustr ); + saveAndReload(TestFilter::XLS); xChartDoc = getChartDocFromSheet( 0 ); verify( xChartDoc, false, util::NumberFormat::NUMBER ); } @@ -837,7 +837,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelBordersDOCX) // FIXME: validation error in OOXML export: Errors: 3 skipValidation(); - saveAndReload(u"Office Open XML Text"_ustr); + saveAndReload(TestFilter::DOCX); xChartDoc.set(getChartDocFromWriter(0), uno::UNO_QUERY); verify(xChartDoc , 0); @@ -855,7 +855,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabel3DChartDOCX) // FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -872,7 +872,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelBarChartDOCX) Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -891,7 +891,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelClusteredBarChartDOCX) // FIXME: validation error in OOXML export: Errors: 9 skipValidation(); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -906,7 +906,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelRadarChartDOCX) Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -925,7 +925,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelDoughnutChartDOCX) // FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -944,7 +944,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelAreaChartDOCX) // FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -964,7 +964,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelDefaultLineChartDOCX) Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - saveAndReload(u"Office Open XML Text"_ustr); + saveAndReload(TestFilter::DOCX); xChartDoc.set(getChartDocFromWriter(0), uno::UNO_QUERY); Reference<chart2::XDataSeries> xDataSeries = getDataSeriesFromDoc(xChartDoc, 0); @@ -983,7 +983,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testIndividualDataLabelProps) // FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[3]/c:dLbls/c:dLbl/c:txPr/a:p/a:pPr/a:defRPr", "b", u"1"); @@ -995,7 +995,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testIndividualDataLabelProps) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testBarChartRotation) { loadFromFile(u"docx/barChartRotation.docx"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -1015,7 +1015,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testShapeFollowedByChart) // FIXME: validation error in OOXML export: Errors: 5 skipValidation(); - save(u"Office Open XML Text"_ustr ); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -1032,7 +1032,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieChartDataLabels) // FIXME: validation error in OOXML export: Errors: 19 skipValidation(); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pie3DChart/c:ser[1]/c:dLbls/c:dLbl[1]/c:dLblPos", "val", u"outEnd"); @@ -1041,7 +1041,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieChartDataLabels) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testSeriesIdxOrder) { loadFromFile(u"docx/testSeriesIdxOrder.docx"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:idx[1]", "val", u"1"); @@ -1065,7 +1065,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testScatterPlotLabels) CPPUNIT_ASSERT_EQUAL(u"c"_ustr, aLabels[2][0].get<OUString>()); // Reload the doc and check again. The labels should not change. - saveAndReload(u"writer8"_ustr); + saveAndReload(TestFilter::ODT); xChartDoc.set(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1083,7 +1083,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testScatterPlotLabels) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testErrorBarDataRangeODS) { loadFromFile(u"ods/ErrorBarRange.ods"); - saveAndReload(u"calc8"_ustr); + saveAndReload(TestFilter::ODS); uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0 ); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1112,7 +1112,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testErrorBarDataRangeODS) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, tdf50934_barOfPie) { loadFromFile(u"ods/tdf50934_barOfPie.ods"); - saveAndReload(u"calc8"_ustr); + saveAndReload(TestFilter::ODS); uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0 ); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1135,7 +1135,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, tdf50934_barOfPie) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, tdf50934_pieOfPie) { loadFromFile(u"ods/tdf50934_pieOfPie.ods"); - saveAndReload(u"calc8"_ustr); + saveAndReload(TestFilter::ODS); uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0 ); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1158,7 +1158,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, tdf50934_pieOfPie) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, tdf161800_barOfPie_split_pos) { loadFromFile(u"ods/tdf161800_barOfPie_split_pos.ods"); - saveAndReload(u"calc8"_ustr); + saveAndReload(TestFilter::ODS); uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0 ); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1178,7 +1178,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, tdf161800_barOfPie_split_pos) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, tdf161800_pieOfPie_split_pos) { loadFromFile(u"ods/tdf161800_pieOfPie_split_pos.ods"); - saveAndReload(u"calc8"_ustr); + saveAndReload(TestFilter::ODS); uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0 ); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1201,7 +1201,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, tdf161800_pieOfPie_split_pos) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testChartCrash) { loadFromFile(u"docx/FDO75975.docx"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); } @@ -1209,7 +1209,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testChartCrash) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieChartRotation) { loadFromFile(u"docx/pieChartRotation.docx"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotX", "val", u"40"); @@ -1295,7 +1295,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testGapWidthXLSX) xChartDoc = getChartDocFromSheet( 1 ); checkSheetForGapWidthAndOverlap(getChartTypeFromDoc( xChartDoc, 0 ), 50, 30); - saveAndReload(u"Calc Office Open XML"_ustr); + saveAndReload(TestFilter::XLSX); xChartDoc = getChartDocFromSheet( 0 ); checkSheetForGapWidthAndOverlap(getChartTypeFromDoc( xChartDoc, 0 ), 120, -60); @@ -1316,7 +1316,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataseriesOverlapStackedChartXLSX) xChartDoc = getChartDocFromSheet( 1); checkSheetForGapWidthAndOverlap(getChartTypeFromDoc( xChartDoc, 0 ), 100, 35); - saveAndReload(u"Calc Office Open XML"_ustr); + saveAndReload(TestFilter::XLSX); xChartDoc = getChartDocFromSheet( 0); checkSheetForGapWidthAndOverlap(getChartTypeFromDoc( xChartDoc, 0 ), 100, 100); @@ -1328,7 +1328,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataseriesOverlapStackedChartXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testSmoothedLines) { loadFromFile(u"ods/smoothedLines.ods"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:smooth", "val", u"0"); @@ -1346,7 +1346,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testLabelStringODS) OUString aLabelString = xLabelSeq->getSourceRangeRepresentation(); CPPUNIT_ASSERT_EQUAL(u"\"LabelName\""_ustr, aLabelString); - saveAndReload(u"calc8"_ustr); + saveAndReload(TestFilter::ODS); xChartDoc = getChartDocFromSheet( 0 ); xLabelSeq = getLabelDataSequenceFromDoc(xChartDoc); @@ -1403,7 +1403,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testStyleImportExport) // Test that this value round-trips successfully. loadFromFile(std::u16string_view(u"xlsx/column-style.xlsx")); - save("Calc Office Open XML"); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/style1.xml"); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/cs:chartStyle"); diff --git a/chart2/qa/extras/chart2export2.cxx b/chart2/qa/extras/chart2export2.cxx index e6253342dcce..8295da0c19b2 100644 --- a/chart2/qa/extras/chart2export2.cxx +++ b/chart2/qa/extras/chart2export2.cxx @@ -42,7 +42,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testSetSeriesToSecondaryAxisXLSX) // Attach the second series to the secondary axis. (The third series is already attached.) xPropSet->setPropertyValue(u"AttachedAxisIndex"_ustr, uno::Any(AxisIndex)); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Check there are only two <lineChart> tag in the XML, one for the primary and one for the secondary axis. @@ -53,7 +53,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCombinedChartSecondaryAxisXLSX) { // Original file was created with MS Office loadFromFile(u"xlsx/combined_chart_secondary_axis.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Collect barchart axID on secondary Axis @@ -81,7 +81,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCombinedChartSecondaryAxisODS) { // Original file was created with LibreOffice loadFromFile(u"ods/combined_chart_secondary_axis.ods"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Collect barchart axID on secondary Axis @@ -115,7 +115,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCrossBetweenXLSX) // Original files were created with MS Office { loadFromFile(u"xlsx/tdf127777.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val", @@ -123,7 +123,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCrossBetweenXLSX) } { loadFromFile(u"xlsx/tdf132076.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val", @@ -135,7 +135,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCrossBetweenWithDeletedAxis) { // Original file was created with MS Office (the category axis is deleted in the file) loadFromFile(u"xlsx/tdf128633.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val", @@ -146,7 +146,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCrossBetweenODS) { // Original file was created with LibreOffice loadFromFile(u"ods/test_CrossBetween.ods"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val", @@ -156,7 +156,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCrossBetweenODS) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testChartexTitleXLSX) { loadFromFile(u"xlsx/funnel1.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chartEx1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -174,7 +174,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testChartexTitleXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testChartexPPTX) { loadFromFile(u"pptx/funnel-pp1.pptx"); - save(u"Impress Office Open XML"_ustr); + save(TestFilter::PPTX); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chartEx1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -185,7 +185,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testChartexPPTX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testAxisTitleRotationXLSX) { loadFromFile(u"xlsx/axis_title_rotation.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -196,7 +196,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testAxisTitleRotationXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testAxisTitlePositionDOCX) { loadFromFile(u"docx/testAxisTitlePosition.docx"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -233,7 +233,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testAxisCrossBetweenDOCX) // FIXME: validation error in OOXML export: Errors: 3 skipValidation(); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); assertXPath(pXmlDoc, "(//c:crossBetween)[1]", "val", u"midCat"); } @@ -241,7 +241,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testAxisCrossBetweenDOCX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testPieChartDataPointExplosionXLSX) { loadFromFile(u"xlsx/pie_chart_datapoint_explosion.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -360,7 +360,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomDataLabel) aFields[1]->getFieldType()); CPPUNIT_ASSERT_EQUAL(u" <CELLREF"_ustr, aFields[1]->getString()); - save(u"Impress MS PowerPoint 2007 XML"_ustr); + save(TestFilter::PPTX_2007); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Check the data labels font color for the complete data series @@ -377,7 +377,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDataSeriesName) // ODF { loadFromFile(u"ods/ser_labels.ods"); - saveAndReload(u"calc8"_ustr); + saveAndReload(TestFilter::ODS); uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); CPPUNIT_ASSERT(xDataSeries.is()); @@ -391,7 +391,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDataSeriesName) // OOXML { loadFromFile(u"xlsx/ser_labels.xlsx"); - saveAndReload(u"Calc Office Open XML"_ustr); + saveAndReload(TestFilter::XLSX); uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); CPPUNIT_ASSERT(xDataSeries.is()); @@ -410,7 +410,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomPositionofDataLabel) loadFromFile(u"xlsx/testCustomPosDataLabels.xlsx"); { - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -435,7 +435,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomPositionofDataLabel) loadFromFile(u"docx/testTdf108110.docx"); { - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -460,7 +460,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomPositionofDataLabel) loadFromFile(u"ods/tdf136024.ods"); { - saveAndReload(u"calc8"_ustr); + saveAndReload(TestFilter::ODS); // tdf#136024: test custom position of pie chart data label after an ods export Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT(xChartDoc.is()); @@ -484,7 +484,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf161571PiechartCustomPosDataLabels skipValidation(); loadFromFile(u"xlsx/tdf161607PieChartLeaderLinesColorWidth.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -576,7 +576,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testLeaderLines) loadFromFile(u"xlsx/testTdf90749.xlsx"); { - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, @@ -590,7 +590,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testLeaderLines) } loadFromFile(u"docx/MSO_Custom_Leader_Line.docx"); { - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // tdf#134571: Check the leader line is switch off. @@ -607,7 +607,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf161607PieChartLeaderLinesColorWid skipValidation(); loadFromFile(u"xlsx/tdf161607PieChartLeaderLinesColorWidth.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -631,7 +631,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf161607PieChartLeaderLinesColorWid CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testNumberFormatExportPPTX) { loadFromFile(u"pptx/tdf115859.pptx"); - save(u"Impress MS PowerPoint 2007 XML"_ustr); + save(TestFilter::PPTX_2007); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -648,7 +648,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testLabelSeparatorExportDOCX) Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -666,7 +666,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testLabelSeparatorExportDOCX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testChartTitlePropertiesColorFillPPTX) { loadFromFile(u"pptx/testChartTitlePropertiesColorFill.pptx"); - save(u"Impress MS PowerPoint 2007 XML"_ustr); + save(TestFilter::PPTX_2007); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPathInsensitive(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr", @@ -677,7 +677,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testChartTitlePropertiesColorFillPPTX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testChartTitlePropertiesGradientFillPPTX) { loadFromFile(u"pptx/testChartTitlePropertiesGradientFill.pptx"); - save(u"Impress MS PowerPoint 2007 XML"_ustr); + save(TestFilter::PPTX_2007); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPathInsensitive( @@ -692,7 +692,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testChartTitlePropertiesGradientFillPPTX CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testChartTitlePropertiesBitmapFillPPTX) { loadFromFile(u"pptx/testChartTitlePropertiesBitmapFill.pptx"); - save(u"Impress MS PowerPoint 2007 XML"_ustr); + save(TestFilter::PPTX_2007); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:blipFill/a:blip", "embed", @@ -703,7 +703,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testChartTitlePropertiesBitmapFillPPTX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testxAxisLabelsRotation) { loadFromFile(u"xlsx/xAxisLabelsRotation.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc1 = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc1); @@ -715,7 +715,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testxAxisLabelsRotation) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testMultipleCategoryAxisLablesXLSX) { loadFromFile(u"ods/multilevelcat.ods"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // check category axis labels number of first level @@ -748,7 +748,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testMultipleCategoryAxisLablesXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testMultipleCategoryAxisLablesDOCX) { loadFromFile(u"odt/multilevelcat.odt"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // check category axis labels number of first level @@ -781,7 +781,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testMultipleCategoryAxisLablesDOCX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf116163) { loadFromFile(u"pptx/tdf116163.pptx"); - save(u"Impress MS PowerPoint 2007 XML"_ustr); + save(TestFilter::PPTX_2007); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -792,7 +792,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf116163) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf111824) { loadFromFile(u"xlsx/tdf111824.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -807,7 +807,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf111824) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, test3DAreaChartZAxis) { loadFromFile(u"xlsx/test3DAreaChartZAxis.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -823,7 +823,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf119029) { loadFromFile(u"odp/tdf119029.odp"); // Only use "chart", without number, because the number depends on the previous tests - save(u"Impress MS PowerPoint 2007 XML"_ustr); + save(TestFilter::PPTX_2007); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -835,7 +835,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf119029) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf108022) { loadFromFile(u"odt/tdf108022.odt"); - saveAndReload(u"Office Open XML Text"_ustr); + saveAndReload(TestFilter::DOCX); // assert we really have two charts Reference<chart2::XChartDocument> xChartDoc1(getChartDocFromWriter(0), uno::UNO_QUERY); @@ -847,7 +847,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf108022) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf121744) { loadFromFile(u"docx/tdf121744.docx"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -863,7 +863,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf121744) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf121189) { loadFromFile(u"odp/tdf121189.odp"); - saveAndReload(u"Impress Office Open XML"_ustr); + saveAndReload(TestFilter::PPTX); uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent, uno::UNO_QUERY_THROW); uno::Reference<drawing::XDrawPage> xPage(xDoc->getDrawPages()->getByIndex(0), @@ -881,7 +881,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf122031) // FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -901,7 +901,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf122031) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf115012) { loadFromFile(u"xlsx/tdf115012.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // workaround: use-zero instead of leave-gap to show the original line chart @@ -915,7 +915,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf134118) // FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // workaround: use leave-gap instead of zero to show the original line chart @@ -932,7 +932,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf123206_customLabelText) // FIXME: validation error in OOXML export: Errors: 2 skipValidation(); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -946,7 +946,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, test_style) { loadFromFile(u"xlsx/column-style.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // workaround: use leave-gap instead of zero to show the original line chart @@ -963,7 +963,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomLabelText) // FIXME: validation error in OOXML export: Errors: 3 skipValidation(); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -996,7 +996,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDeletedLegendEntries) { loadFromFile(u"xlsx/deleted_legend_entry.xlsx"); { - saveAndReload(u"Calc Office Open XML"_ustr); + saveAndReload(TestFilter::XLSX); Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT(xChartDoc.is()); Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 1)); @@ -1010,7 +1010,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDeletedLegendEntries) loadFromFile(u"xlsx/deleted_legend_entry2.xlsx"); { - saveAndReload(u"Calc Office Open XML"_ustr); + saveAndReload(TestFilter::XLSX); Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT(xChartDoc.is()); Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); @@ -1036,7 +1036,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDeletedLegendEntries) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf60316) { loadFromFile(u"pptx/tdf60316.pptx"); - save(u"Impress MS PowerPoint 2007 XML"_ustr); + save(TestFilter::PPTX_2007); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -1048,7 +1048,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf60316) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf130225) { loadFromFile(u"docx/piechart_deleted_legend_entry.docx"); - saveAndReload(u"Office Open XML Text"_ustr); + saveAndReload(TestFilter::DOCX); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); @@ -1063,7 +1063,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf130225) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf59857) { loadFromFile(u"ods/tdf59857.ods"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -1079,7 +1079,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf59857) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf126076) { loadFromFile(u"xlsx/auto_marker_excel10.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -1094,7 +1094,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf126076) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf75330) { loadFromFile(u"ods/legend_overlay.ods"); - saveAndReload(u"calc8"_ustr); + saveAndReload(TestFilter::ODS); { uno::Reference<chart2::XChartDocument> xChart2Doc = getChartDocFromSheet(0); uno::Reference<chart::XChartDocument> xChartDoc(xChart2Doc, uno::UNO_QUERY); @@ -1104,7 +1104,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf75330) CPPUNIT_ASSERT(xPropertySet->getPropertyValue(u"Overlay"_ustr) >>= bOverlay); CPPUNIT_ASSERT(bOverlay); } - saveAndReload(u"Calc Office Open XML"_ustr); + saveAndReload(TestFilter::XLSX); { uno::Reference<chart2::XChartDocument> xChart2Doc = getChartDocFromSheet(0); uno::Reference<chart::XChartDocument> xChartDoc(xChart2Doc, uno::UNO_QUERY); @@ -1119,7 +1119,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf75330) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf127792) { loadFromFile(u"docx/MSO_axis_position.docx"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val", @@ -1135,7 +1135,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf131979) { loadFromFile(u"ods/tdf131115.ods"); { - saveAndReload(u"calc8"_ustr); + saveAndReload(TestFilter::ODS); Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT(xChartDoc.is()); Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); @@ -1151,7 +1151,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf131979) loadFromFile(u"ods/tdf131979.ods"); { - saveAndReload(u"calc8"_ustr); + saveAndReload(TestFilter::ODS); Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT(xChartDoc.is()); Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); @@ -1173,7 +1173,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf132076) { loadFromFile(u"ods/tdf132076.ods"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:numFmt", "formatCode", @@ -1183,7 +1183,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf132076) } { loadFromFile(u"xlsx/tdf132076.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:numFmt", "formatCode", @@ -1196,7 +1196,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf132076) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf125812) { loadFromFile(u"odp/ellipticalGradientFill.odp"); - save(u"Impress MS PowerPoint 2007 XML"_ustr); + save(TestFilter::PPTX_2007); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:path", "path", @@ -1218,7 +1218,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf133190) // FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -1240,7 +1240,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf133191) // FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -1254,7 +1254,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf133191) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf132594) { loadFromFile(u"xlsx/chart_pie2007.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -1279,7 +1279,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf134255) skipValidation(); // export test - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -1309,7 +1309,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf134977) skipValidation(); //export test - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, @@ -1321,7 +1321,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf134977) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf123647) { loadFromFile(u"xlsx/empty_chart.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -1335,7 +1335,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf136267) // FIXME: validation error in OOXML export: Errors: 2 skipValidation(); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -1348,7 +1348,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf136267) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDataLabelPlacementPieChart) { loadFromFile(u"xlsx/tdf134978.xlsx"); - saveAndReload(u"calc8"_ustr); + saveAndReload(TestFilter::ODS); uno::Reference<chart::XChartDocument> xChartDoc(getChartCompFromSheet(0, 0), UNO_QUERY_THROW); // test the placement of the manually positioned label Reference<beans::XPropertySet> xDataPointPropSet( @@ -1367,7 +1367,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf137917) // FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -1438,7 +1438,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf138204) // FIXME: validation error in OOXML export: Errors: 2 skipValidation(); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -1482,7 +1482,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf138181) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomShapeText) { loadFromFile(u"ods/tdf72776.ods"); - saveAndReload(u"calc8"_ustr); + saveAndReload(TestFilter::ODS); Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0), UNO_QUERY_THROW); // test that the text of custom shape exists inside the chart Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, UNO_QUERY_THROW); @@ -1497,7 +1497,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomShapeText) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testuserShapesXLSX) { loadFromFile(u"xlsx/tdf128621.xlsx"); - saveAndReload(u"Calc Office Open XML"_ustr); + saveAndReload(TestFilter::XLSX); Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1525,7 +1525,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testuserShapesXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testuserShapesDOCX) { loadFromFile(u"docx/tdf143130.docx"); - saveAndReload(u"Office Open XML Text"_ustr); + saveAndReload(TestFilter::DOCX); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1553,7 +1553,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testuserShapesDOCX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testGraphicBlipXLSX) { loadFromFile(u"xlsx/tdf143127.xlsx"); - saveAndReload(u"Calc Office Open XML"_ustr); + saveAndReload(TestFilter::XLSX); Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1581,7 +1581,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testGraphicBlipXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testNameRangeXLSX) { loadFromFile(u"xlsx/chart_with_name_range.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // test the syntax of local range name on the local sheet. @@ -1630,7 +1630,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf143942) // FIXME: validation error in OOXML export: Errors: 4 skipValidation(); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -1670,7 +1670,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDateCategoriesPPTX) // FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - save(u"Impress Office Open XML"_ustr); + save(TestFilter::PPTX); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -1730,7 +1730,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDataTableImportExport) CPPUNIT_ASSERT(xPropertySet->getPropertyValue(u"Keys"_ustr) >>= bKeys); CPPUNIT_ASSERT_EQUAL(false, bKeys); } - saveAndReload(u"calc8"_ustr); + saveAndReload(TestFilter::ODS); { uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1760,7 +1760,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf166249) loadFromFile(u"xlsx/tdf166249.xlsx"); // FIXME: validation error in OOXML export skipValidation(); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); diff --git a/chart2/qa/extras/chart2export3.cxx b/chart2/qa/extras/chart2export3.cxx index f8655e99a3fe..31d407cbe787 100644 --- a/chart2/qa/extras/chart2export3.cxx +++ b/chart2/qa/extras/chart2export3.cxx @@ -31,7 +31,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf108107) // FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:idx", "val", u"1"); @@ -42,7 +42,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf108107) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf114139) { loadFromFile(u"xlsx/tdf114139.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -55,7 +55,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf114139) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf64224) { loadFromFile(u"ods/tdf64224.ods"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -67,7 +67,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf64224) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesColorFillDOCX) { loadFromFile(u"docx/testChartTitlePropertiesColorFill.docx"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPathInsensitive(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr", "val", u"ff0000"); @@ -77,7 +77,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesColorFillDOCX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesGradientFillDOCX) { loadFromFile(u"docx/testChartTitlePropertiesGradientFill.docx"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPathInsensitive(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr", "val", u"cccccc"); @@ -88,7 +88,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesGradientFillDOCX CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesBitmapFillDOCX) { loadFromFile(u"docx/testChartTitlePropertiesBitmapFill.docx"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:blipFill/a:blip", "embed", u"rId1"); @@ -100,7 +100,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testColorGradientWithTransparencyDOCX) { // Test color gradient (two color) with gradient transparency loadFromFile(u"docx/testColorGradientWithTransparency.docx"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Test the transparency of the first color @@ -113,7 +113,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testColorGradientWithTransparencyODS) { // Test color gradient (two color) with simple transparency loadFromFile(u"ods/testColorGradientWithTransparency.ods"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Test the transparency of the first color @@ -126,7 +126,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testColorGradientStopXLSX) { // Test color gradient (two color) stop of the first color loadFromFile(u"xlsx/tdf128619.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Test the position of the first color @@ -138,7 +138,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testColorGradientStopXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testRadialColorGradientDOCX) { loadFromFile(u"docx/tdf128794.docx"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Test the gradient style (if there is no 'a:path' attribute, it is a linear gradient) @@ -154,7 +154,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testRadialColorGradientDOCX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBarChartDataPointPropDOCX) { loadFromFile(u"docx/testBarChartDataPointPropDOCX.docx"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -177,7 +177,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testFdo83058dlblPos) // FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[2]/c:dLblPos", "val", u"outEnd"); @@ -189,7 +189,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testFdo83058dlblPos) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testAutoTitleDelXLSX) { loadFromFile(u"xlsx/autotitledel_2007.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:autoTitleDeleted", "val", u"0"); @@ -198,7 +198,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testAutoTitleDelXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDispBlanksAsXLSX) { loadFromFile(u"xlsx/dispBlanksAs_2007.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs", "val", u"gap"); @@ -207,7 +207,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDispBlanksAsXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testMarkerColorXLSX) { loadFromFile(u"xlsx/markerColor.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPathInsensitive(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:marker/c:spPr/a:solidFill/a:srgbClr", "val", u"92d050"); @@ -216,7 +216,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testMarkerColorXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testRoundedCornersXLSX) { loadFromFile(u"xlsx/markerColor.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:roundedCorners", "val", u"0"); @@ -225,7 +225,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testRoundedCornersXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testAxisNumberFormatXLSX) { loadFromFile(u"ods/axis_number_format.ods"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx", 2); @@ -243,7 +243,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDataPointLabelNumberFormatXLSX) loadFromFile(u"ods/tdf123774.ods"); { - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:numFmt", "formatCode", u"[$-40E]0.00%"); @@ -255,7 +255,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDataPointLabelNumberFormatXLSX) loadFromFile(u"xlsx/tdf130986.xlsx"); { - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl/c:idx", "val", u"1"); @@ -275,7 +275,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDataLabelDefaultValuesXLSX) CPPUNIT_ASSERT(aAny >>= aLabel); CPPUNIT_ASSERT(aLabel.ShowNumber); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:showVal", "val", u"1"); @@ -292,7 +292,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDataLabelFillColor) sal_Int32 nLabelFillColor; CPPUNIT_ASSERT(aAny >>= nLabelFillColor); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPathInsensitive(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:spPr/a:solidFill/a:srgbClr", "val", u"f79646"); @@ -301,7 +301,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDataLabelFillColor) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTitleOverlayXLSX) { loadFromFile(u"xlsx/chart_title.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:overlay", "val", u"0"); @@ -310,7 +310,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTitleOverlayXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testInvertIfNegativeXLSX) { loadFromFile(u"xlsx/bar_chart_simple.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:invertIfNegative", "val", u"0"); @@ -319,7 +319,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testInvertIfNegativeXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBubble3DXLSX) { loadFromFile(u"xlsx/bubble_chart_simple.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:bubbleChart/c:ser[1]/c:bubble3D", "val", u"0"); @@ -330,7 +330,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBubble3DXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testNoMarkerXLSX) { loadFromFile(u"xlsx/no_marker.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:marker/c:symbol", "val", u"none"); @@ -341,7 +341,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testNoMarkerXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTitleManualLayoutXLSX) { loadFromFile(u"xlsx/title_manual_layout.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:layout/c:manualLayout/c:layoutTarget", 0); @@ -365,7 +365,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTitleManualLayoutXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testPlotAreaManualLayoutXLSX) { loadFromFile(u"xlsx/plot_area_manual_layout.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -399,7 +399,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testPlotAreaManualLayoutXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testLegendManualLayoutXLSX) { loadFromFile(u"xlsx/legend_manual_layout.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -436,7 +436,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testLegendManualLayoutXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartSubTitle) { loadFromFile(u"ods/testChartSubTitle.ods"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // test properties of subtitle @@ -457,7 +457,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartSubTitle) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartMainWithSubTitle) { loadFromFile(u"ods/testChartMainWithSubTitle.ods"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // test properties of title @@ -480,7 +480,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartMainWithSubTitle) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testAutoTitleDeleted) { loadFromFile(u"xlsx/testAutoTitleDeleted.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:autoTitleDeleted", "val", u"1"); @@ -489,7 +489,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testAutoTitleDeleted) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesColorFillXLSX) { loadFromFile(u"xlsx/testChartTitlePropertiesColorFill.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPathInsensitive(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr", "val", u"ff0000"); @@ -499,7 +499,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesColorFillXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesGradientFillXLSX) { loadFromFile(u"xlsx/testChartTitlePropertiesGradientFill.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPathInsensitive(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr", "val", u"cccccc"); @@ -510,7 +510,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesGradientFillXLSX CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesBitmapFillXLSX) { loadFromFile(u"xlsx/testChartTitlePropertiesBitmapFill.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:blipFill/a:blip", "embed", u"rId1"); @@ -520,7 +520,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesBitmapFillXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBarChartDataPointPropXLSX) { loadFromFile(u"xlsx/testBarChartDataPointPropXLSX.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -539,7 +539,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBarChartDataPointPropXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testAxisCharacterPropertiesXLSX) { loadFromFile(u"xlsx/axis_character_properties.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -557,7 +557,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testAxisCharacterPropertiesXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTitleCharacterPropertiesXLSX) { loadFromFile(u"xlsx/title_character_properties.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -571,7 +571,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTitleCharacterPropertiesXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testPlotVisOnlyXLSX) { loadFromFile(u"xlsx/hidden_cells.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -581,7 +581,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testPlotVisOnlyXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBarChartVaryColorsXLSX) { loadFromFile(u"xlsx/tdf90876.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -591,7 +591,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBarChartVaryColorsXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf96161) { loadFromFile(u"ods/tdf96161.ods"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -605,7 +605,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTableOnPage3) // FIXME: validation error in OOXML export: Errors: 2 skipValidation(); - saveAndReload(u"Office Open XML Text"_ustr); + saveAndReload(TestFilter::DOCX); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -622,7 +622,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, tdf137691) { // given a doc where the banana negative data formats as ($123) and the pineapple data as $(123) loadFromFile(u"pptx/tdf137691_dataTable.pptx"); - saveAndReload(u"Impress MS PowerPoint 2007 XML"_ustr); + saveAndReload(TestFilter::PPTX_2007); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); @@ -642,7 +642,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, tdf137691) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testMultipleAxisXLSX) { loadFromFile(u"ods/multiple_axis.ods"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -658,7 +658,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testMultipleAxisXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testSecondaryAxisXLSX) { loadFromFile(u"ods/secondary_axis.ods"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -675,7 +675,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testSecondaryAxisXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBarChartSecondaryAxisXLSX) { loadFromFile(u"xlsx/testSecondaryAxis.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Collect barchart axID on primary Axis @@ -694,7 +694,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBarChartSecondaryAxisXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testEmptyCharts) { loadFromFile(u"odt/testEmptyCharts.odt"); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); // Make sure each chart exists in the respective XML xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); @@ -729,7 +729,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf148142) xAxis->setScaleData(aScaleData); // Check the X axis position after export. - saveAndReload(u"calc8"_ustr); + saveAndReload(TestFilter::ODS); Reference<chart2::XChartDocument> xChartDoc2 = getChartDocFromSheet(0); CPPUNIT_ASSERT(xChartDoc2.is()); Reference<chart2::XAxis> xAxis2 = getAxisFromDoc(xChartDoc2, 0, 0, 0); @@ -741,7 +741,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf148142) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testFormattedChartTitles) { loadFromFile(u"xlsx/tdf39052.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -896,7 +896,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testODSFormattedChartTitles) // The document contains a line chart with "Between tick marks" X axis position. loadFromFile(u"ods/tdf39052.ods"); // Check formatted strings after export. - saveAndReload(u"calc8"_ustr); + saveAndReload(TestFilter::ODS); Reference<chart2::XChartDocument> xChart2Doc = getChartDocFromSheet(0); CPPUNIT_ASSERT(xChart2Doc.is()); @@ -911,7 +911,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testODSFormattedChartTitles) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf148117) { loadFromFile(u"pptx/tdf148117.pptx"); - save(u"Impress MS PowerPoint 2007 XML"_ustr); + save(TestFilter::PPTX_2007); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:date1904", "val", u"0"); @@ -920,7 +920,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf148117) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, test1904NullDate) { loadFromFile(u"pptx/1904NullDate.pptx"); - saveAndReload(u"Impress MS PowerPoint 2007 XML"_ustr); + saveAndReload(TestFilter::PPTX_2007); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); Reference<beans::XPropertySet> xPropSet(xChartDoc, uno::UNO_QUERY); diff --git a/chart2/qa/extras/chart2geometry.cxx b/chart2/qa/extras/chart2geometry.cxx index da871c776e6f..ade614b77386 100644 --- a/chart2/qa/extras/chart2geometry.cxx +++ b/chart2/qa/extras/chart2geometry.cxx @@ -74,7 +74,7 @@ void Chart2GeometryTest::testTdf135184RoundLineCap() { // It tests chart area, data series line and regression-curve line. loadFromFile(u"xlsx/tdf135184RoundLineCap.xlsx"); - save(u"calc8"_ustr); + save(TestFilter::ODS); xmlDocUniquePtr pXmlDoc = parseExport(u"Object 1/content.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -103,7 +103,7 @@ void Chart2GeometryTest::testTdf135184RoundLineCap2() { // It tests legend, data series sector and title. loadFromFile(u"xlsx/tdf135184RoundLineCap2.xlsx"); - save(u"calc8"_ustr); + save(TestFilter::ODS); xmlDocUniquePtr pXmlDoc = parseExport(u"Object 1/content.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -134,7 +134,7 @@ void Chart2GeometryTest::testTdf135184RoundLineCap3() { // It tests chart area, data series line and regression-curve line. loadFromFile(u"xlsx/tdf135184RoundLineCap.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -152,7 +152,7 @@ void Chart2GeometryTest::testTdf135184RoundLineCap4() { // It tests legend, data series sector and title. loadFromFile(u"xlsx/tdf135184RoundLineCap2.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -177,7 +177,7 @@ void Chart2GeometryTest::testTdf128345ChartArea_CG_TS_export() // ODF im/export for MCGR is integrated // Make sure the chart area has a transparency in gradient stops in saved pptx file. - save(u"Impress MS PowerPoint 2007 XML"_ustr); + save(TestFilter::PPTX_2007); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -203,7 +203,7 @@ void Chart2GeometryTest::testTdf128345ChartArea_CG_TS_import() loadFromFile(u"pptx/tdf128345_ChartArea_CG_TS.pptx"); // Find transparency gradient name - save(u"impress8"_ustr); + save(TestFilter::ODP); xmlDocUniquePtr pXmlDoc = parseExport(u"Object 1/content.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); const OUString sOUChartStyleName = getXPathContent( @@ -218,7 +218,7 @@ void Chart2GeometryTest::testTdf128345ChartArea_CG_TS_import() = getXPathContent(pXmlDoc, sStylePath + "/style:graphic-properties/@draw:opacity-name"); // Verify the content of the opacity definition - save(u"impress8"_ustr); + save(TestFilter::ODP); xmlDocUniquePtr pXmlDoc2 = parseExport(u"Object 1/styles.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc2); const OString sAttribute("@draw:name='" + OU2O(sOUOpacityName) + "'"); @@ -238,7 +238,7 @@ void Chart2GeometryTest::testTdf128345ChartWall_CS_TG_export() loadFromFile(u"odp/tdf128345_ChartWall_CS_TG.odp"); // Make sure the chart has a gradient with transparency in gradient stops in saved pptx file. - save(u"Impress MS PowerPoint 2007 XML"_ustr); + save(TestFilter::PPTX_2007); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -257,7 +257,7 @@ void Chart2GeometryTest::testTdf128345ChartWall_CS_TG_import() loadFromFile(u"pptx/tdf128345_ChartWall_CS_TG.pptx"); // Find transparency gradient name - save(u"impress8"_ustr); + save(TestFilter::ODP); xmlDocUniquePtr pXmlDoc = parseExport(u"Object 1/content.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); const OUString sOUChartStyleName @@ -272,7 +272,7 @@ void Chart2GeometryTest::testTdf128345ChartWall_CS_TG_import() = getXPathContent(pXmlDoc, sStylePath + "/style:graphic-properties/@draw:opacity-name"); // Verify content of the opacity definition - save(u"impress8"_ustr); + save(TestFilter::ODP); xmlDocUniquePtr pXmlDoc2 = parseExport(u"Object 1/styles.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc2); const OString sAttribute("@draw:name='" + OU2O(sOUOpacityName) + "'"); @@ -290,7 +290,7 @@ void Chart2GeometryTest::testTdf128345Legend_CS_TG_axial_export() loadFromFile(u"odp/tdf128345_Legend_CS_TG_axial.odp"); // Make sure the chart has a gradient with transparency in gradient stops in saved pptx file. - save(u"Impress MS PowerPoint 2007 XML"_ustr); + save(TestFilter::PPTX_2007); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -319,7 +319,7 @@ void Chart2GeometryTest::testTdf128345Legend_CS_TG_axial_import() loadFromFile(u"pptx/tdf128345_Legend_CS_TG_axial.pptx"); // Find transparency gradient name - save(u"impress8"_ustr); + save(TestFilter::ODP); xmlDocUniquePtr pXmlDoc = parseExport(u"Object 1/content.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); const OUString sOUChartStyleName @@ -334,7 +334,7 @@ void Chart2GeometryTest::testTdf128345Legend_CS_TG_axial_import() = getXPathContent(pXmlDoc, sStylePath + "/style:graphic-properties/@draw:opacity-name"); // Verify content of the opacity definition - save(u"impress8"_ustr); + save(TestFilter::ODP); xmlDocUniquePtr pXmlDoc2 = parseExport(u"Object 1/styles.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc2); const OString sAttribute("@draw:name='" + OU2O(sOUOpacityName) + "'"); @@ -439,7 +439,7 @@ void Chart2GeometryTest::testTdf135366LabelExport() // FIXME: Error: unexpected attribute "loext:label-stroke-color" skipValidation(); - save(u"writer8"_ustr); + save(TestFilter::ODT); xmlDocUniquePtr pXmlDoc = parseExport(u"Object 1/content.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -468,7 +468,7 @@ void Chart2GeometryTest::testTdf135366_CustomLabelText() // although the used <chart:data-label> element exists since ODF 1.2. SetODFDefaultVersion(SvtSaveOptions::ODFVER_012); loadFromFile(u"pptx/tdf135366_CustomLabelText.pptx"); - save(u"impress8"_ustr); + save(TestFilter::ODP); xmlDocUniquePtr pXmlDoc = parseExport(u"Object 1/content.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); diff --git a/chart2/qa/extras/chart2import2.cxx b/chart2/qa/extras/chart2import2.cxx index c20efb0f6835..159884c12268 100644 --- a/chart2/qa/extras/chart2import2.cxx +++ b/chart2/qa/extras/chart2import2.cxx @@ -942,7 +942,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf166428) // The attribute table:cell-range-address does not exist in ODF 1.4. and therefore may not be // be written. - saveAndReload(u"calc8"_ustr); + saveAndReload(TestFilter::ODS); xmlDocUniquePtr pXmlDoc = parseExport(u"Object 1/content.xml"_ustr); assertXPathNoAttribute(pXmlDoc, "/office:document-content/office:body/office:chart/chart:chart/" diff --git a/filter/qa/unit/svg.cxx b/filter/qa/unit/svg.cxx index 4fab96055822..3d8c3a23e015 100644 --- a/filter/qa/unit/svg.cxx +++ b/filter/qa/unit/svg.cxx @@ -79,7 +79,7 @@ CPPUNIT_TEST_FIXTURE(SvgFilterTest, testSemiTransparentLine) loadFromFile(u"semi-transparent-line.odg"); // Export it to SVG. - save(u"draw_svg_Export"_ustr); + save(TestFilter::SVG_DRAW); // Get the style of the group around the actual <path> element. xmlDocUniquePtr pXmlDoc = parseExportedFile(); @@ -99,7 +99,7 @@ CPPUNIT_TEST_FIXTURE(SvgFilterTest, testSemiTransparentFillWithTransparentLine) loadFromFile(u"semi-transparent-fill.odg"); // Export it to SVG. - save(u"draw_svg_Export"_ustr); + save(TestFilter::SVG_DRAW); // Get the style of the group around the actual <path> element. xmlDocUniquePtr pXmlDoc = parseExportedFile(); @@ -128,7 +128,7 @@ CPPUNIT_TEST_FIXTURE(SvgFilterTest, testSemiTransparentText) loadFromFile(u"TransparentText.odg"); // Export to SVG. - save(u"draw_svg_Export"_ustr); + save(TestFilter::SVG_DRAW); xmlDocUniquePtr pXmlDoc = parseExportedFile(); // We expect 2 groups of class "TextShape" that @@ -170,7 +170,7 @@ CPPUNIT_TEST_FIXTURE(SvgFilterTest, testSemiTransparentMultiParaText) xShapeProps->setPropertyValue(u"CharTransparence"_ustr, uno::Any(static_cast<sal_Int16>(20))); // When exporting to SVG: - save(u"draw_svg_Export"_ustr); + save(TestFilter::SVG_DRAW); // Then make sure that the two semi-transparent paragraphs have the same X position: xmlDocUniquePtr pXmlDoc = parseExportedFile(); @@ -215,7 +215,7 @@ CPPUNIT_TEST_FIXTURE(SvgFilterTest, testCustomBullet) loadFromFile(u"custom-bullet.fodp"); // When exporting that to SVG: - save(u"impress_svg_Export"_ustr); + save(TestFilter::SVG_IMPRESS); // Then make sure the bullet glyph is not lost: xmlDocUniquePtr pXmlDoc = parseExportedFile(); @@ -235,7 +235,7 @@ CPPUNIT_TEST_FIXTURE(SvgFilterTest, attributeRedefinedTest) loadFromFile(u"attributeRedefinedTest.odp"); // Export to SVG. - save(u"impress_svg_Export"_ustr); + save(TestFilter::SVG_IMPRESS); xmlDocUniquePtr pXmlDoc = parseExportedFile(); // We expect four paragraph @@ -279,7 +279,7 @@ CPPUNIT_TEST_FIXTURE(SvgFilterTest, testTab) xShapeText->setString(u"A B"_ustr); // When exporting that document to SVG: - save(u"impress_svg_Export"_ustr); + save(TestFilter::SVG_IMPRESS); // Then make sure the tab is not lost: xmlDocUniquePtr pXmlDoc = parseExportedFile(); @@ -296,7 +296,7 @@ CPPUNIT_TEST_FIXTURE(SvgFilterTest, textInImage) loadFromFile(u"text-in-image.odp"); // Export to SVG. - save(u"impress_svg_Export"_ustr); + save(TestFilter::SVG_IMPRESS); xmlDocUniquePtr pXmlDoc = parseExportedFile(); @@ -314,7 +314,7 @@ CPPUNIT_TEST_FIXTURE(SvgFilterTest, testSemiTransparentTextBullet) loadFromFile(u"semi-transparent-text-bullet.odg"); // When exporting to SVG: - save(u"draw_svg_Export"_ustr); + save(TestFilter::SVG_DRAW); // Then make sure the result is correct: xmlDocUniquePtr pXmlDoc = parseExportedFile(); @@ -342,7 +342,7 @@ CPPUNIT_TEST_FIXTURE(SvgFilterTest, testMapModeText) loadFromFile(u"YAxis.odg"); // Export to SVG. - save(u"draw_svg_Export"_ustr); + save(TestFilter::SVG_DRAW); xmlDocUniquePtr pXmlDoc = parseExportedFile(); @@ -370,7 +370,7 @@ CPPUNIT_TEST_FIXTURE(SvgFilterTest, testTdf91315) // Load a presentation containing RTL text loadFromFile(u"tdf91315.fodp"); - save(u"impress_svg_Export"_ustr); + save(TestFilter::SVG_IMPRESS); xmlDocUniquePtr pXmlDoc = parseExportedFile(); @@ -385,7 +385,7 @@ CPPUNIT_TEST_FIXTURE(SvgFilterTest, testTdf166789) // A fit-to-size text loadFromFile(u"fit-to-size-text.fodg"); - save(u"impress_svg_Export"_ustr); + save(TestFilter::SVG_IMPRESS); xmlDocUniquePtr pXmlDoc = parseExportedFile(); diff --git a/include/test/unoapi_test.hxx b/include/test/unoapi_test.hxx index a7b12bc10263..f5b3e62d48b3 100644 --- a/include/test/unoapi_test.hxx +++ b/include/test/unoapi_test.hxx @@ -23,6 +23,94 @@ #include <unotools/tempfile.hxx> #include <vcl/filter/PDFiumLibrary.hxx> +enum class TestFilter +{ + NONE, + CSV, + DOC, + DOCBOOK, + DOCM, + DOCX, + DOCX_2007, + DOTX, + FODG, + FODS, + FODT, + HTML_CALC, + HTML_IMPRESS, + HTML_WRITER, + MD, + MML, + ODB, + ODG, + ODM, + ODP, + ODS, + ODT, + OTT, + PDF_WRITER, + POTX, + PPT, + PPTM, + PPTX, + PPTX_2007, + RTF, + SVG_DRAW, + SVG_IMPRESS, + TEXT, + TEXT_ENCODED, + XHTML_CALC, + XHTML_DRAW, + XHTML_WRITER, + XLS, + XLSM, + XLST, + XLSX, +}; + +const std::unordered_map<TestFilter, OUString> TestFilterNames{ + { TestFilter::CSV, u"Text - txt - csv (StarCalc)"_ustr }, + { TestFilter::DOC, u"MS Word 97"_ustr }, + { TestFilter::DOCBOOK, u"DocBook File"_ustr }, + { TestFilter::DOCM, u"MS Word 2007 XML VBA"_ustr }, + { TestFilter::DOCX, u"Office Open XML Text"_ustr }, + { TestFilter::DOCX_2007, u"MS Word 2007 XML"_ustr }, + { TestFilter::DOTX, u"MS Word 2007 XML Template"_ustr }, + { TestFilter::FODG, u"OpenDocument Drawing Flat XML"_ustr }, + { TestFilter::FODS, u"OpenDocument Spreadsheet Flat XML"_ustr }, + { TestFilter::FODT, u"OpenDocument Text Flat XML"_ustr }, + { TestFilter::HTML_CALC, u"HTML (StarCalc)"_ustr }, + { TestFilter::HTML_IMPRESS, u"impress_html_Export"_ustr }, + { TestFilter::HTML_WRITER, u"HTML (StarWriter)"_ustr }, + { TestFilter::MD, u"Markdown"_ustr }, + { TestFilter::MML, u"MathML XML (Math)"_ustr }, + { TestFilter::ODB, u"StarOffice XML (Base)"_ustr }, + { TestFilter::ODG, u"draw8"_ustr }, + { TestFilter::ODM, u"writerglobal8_writer"_ustr }, + { TestFilter::ODP, u"impress8"_ustr }, + { TestFilter::ODS, u"calc8"_ustr }, + { TestFilter::ODT, u"writer8"_ustr }, + { TestFilter::OTT, u"writer8_template"_ustr }, + { TestFilter::PDF_WRITER, u"writer_pdf_Export"_ustr }, + { TestFilter::POTX, u"Impress Office Open XML Template"_ustr }, + { TestFilter::PPT, u"MS PowerPoint 97"_ustr }, + { TestFilter::PPTM, u"Impress MS PowerPoint 2007 XML VBA"_ustr }, + { TestFilter::PPTX, u"Impress Office Open XML"_ustr }, + { TestFilter::PPTX_2007, u"Impress MS PowerPoint 2007 XML"_ustr }, + { TestFilter::RTF, u"Rich Text Format"_ustr }, + { TestFilter::SVG_DRAW, u"draw_svg_Export"_ustr }, + { TestFilter::SVG_IMPRESS, u"impress_svg_Export"_ustr }, + { TestFilter::TEXT, u"Text"_ustr }, + { TestFilter::TEXT_ENCODED, u"Text (encoded)"_ustr }, + { TestFilter::XHTML_CALC, u"XHTML Calc File"_ustr }, + { TestFilter::XHTML_DRAW, u"XHTML Draw File"_ustr }, + { TestFilter::XHTML_WRITER, u"XHTML Writer File"_ustr }, + { TestFilter::XLS, u"MS Excel 97"_ustr }, + { TestFilter::XLSM, u"Calc MS Excel 2007 VBA XML"_ustr }, + { TestFilter::XLST, u"Calc MS Excel 2007 XML Template"_ustr }, + { TestFilter::XLSX, u"Calc Office Open XML"_ustr }, +}; + // basic uno api test class class OOO_DLLPUBLIC_TEST UnoApiTest : public test::BootstrapFixture, public unotest::MacrosTest @@ -43,9 +131,9 @@ public: css::uno::Any executeMacro(const OUString& rScriptURL, const css::uno::Sequence<css::uno::Any>& rParams = {}); - void save(const OUString& rFilter, const char* pPassword = nullptr); + void save(TestFilter eFilter, const char* pPassword = nullptr); void saveWithParams(const css::uno::Sequence<css::beans::PropertyValue>& rParams); - void saveAndReload(const OUString& rFilter, const char* pPassword = nullptr); + void saveAndReload(TestFilter eFilter, const char* pPassword = nullptr); std::unique_ptr<vcl::pdf::PDFiumDocument> parsePDFExport(const OString& rPassword = OString()); diff --git a/oox/qa/unit/drawingml.cxx b/oox/qa/unit/drawingml.cxx index 2c38faff9285..e9e67c8c62b3 100644 --- a/oox/qa/unit/drawingml.cxx +++ b/oox/qa/unit/drawingml.cxx @@ -74,7 +74,7 @@ public: CPPUNIT_TEST_FIXTURE(OoxDrawingmlTest, testTransparentText) { loadFromFile(u"transparent-text.pptx"); - saveAndReload(u"Impress Office Open XML"_ustr); + saveAndReload(TestFilter::PPTX); uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<drawing::XDrawPage> xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0), @@ -98,7 +98,7 @@ CPPUNIT_TEST_FIXTURE(OoxDrawingmlTest, testTransparentText) CPPUNIT_TEST_FIXTURE(OoxDrawingmlTest, testTdf131082) { loadFromFile(u"tdf131082.pptx"); - saveAndReload(u"Impress Office Open XML"_ustr); + saveAndReload(TestFilter::PPTX); uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<drawing::XDrawPage> xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0), @@ -314,7 +314,7 @@ CPPUNIT_TEST_FIXTURE(OoxDrawingmlTest, testTableShadow) // was lost on import. verify(mxComponent); - saveAndReload(u"Impress Office Open XML"_ustr); + saveAndReload(TestFilter::PPTX); // Without the accompanying fix in place, this test would have failed, because shadow on a table // was lost on export. @@ -343,7 +343,7 @@ CPPUNIT_TEST_FIXTURE(OoxDrawingmlTest, testTdf142605_CurveSize) // rectangle of the shape. Error was, that the export uses a path size which included the // control points. loadFromFile(u"tdf142605_CurveSize.odp"); - saveAndReload(u"Impress Office Open XML"_ustr); + saveAndReload(TestFilter::PPTX); uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier(mxComponent, uno::UNO_QUERY); auto xPage = xDrawPagesSupplier->getDrawPages()->getByIndex(0); diff --git a/oox/qa/unit/export.cxx b/oox/qa/unit/export.cxx index 30273cd2acf2..33c8d1d29736 100644 --- a/oox/qa/unit/export.cxx +++ b/oox/qa/unit/export.cxx @@ -31,7 +31,7 @@ CPPUNIT_TEST_FIXTURE(Test, testPolylineConnectorPosition) // Given a document with a group shape and therein a polyline and a connector. loadFromFile(u"tdf141786_PolylineConnectorInGroup.odt"); // When saving that to DOCX: - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); // Then make sure polyline and connector have the correct position. xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); @@ -60,7 +60,7 @@ CPPUNIT_TEST_FIXTURE(Test, testRotatedShapePosition) skipValidation(); // When saving that to DOCX: - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); // Then make sure the rotated child shape has the correct position. xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); @@ -80,7 +80,7 @@ CPPUNIT_TEST_FIXTURE(Test, testInsertCheckboxContentControlOdt) dispatchCommand(mxComponent, u".uno:TrackChanges"_ustr, {}); dispatchCommand(mxComponent, u".uno:InsertCheckboxContentControl"_ustr, {}); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); // validate(maTempFile.GetFileName(), test::OOXML); // Enable when unrelated errors are fixed. } @@ -93,7 +93,7 @@ CPPUNIT_TEST_FIXTURE(Test, testInsertCheckboxContentControlDocx) // when exporting to docx. dispatchCommand(mxComponent, u".uno:InsertCheckboxContentControl"_ustr, {}); - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); // validate(maTempFile.GetFileName(), test::OOXML); // Enable when unrelated errors are fixed. } @@ -115,7 +115,7 @@ CPPUNIT_TEST_FIXTURE(Test, testInsertCheckboxContentControlDocx) dispatchCommand(mxComponent, u".uno:InsertCheckboxContentControl"_ustr, {}); // Loading should not show the "corrupted" dialog, which would assert. - saveAndReload(u"Office Open XML Text"_ustr); + saveAndReload(TestFilter::DOCX); // Now that we loaded it successfully, delete the controls, // still with change-tracking enabled, and save. @@ -123,7 +123,7 @@ CPPUNIT_TEST_FIXTURE(Test, testInsertCheckboxContentControlDocx) dispatchCommand(mxComponent, u".uno:Delete"_ustr, {}); // Loading should not show the "corrupted" dialog, which would assert. - saveAndReload(u"Office Open XML Text"_ustr); + saveAndReload(TestFilter::DOCX); // validate(maTempFile.GetFileName(), test::OOXML); // Enable when unrelated errors are fixed. } } @@ -137,7 +137,7 @@ CPPUNIT_TEST_FIXTURE(Test, testDmlGroupshapePolygon) skipValidation(); // When saving that to DOCX: - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); // Then make sure that the group shape, the group shape's child size and the child shape's size // match: @@ -158,7 +158,7 @@ CPPUNIT_TEST_FIXTURE(Test, testCustomShapeArrowExport) skipValidation(); // When saving that to DOCX: - save(u"Office Open XML Text"_ustr); + save(TestFilter::DOCX); // Then the shapes should retain their correct control values. xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); @@ -344,7 +344,7 @@ CPPUNIT_TEST_FIXTURE(Test, testCameraRevolutionGrabBag) loadFromFile(u"camera-rotation-revolution-nonwps.pptx"); // When saving that document: - save(u"Impress Office Open XML"_ustr); + save(TestFilter::PPTX); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/slides/slide1.xml"_ustr); // Then make sure the revolution is exported without a problem: @@ -369,7 +369,7 @@ CPPUNIT_TEST_FIXTURE(Test, testReferToTheme) loadFromFile(u"refer-to-theme.pptx"); // When saving that document: - save(u"Impress Office Open XML"_ustr); + save(TestFilter::PPTX); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/slides/slide1.xml"_ustr); // Then make sure the shape text color is a scheme color: @@ -410,7 +410,7 @@ CPPUNIT_TEST_FIXTURE(Test, testThemeColor_ShapeFill) loadFromFile(u"ReferenceShapeFill.fodp"); // When saving that document: - save(u"Impress Office Open XML"_ustr); -e ... etc. - the rest is truncated
