From 15e899ccadf1d1096c54330205207f162a7b3a0b Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Thu, 3 Nov 2022 16:31:18 +0100 Subject: CppunitTest_sd_shape_import_export_tests: fix build mid-air conflict between 933768ffcd8617942f45481de77e656ded9dcfe2 "tdf#150966 oox export avoid bottom above top for text area" and d40d64da771427423786dc62a2f4ad08cab53179 "swmodeltestbase: remove duplicated code" Change-Id: I248066f2dc3940b39a6727fbb7d070cb527a625a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142242 Tested-by: Xisco Fauli Reviewed-by: Xisco Fauli --- sd/qa/unit/ShapeImportExportTest.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd/qa') diff --git a/sd/qa/unit/ShapeImportExportTest.cxx b/sd/qa/unit/ShapeImportExportTest.cxx index ce972e0a38cc..7210eb82496c 100644 --- a/sd/qa/unit/ShapeImportExportTest.cxx +++ b/sd/qa/unit/ShapeImportExportTest.cxx @@ -375,7 +375,7 @@ void ShapeImportExportTest::testTextDistancesODP_OOXML_Export() { loadFromURL(u"odp/tdf150966_hugeInset.odp"); utl::TempFileNamed aTempFile = save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport(aTempFile, "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc = parseExport(aTempFile.GetURL(), "ppt/slides/slide1.xml"); CPPUNIT_ASSERT(pXmlDoc); // The text ends 5cm below the top edge of the shape. -- cgit