diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2022-11-03 16:31:18 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2022-11-03 16:45:10 +0100 |
| commit | 15e899ccadf1d1096c54330205207f162a7b3a0b (patch) | |
| tree | ec3871842dd3fd58f19ab9500fa40dcad86a3f77 /sd/qa | |
| parent | 7bd657b5dac270dae09cd0fe2b22d23fd2fc7245 (diff) | |
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 <xiscofauli@libreoffice.org>
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sd/qa')
| -rw-r--r-- | sd/qa/unit/ShapeImportExportTest.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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. |