sc/qa/unit/subsequent_export_test4.cxx |    2 +-
 sd/qa/unit/export-tests-ooxml4.cxx     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0cecb53eee48b85c87a250a33bd351183d3c456a
Author:     Xisco Fauli <[email protected]>
AuthorDate: Thu Nov 20 09:47:56 2025 +0100
Commit:     Xisco Fauli <[email protected]>
CommitDate: Thu Nov 20 12:42:48 2025 +0100

    fix mid-air conflict
    
    after
    commit a913faf181afb8b8718711eba0ad0cceec961f01
    Author: Aron Budea <[email protected]>
    Date:   Tue Nov 18 12:31:21 2025 +1030
    
        tdf#169496 oox: hidden images in PPTX/XLSX shown after roundtrip
    
    and
    
    commit 801dc48c6f7df686574c76e8ca67ac59dd1604f8
    Author: Xisco Fauli <[email protected]>
    Date:   Tue Nov 18 12:54:02 2025 +0100
    
        UnoApiTest: Add enum for filter names
    
    Change-Id: Iefbf9b2e3e73f955d7724f66a54943a6f7f375a7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194243
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <[email protected]>

diff --git a/sc/qa/unit/subsequent_export_test4.cxx 
b/sc/qa/unit/subsequent_export_test4.cxx
index 1bb4c3d3bba9..9ddd52f9afc3 100644
--- a/sc/qa/unit/subsequent_export_test4.cxx
+++ b/sc/qa/unit/subsequent_export_test4.cxx
@@ -939,7 +939,7 @@ CPPUNIT_TEST_FIXTURE(ScExportTest4, 
testtdf169496_hidden_graphic)
 {
     createScDoc("xlsx/tdf169496_hidden_graphic.xlsx");
 
-    save(u"Calc Office Open XML"_ustr);
+    save(TestFilter::XLSX);
 
     xmlDocUniquePtr pDrawing = parseExport(u"xl/drawings/drawing1.xml"_ustr);
     CPPUNIT_ASSERT(pDrawing);
diff --git a/sd/qa/unit/export-tests-ooxml4.cxx 
b/sd/qa/unit/export-tests-ooxml4.cxx
index 911e3fcd2d11..044e61827fed 100644
--- a/sd/qa/unit/export-tests-ooxml4.cxx
+++ b/sd/qa/unit/export-tests-ooxml4.cxx
@@ -1609,7 +1609,7 @@ CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest4, 
testOLEObjectAnimationTarget)
 CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest4, testtdf169496_hidden_graphic)
 {
     createSdImpressDoc("pptx/tdf169496_hidden_graphic.pptx");
-    save(u"Impress Office Open XML"_ustr);
+    save(TestFilter::PPTX);
 
     xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/slides/slide1.xml"_ustr);
 

Reply via email to