sc/qa/unit/subsequent_export_test4.cxx | 6 +++--- sd/qa/unit/export-tests-ooxml4.cxx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 122eb9e5e83800c1cb673cbb5f372409b75ede8e Author: Miklos Vajna <[email protected]> AuthorDate: Sat Mar 21 19:08:18 2026 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sat Mar 21 23:48:32 2026 +0100 CppunitTest_sc_subsequent_export_test4: fix build /home/vmiklos/git/libreoffice/co-26.04/sc/qa/unit/subsequent_export_test4.cxx: In member function ‘void testUserDefinedFunctions::TestBody()’: /home/vmiklos/git/libreoffice/co-26.04/sc/qa/unit/subsequent_export_test4.cxx:2565:10: error: cannot convert ‘rtl::OUString’ to ‘TestFilter’ 2565 | save(u"Calc Office Open XML"_ustr); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | | rtl::OUString Similar for CppunitTest_sd_export_tests-ooxml4, too. Went wrong in commit c2a46dc1ca02e9b682248099ef08e01e8f26dc92 (PPTX: Use correct shape-id for connector shapes, 2026-03-21). Change-Id: Ibfb084911fbd6d1266db32207b03861fb536c885 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/202323 Reviewed-by: Andras Timar <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/sc/qa/unit/subsequent_export_test4.cxx b/sc/qa/unit/subsequent_export_test4.cxx index f8a1724250bf..d044c9389c17 100644 --- a/sc/qa/unit/subsequent_export_test4.cxx +++ b/sc/qa/unit/subsequent_export_test4.cxx @@ -2562,21 +2562,21 @@ CPPUNIT_TEST_FIXTURE(ScExportTest4, testMacrosInXLSX) CPPUNIT_TEST_FIXTURE(ScExportTest4, testUserDefinedFunctions) { createScDoc("xls/user_defined_function.xls"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); xmlDocUniquePtr pSheet = parseExport(u"xl/worksheets/sheet1.xml"_ustr); CPPUNIT_ASSERT(pSheet); assertXPathContent(pSheet, "/x:worksheet/x:sheetData/x:row[44]/x:c[1]/x:f", u"_xludf.Sum(B9:C42)"); createScDoc("xlsx/user_defined_function.xlsx"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); pSheet = parseExport(u"xl/worksheets/sheet1.xml"_ustr); CPPUNIT_ASSERT(pSheet); assertXPathContent(pSheet, "/x:worksheet/x:sheetData/x:row[42]/x:c[1]/x:f", u"_xludf.SUM(B9:C42)"); createScDoc("xls/external_named_function.xls"); - save(u"Calc Office Open XML"_ustr); + save(TestFilter::XLSX); pSheet = parseExport(u"xl/worksheets/sheet1.xml"_ustr); CPPUNIT_ASSERT(pSheet); assertXPathContent(pSheet, "/x:worksheet/x:sheetData/x:row[1]/x:c[2]/x:f", diff --git a/sd/qa/unit/export-tests-ooxml4.cxx b/sd/qa/unit/export-tests-ooxml4.cxx index fab74edbd61f..f5390961921d 100644 --- a/sd/qa/unit/export-tests-ooxml4.cxx +++ b/sd/qa/unit/export-tests-ooxml4.cxx @@ -1934,7 +1934,7 @@ CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest4, testTdf114443_PPSX) CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest4, testConnectorShapeAnimationTarget) { createSdImpressDoc("pptx/connector-shape-animations.pptx"); - save(u"Impress Office Open XML"_ustr); + save(TestFilter::PPTX); xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/slides/slide1.xml"_ustr);
