summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2022-09-21 20:54:00 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2022-09-29 09:11:18 +0200
commit4b95451f859bac8e05956ce12df17f1ee410032d (patch)
tree2ebe03c8ecbba3c9179d33c346774e037fcfc224 /sd
parenta08468c1a5255d3fb04cd8a0dc627acdea40426a (diff)
split utl::TempFile into fast and named variants
which makes it easier to know what each variant requires to stay on it's happy path Change-Id: I3275a2543573367714bc78092e882f6535507285 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140469 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
-rw-r--r--sd/qa/filter/eppt/eppt.cxx6
-rw-r--r--sd/qa/unit/HtmlExportTest.cxx2
-rw-r--r--sd/qa/unit/PNGExportTests.cxx16
-rw-r--r--sd/qa/unit/SVGExportTests.cxx2
-rw-r--r--sd/qa/unit/SdrPdfImportTest.cxx2
-rw-r--r--sd/qa/unit/ShapeImportExportTest.cxx2
-rw-r--r--sd/qa/unit/export-tests-ooxml1.cxx78
-rw-r--r--sd/qa/unit/export-tests-ooxml2.cxx92
-rw-r--r--sd/qa/unit/export-tests-ooxml3.cxx130
-rw-r--r--sd/qa/unit/export-tests.cxx54
-rw-r--r--sd/qa/unit/misc-tests.cxx12
-rw-r--r--sd/qa/unit/sdmodeltestbase.hxx12
-rw-r--r--sd/qa/unit/uiimpress.cxx7
-rw-r--r--sd/source/ui/app/sdxfer.cxx3
14 files changed, 209 insertions, 209 deletions
diff --git a/sd/qa/filter/eppt/eppt.cxx b/sd/qa/filter/eppt/eppt.cxx
index 151b9cfce27a..ce8131d3e25f 100644
--- a/sd/qa/filter/eppt/eppt.cxx
+++ b/sd/qa/filter/eppt/eppt.cxx
@@ -66,7 +66,7 @@ CPPUNIT_TEST_FIXTURE(Test, testOOXMLCustomShapeBitmapFill)
// Save the bugdoc to PPT.
OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "custom-shape-bitmap-fill.pptx";
getComponent() = loadFromDesktop(aURL);
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
uno::Reference<frame::XStorable> xStorable(getComponent(), uno::UNO_QUERY);
utl::MediaDescriptor aMediaDescriptor;
@@ -106,7 +106,7 @@ CPPUNIT_TEST_FIXTURE(Test, testThemeExport)
xMasterPage->setPropertyValue("Theme", aTheme);
// When exporting to PPTX:
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
uno::Reference<frame::XStorable> xStorable(xComponent, uno::UNO_QUERY);
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= OUString("Impress Office Open XML");
@@ -133,7 +133,7 @@ CPPUNIT_TEST_FIXTURE(Test, testLoopingFromAnimation)
getComponent() = loadFromDesktop(aURL);
// When exporting that to PPTX:
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
uno::Reference<frame::XStorable> xStorable(getComponent(), uno::UNO_QUERY);
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= OUString("Impress Office Open XML");
diff --git a/sd/qa/unit/HtmlExportTest.cxx b/sd/qa/unit/HtmlExportTest.cxx
index 1390b267de7f..ea8de7b9be06 100644
--- a/sd/qa/unit/HtmlExportTest.cxx
+++ b/sd/qa/unit/HtmlExportTest.cxx
@@ -21,7 +21,7 @@ private:
{
FileFormat* pFormat = getFormat(HTML);
OUString aExt = "." + OUString::createFromAscii(pFormat->pName);
- utl::TempFile aTempFile(u"", true, aExt);
+ utl::TempFileNamed aTempFile(u"", true, aExt);
aTempFile.EnableKillingFile();
exportTo(xDocShRef.get(), pFormat, aTempFile);
return parseHtml(aTempFile);
diff --git a/sd/qa/unit/PNGExportTests.cxx b/sd/qa/unit/PNGExportTests.cxx
index a03350d8c882..0d3ed74eca28 100644
--- a/sd/qa/unit/PNGExportTests.cxx
+++ b/sd/qa/unit/PNGExportTests.cxx
@@ -62,7 +62,7 @@ CPPUNIT_TEST_FIXTURE(SdPNGExportTest, testTdf105998)
uno::Reference<drawing::XGraphicExportFilter> xGraphicExporter
= drawing::GraphicExportFilter::create(xContext);
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
uno::Sequence<beans::PropertyValue> aDescriptor{
@@ -127,7 +127,7 @@ CPPUNIT_TEST_FIXTURE(SdPNGExportTest, testTdf126319)
uno::Reference<drawing::XGraphicExportFilter> xGraphicExporter
= drawing::GraphicExportFilter::create(xContext);
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
uno::Sequence<beans::PropertyValue> aDescriptor{
@@ -201,7 +201,7 @@ CPPUNIT_TEST_FIXTURE(SdPNGExportTest, testTdf136632)
uno::Sequence<beans::PropertyValue> aFilterData{ comphelper::makePropertyValue("Translucent",
sal_Int32(0)) };
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
uno::Sequence<beans::PropertyValue> aDescriptor{
@@ -241,7 +241,7 @@ CPPUNIT_TEST_FIXTURE(SdPNGExportTest, testTdf113163)
comphelper::makePropertyValue("PixelHeight", sal_Int32(100))
};
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
uno::Sequence<beans::PropertyValue> aDescriptor{
@@ -296,7 +296,7 @@ CPPUNIT_TEST_FIXTURE(SdPNGExportTest, testTdf147119)
comphelper::makePropertyValue("Translucent", sal_Int32(1)),
};
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
uno::Sequence<beans::PropertyValue> aDescriptor{
@@ -348,7 +348,7 @@ CPPUNIT_TEST_FIXTURE(SdPNGExportTest, testTdf113197)
comphelper::makePropertyValue("PixelHeight", sal_Int32(100)),
};
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
uno::Sequence<beans::PropertyValue> aDescriptor{
@@ -403,7 +403,7 @@ CPPUNIT_TEST_FIXTURE(SdPNGExportTest, testTdf93124)
comphelper::makePropertyValue("PixelHeight", sal_Int32(180))
};
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
uno::Sequence<beans::PropertyValue> aDescriptor{
@@ -466,7 +466,7 @@ CPPUNIT_TEST_FIXTURE(SdPNGExportTest, testTdf99729)
comphelper::makePropertyValue("PixelHeight", sal_Int32(240))
};
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
uno::Sequence<beans::PropertyValue> aDescriptor{
diff --git a/sd/qa/unit/SVGExportTests.cxx b/sd/qa/unit/SVGExportTests.cxx
index 4878eca27972..270c98dd53d8 100644
--- a/sd/qa/unit/SVGExportTests.cxx
+++ b/sd/qa/unit/SVGExportTests.cxx
@@ -96,7 +96,7 @@ class SdSVGFilterTest : public test::BootstrapFixture, public unotest::MacrosTes
};
uno::Reference<lang::XComponent> mxComponent;
- utl::TempFile maTempFile;
+ utl::TempFileNamed maTempFile;
protected:
void load(std::u16string_view pDir, const char* pName)
diff --git a/sd/qa/unit/SdrPdfImportTest.cxx b/sd/qa/unit/SdrPdfImportTest.cxx
index ba3c42e92d46..f92c659a1bba 100644
--- a/sd/qa/unit/SdrPdfImportTest.cxx
+++ b/sd/qa/unit/SdrPdfImportTest.cxx
@@ -231,7 +231,7 @@ CPPUNIT_TEST_FIXTURE(SdrPdfImportTest, testAnnotationsImportExport)
}
{ // save as PDF and check annotations
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
diff --git a/sd/qa/unit/ShapeImportExportTest.cxx b/sd/qa/unit/ShapeImportExportTest.cxx
index 071fdc58c74e..186aafa4a267 100644
--- a/sd/qa/unit/ShapeImportExportTest.cxx
+++ b/sd/qa/unit/ShapeImportExportTest.cxx
@@ -262,7 +262,7 @@ void ShapeImportExportTest::testTextDistancesOOXML_Export()
::sd::DrawDocShellRef xDocShell
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/TextDistancesInsets3.pptx"), PPTX);
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
xDocShell = saveAndReload(xDocShell.get(), PPTX, &aTempFile);
xDocShell->DoClose();
diff --git a/sd/qa/unit/export-tests-ooxml1.cxx b/sd/qa/unit/export-tests-ooxml1.cxx
index c5a2c2ebc7e8..624dcede7eb3 100644
--- a/sd/qa/unit/export-tests-ooxml1.cxx
+++ b/sd/qa/unit/export-tests-ooxml1.cxx
@@ -225,7 +225,7 @@ void SdOOXMLExportTest1::testTdf149311()
{
sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf149311.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -239,7 +239,7 @@ void SdOOXMLExportTest1::testTdf149128()
{
sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf149128.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -254,7 +254,7 @@ void SdOOXMLExportTest1::testTdf66228()
{
sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf66228.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -267,7 +267,7 @@ void SdOOXMLExportTest1::testTdf147919()
{
sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf147919.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -327,7 +327,7 @@ void SdOOXMLExportTest1::testTdf130165()
{
sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf146223.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -339,7 +339,7 @@ void SdOOXMLExportTest1::testTdf124781()
{
sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf124781.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -356,7 +356,7 @@ void SdOOXMLExportTest1::testTdf144914()
{
sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf144616.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -398,7 +398,7 @@ void SdOOXMLExportTest1::testTdf144914()
void SdOOXMLExportTest1::testTdf124232()
{
sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf141704.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -440,7 +440,7 @@ void SdOOXMLExportTest1::testTdf124232()
void SdOOXMLExportTest1::testTdf143624()
{
sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf143624.pptx"), PPTX );
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -454,7 +454,7 @@ void SdOOXMLExportTest1::testTdf143624()
void SdOOXMLExportTest1::testTdf142648()
{
sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf142648.pptx"), PPTX );
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
uno::Reference<drawing::XDrawPagesSupplier> xDPS(xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW);
uno::Reference<drawing::XDrawPages> xDrawPages(xDPS->getDrawPages(), uno::UNO_SET_THROW);
@@ -475,7 +475,7 @@ void SdOOXMLExportTest1::testTdf142648()
void SdOOXMLExportTest1::testTdf47365()
{
sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/loopNoPause.pptx"), PPTX );
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -489,7 +489,7 @@ void SdOOXMLExportTest1::testTdf47365()
void SdOOXMLExportTest1::testTdf125071()
{
sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf125071.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -502,7 +502,7 @@ void SdOOXMLExportTest1::testTdf125071()
void SdOOXMLExportTest1::testTdf54037()
{
sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf54037.pptx"), PPTX );
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -938,7 +938,7 @@ void SdOOXMLExportTest1::testTableCellFillProperties()
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= OStringToOUString(std::string_view(aFileFormats[PPTX].pFilterName), RTL_TEXTENCODING_UTF8);
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
xComponent.set(xStorable, uno::UNO_QUERY);
@@ -1274,7 +1274,7 @@ void SdOOXMLExportTest1::testTdf112633()
{
// Load document and export it to a temporary file
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf112633.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1301,7 +1301,7 @@ void SdOOXMLExportTest1::testTdf112633()
void SdOOXMLExportTest1::testTdf128952()
{
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf128952.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1316,7 +1316,7 @@ void SdOOXMLExportTest1::testTdf128952()
void SdOOXMLExportTest1::testTdf127090()
{
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf127090.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1329,7 +1329,7 @@ void SdOOXMLExportTest1::testCustomXml()
{
// Load document and export it to a temporary file
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/customxml.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1351,7 +1351,7 @@ void SdOOXMLExportTest1::testTdf94238()
// Load document and export it to a temporary file.
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf94238.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
uno::Reference<drawing::XDrawPagesSupplier> xDoc(xDocShRef->GetDoc()->getUnoModel(),
uno::UNO_QUERY);
@@ -1389,7 +1389,7 @@ void SdOOXMLExportTest1::testPictureTransparency()
// Load document and export it to a temporary file.
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/image_transparency.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
uno::Reference<drawing::XDrawPagesSupplier> xDoc(xDocShRef->GetDoc()->getUnoModel(),
uno::UNO_QUERY);
@@ -1443,7 +1443,7 @@ void SdOOXMLExportTest1::testRoundtripOwnLineStyles()
}
// Save to pptx, reload and compare the LineDash values
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
uno::Reference<drawing::XDrawPagesSupplier> xDocpptx(xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY);
CPPUNIT_ASSERT(xDocpptx.is());
@@ -1472,7 +1472,7 @@ void SdOOXMLExportTest1::testRoundtripPrstDash()
// load and save document, compare prstDash values in saved document with original.
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/presetDashDot.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
const OUString sOriginal[] = {
@@ -1522,7 +1522,7 @@ void SdOOXMLExportTest1::testDashOnHairline()
// load and save document, make sure the custDash has 11 child elements.
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf127267DashOnHairline.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1534,7 +1534,7 @@ void SdOOXMLExportTest1::testNarrationNonMediaShape()
{
sd::DrawDocShellRef xDocShRef = loadURL(
m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/narration-non-media-shape.pptx"), PPTX);
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
// Without the accompanying fix in place, this test would have failed,
// beans::UnknownPropertyException was thrown.
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &aTempFile);
@@ -1546,7 +1546,7 @@ void SdOOXMLExportTest1::testCustomshapeBitmapfillSrcrect()
::sd::DrawDocShellRef xDocShRef = loadURL(
m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/customshape-bitmapfill-srcrect.pptx"),
PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1582,7 +1582,7 @@ void SdOOXMLExportTest1::testTdf100348FontworkBitmapFill()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf100348_FontworkBitmapFill.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1598,7 +1598,7 @@ void SdOOXMLExportTest1::testTdf100348FontworkGradientGlow()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf100348_FontworkGradientGlow.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1615,7 +1615,7 @@ void SdOOXMLExportTest1::testTdf128345FullTransparentGradient()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf128345_FullTransparentGradient.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1628,7 +1628,7 @@ void SdOOXMLExportTest1::testTdf128345GradientLinear()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf128345_GradientLinear.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1649,7 +1649,7 @@ void SdOOXMLExportTest1::testTdf128345GradientRadial()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf128345_GradientRadial.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1686,7 +1686,7 @@ void SdOOXMLExportTest1::testTdf134969TransparencyOnColorGradient()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf134969_TransparencyOnColorGradient.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1702,7 +1702,7 @@ void SdOOXMLExportTest1::testArcTo()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/arc-validiert.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1718,7 +1718,7 @@ void SdOOXMLExportTest1::testNarrationMimeType()
{
sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/narration.pptx"), PPTX);
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &aTempFile);
xmlDocUniquePtr pXmlDoc = parseExport(aTempFile, "[Content_Types].xml");
// Without the accompanying fix in place, this test would have failed with:
@@ -1783,7 +1783,7 @@ void SdOOXMLExportTest1::testTdf140865Wordart3D()
{
sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf140865Wordart3D.pptx"), PPTX);
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &aTempFile);
xmlDocUniquePtr pXmlDoc = parseExport(aTempFile, "ppt/slides/slide1.xml");
@@ -1804,7 +1804,7 @@ void SdOOXMLExportTest1::testTdf140865Wordart3D()
void SdOOXMLExportTest1::testTdf124457()
{
sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf124457.pptx"), PPTX );
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1824,7 +1824,7 @@ void SdOOXMLExportTest1::testTdf124457()
void SdOOXMLExportTest1::testTdf143126()
{
sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf143126.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1838,7 +1838,7 @@ void SdOOXMLExportTest1::testTdf143126()
void SdOOXMLExportTest1::testTdf143129()
{
sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf143129.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1852,7 +1852,7 @@ void SdOOXMLExportTest1::testTdf118045()
{
sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf118045.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1865,7 +1865,7 @@ void SdOOXMLExportTest1::testTdf137675()
{
sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf137675.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx
index 6c82d765f27f..4366d26fddd1 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -218,7 +218,7 @@ void SdOOXMLExportTest2::testTdf149697()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf149697.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -241,7 +241,7 @@ void SdOOXMLExportTest2::testTdf149126()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf149126.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -255,7 +255,7 @@ void SdOOXMLExportTest2::testTdf131905()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf131905.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -291,7 +291,7 @@ void SdOOXMLExportTest2::testBnc822341()
{
// Check import / export of embedded text document
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/bnc822341.odp"), ODP);
- utl::TempFile tempFile1;
+ utl::TempFileNamed tempFile1;
xDocShRef = saveAndReload( xDocShRef.get(), PPTX, &tempFile1 );
// Export an LO specific ole object (imported from an ODP document)
@@ -321,7 +321,7 @@ void SdOOXMLExportTest2::testBnc822341()
CPPUNIT_ASSERT_EQUAL( SdrObjKind::OLE2, pObj->GetObjIdentifier() );
}
- utl::TempFile tempFile2;
+ utl::TempFileNamed tempFile2;
xDocShRef = saveAndReload( xDocShRef.get(), PPTX, &tempFile2 );
// Export an MS specific ole object (imported from a PPTX document)
@@ -361,7 +361,7 @@ void SdOOXMLExportTest2::testMathObject()
{
// Check import / export of math object
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/math.odp"), ODP);
- utl::TempFile tempFile1;
+ utl::TempFileNamed tempFile1;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile1);
// Export an LO specific ole object (imported from an ODP document)
@@ -381,7 +381,7 @@ void SdOOXMLExportTest2::testMathObject()
CPPUNIT_ASSERT_EQUAL(SdrObjKind::OLE2, pObj->GetObjIdentifier());
}
- utl::TempFile tempFile2;
+ utl::TempFileNamed tempFile2;
xDocShRef = saveAndReload( xDocShRef.get(), PPTX, &tempFile2 );
// Export an MS specific ole object (imported from a PPTX document)
@@ -408,7 +408,7 @@ void SdOOXMLExportTest2::testMathObjectPPT2010()
{
// Check import / export of math object
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/Math.pptx"), PPTX);
- utl::TempFile tempFile1;
+ utl::TempFileNamed tempFile1;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile1);
// Export an MS specific ole object (imported from a PPTX document)
@@ -738,7 +738,7 @@ void SdOOXMLExportTest2::testPresetShapesExport()
"adj3","val 3770",
};
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload( xDocShRef.get(), PPTX, &tempFile );
xmlDocUniquePtr pXmlDocCT = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -988,7 +988,7 @@ void SdOOXMLExportTest2::testTdf92076()
void SdOOXMLExportTest2::testTdf59046()
{
sd::DrawDocShellRef xShell = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf59046.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xShell = saveAndReload(xShell.get(), PPTX, &tempFile);
xShell->DoClose();
xmlDocUniquePtr pXmlDocRels = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -998,7 +998,7 @@ void SdOOXMLExportTest2::testTdf59046()
void SdOOXMLExportTest2::testTdf133502()
{
sd::DrawDocShellRef xShell = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf133502.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xShell = saveAndReload(xShell.get(), PPTX, &tempFile);
xShell->DoClose();
xmlDocUniquePtr pXmlDocRels = parseExport(tempFile, "ppt/comments/comment1.xml");
@@ -1014,7 +1014,7 @@ void SdOOXMLExportTest2::testTdf105739()
{
// Gradient was lost during saving to ODP
sd::DrawDocShellRef xShell = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf105739.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xShell = saveAndReload(xShell.get(), ODP, &tempFile);
uno::Reference<drawing::XDrawPage> xPage = getPage(0, xShell);
uno::Reference<beans::XPropertySet> xPropSet(xPage, uno::UNO_QUERY);
@@ -1069,7 +1069,7 @@ void SdOOXMLExportTest2::testPageBitmapWithTransparency()
void SdOOXMLExportTest2::testPptmContentType()
{
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptm/macro.pptm"), PPTM);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTM, &tempFile);
// Assert that the content type is the one of PPTM
@@ -1085,7 +1085,7 @@ void SdOOXMLExportTest2::testPptmContentType()
void SdOOXMLExportTest2::testTdf111798()
{
sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf111798.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
xmlDocUniquePtr pXmlDoc = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -1130,7 +1130,7 @@ void SdOOXMLExportTest2::testTdf111798()
void SdOOXMLExportTest2::testPptmVBAStream()
{
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptm/macro.pptm"), PPTM);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTM, &tempFile);
uno::Reference<packages::zip::XZipFileAccess2> xNameAccess = packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory), tempFile.GetURL());
@@ -1143,7 +1143,7 @@ void SdOOXMLExportTest2::testPptmVBAStream()
void SdOOXMLExportTest2::testTdf111863()
{
sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf111863.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1156,7 +1156,7 @@ void SdOOXMLExportTest2::testTdf111863()
void SdOOXMLExportTest2::testTdf111518()
{
sd::DrawDocShellRef xShell = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf111518.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
tempFile.EnableKillingFile(false);
xShell = saveAndReload(xShell.get(), PPTX, &tempFile);
xShell->DoClose();
@@ -1172,7 +1172,7 @@ void SdOOXMLExportTest2::testTdf100387()
{
sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf100387.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -1201,7 +1201,7 @@ void SdOOXMLExportTest2::testTdf100387()
void SdOOXMLExportTest2::testClosingShapesAndLineCaps()
{
sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/closed-shapes.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -1236,7 +1236,7 @@ void SdOOXMLExportTest2::testClosingShapesAndLineCaps()
void SdOOXMLExportTest2::testRotateFlip()
{
sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/rotate_flip.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -1282,7 +1282,7 @@ void SdOOXMLExportTest2::testRotateFlip()
void SdOOXMLExportTest2::testTdf106867()
{
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf106867.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
const SdrPage *pPage = GetPage(1, xDocShRef.get());
@@ -1312,7 +1312,7 @@ void SdOOXMLExportTest2::testTdf106867()
void SdOOXMLExportTest2::testTdf112280()
{
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf112280.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1325,7 +1325,7 @@ void SdOOXMLExportTest2::testTdf112280()
void SdOOXMLExportTest2::testTdf112088()
{
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf112088.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1337,7 +1337,7 @@ void SdOOXMLExportTest2::testTdf112088()
void SdOOXMLExportTest2::testTdf112333()
{
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf112333.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1366,7 +1366,7 @@ void SdOOXMLExportTest2::testTdf112552()
{
// Background fill was not displayed, but it was because of the wrong geometry
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf112552.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -1381,7 +1381,7 @@ void SdOOXMLExportTest2::testTdf112557()
{
// Subtitle shape should be skipped by export.
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf112557.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slideMasters/slideMaster1.xml");
@@ -1392,7 +1392,7 @@ void SdOOXMLExportTest2::testTdf112557()
void SdOOXMLExportTest2::testTdf128049()
{
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf128049.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -1406,7 +1406,7 @@ void SdOOXMLExportTest2::testTdf128049()
void SdOOXMLExportTest2::testTdf106026()
{
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf106026.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlMasterContent = parseExport(tempFile, "ppt/slideMasters/slideMaster1.xml");
@@ -1431,7 +1431,7 @@ void SdOOXMLExportTest2::testTdf106026()
void SdOOXMLExportTest2::testTdf112334()
{
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf112334.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1444,7 +1444,7 @@ void SdOOXMLExportTest2::testTdf112334()
void SdOOXMLExportTest2::testTdf112089()
{
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf112089.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1458,7 +1458,7 @@ void SdOOXMLExportTest2::testTdf112089()
void SdOOXMLExportTest2::testTdf112086()
{
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf112086.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1496,7 +1496,7 @@ void SdOOXMLExportTest2::testTdf112647()
void SdOOXMLExportTest2::testGroupRotation()
{
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/group_rotation.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1509,7 +1509,7 @@ void SdOOXMLExportTest2::testGroupRotation()
void SdOOXMLExportTest2::testTdf104788()
{
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf104788.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1535,7 +1535,7 @@ void SdOOXMLExportTest2::testSmartartRotation2()
uno::Sequence<beans::PropertyValue> aInteropGrabBag;
xShape->setPropertyValue("InteropGrabBag", uno::Any(aInteropGrabBag));
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1552,7 +1552,7 @@ void SdOOXMLExportTest2::testSmartartRotation2()
void SdOOXMLExportTest2::testTdf91999_rotateShape()
{
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf91999_rotateShape.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1568,7 +1568,7 @@ void SdOOXMLExportTest2::testTdf91999_rotateShape()
void SdOOXMLExportTest2::testTdf114845_rotateShape()
{
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf114845_rotateShape.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1584,7 +1584,7 @@ void SdOOXMLExportTest2::testTdf114845_rotateShape()
void SdOOXMLExportTest2::testGroupsPosition()
{
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/group.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1598,7 +1598,7 @@ void SdOOXMLExportTest2::testGroupsPosition()
void SdOOXMLExportTest2::testGroupsRotatedPosition()
{
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/group-rot.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1610,7 +1610,7 @@ void SdOOXMLExportTest2::testGroupsRotatedPosition()
void SdOOXMLExportTest2::testAccentColor()
{
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/accent-color.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1634,7 +1634,7 @@ void SdOOXMLExportTest2::testAccentColor()
void SdOOXMLExportTest2::testThemeColors()
{
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf84205.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1646,7 +1646,7 @@ void SdOOXMLExportTest2::testThemeColors()
void SdOOXMLExportTest2::testTdf111785()
{
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf111785.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1661,7 +1661,7 @@ void SdOOXMLExportTest2::testTdf111785()
void SdOOXMLExportTest2::testTdf118825()
{
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf118825-motionpath.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -1701,7 +1701,7 @@ void SdOOXMLExportTest2::testTextColumns_tdf140852()
xColProps->getPropertyValue("AutomaticDistance"));
}
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
{
@@ -1757,7 +1757,7 @@ void SdOOXMLExportTest2::testTextColumns_3columns()
CPPUNIT_ASSERT_LESS(sal_Int16(100), nScale);
}
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
{
@@ -1794,7 +1794,7 @@ void SdOOXMLExportTest2::testTdf59323_slideFooters()
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf59323.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
uno::Reference<drawing::XDrawPagesSupplier> xDoc(xDocShRef->GetDoc()->getUnoModel(),
@@ -1851,7 +1851,7 @@ void SdOOXMLExportTest2::testTdf53970()
{
::sd::DrawDocShellRef xDocShRef = loadURL(
m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf53970_linked.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlRels = parseExport(tempFile, "ppt/slides/_rels/slide1.xml.rels");
diff --git a/sd/qa/unit/export-tests-ooxml3.cxx b/sd/qa/unit/export-tests-ooxml3.cxx
index e2ef6928104f..4f5460e1c00b 100644
--- a/sd/qa/unit/export-tests-ooxml3.cxx
+++ b/sd/qa/unit/export-tests-ooxml3.cxx
@@ -224,7 +224,7 @@ void SdOOXMLExportTest3::testTdf129430()
{
sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf129430.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -237,7 +237,7 @@ void SdOOXMLExportTest3::testTdf114848()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf114848.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -253,7 +253,7 @@ void SdOOXMLExportTest3::testTdf147586()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf147586.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -273,7 +273,7 @@ void SdOOXMLExportTest3::testTdf68759()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf68759.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -299,7 +299,7 @@ void SdOOXMLExportTest3::testTdf127901()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf127901.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -321,7 +321,7 @@ void SdOOXMLExportTest3::testTdf48735()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf48735.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -336,7 +336,7 @@ void SdOOXMLExportTest3::testTdf90626()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf90626.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -355,7 +355,7 @@ void SdOOXMLExportTest3::testTdf107608()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf107608.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0, xDocShRef));
@@ -381,7 +381,7 @@ void SdOOXMLExportTest3::testTdf111786()
// Export line transparency with the color
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf111786.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0, xDocShRef));
@@ -402,7 +402,7 @@ void SdOOXMLExportTest3::testFontScale()
{
sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/font-scale.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -418,7 +418,7 @@ void SdOOXMLExportTest3::testShapeAutofitPPTX()
{
sd::DrawDocShellRef xDocShRef = loadURL(
m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/testShapeAutofit.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
CPPUNIT_ASSERT(pXmlDocContent);
@@ -433,7 +433,7 @@ void SdOOXMLExportTest3::testLegacyShapeAutofitPPTX()
{
sd::DrawDocShellRef xDocShRef = loadURL(
m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/testLegacyShapeAutofit.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
CPPUNIT_ASSERT(pXmlDocContent);
@@ -450,7 +450,7 @@ void SdOOXMLExportTest3::testTdf115394()
{
sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf115394.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
double fTransitionDuration;
@@ -485,7 +485,7 @@ void SdOOXMLExportTest3::testTdf115394Zero()
{
sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf115394-zero.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
double fTransitionDuration;
@@ -500,7 +500,7 @@ void SdOOXMLExportTest3::testTdf115005()
{
sd::DrawDocShellRef xDocShRefOriginal
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf115005.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
sd::DrawDocShellRef xDocShRefResaved = saveAndReload(xDocShRefOriginal.get(), ODP, &tempFile);
// additional checks of the output file
@@ -536,7 +536,7 @@ int SdOOXMLExportTest3::testTdf115005_FallBack_Images(bool bAddReplacementImages
}
// save the file with already set options
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
sd::DrawDocShellRef xDocShRefResaved = saveAndReload(xDocShRefOriginal.get(), ODP, &tempFile);
// additional checks of the output file
@@ -577,7 +577,7 @@ void SdOOXMLExportTest3::testTdf118806()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf118806.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -590,7 +590,7 @@ void SdOOXMLExportTest3::testTdf130058()
{
sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf130058.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0, xDocShRef));
@@ -623,7 +623,7 @@ void SdOOXMLExportTest3::testTdf111789()
// Shadow properties were not exported for text shapes.
sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf111789.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
// First text shape has some shadow
@@ -666,7 +666,7 @@ void SdOOXMLExportTest3::testTdf145162()
{
sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf145162.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -681,7 +681,7 @@ void SdOOXMLExportTest3::testZeroIndentExport()
// Load the bugdoc and save to pptx then.
sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/testZeroIndent.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
// There are 3 slides, get them
xmlDocUniquePtr pSlide1 = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -716,7 +716,7 @@ void SdOOXMLExportTest3::testTdf100348_convert_Fontwork2TextWarp()
{
::sd::DrawDocShellRef xDocShRef = loadURL(
m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf100348_Fontwork2TextWarp.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
// Resulting pptx has to contain the TextWarp shape
@@ -772,7 +772,7 @@ void SdOOXMLExportTest3::testTdf1225573_FontWorkScaleX()
{
::sd::DrawDocShellRef xDocShRef = loadURL(
m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf125573_FontWorkScaleX.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
// Error was, that attribute 'fromWordArt' was ignored
@@ -807,7 +807,7 @@ void SdOOXMLExportTest3::testTdf99497_keepAppearanceOfCircleKind()
// original angles. Shape 'arc' needs to be unfilled.
::sd::DrawDocShellRef xDocShRef = loadURL(
m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf99497_CircleKind.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
// slide 1 45° -> adj1 = 20493903, 270° -> adj2 = 5400000, <a:noFill/> exists
@@ -843,7 +843,7 @@ void SdOOXMLExportTest3::testTdf104792()
::sd::DrawDocShellRef xDocShRef = loadURL(
m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf104792-smart-art-animation.pptx"),
PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -860,7 +860,7 @@ void SdOOXMLExportTest3::testTdf90627()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf90627.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -878,7 +878,7 @@ void SdOOXMLExportTest3::testTdf104786()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf104786.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide2.xml");
@@ -896,7 +896,7 @@ void SdOOXMLExportTest3::testTdf118783()
{
sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf118783.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -911,7 +911,7 @@ void SdOOXMLExportTest3::testTdf104789()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf104789.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -929,7 +929,7 @@ void SdOOXMLExportTest3::testOpenDocumentAsReadOnly()
::sd::DrawDocShellRef xDocShRef = loadURL(
m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/open-as-read-only.pptx"), PPTX);
CPPUNIT_ASSERT(xDocShRef->IsSecurityOptOpenReadOnly());
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
CPPUNIT_ASSERT(xDocShRef->IsSecurityOptOpenReadOnly());
xDocShRef->DoClose();
@@ -939,7 +939,7 @@ void SdOOXMLExportTest3::testTdf118835()
{
sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf118835.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -968,7 +968,7 @@ void SdOOXMLExportTest3::testTdf118768()
{
sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf118768-brake.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -988,7 +988,7 @@ void SdOOXMLExportTest3::testTdf118836()
{
sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf118836.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -1080,7 +1080,7 @@ void SdOOXMLExportTest3::testTdf116350TextEffects()
CPPUNIT_ASSERT_EQUAL(true, bScaleX);
// Export
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -1095,7 +1095,7 @@ void SdOOXMLExportTest3::testTdf128096()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf128096.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1114,7 +1114,7 @@ void SdOOXMLExportTest3::testTdf120573()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf120573.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDoc = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -1136,7 +1136,7 @@ void SdOOXMLExportTest3::testTdf119118()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf119118.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
assertXPath(pXmlDocContent, "//p:iterate", "type", "lt");
@@ -1148,7 +1148,7 @@ void SdOOXMLExportTest3::testTdf99213()
{
::sd::DrawDocShellRef xDocShRef = loadURL(
m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf99213-target-missing.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
// Number of nodes with p:attrNameLst was 3, including one that missed tgtEl
@@ -1168,7 +1168,7 @@ void SdOOXMLExportTest3::testPotxExport()
xLoadable->initNew();
// Export as a POTM template
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), POTX, &tempFile);
xDocShRef->DoClose();
@@ -1183,7 +1183,7 @@ void SdOOXMLExportTest3::testPotxExport()
void SdOOXMLExportTest3::testTdf44223()
{
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf44223.pptx"), PPTX);
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
@@ -1225,7 +1225,7 @@ void SdOOXMLExportTest3::testTdf135843()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf135843_export.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDoc = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -1250,7 +1250,7 @@ void SdOOXMLExportTest3::testSmartArtPreserve()
{
::sd::DrawDocShellRef xDocShRef = loadURL(
m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/smartart-preserve.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDoc = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -1306,7 +1306,7 @@ void SdOOXMLExportTest3::testTdf125346()
// There are two themes in the test document, make sure we use the right theme
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf125346.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0, xDocShRef));
@@ -1329,7 +1329,7 @@ void SdOOXMLExportTest3::testTdf125346_2()
// Test more slides with different themes
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf125346_2.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
{
@@ -1385,7 +1385,7 @@ void SdOOXMLExportTest3::testTdf125360()
xShape->setPropertyValue("FillTransparence", uno::Any(static_cast<sal_Int32>(23)));
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xShape.set(getShapeFromPage(0, 0, xDocShRef));
@@ -1408,7 +1408,7 @@ void SdOOXMLExportTest3::testTdf125360_1()
xShape->setPropertyValue("FillTransparence", uno::Any(static_cast<sal_Int32>(23)));
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xShape.set(getShapeFromPage(0, 0, xDocShRef));
@@ -1435,7 +1435,7 @@ void SdOOXMLExportTest3::testTdf125360_2()
xShape->setPropertyValue("FillTransparence", uno::Any(static_cast<sal_Int32>(23)));
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xShape.set(getShapeFromPage(0, 0, xDocShRef));
@@ -1451,7 +1451,7 @@ void SdOOXMLExportTest3::testTdf125551()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf125551.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
uno::Reference<drawing::XShapes> xGroupShape(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY);
@@ -1467,7 +1467,7 @@ void SdOOXMLExportTest3::testTdf136830()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf136830.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
// Without the fix in place, the X position of the shapes would have been 0
@@ -1490,7 +1490,7 @@ void SdOOXMLExportTest3::testTdf126234()
{
sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf126234.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
// check relative size of the bullet, 400% is a legitimate value for MS Office document
@@ -1510,7 +1510,7 @@ void SdOOXMLExportTest3::testTdf126741()
{
sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf126741.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
// dash dot dot line style import fix
@@ -1593,7 +1593,7 @@ void SdOOXMLExportTest3::testTdf128213()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf128213.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -1604,7 +1604,7 @@ void SdOOXMLExportTest3::testTdf79082()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf79082.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
@@ -1761,7 +1761,7 @@ void SdOOXMLExportTest3::testTdf132201EffectOrder()
{
auto xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/effectOrder.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
assertXPathChildren(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:sp[3]/p:spPr/a:effectLst", 2);
@@ -1805,7 +1805,7 @@ void SdOOXMLExportTest3::testTdf119223()
{
auto xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf119223.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1830,7 +1830,7 @@ void SdOOXMLExportTest3::testTdf128213ShapeRot()
{
auto xDocShRef = loadURL(
m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf128213-shaperot.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
@@ -1846,7 +1846,7 @@ void SdOOXMLExportTest3::testTdf125560_textDeflate()
{
auto xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/ShapePlusImage.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
// This problem did not affect the pptx export, only the ODP so assert that
xDocShRef = saveAndReload(xDocShRef.get(), ODP, &tempFile);
@@ -1863,7 +1863,7 @@ void SdOOXMLExportTest3::testTdf125560_textInflateTop()
{
auto xDocShRef = loadURL(
m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/ShapeTextInflateTop.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
// This problem did not affect the pptx export, only the ODP so assert that
xDocShRef = saveAndReload(xDocShRef.get(), ODP, &tempFile);
@@ -1881,7 +1881,7 @@ void SdOOXMLExportTest3::testTdf142235_TestPlaceholderTextAlignment()
auto xDocShRef = loadURL(
m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/placeholder-box-textalignment.odp"), ODP);
- utl::TempFile tmpfile;
+ utl::TempFileNamed tmpfile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tmpfile);
xDocShRef->DoClose();
@@ -1963,7 +1963,7 @@ void SdOOXMLExportTest3::testTdf143315()
m_directories.getURLFromSrc(u"sd/qa/unit/data/ppt/tdf143315-WordartWithoutBullet.ppt"),
PPT);
- utl::TempFile tmpfile;
+ utl::TempFileNamed tmpfile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tmpfile);
xDocShRef->DoClose();
@@ -1999,7 +1999,7 @@ void SdOOXMLExportTest3::testTdf147121()
const auto nFontSizeBefore = xRun->getPropertyValue("CharHeight").get<float>() * 100;
// Save and reload
- utl::TempFile tmpfile;
+ utl::TempFileNamed tmpfile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tmpfile);
xDocShRef->DoClose();
@@ -2053,7 +2053,7 @@ void SdOOXMLExportTest3::testTdf74670()
{
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf74670.odp"), ODP);
- utl::TempFile tmpfile;
+ utl::TempFileNamed tmpfile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tmpfile);
xDocShRef->DoClose();
@@ -2164,7 +2164,7 @@ void SdOOXMLExportTest3::testTdf149551_tbrl90()
CPPUNIT_ASSERT_EQUAL(text::WritingMode2::TB_RL90, eWritingMode);
// Test, that it is exported to vert="vert"
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &aTempFile);
xmlDocUniquePtr pXmlDoc = parseExport(aTempFile, "ppt/slides/slide1.xml");
assertXPath(pXmlDoc, "//a:bodyPr", "vert", "vert");
@@ -2200,7 +2200,7 @@ void SdOOXMLExportTest3::testTdf149551_btlr()
CPPUNIT_ASSERT_EQUAL(text::WritingMode2::BT_LR, eWritingMode);
// Test, that it is exported to vert="vert270"
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &aTempFile);
xmlDocUniquePtr pXmlDoc = parseExport(aTempFile, "ppt/slides/slide1.xml");
assertXPath(pXmlDoc, "//a:bodyPr", "vert", "vert270");
@@ -2233,7 +2233,7 @@ void SdOOXMLExportTest3::testTdf94122_autoColor()
::sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf94122_autocolor.odp"), ODP);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
xDocShRef->DoClose();
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 97167d219ff3..a040438fb103 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -327,7 +327,7 @@ void SdExportTest::testMediaEmbedding()
void SdExportTest::testFillBitmapUnused()
{
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/fillbitmap2.odp"), ODP);
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
xDocShRef = saveAndReload(xDocShRef.get(), ODP, &aTempFile);
xmlDocUniquePtr pXmlDoc = parseExport(aTempFile, "content.xml");
@@ -417,7 +417,7 @@ void SdExportTest::testTdf97630()
}
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
xDocShRef = saveAndReload(xDocShRef.get(), ODP, &aTempFile);
{
@@ -486,7 +486,7 @@ void SdExportTest::testSwappedOutImageExport()
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= OStringToOUString(std::string_view(aFileFormats[vFormats[nExportFormat]].pFilterName), RTL_TEXTENCODING_UTF8);
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
xComponent.set(xStorable, uno::UNO_QUERY);
@@ -541,7 +541,7 @@ void SdExportTest::testOOoXMLAnimations()
uno::Reference<frame::XStorable> xStorable(xComponent, uno::UNO_QUERY);
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= OStringToOUString(std::string_view(getFormat(ODP)->pFilterName), RTL_TEXTENCODING_UTF8);
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
@@ -618,7 +618,7 @@ void SdExportTest::testUnknownAttributes()
uno::Reference<frame::XStorable> xStorable(xComponent, uno::UNO_QUERY);
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= OStringToOUString(std::string_view(getFormat(ODP)->pFilterName), RTL_TEXTENCODING_UTF8);
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
@@ -726,7 +726,7 @@ void SdExportTest::testLinkedGraphicRT()
}
// Save and reload
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
xComponent.set(xStorable, uno::UNO_QUERY);
@@ -758,7 +758,7 @@ void SdExportTest::testTdf79082()
{
sd::DrawDocShellRef xDocShRef
= loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/ppt/tdf79082.ppt"), PPT);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
tempFile.EnableKillingFile();
xDocShRef = saveAndReload(xDocShRef.get(), ODP, &tempFile);
xmlDocUniquePtr pXmlDoc = parseExport(tempFile, "content.xml");
@@ -821,7 +821,7 @@ void SdExportTest::testImageWithSpecialID()
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= OStringToOUString(std::string_view(aFileFormats[vFormats[nExportFormat]].pFilterName), RTL_TEXTENCODING_UTF8);
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
xComponent.set(xStorable, uno::UNO_QUERY);
@@ -998,7 +998,7 @@ void SdExportTest::testDefaultSubscripts()
void SdExportTest::testTdf98477()
{
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf98477grow.pptx"), PPTX);
xDocShRef = saveAndReload(xDocShRef.get(), ODP, &tempFile);
@@ -1027,7 +1027,7 @@ void SdExportTest::testAuthorField()
void SdExportTest::testTdf50499()
{
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf50499.pptx"), PPTX);
xDocShRef = saveAndReload(xDocShRef.get(), ODP, &tempFile);
@@ -1116,7 +1116,7 @@ void SdExportTest::testTextRotation()
pBatch->commit();
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/shape-text-rotate.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), ODP, &tempFile);
uno::Reference<drawing::XDrawPage> xPage(getPage(0, xDocShRef));
@@ -1136,7 +1136,7 @@ void SdExportTest::testTextRotation()
pBatch->commit();
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/shape-text-rotate.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), ODP, &tempFile);
uno::Reference<drawing::XDrawPage> xPage(getPage(0, xDocShRef));
@@ -1165,7 +1165,7 @@ void SdExportTest::testTdf115394PPT()
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= OStringToOUString(std::string_view(aFileFormats[PPT].pFilterName), RTL_TEXTENCODING_UTF8);
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
xComponent.set(xStorable, uno::UNO_QUERY);
@@ -1204,7 +1204,7 @@ void SdExportTest::testBulletsAsImage()
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= OStringToOUString(std::string_view(aFileFormats[nExportFormat].pFilterName), RTL_TEXTENCODING_UTF8);
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
xComponent.set(xStorable, uno::UNO_QUERY);
@@ -1284,7 +1284,7 @@ void SdExportTest::testBulletsAsImage()
void SdExportTest::testTdf113822()
{
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf113822underline.pptx"), PPTX);
// Was unable to export iterate container (tdf#99213).
@@ -1307,7 +1307,7 @@ void SdExportTest::testTdf113822()
void SdExportTest::testTdf113818()
{
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf113818-swivel.pptx"), PPTX);
xDocShRef = saveAndReload(xDocShRef.get(), PPT);
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
@@ -1321,7 +1321,7 @@ void SdExportTest::testTdf113818()
void SdExportTest::testTdf119629()
{
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/ppt/tdf119629.ppt"), PPT);
xDocShRef = saveAndReload(xDocShRef.get(), PPT);
xDocShRef = saveAndReload(xDocShRef.get(), ODP, &tempFile);
@@ -1342,7 +1342,7 @@ void SdExportTest::testTdf119629()
void SdExportTest::testTdf141269()
{
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf141269.odp"), ODP);
xDocShRef = saveAndReload(xDocShRef.get(), PPT);
@@ -1371,7 +1371,7 @@ void SdExportTest::testTdf141269()
void SdExportTest::testTdf123557()
{
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/trigger.pptx"), PPTX);
xDocShRef = saveAndReload(xDocShRef.get(), PPTX);
xDocShRef = saveAndReload(xDocShRef.get(), ODP, &tempFile);
@@ -1414,7 +1414,7 @@ void SdExportTest::testTdf126761()
void SdExportTest::testGlow()
{
auto xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odg/glow.odg"), ODG);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), ODG, &tempFile);
uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0, xDocShRef));
@@ -1456,7 +1456,7 @@ void SdExportTest::testSoftEdges()
{
auto xDocShRef
= loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odg/softedges.odg"), ODG);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), ODG, &tempFile);
auto xShapeProps(getShapeFromPage(0, 0, xDocShRef));
@@ -1483,7 +1483,7 @@ void SdExportTest::testSoftEdges()
void SdExportTest::testShadowBlur()
{
auto xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odg/shadow-blur.odg"), ODG);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), ODG, &tempFile);
uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0, xDocShRef));
@@ -1519,7 +1519,7 @@ void SdExportTest::testTdf91060()
void SdExportTest::testTdf128550()
{
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf128550.pptx"), PPTX);
xDocShRef = saveAndReload(xDocShRef.get(), ODP, &tempFile);
xmlDocUniquePtr pXmlDoc = parseExport(tempFile, "content.xml");
@@ -1534,7 +1534,7 @@ void SdExportTest::testTdf140714()
//Without the fix in place, shape will be imported as GraphicObjectShape instead of CustomShape.
auto xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf140714.pptx"), PPTX);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
uno::Reference<drawing::XShape> xShape(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY);
@@ -1608,7 +1608,7 @@ void SdExportTest::testMasterPageBackgroundFullSize()
CPPUNIT_ASSERT_EQUAL(sal_Int16(0), xBackgroundProps->getPropertyValue("FillTransparence").get<sal_Int16>());
}
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), ODP, &tempFile);
xMPS.set(xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY);
@@ -1717,7 +1717,7 @@ void SdExportTest::testColumnsODG()
CPPUNIT_ASSERT_EQUAL(sal_Int32(700), pTextObj->GetTextColumnsSpacing());
}
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), ODG, &tempFile);
{
@@ -1759,7 +1759,7 @@ void SdExportTest::testColumnsODG()
void SdExportTest::testTdf112126()
{
sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/tdf112126.odg"), ODG);
- utl::TempFile tempFile;
+ utl::TempFileNamed tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), ODG, &tempFile);
uno::Reference<drawing::XDrawPage> xPage(getPage(0, xDocShRef));
uno::Reference<beans::XPropertySet> xPropertySet(xPage, uno::UNO_QUERY);
diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx
index 39d36fa35ef5..41d406e2a1e5 100644
--- a/sd/qa/unit/misc-tests.cxx
+++ b/sd/qa/unit/misc-tests.cxx
@@ -567,7 +567,7 @@ void SdMiscTest::testTdf101242_ODF_add_settings()
std::shared_ptr<comphelper::ConfigurationChanges> pBatch( comphelper::ConfigurationChanges::create() );
officecfg::Office::Common::Misc::WriteLayerStateAsConfigItem::set(true, pBatch);
pBatch->commit();
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
save(xDocShRef.get(), getFormat(ODG), aTempFile );
@@ -617,7 +617,7 @@ void SdMiscTest::testTdf101242_ODF_no_settings()
std::shared_ptr<comphelper::ConfigurationChanges> pBatch( comphelper::ConfigurationChanges::create() );
officecfg::Office::Common::Misc::WriteLayerStateAsConfigItem::set(false, pBatch);
pBatch->commit();
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
save(xDocShRef.get(), getFormat(ODG), aTempFile );
@@ -659,7 +659,7 @@ void SdMiscTest::testTdf101242_settings_keep()
std::shared_ptr<comphelper::ConfigurationChanges> pBatch( comphelper::ConfigurationChanges::create() );
officecfg::Office::Common::Misc::WriteLayerStateAsConfigItem::set(true, pBatch);
pBatch->commit();
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
save(xDocShRef.get(), getFormat(ODG), aTempFile );
@@ -710,7 +710,7 @@ void SdMiscTest::testTdf101242_settings_remove()
std::shared_ptr<comphelper::ConfigurationChanges> pBatch( comphelper::ConfigurationChanges::create() );
officecfg::Office::Common::Misc::WriteLayerStateAsConfigItem::set(false, pBatch);
pBatch->commit();
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
save(xDocShRef.get(), getFormat(ODG), aTempFile );
@@ -757,7 +757,7 @@ void SdMiscTest::testTdf119392()
pPageView -> SetLayerVisible("-P-", false);
pPageView -> SetLayerPrintable("-P-", true);
pPageView -> SetLayerLocked("-P-", false);
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
save(xDocShRef.get(), getFormat(ODG), aTempFile );
@@ -849,7 +849,7 @@ void SdMiscTest::testTdf98839_ShearVFlipH()
pShape->Mirror(Point(4000, 2000), Point(4000, 10000));
// Save and examine attribute draw:transform
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
save(xDocShRef.get(), getFormat(ODG), aTempFile);
xmlDocUniquePtr pXmlDoc = parseExport(aTempFile, "content.xml");
diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx
index d5e63716f248..d7195a4bdd37 100644
--- a/sd/qa/unit/sdmodeltestbase.hxx
+++ b/sd/qa/unit/sdmodeltestbase.hxx
@@ -198,7 +198,7 @@ protected:
return pFormat;
}
- void exportTo(sd::DrawDocShell* pShell, FileFormat const * pFormat, utl::TempFile const & rTempFile)
+ void exportTo(sd::DrawDocShell* pShell, FileFormat const * pFormat, utl::TempFileNamed const & rTempFile)
{
SfxMedium aStoreMedium(rTempFile.GetURL(), StreamMode::STD_WRITE);
if ( std::strcmp(pFormat->pName, "odg") == 0)
@@ -238,7 +238,7 @@ protected:
}
- void save(sd::DrawDocShell* pShell, FileFormat const * pFormat, utl::TempFile const & rTempFile)
+ void save(sd::DrawDocShell* pShell, FileFormat const * pFormat, utl::TempFileNamed const & rTempFile)
{
SfxMedium aStoreMedium(rTempFile.GetURL(), StreamMode::STD_WRITE);
if ( std::strcmp(pFormat->pName, "odg") == 0 )
@@ -276,13 +276,13 @@ protected:
}
sd::DrawDocShellRef saveAndReload(sd::DrawDocShell *pShell, sal_Int32 nExportType,
- utl::TempFile * pTempFile = nullptr)
+ utl::TempFileNamed * pTempFile = nullptr)
{
FileFormat* pFormat = getFormat(nExportType);
- std::unique_ptr<utl::TempFile> pNewTempFile;
+ std::unique_ptr<utl::TempFileNamed> pNewTempFile;
if (!pTempFile)
{
- pNewTempFile.reset(new utl::TempFile);
+ pNewTempFile.reset(new utl::TempFileNamed);
pTempFile = pNewTempFile.get();
}
save(pShell, pFormat, *pTempFile);
@@ -444,7 +444,7 @@ class SdModelTestBaseXML
{
public:
- xmlDocUniquePtr parseExport(utl::TempFile const & rTempFile, OUString const& rStreamName)
+ xmlDocUniquePtr parseExport(utl::TempFileNamed const & rTempFile, OUString const& rStreamName)
{
std::unique_ptr<SvStream> const pStream(parseExportStream(rTempFile, rStreamName));
xmlDocUniquePtr pXmlDoc = parseXmlStream(pStream.get());
diff --git a/sd/qa/unit/uiimpress.cxx b/sd/qa/unit/uiimpress.cxx
index 3d2574da0b82..fafd3fe4cc56 100644
--- a/sd/qa/unit/uiimpress.cxx
+++ b/sd/qa/unit/uiimpress.cxx
@@ -72,7 +72,8 @@ public:
void insertStringToObject(sal_uInt16 nObj, const std::u16string_view& rStr, bool bUseEscape);
sd::slidesorter::SlideSorterViewShell* getSlideSorterViewShell();
FileFormat* getFormat(sal_Int32 nExportType);
- void save(sd::DrawDocShell* pShell, FileFormat const* pFormat, utl::TempFile const& rTempFile);
+ void save(sd::DrawDocShell* pShell, FileFormat const* pFormat,
+ utl::TempFileNamed const& rTempFile);
};
void SdUiImpressTest::setUp()
@@ -174,7 +175,7 @@ FileFormat* SdUiImpressTest::getFormat(sal_Int32 nExportType)
}
void SdUiImpressTest::save(sd::DrawDocShell* pShell, FileFormat const* pFormat,
- utl::TempFile const& rTempFile)
+ utl::TempFileNamed const& rTempFile)
{
SfxMedium aStoreMedium(rTempFile.GetURL(), StreamMode::STD_WRITE);
if (std::strcmp(pFormat->pName, "odg") == 0)
@@ -1118,7 +1119,7 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf127696)
dispatchCommand(mxComponent, ".uno:OutlineFont", {});
// Save it as PPTX and load it again.
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
save(dynamic_cast<SdXImpressDocument*>(mxComponent.get())->GetDocShell(), getFormat(PPTX),
aTempFile);
mxComponent = loadFromDesktop(aTempFile.GetURL());
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index a49579a60df5..4a67154ccd6f 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -597,8 +597,7 @@ bool SdTransferable::WriteObject( tools::SvRef<SotTempStream>& rxOStm, void* pOb
case SDTRANSFER_OBJECTTYPE_DRAWOLE:
{
SfxObjectShell* pEmbObj = static_cast<SfxObjectShell*>(pObject);
- ::utl::TempFile aTempFile;
- aTempFile.EnableKillingFile();
+ ::utl::TempFileFast aTempFile;
SvStream* pTempStream = aTempFile.GetStream(StreamMode::READWRITE);
try