diff options
author | Xisco Fauli <xiscofauli@libreoffice.org> | 2022-11-04 17:31:55 +0100 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2022-11-08 11:54:22 +0100 |
commit | 248be1fe7d31499fe7e237bb15ec67b55962c1a7 (patch) | |
tree | d2a3693af5d555f5c6cca31b625a9001af21e869 /sd/qa/unit/export-tests-ooxml1.cxx | |
parent | 444bf8710d5da7b584fbcb94693e4ed8d2e29297 (diff) |
UnoApiTest: simplify code by using tempfile member
SwModelTestBase does the same. this will help to make
SwModelTestBase inherit from UnoApiTest
Change-Id: If1c824cf92f0e8b70253e4d5fdeddcaa521d4632
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142287
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sd/qa/unit/export-tests-ooxml1.cxx')
-rw-r--r-- | sd/qa/unit/export-tests-ooxml1.cxx | 193 |
1 files changed, 96 insertions, 97 deletions
diff --git a/sd/qa/unit/export-tests-ooxml1.cxx b/sd/qa/unit/export-tests-ooxml1.cxx index 937a59e58347..97d2b80902c8 100644 --- a/sd/qa/unit/export-tests-ooxml1.cxx +++ b/sd/qa/unit/export-tests-ooxml1.cxx @@ -228,9 +228,9 @@ void checkFontAttributes(const SdrTextObj* pObj, ItemValue nVal, sal_uInt32 nId) void SdOOXMLExportTest1::testTdf149311() { loadFromURL(u"odp/tdf149311.odp"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); - xmlDocUniquePtr pRelsDoc = parseExport(tempFile.GetURL(), "ppt/slides/_rels/slide1.xml.rels"); + xmlDocUniquePtr pRelsDoc = parseExport("ppt/slides/_rels/slide1.xml.rels"); assertXPath(pRelsDoc, "/rels:Relationships/rels:Relationship[@Id='rId1']", "Target", "slide2.xml"); @@ -239,9 +239,9 @@ void SdOOXMLExportTest1::testTdf149311() void SdOOXMLExportTest1::testTdf149128() { loadFromURL(u"odp/tdf149128.odp"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc = parseExport("ppt/slides/slide1.xml"); assertXPath(pXmlDoc, "/p:sld/p:cSld/p:spTree/p:cxnSp/p:nvCxnSpPr/p:cNvCxnSpPr/a:stCxn", "id", "42"); assertXPath(pXmlDoc, "/p:sld/p:cSld/p:spTree/p:cxnSp/p:nvCxnSpPr/p:cNvCxnSpPr/a:stCxn", "idx", @@ -255,9 +255,9 @@ void SdOOXMLExportTest1::testTdf149128() void SdOOXMLExportTest1::testTdf66228() { loadFromURL(u"odp/tdf66228.odp"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc = parseExport("ppt/slides/slide1.xml"); assertXPath(pXmlDoc, "/p:sld/p:cSld/p:spTree/p:cxnSp/p:spPr/a:prstGeom", "prst", "bentConnector3"); } @@ -265,9 +265,9 @@ void SdOOXMLExportTest1::testTdf66228() void SdOOXMLExportTest1::testTdf147919() { loadFromURL(u"odp/tdf147919.odp"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc = parseExport("ppt/slides/slide1.xml"); assertXPath(pXmlDoc, "/p:sld/p:cSld/p:spTree/p:cxnSp[1]/p:spPr/a:prstGeom", "prst", "bentConnector2"); @@ -334,22 +334,22 @@ void SdOOXMLExportTest1::testTdf147919() void SdOOXMLExportTest1::testTdf130165() { loadFromURL(u"pptx/tdf146223.pptx"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc = parseExport("ppt/slides/slide1.xml"); assertXPath(pXmlDoc, "/p:sld", "showMasterSp", "0"); } void SdOOXMLExportTest1::testTdf124781() { loadFromURL(u"odp/tdf124781.odp"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc1 = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc1 = parseExport("ppt/slides/slide1.xml"); assertXPath(pXmlDoc1, "/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:p[1]/a:r[2]/a:rPr", "baseline", "33000"); - xmlDocUniquePtr pXmlDoc2 = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc2 = parseExport("ppt/slides/slide1.xml"); assertXPath(pXmlDoc2, "/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:p[2]/a:r[2]/a:rPr", "baseline", "-8000"); } @@ -357,39 +357,39 @@ void SdOOXMLExportTest1::testTdf124781() void SdOOXMLExportTest1::testTdf144914() { loadFromURL(u"pptx/tdf144616.pptx"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc1 = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc1 = parseExport("ppt/slides/slide1.xml"); assertXPath(pXmlDoc1, "/p:sld/p:cSld/p:spTree/p:sp[1]/p:nvSpPr/p:cNvPr/a:hlinkClick", "action", "ppaction://hlinkshowjump?jump=firstslide"); - xmlDocUniquePtr pXmlDoc2 = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc2 = parseExport("ppt/slides/slide1.xml"); assertXPath(pXmlDoc2, "/p:sld/p:cSld/p:spTree/p:sp[2]/p:nvSpPr/p:cNvPr/a:hlinkClick", "action", "ppaction://hlinkshowjump?jump=lastslide"); - xmlDocUniquePtr pXmlDoc3 = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc3 = parseExport("ppt/slides/slide1.xml"); assertXPath(pXmlDoc3, "/p:sld/p:cSld/p:spTree/p:sp[3]/p:nvSpPr/p:cNvPr/a:hlinkClick", "action", "ppaction://hlinkshowjump?jump=nextslide"); - xmlDocUniquePtr pXmlDoc4 = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc4 = parseExport("ppt/slides/slide1.xml"); assertXPath(pXmlDoc4, "/p:sld/p:cSld/p:spTree/p:sp[4]/p:nvSpPr/p:cNvPr/a:hlinkClick", "action", "ppaction://hlinkshowjump?jump=previousslide"); - xmlDocUniquePtr pXmlDoc5 = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc5 = parseExport("ppt/slides/slide1.xml"); assertXPath(pXmlDoc5, "/p:sld/p:cSld/p:spTree/p:sp[5]/p:nvSpPr/p:cNvPr/a:hlinkClick", "action", "ppaction://hlinksldjump"); - xmlDocUniquePtr pRelsDoc5 = parseExport(tempFile.GetURL(), "ppt/slides/_rels/slide1.xml.rels"); + xmlDocUniquePtr pRelsDoc5 = parseExport("ppt/slides/_rels/slide1.xml.rels"); assertXPath(pRelsDoc5, "/rels:Relationships/rels:Relationship[@Id='rId1']", "Target", "slide2.xml"); - xmlDocUniquePtr pXmlDoc6 = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc6 = parseExport("ppt/slides/slide1.xml"); assertXPath(pXmlDoc6, "/p:sld/p:cSld/p:spTree/p:sp[6]/p:nvSpPr/p:cNvPr/a:hlinkClick", "action", "ppaction://hlinkshowjump?jump=endshow"); - xmlDocUniquePtr pXmlDoc7 = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc7 = parseExport("ppt/slides/slide1.xml"); assertXPath(pXmlDoc7, "/p:sld/p:cSld/p:spTree/p:sp[7]/p:nvSpPr/p:cNvPr/a:hlinkClick", "id", "rId2"); - xmlDocUniquePtr pRelsDoc7 = parseExport(tempFile.GetURL(), "ppt/slides/_rels/slide1.xml.rels"); + xmlDocUniquePtr pRelsDoc7 = parseExport("ppt/slides/_rels/slide1.xml.rels"); assertXPath(pRelsDoc7, "/rels:Relationships/rels:Relationship[@Id='rId2']", "Target", "http://www.example.com/"); } @@ -397,39 +397,39 @@ void SdOOXMLExportTest1::testTdf144914() void SdOOXMLExportTest1::testTdf124232() { loadFromURL(u"pptx/tdf141704.pptx"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc1 = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc1 = parseExport("ppt/slides/slide1.xml"); assertXPath(pXmlDoc1, "/p:sld/p:cSld/p:spTree/p:pic/p:nvPicPr/p:cNvPr/a:hlinkClick", "action", "ppaction://hlinkshowjump?jump=lastslide"); - xmlDocUniquePtr pXmlDoc2 = parseExport(tempFile.GetURL(), "ppt/slides/slide2.xml"); + xmlDocUniquePtr pXmlDoc2 = parseExport("ppt/slides/slide2.xml"); assertXPath(pXmlDoc2, "/p:sld/p:cSld/p:spTree/p:pic/p:nvPicPr/p:cNvPr/a:hlinkClick", "action", "ppaction://hlinkshowjump?jump=nextslide"); - xmlDocUniquePtr pXmlDoc3 = parseExport(tempFile.GetURL(), "ppt/slides/slide3.xml"); + xmlDocUniquePtr pXmlDoc3 = parseExport("ppt/slides/slide3.xml"); assertXPath(pXmlDoc3, "/p:sld/p:cSld/p:spTree/p:pic/p:nvPicPr/p:cNvPr/a:hlinkClick", "action", "ppaction://hlinkshowjump?jump=previousslide"); - xmlDocUniquePtr pXmlDoc4 = parseExport(tempFile.GetURL(), "ppt/slides/slide4.xml"); + xmlDocUniquePtr pXmlDoc4 = parseExport("ppt/slides/slide4.xml"); assertXPath(pXmlDoc4, "/p:sld/p:cSld/p:spTree/p:pic/p:nvPicPr/p:cNvPr/a:hlinkClick", "id", "rId1"); - xmlDocUniquePtr pRelsDoc4 = parseExport(tempFile.GetURL(), "ppt/slides/_rels/slide4.xml.rels"); + xmlDocUniquePtr pRelsDoc4 = parseExport("ppt/slides/_rels/slide4.xml.rels"); assertXPath(pRelsDoc4, "/rels:Relationships/rels:Relationship[@Id='rId1']", "Target", "http://www.example.com/"); - xmlDocUniquePtr pXmlDoc5 = parseExport(tempFile.GetURL(), "ppt/slides/slide5.xml"); + xmlDocUniquePtr pXmlDoc5 = parseExport("ppt/slides/slide5.xml"); assertXPath(pXmlDoc5, "/p:sld/p:cSld/p:spTree/p:pic/p:nvPicPr/p:cNvPr/a:hlinkClick", "action", "ppaction://hlinksldjump"); - xmlDocUniquePtr pRelsDoc5 = parseExport(tempFile.GetURL(), "ppt/slides/_rels/slide5.xml.rels"); + xmlDocUniquePtr pRelsDoc5 = parseExport("ppt/slides/_rels/slide5.xml.rels"); assertXPath(pRelsDoc5, "/rels:Relationships/rels:Relationship[@Id='rId1']", "Target", "slide6.xml"); - xmlDocUniquePtr pXmlDoc6 = parseExport(tempFile.GetURL(), "ppt/slides/slide6.xml"); + xmlDocUniquePtr pXmlDoc6 = parseExport("ppt/slides/slide6.xml"); assertXPath(pXmlDoc6, "/p:sld/p:cSld/p:spTree/p:pic/p:nvPicPr/p:cNvPr/a:hlinkClick", "action", "ppaction://hlinkshowjump?jump=endshow"); - xmlDocUniquePtr pXmlDoc7 = parseExport(tempFile.GetURL(), "ppt/slides/slide7.xml"); + xmlDocUniquePtr pXmlDoc7 = parseExport("ppt/slides/slide7.xml"); assertXPath(pXmlDoc7, "/p:sld/p:cSld/p:spTree/p:pic/p:nvPicPr/p:cNvPr/a:hlinkClick", "action", "ppaction://hlinkshowjump?jump=firstslide"); } @@ -437,9 +437,9 @@ void SdOOXMLExportTest1::testTdf124232() void SdOOXMLExportTest1::testTdf143624() { loadFromURL(u"pptx/tdf143624.pptx"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport(tempFile.GetURL(), "ppt/presProps.xml"); + xmlDocUniquePtr pXmlDoc = parseExport("ppt/presProps.xml"); assertXPath(pXmlDoc, "/p:presentationPr/p:showPr", "useTimings", "0"); @@ -457,9 +457,9 @@ void SdOOXMLExportTest1::testTdf142648() uno::Reference<container::XNamed> xNamed(xDrawPage, uno::UNO_QUERY_THROW); xNamed->setName("#Slide 1"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); - xmlDocUniquePtr pRelsDoc = parseExport(tempFile.GetURL(), "ppt/slides/_rels/slide2.xml.rels"); + xmlDocUniquePtr pRelsDoc = parseExport("ppt/slides/_rels/slide2.xml.rels"); assertXPath(pRelsDoc, "/rels:Relationships/rels:Relationship[@Id='rId1']", "Target", "slide1.xml"); @@ -468,9 +468,9 @@ void SdOOXMLExportTest1::testTdf142648() void SdOOXMLExportTest1::testTdf47365() { loadFromURL(u"pptx/loopNoPause.pptx"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport(tempFile.GetURL(), "ppt/presProps.xml"); + xmlDocUniquePtr pXmlDoc = parseExport("ppt/presProps.xml"); assertXPath(pXmlDoc, "/p:presentationPr/p:showPr", "loop", "1"); @@ -480,9 +480,9 @@ void SdOOXMLExportTest1::testTdf47365() void SdOOXMLExportTest1::testTdf125071() { loadFromURL(u"pptx/tdf125071.pptx"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport(tempFile.GetURL(), "ppt/presentation.xml"); + xmlDocUniquePtr pXmlDoc = parseExport("ppt/presentation.xml"); assertXPath(pXmlDoc, "/p:presentation/p:custShowLst/p:custShow[1]", "name", "Custom1"); assertXPath(pXmlDoc, "/p:presentation/p:custShowLst/p:custShow[2]", "name", "Custom2"); @@ -491,10 +491,10 @@ void SdOOXMLExportTest1::testTdf125071() void SdOOXMLExportTest1::testTdf54037() { loadFromURL(u"pptx/tdf54037.pptx"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); - xmlDocUniquePtr pRelsDoc = parseExport(tempFile.GetURL(), "ppt/slides/_rels/slide1.xml.rels"); + xmlDocUniquePtr pXmlDoc = parseExport("ppt/slides/slide1.xml"); + xmlDocUniquePtr pRelsDoc = parseExport("ppt/slides/_rels/slide1.xml.rels"); assertXPath(pXmlDoc, "/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:p[1]/a:r/a:rPr/a:hlinkClick", "action", "ppaction://hlinksldjump"); @@ -1240,10 +1240,10 @@ void SdOOXMLExportTest1::testTdf112633() { // Load document and export it to a temporary file loadFromURL(u"pptx/tdf112633.pptx"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); - xmlDocUniquePtr pRelsDoc = parseExport(tempFile.GetURL(), "ppt/slides/_rels/slide1.xml.rels"); + xmlDocUniquePtr pXmlDoc = parseExport("ppt/slides/slide1.xml"); + xmlDocUniquePtr pRelsDoc = parseExport("ppt/slides/_rels/slide1.xml.rels"); // Check image with artistic effect exists in the slide assertXPath(pXmlDoc, @@ -1263,16 +1263,16 @@ void SdOOXMLExportTest1::testTdf112633() // Check the .wdp file exists uno::Reference<packages::zip::XZipFileAccess2> xNameAccess = packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory), - tempFile.GetURL()); + maTempFile.GetURL()); CPPUNIT_ASSERT_EQUAL(true, bool(xNameAccess->hasByName("ppt/media/hdphoto1.wdp"))); } void SdOOXMLExportTest1::testTdf128952() { loadFromURL(u"pptx/tdf128952.pptx"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc = parseExport("ppt/slides/slide1.xml"); assertXPath(pXmlDoc, "/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:xfrm/a:off", "x", "360"); assertXPath(pXmlDoc, "/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:xfrm/a:off", "y", "-360"); @@ -1283,9 +1283,9 @@ void SdOOXMLExportTest1::testTdf128952() void SdOOXMLExportTest1::testTdf127090() { loadFromURL(u"pptx/tdf127090.odp"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc = parseExport("ppt/slides/slide1.xml"); assertXPath(pXmlDoc, "/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:bodyPr", "rot", "-5400000"); } @@ -1294,11 +1294,11 @@ void SdOOXMLExportTest1::testCustomXml() { // Load document and export it to a temporary file loadFromURL(u"pptx/customxml.pptx"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport(tempFile.GetURL(), "customXml/item1.xml"); + xmlDocUniquePtr pXmlDoc = parseExport("customXml/item1.xml"); CPPUNIT_ASSERT(pXmlDoc); - xmlDocUniquePtr pRelsDoc = parseExport(tempFile.GetURL(), "customXml/_rels/item1.xml.rels"); + xmlDocUniquePtr pRelsDoc = parseExport("customXml/_rels/item1.xml.rels"); CPPUNIT_ASSERT(pRelsDoc); // Check there is a relation to itemProps1.xml. @@ -1306,7 +1306,7 @@ void SdOOXMLExportTest1::testCustomXml() assertXPath(pRelsDoc, "/rels:Relationships/rels:Relationship[@Id='rId1']", "Target", "itemProps1.xml"); - std::unique_ptr<SvStream> pStream = parseExportStream(tempFile.GetURL(), "ddp/ddpfile.xen"); + std::unique_ptr<SvStream> pStream = parseExportStream(maTempFile.GetURL(), "ddp/ddpfile.xen"); CPPUNIT_ASSERT(pStream); } @@ -1314,7 +1314,7 @@ void SdOOXMLExportTest1::testTdf94238() { // Load document and export it to a temporary file. loadFromURL(u"pptx/tdf94238.pptx"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent, uno::UNO_QUERY); CPPUNIT_ASSERT(xDoc.is()); @@ -1347,7 +1347,7 @@ void SdOOXMLExportTest1::testPictureTransparency() { // Load document and export it to a temporary file. loadFromURL(u"odp/image_transparency.odp"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent, uno::UNO_QUERY); CPPUNIT_ASSERT(xDoc.is()); @@ -1394,7 +1394,7 @@ void SdOOXMLExportTest1::testRoundtripOwnLineStyles() } // Save to pptx, reload and compare the LineDash values - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); uno::Reference<drawing::XDrawPagesSupplier> xDocpptx(mxComponent, uno::UNO_QUERY); CPPUNIT_ASSERT(xDocpptx.is()); uno::Reference<drawing::XDrawPage> xPagepptx(xDocpptx->getDrawPages()->getByIndex(0), @@ -1421,12 +1421,12 @@ void SdOOXMLExportTest1::testRoundtripPrstDash() { // load and save document, compare prstDash values in saved document with original. loadFromURL(u"pptx/presetDashDot.pptx"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); const OUString sOriginal[] = { "dash", "dashDot", "dot", "lgDash", "lgDashDot", "lgDashDotDot", "sysDash", "sysDashDot", "sysDashDotDot", "sysDot" }; - xmlDocUniquePtr pXmlDoc = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc = parseExport("ppt/slides/slide1.xml"); const OString sStart = "/p:sld/p:cSld/p:spTree/p:sp["; const OString sEnd = "]/p:spPr/a:ln/a:prstDash"; for (sal_uInt16 i = 0; i < 10; i++) @@ -1458,16 +1458,15 @@ void SdOOXMLExportTest1::testDashOnHairline() { // load and save document, make sure the custDash has 11 child elements. loadFromURL(u"odp/tdf127267DashOnHairline.odp"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc = parseExport("ppt/slides/slide1.xml"); assertXPath(pXmlDoc, "/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:ln/a:custDash/a:ds", 11); } void SdOOXMLExportTest1::testNarrationNonMediaShape() { loadFromURL(u"pptx/narration-non-media-shape.pptx"); - utl::TempFileNamed aTempFile; // Without the accompanying fix in place, this test would have failed, // beans::UnknownPropertyException was thrown. saveAndReload("Impress Office Open XML"); @@ -1476,9 +1475,9 @@ void SdOOXMLExportTest1::testNarrationNonMediaShape() void SdOOXMLExportTest1::testCustomshapeBitmapfillSrcrect() { loadFromURL(u"pptx/customshape-bitmapfill-srcrect.pptx"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc = parseExport("ppt/slides/slide1.xml"); // tdf#132680 // We are preventing the side effect of DOCX improvement to PPTX case. @@ -1507,11 +1506,11 @@ void SdOOXMLExportTest1::testCustomshapeBitmapfillSrcrect() void SdOOXMLExportTest1::testTdf100348FontworkBitmapFill() { loadFromURL(u"odp/tdf100348_FontworkBitmapFill.odp"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); // Make sure the fontwork shape has a blip bitmap fill and a colored outline. // Without the patch, fill and outline were black. - xmlDocUniquePtr pXmlDoc = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc = parseExport("ppt/slides/slide1.xml"); const OString sPathStart("//p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:p/a:r/a:rPr"); assertXPath(pXmlDoc, sPathStart + "/a:blipFill/a:blip", 1); assertXPath(pXmlDoc, sPathStart + "/a:ln/a:solidFill/a:srgbClr", "val", "ffbf00"); @@ -1520,11 +1519,11 @@ void SdOOXMLExportTest1::testTdf100348FontworkBitmapFill() void SdOOXMLExportTest1::testTdf100348FontworkGradientGlow() { loadFromURL(u"odp/tdf100348_FontworkGradientGlow.odp"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); // Make sure the fontwork shape has a gradient fill and a colored glow. // Without the patch, fill was black and no glow applied. - xmlDocUniquePtr pXmlDoc = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc = parseExport("ppt/slides/slide1.xml"); const OString sPathStart("//p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:p/a:r/a:rPr"); assertXPath(pXmlDoc, sPathStart + "/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr", "val", "8d281e"); assertXPath(pXmlDoc, sPathStart + "/a:effectLst/a:glow", "rad", "63360"); @@ -1534,20 +1533,20 @@ void SdOOXMLExportTest1::testTdf100348FontworkGradientGlow() void SdOOXMLExportTest1::testTdf128345FullTransparentGradient() { loadFromURL(u"odp/tdf128345_FullTransparentGradient.odp"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); // Make sure the shape has no fill. Without the patch, fill was solid red. - xmlDocUniquePtr pXmlDoc = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc = parseExport("ppt/slides/slide1.xml"); assertXPath(pXmlDoc, "//p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:noFill"); } void SdOOXMLExportTest1::testTdf128345GradientLinear() { loadFromURL(u"odp/tdf128345_GradientLinear.odp"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); // Make sure the shape has a lin fill. Without the patch, fill was solid red. - xmlDocUniquePtr pXmlDoc = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc = parseExport("ppt/slides/slide1.xml"); const OString sPathStart("//p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:gradFill"); assertXPath(pXmlDoc, sPathStart + "/a:lin", "ang", "3600000"); assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs", 2); @@ -1562,11 +1561,11 @@ void SdOOXMLExportTest1::testTdf128345GradientLinear() void SdOOXMLExportTest1::testTdf128345GradientRadial() { loadFromURL(u"odp/tdf128345_GradientRadial.odp"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); // Make sure the shape has transparency. In OOXML alpha means 'opacity' with default // 100000 for full opak, so only the full transparency with val 0 should be written. - xmlDocUniquePtr pXmlDoc = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc = parseExport("ppt/slides/slide1.xml"); const OString sPathStart("//p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:gradFill"); assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs", 2); assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[1]/a:srgbClr", "val", "ff0000"); @@ -1593,10 +1592,10 @@ void SdOOXMLExportTest1::testTdf128345GradientAxial() void SdOOXMLExportTest1::testTdf134969TransparencyOnColorGradient() { loadFromURL(u"odp/tdf134969_TransparencyOnColorGradient.odp"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); // Make sure the shape has a transparency in gradient stops. - xmlDocUniquePtr pXmlDoc = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc = parseExport("ppt/slides/slide1.xml"); const OString sPathStart("//p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:gradFill"); assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs", 2); assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[1]/a:srgbClr/a:alpha", "val", "60000"); @@ -1606,9 +1605,9 @@ void SdOOXMLExportTest1::testTdf134969TransparencyOnColorGradient() void SdOOXMLExportTest1::testArcTo() { loadFromURL(u"pptx/arc-validiert.pptx"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc = parseExport("ppt/slides/slide1.xml"); const OString sPath("//a:custGeom/a:pathLst/a:path/a:arcTo"); assertXPath(pXmlDoc, sPath, "wR", "3"); assertXPath(pXmlDoc, sPath, "hR", "3"); @@ -1619,8 +1618,8 @@ void SdOOXMLExportTest1::testArcTo() void SdOOXMLExportTest1::testNarrationMimeType() { loadFromURL(u"pptx/narration.pptx"); - utl::TempFileNamed aTempFile = save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport(aTempFile.GetURL(), "[Content_Types].xml"); + save("Impress Office Open XML"); + xmlDocUniquePtr pXmlDoc = parseExport("[Content_Types].xml"); // Without the accompanying fix in place, this test would have failed with: // - Expected: audio/mp4 // - Actual : application/vnd.sun.star.media @@ -1630,10 +1629,10 @@ void SdOOXMLExportTest1::testNarrationMimeType() "ContentType", "audio/mp4"); // Check if the bitmap of the media shape is exported correctly. - xmlDocUniquePtr pSlideDoc = parseExport(aTempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pSlideDoc = parseExport("ppt/slides/slide1.xml"); OUString aImageId = getXPath(pSlideDoc, "/p:sld/p:cSld/p:spTree/p:pic/p:blipFill/a:blip", "embed"); - xmlDocUniquePtr pRelsDoc = parseExport(aTempFile.GetURL(), "ppt/slides/_rels/slide1.xml.rels"); + xmlDocUniquePtr pRelsDoc = parseExport("ppt/slides/_rels/slide1.xml.rels"); OUString aImagePath = "/rels:Relationships/rels:Relationship[@Id='" + aImageId + "']"; // Something like ../media/image2.png. OUString aImageStreamName = getXPath(pRelsDoc, aImagePath.toUtf8(), "Target"); @@ -1641,7 +1640,7 @@ void SdOOXMLExportTest1::testNarrationMimeType() // Something like ppt/media/image2.png. OUString aImageRelName; CPPUNIT_ASSERT(aImageAbsName.startsWith("file:///", &aImageRelName)); - std::unique_ptr<SvStream> pImageStream = parseExportStream(aTempFile.GetURL(), aImageRelName); + std::unique_ptr<SvStream> pImageStream = parseExportStream(maTempFile.GetURL(), aImageRelName); vcl::PngImageReader aReader(*pImageStream); BitmapEx aBitmapEx = aReader.read(); // Without the accompanying fix in place, this test would have failed with: @@ -1681,8 +1680,8 @@ void SdOOXMLExportTest1::testNarrationMimeType() void SdOOXMLExportTest1::testTdf140865Wordart3D() { loadFromURL(u"pptx/tdf140865Wordart3D.pptx"); - utl::TempFileNamed aTempFile = save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport(aTempFile.GetURL(), "ppt/slides/slide1.xml"); + save("Impress Office Open XML"); + xmlDocUniquePtr pXmlDoc = parseExport("ppt/slides/slide1.xml"); // without the fix in place a:sp3d was lost on round trip, and so extrusion was lost. constexpr OStringLiteral sPathStart("//p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:bodyPr"); @@ -1699,9 +1698,9 @@ void SdOOXMLExportTest1::testTdf140865Wordart3D() void SdOOXMLExportTest1::testTdf124457() { loadFromURL(u"pptx/tdf124457.pptx"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc = parseExport("ppt/slides/slide1.xml"); assertXPath(pXmlDoc, "/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/" @@ -1717,9 +1716,9 @@ void SdOOXMLExportTest1::testTdf124457() void SdOOXMLExportTest1::testTdf143126() { loadFromURL(u"pptx/tdf143126.pptx"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport(tempFile.GetURL(), "ppt/presProps.xml"); + xmlDocUniquePtr pXmlDoc = parseExport("ppt/presProps.xml"); assertXPath(pXmlDoc, "/p:presentationPr/p:showPr", "showNarration", "1"); assertXPath(pXmlDoc, "/p:presentationPr/p:showPr/p:sldRg", "st", "2"); @@ -1729,9 +1728,9 @@ void SdOOXMLExportTest1::testTdf143126() void SdOOXMLExportTest1::testTdf143129() { loadFromURL(u"pptx/tdf143129.pptx"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport(tempFile.GetURL(), "ppt/presProps.xml"); + xmlDocUniquePtr pXmlDoc = parseExport("ppt/presProps.xml"); assertXPath(pXmlDoc, "/p:presentationPr/p:showPr", "showNarration", "1"); assertXPath(pXmlDoc, "/p:presentationPr/p:showPr/p:custShow", "id", "0"); @@ -1740,9 +1739,9 @@ void SdOOXMLExportTest1::testTdf143129() void SdOOXMLExportTest1::testTdf118045() { loadFromURL(u"odp/tdf118045.odp"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc1 = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc1 = parseExport("ppt/slides/slide1.xml"); assertXPath(pXmlDoc1, "/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:p/a:pPr/a:lnSpc/a:spcPct", "val", "110000"); } @@ -1750,9 +1749,9 @@ void SdOOXMLExportTest1::testTdf118045() void SdOOXMLExportTest1::testTdf137675() { loadFromURL(u"pptx/tdf137675.pptx"); - utl::TempFileNamed tempFile = save("Impress Office Open XML"); + save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport(tempFile.GetURL(), "ppt/slides/slide1.xml"); + xmlDocUniquePtr pXmlDoc = parseExport("ppt/slides/slide1.xml"); assertXPath(pXmlDoc, "/p:sld/p:cSld/p:spTree/p:sp/p:spPr/a:custGeom/a:pathLst/a:path", "fill", "none"); } |