chart2/qa/extras/chart2export2.cxx | 18 +++++++++--------- chart2/qa/extras/chart2export3.cxx | 6 +++--- chart2/qa/extras/chart2geometry.cxx | 6 +++--- sd/qa/unit/import-tests2.cxx | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-)
New commits: commit 4b0ff250aca61283af9debce94846ff57ff6a8a8 Author: Justin Luth <[email protected]> AuthorDate: Fri Dec 5 19:40:46 2025 -0500 Commit: Justin Luth <[email protected]> CommitDate: Tue Jan 6 23:06:53 2026 +0100 tdf#165180 qa: instead of testing PPTX_2007, test PPTX (2010) Currently, there ought to be no difference between the two filters. AFAICS, these were just a copy/pasta distinction, and not intentional to test specifically the 2007 filter. Usually we test PPTX (even though no users ever use that filter). In any case, it is good to test that our 2010 filters are working properly... Change-Id: Ibd2bae7d17e18c53fd3051e0ff30a9550c0be7e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195140 Reviewed-by: Justin Luth <[email protected]> Tested-by: Jenkins diff --git a/chart2/qa/extras/chart2export2.cxx b/chart2/qa/extras/chart2export2.cxx index 1be3ab2a3822..f3bc023082ef 100644 --- a/chart2/qa/extras/chart2export2.cxx +++ b/chart2/qa/extras/chart2export2.cxx @@ -354,7 +354,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomDataLabel) aFields[1]->getFieldType()); CPPUNIT_ASSERT_EQUAL(u" <CELLREF"_ustr, aFields[1]->getString()); - save(TestFilter::PPTX_2007); + save(TestFilter::PPTX); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -626,7 +626,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf161607PieChartLeaderLinesColorWid CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testNumberFormatExportPPTX) { loadFromFile(u"pptx/tdf115859.pptx"); - save(TestFilter::PPTX_2007); + save(TestFilter::PPTX); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -661,7 +661,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testLabelSeparatorExportDOCX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testChartTitlePropertiesColorFillPPTX) { loadFromFile(u"pptx/testChartTitlePropertiesColorFill.pptx"); - save(TestFilter::PPTX_2007); + save(TestFilter::PPTX); 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", @@ -672,7 +672,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testChartTitlePropertiesColorFillPPTX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testChartTitlePropertiesGradientFillPPTX) { loadFromFile(u"pptx/testChartTitlePropertiesGradientFill.pptx"); - save(TestFilter::PPTX_2007); + save(TestFilter::PPTX); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPathInsensitive( @@ -687,7 +687,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testChartTitlePropertiesGradientFillPPTX CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testChartTitlePropertiesBitmapFillPPTX) { loadFromFile(u"pptx/testChartTitlePropertiesBitmapFill.pptx"); - save(TestFilter::PPTX_2007); + save(TestFilter::PPTX); 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", @@ -776,7 +776,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testMultipleCategoryAxisLablesDOCX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf116163) { loadFromFile(u"pptx/tdf116163.pptx"); - save(TestFilter::PPTX_2007); + save(TestFilter::PPTX); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -818,7 +818,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(TestFilter::PPTX_2007); + save(TestFilter::PPTX); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -1019,7 +1019,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDeletedLegendEntries) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf60316) { loadFromFile(u"pptx/tdf60316.pptx"); - save(TestFilter::PPTX_2007); + save(TestFilter::PPTX); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -1176,7 +1176,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf132076) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf125812) { loadFromFile(u"odp/ellipticalGradientFill.odp"); - save(TestFilter::PPTX_2007); + save(TestFilter::PPTX); 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", diff --git a/chart2/qa/extras/chart2export3.cxx b/chart2/qa/extras/chart2export3.cxx index 5424f4a8bd1e..7fc7bfea2dd3 100644 --- a/chart2/qa/extras/chart2export3.cxx +++ b/chart2/qa/extras/chart2export3.cxx @@ -629,7 +629,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(TestFilter::PPTX_2007); + saveAndReload(TestFilter::PPTX); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); @@ -922,7 +922,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testODSFormattedChartTitles) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf148117) { loadFromFile(u"pptx/tdf148117.pptx"); - save(TestFilter::PPTX_2007); + save(TestFilter::PPTX); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:date1904", "val", u"0"); @@ -931,7 +931,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf148117) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, test1904NullDate) { loadFromFile(u"pptx/1904NullDate.pptx"); - saveAndReload(TestFilter::PPTX_2007); + saveAndReload(TestFilter::PPTX); 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 ade614b77386..0df5f707f925 100644 --- a/chart2/qa/extras/chart2geometry.cxx +++ b/chart2/qa/extras/chart2geometry.cxx @@ -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(TestFilter::PPTX_2007); + save(TestFilter::PPTX); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -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(TestFilter::PPTX_2007); + save(TestFilter::PPTX); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -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(TestFilter::PPTX_2007); + save(TestFilter::PPTX); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); diff --git a/sd/qa/unit/import-tests2.cxx b/sd/qa/unit/import-tests2.cxx index cdae01a52184..cc41b075d22a 100644 --- a/sd/qa/unit/import-tests2.cxx +++ b/sd/qa/unit/import-tests2.cxx @@ -191,7 +191,7 @@ CPPUNIT_TEST_FIXTURE(SdImportTest2, testTdf157285) CPPUNIT_TEST_FIXTURE(SdImportTest2, testTdf152186) { createSdImpressDoc("pptx/tdf152186.pptx"); - saveAndReload(TestFilter::PPTX_2007); + saveAndReload(TestFilter::PPTX); bool bHasShadow = bool(); const SdrPage* pPage = GetPage(1); @@ -2089,7 +2089,7 @@ CPPUNIT_TEST_FIXTURE(SdImportTest2, testTdf149961AutofitIndentation) CPPUNIT_TEST_FIXTURE(SdImportTest2, testTdf149588TransparentSolidFill) { createSdImpressDoc("pptx/tdf149588_transparentSolidFill.pptx"); - saveAndReload(TestFilter::PPTX_2007); + saveAndReload(TestFilter::PPTX); uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(6, 0)); uno::Reference<text::XTextRange> xParagraph(getParagraphFromShape(0, xShape));
