summaryrefslogtreecommitdiff
path: root/sw/qa
diff options
context:
space:
mode:
Diffstat (limited to 'sw/qa')
-rw-r--r--sw/qa/core/draw/draw.cxx2
-rw-r--r--sw/qa/core/filters-test.cxx2
-rw-r--r--sw/qa/core/filters-test2.cxx2
-rw-r--r--sw/qa/core/macros-test.cxx4
-rw-r--r--sw/qa/core/uwriter.cxx2
-rw-r--r--sw/qa/extras/globalfilter/globalfilter.cxx42
-rw-r--r--sw/qa/extras/htmlexport/htmlexport.cxx2
-rw-r--r--sw/qa/extras/layout/layout.cxx8
-rw-r--r--sw/qa/extras/layout/layout2.cxx4
-rw-r--r--sw/qa/extras/mailmerge/mailmerge.cxx2
-rw-r--r--sw/qa/extras/mailmerge/mailmerge2.cxx2
-rw-r--r--sw/qa/extras/odfexport/odfexport.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmllinks.cxx2
-rw-r--r--sw/qa/extras/uiwriter/uiwriter.cxx2
-rw-r--r--sw/qa/extras/uiwriter/uiwriter4.cxx8
-rw-r--r--sw/qa/extras/uiwriter/uiwriter6.cxx6
-rw-r--r--sw/qa/extras/uiwriter/uiwriter7.cxx6
-rw-r--r--sw/qa/extras/uiwriter/uiwriter8.cxx2
-rw-r--r--sw/qa/inc/swmodeltestbase.hxx4
-rw-r--r--sw/qa/uibase/uiview/uiview.cxx2
-rw-r--r--sw/qa/unit/swmodeltestbase.cxx2
21 files changed, 54 insertions, 54 deletions
diff --git a/sw/qa/core/draw/draw.cxx b/sw/qa/core/draw/draw.cxx
index feb347adc8d4..25f7e1bd442d 100644
--- a/sw/qa/core/draw/draw.cxx
+++ b/sw/qa/core/draw/draw.cxx
@@ -111,7 +111,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreDrawTest, testTdf107727FrameBorder)
// Export to RTF and reload
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= OUString("Rich Text Format");
diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx
index 3e4dfd697206..e880e428fc34 100644
--- a/sw/qa/core/filters-test.cxx
+++ b/sw/qa/core/filters-test.cxx
@@ -117,7 +117,7 @@ bool SwFiltersTest::filter(const OUString &rFilter, const OUString &rURL,
bool bSaved;
{
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
SfxMedium aDstMed(aTempFile.GetURL(), StreamMode::STD_WRITE);
aDstMed.SetFilter(pExportFilter);
diff --git a/sw/qa/core/filters-test2.cxx b/sw/qa/core/filters-test2.cxx
index 965645c3be57..08736b962a85 100644
--- a/sw/qa/core/filters-test2.cxx
+++ b/sw/qa/core/filters-test2.cxx
@@ -111,7 +111,7 @@ bool SwFiltersTest2::filter(const OUString& rFilter, const OUString& rURL,
if (bLoaded)
xDocShRef->ResetError();
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
SfxMedium aDstMed(aTempFile.GetURL(), StreamMode::STD_WRITE);
aDstMed.SetFilter(pExportFilter);
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index 0df5ea55a44f..f02bd34d91be 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -383,7 +383,7 @@ void SwMacrosTest::testFdo68983()
loadFromDesktop(aFileName, "com.sun.star.text.TextDocument");
Reference< frame::XStorable > xDocStorable(xComponent, UNO_QUERY_THROW);
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
Sequence<beans::PropertyValue> desc( comphelper::InitPropertySequence({
{ "FilterName", Any(OUString("writer8")) }
@@ -415,7 +415,7 @@ void SwMacrosTest::testFdo87530()
Reference<css::lang::XComponent> xComponent =
loadFromDesktop("private:factory/swriter", "com.sun.star.text.TextDocument");
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
Sequence<beans::PropertyValue> desc( comphelper::InitPropertySequence({
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 7b6089b50641..a51a472ec7bc 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -196,7 +196,7 @@ void SwDocTest::testFileNameFields()
{
//Here's a file name with some chars in it that will be %% encoded, when expanding
//SwFileNameFields we want to restore the original readable filename
- utl::TempFile aTempFile(u"demo [name]");
+ utl::TempFileNamed aTempFile(u"demo [name]");
aTempFile.EnableKillingFile();
INetURLObject aTempFileURL(aTempFile.GetURL());
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx
index 850df79be627..228c5dc0a234 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -114,7 +114,7 @@ void Test::testEmbeddedGraphicRoundtrip()
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= rFilterName;
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
uno::Reference< lang::XComponent > xComponent(xStorable, uno::UNO_QUERY);
@@ -182,7 +182,7 @@ void Test::testLinkedGraphicRT()
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= rFilterName;
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
uno::Reference< lang::XComponent > xComponent(xStorable, uno::UNO_QUERY);
@@ -248,7 +248,7 @@ void Test::testImageWithSpecialID()
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= rFilterName;
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
uno::Reference< lang::XComponent > xComponent(xStorable, uno::UNO_QUERY);
@@ -343,7 +343,7 @@ void Test::testGraphicShape()
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= rFilterName;
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
uno::Reference< lang::XComponent > xComponent(xStorable, uno::UNO_QUERY);
@@ -447,7 +447,7 @@ void Test::testMultipleIdenticalGraphics()
// Export the document and import again for a check
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= rFilterName;
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
@@ -505,7 +505,7 @@ void Test::testCharHighlightBody()
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= rFilterName;
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
uno::Reference< lang::XComponent > xComponent(xStorable, uno::UNO_QUERY);
@@ -601,7 +601,7 @@ void Test::testCharStyleHighlight()
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= rFilterName;
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
uno::Reference< lang::XComponent > xComponent(xStorable, uno::UNO_QUERY);
@@ -675,7 +675,7 @@ void Test::testCharHighlightODF()
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= OUString("writer8");
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
@@ -790,7 +790,7 @@ void Test::testMSCharBackgroundEditing()
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= rFilterName;
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
uno::Reference< lang::XComponent > xComponent(xStorable, uno::UNO_QUERY);
@@ -854,7 +854,7 @@ void Test::testCharBackgroundToHighlighting()
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= rFilterName;
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
uno::Reference< lang::XComponent > xComponent(xStorable, uno::UNO_QUERY);
@@ -1064,7 +1064,7 @@ void Test::testNestedFieldmark()
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= rFilterName.first;
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
mxComponent->dispose();
@@ -1133,7 +1133,7 @@ void Test::testODF13()
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= OUString("writer8");
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
uno::Reference<frame::XStorable> const xStorable(mxComponent, uno::UNO_QUERY);
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
@@ -1169,7 +1169,7 @@ void Test::testODF13()
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= OUString("writer8");
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
uno::Reference<frame::XStorable> const xStorable(mxComponent, uno::UNO_QUERY);
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
@@ -1205,7 +1205,7 @@ void Test::testODF13()
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= OUString("writer8");
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
uno::Reference<frame::XStorable> const xStorable(mxComponent, uno::UNO_QUERY);
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
@@ -1268,7 +1268,7 @@ void Test::testRedlineFlags()
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= rFilterName;
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
xStorable->storeToURL(aTempFile.GetURL(),
aMediaDescriptor.getAsConstPropertyValueList());
@@ -1351,7 +1351,7 @@ void Test::testBulletAsImage()
aMediaDescriptor["FilterName"] <<= rFilterName;
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
uno::Reference<lang::XComponent> xComponent(xStorable, uno::UNO_QUERY);
@@ -1440,7 +1440,7 @@ void Test::testTextFormField()
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= rFilterName;
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
uno::Reference< lang::XComponent > xComponent(xStorable, uno::UNO_QUERY);
@@ -1503,7 +1503,7 @@ void Test::testCheckBoxFormField()
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= rFilterName;
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
uno::Reference< lang::XComponent > xComponent(xStorable, uno::UNO_QUERY);
@@ -1566,7 +1566,7 @@ void Test::testDropDownFormField()
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= rFilterName;
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
uno::Reference< lang::XComponent > xComponent(xStorable, uno::UNO_QUERY);
@@ -1651,7 +1651,7 @@ void Test::testDateFormField()
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= rFilterName;
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
uno::Reference< lang::XComponent > xComponent(xStorable, uno::UNO_QUERY);
@@ -1845,7 +1845,7 @@ void Test::testDateFormFieldCharacterFormatting()
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= rFilterName;
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
uno::Reference< lang::XComponent > xComponent(xStorable, uno::UNO_QUERY);
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx
index 3a212d2242f5..38ee565cbd14 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -1217,7 +1217,7 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqifOle1PDF)
mxComponent.clear();
ImportFromReqif(maTempFile.GetURL());
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
uno::Sequence<beans::PropertyValue> aStoreProperties = {
comphelper::makePropertyValue("FilterName", OUString("writer8")),
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 0536a54d8b7e..feda2a494469 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -3376,7 +3376,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf109137)
{
createSwDoc(DATA_DIRECTORY, "tdf109137.docx");
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
uno::Sequence<beans::PropertyValue> aDescriptor(comphelper::InitPropertySequence({
{ "FilterName", uno::Any(OUString("writer8")) },
@@ -3538,7 +3538,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf117188)
{
createSwDoc(DATA_DIRECTORY, "tdf117188.docx");
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
uno::Sequence<beans::PropertyValue> aDescriptor(comphelper::InitPropertySequence({
{ "FilterName", uno::Any(OUString("writer8")) },
@@ -3788,7 +3788,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf122607_regression)
uno::Sequence<beans::PropertyValue> props(comphelper::InitPropertySequence({
{ "FilterName", uno::Any(OUString("writer_pdf_Export")) },
}));
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
xStorable->storeToURL(aTempFile.GetURL(), props);
@@ -3832,7 +3832,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf150616)
uno::Sequence<beans::PropertyValue> props(comphelper::InitPropertySequence({
{ "FilterName", uno::Any(OUString("writer_pdf_Export")) },
}));
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
xStorable->storeToURL(aTempFile.GetURL(), props);
diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx
index ac783be344fd..4ba57e79f336 100644
--- a/sw/qa/extras/layout/layout2.cxx
+++ b/sw/qa/extras/layout/layout2.cxx
@@ -740,7 +740,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTableCellInvalidate)
uno::Sequence<beans::PropertyValue> props(comphelper::InitPropertySequence({
{ "FilterName", uno::Any(OUString("writer_pdf_Export")) },
}));
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
xStorable->storeToURL(aTempFile.GetURL(), props);
@@ -2233,7 +2233,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf121509)
CPPUNIT_ASSERT(pTriangleShapeFormat->SetFormatAttr(aNewAnch));
// Reload (docx)
- auto aTemp = utl::TempFile();
+ utl::TempFileNamed aTemp;
save("Office Open XML Text", aTemp);
// The second part: check if the reloaded doc has flys inside a fly
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx
index 8d024194c985..41e1862ff509 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -84,7 +84,7 @@ public:
header();
preTest(filename);
- utl::TempFile aTempDir(nullptr, true);
+ utl::TempFileNamed aTempDir(nullptr, true);
aTempDir.EnableKillingFile();
const OUString aWorkDir = aTempDir.GetURL();
const OUString aURI( m_directories.getURLFromSrc(mpTestDocumentPath) + OUString::createFromAscii(datasource) );
diff --git a/sw/qa/extras/mailmerge/mailmerge2.cxx b/sw/qa/extras/mailmerge/mailmerge2.cxx
index af49344e52b9..cc8bf1c7be15 100644
--- a/sw/qa/extras/mailmerge/mailmerge2.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge2.cxx
@@ -84,7 +84,7 @@ public:
header();
preTest(filename);
- utl::TempFile aTempDir(nullptr, true);
+ utl::TempFileNamed aTempDir(nullptr, true);
aTempDir.EnableKillingFile();
const OUString aWorkDir = aTempDir.GetURL();
const OUString aURI( m_directories.getURLFromSrc(mpTestDocumentPath) + OUString::createFromAscii(datasource) );
diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx
index 9c723e240380..b07249cc7d77 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -901,7 +901,7 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo58949)
* and replacement image) OLE objects using UNO, so we'll check the zip file directly.
*/
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
save("writer8", aTempFile);
uno::Sequence<uno::Any> aArgs{ uno::Any(aTempFile.GetURL()) };
diff --git a/sw/qa/extras/ooxmlexport/ooxmllinks.cxx b/sw/qa/extras/ooxmlexport/ooxmllinks.cxx
index 79dd0dc7e540..000f4a607ae5 100644
--- a/sw/qa/extras/ooxmlexport/ooxmllinks.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmllinks.cxx
@@ -45,7 +45,7 @@
CPPUNIT_ASSERT(!sFileName.isEmpty()); \
\
/* Get temp path */ \
- OUString sTempDir = utl::TempFile::GetTempNameBaseDirectory(); \
+ OUString sTempDir = utl::GetTempNameBaseDirectory(); \
\
/* Create & apply new URL */ \
OUString sOriginalFileInTempDir = sTempDir + sFileName; \
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index c69c88227f2f..a147f2f9a0c7 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -83,7 +83,7 @@ public:
std::unique_ptr<SwTextBlocks> SwUiWriterTest::readDOCXAutotext(std::u16string_view sFileName, bool bEmpty)
{
- utl::TempFile tmp;
+ utl::TempFileNamed tmp;
tmp.EnableKillingFile();
OUString rURL = tmp.GetURL();
CPPUNIT_ASSERT_EQUAL(
diff --git a/sw/qa/extras/uiwriter/uiwriter4.cxx b/sw/qa/extras/uiwriter/uiwriter4.cxx
index b37c18b672f5..1a7549506bf0 100644
--- a/sw/qa/extras/uiwriter/uiwriter4.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter4.cxx
@@ -646,7 +646,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testBookmarkCollapsed)
CPPUNIT_ASSERT(pDoc);
// save original document
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
save("writer8", aTempFile);
// load only content.xml from the resaved document
@@ -722,7 +722,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testRemoveBookmarkText)
}
// save document
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
save("writer8", aTempFile);
// load only content.xml from the resaved document
@@ -825,7 +825,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testRemoveBookmarkTextAndAddNew)
}
// save document
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
save("writer8", aTempFile);
// load only content.xml from the resaved document
@@ -891,7 +891,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testRemoveBookmarkTextAndAddNewAfterReload
}
// save original document
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
save("writer8", aTempFile);
// load only content.xml from the resaved document
diff --git a/sw/qa/extras/uiwriter/uiwriter6.cxx b/sw/qa/extras/uiwriter/uiwriter6.cxx
index 7ef3ad0df433..0159c5bf07ed 100644
--- a/sw/qa/extras/uiwriter/uiwriter6.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter6.cxx
@@ -688,7 +688,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf115013)
{
const OUString sColumnName("Name with spaces, \"quotes\" and \\backslashes");
- utl::TempFile aTempDir(nullptr, true);
+ utl::TempFileNamed aTempDir(nullptr, true);
aTempDir.EnableKillingFile();
const OUString aWorkDir = aTempDir.GetURL();
@@ -1078,7 +1078,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testFontEmbedding)
xmlDocUniquePtr pXmlDoc;
uno::Sequence<beans::PropertyValue> aDescriptor;
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
// Get document settings
@@ -1301,7 +1301,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testInconsistentBookmark)
// save document and verify the bookmark scoup
{
// save document
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
save("writer8", aTempFile);
// load only content.xml
diff --git a/sw/qa/extras/uiwriter/uiwriter7.cxx b/sw/qa/extras/uiwriter/uiwriter7.cxx
index a24201b78b2f..816bdcd766a6 100644
--- a/sw/qa/extras/uiwriter/uiwriter7.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter7.cxx
@@ -110,7 +110,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testExportToPicture)
uno::Sequence<beans::PropertyValue> aDescriptor(comphelper::InitPropertySequence(
{ { "FilterName", uno::Any(OUString("writer_png_Export")) },
{ "FilterData", uno::Any(aFilterData) } }));
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
xStorable->storeToURL(aTempFile.GetURL(), aDescriptor);
bool extchk = aTempFile.IsValid();
@@ -1290,7 +1290,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf74230)
createSwDoc();
//exporting the empty document to ODT via TempFile
uno::Sequence<beans::PropertyValue> aDescriptor;
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
xStorable->storeToURL(aTempFile.GetURL(), aDescriptor);
CPPUNIT_ASSERT(aTempFile.IsValid());
@@ -2765,7 +2765,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf149184)
uno::Sequence<beans::PropertyValue> aStoreProps = comphelper::InitPropertySequence({
{ "FilterName", uno::Any(OUString("MS Word 97")) },
});
- utl::TempFile aTempFile;
+ utl::TempFileNamed aTempFile;
aTempFile.EnableKillingFile();
// Without the fix in place, the test fails with:
diff --git a/sw/qa/extras/uiwriter/uiwriter8.cxx b/sw/qa/extras/uiwriter/uiwriter8.cxx
index 55edd0ff6963..76262c6a0354 100644
--- a/sw/qa/extras/uiwriter/uiwriter8.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter8.cxx
@@ -2241,7 +2241,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf128106)
SwWrtShell* pWrtShell
= createSwDoc(DATA_DIRECTORY, "cross_reference_demo_bmk.odt")->GetDocShell()->GetWrtShell();
- utl::TempFile tempDir(nullptr, true);
+ utl::TempFileNamed tempDir(nullptr, true);
const auto aPropertyValues = comphelper::InitPropertySequence(
{ { "FileName", css::uno::Any(tempDir.GetURL() + "/test.odm") } });
diff --git a/sw/qa/inc/swmodeltestbase.hxx b/sw/qa/inc/swmodeltestbase.hxx
index 19255e6b3751..ccf8d8ac6ae6 100644
--- a/sw/qa/inc/swmodeltestbase.hxx
+++ b/sw/qa/inc/swmodeltestbase.hxx
@@ -110,7 +110,7 @@ protected:
const char* mpFilter;
sal_uInt32 mnStartTime;
- utl::TempFile maTempFile;
+ utl::TempFileNamed maTempFile;
SvMemoryStream maMemory; ///< Underlying memory for parsed PDF files.
bool mbExported; ///< Does maTempFile already contain something useful?
bool mbFontNameWYSIWYG;
@@ -338,7 +338,7 @@ protected:
void reload(const char* pFilter, const char* filename, const char* pPassword = nullptr);
/// Save the loaded document to a tempfile. Can be used to check the resulting docx/odt directly as a ZIP file.
- void save(const OUString& aFilterName, utl::TempFile& rTempFile);
+ void save(const OUString& aFilterName, utl::TempFileNamed& rTempFile);
/// Combines load() and save().
void loadAndSave(const char* pName);
diff --git a/sw/qa/uibase/uiview/uiview.cxx b/sw/qa/uibase/uiview/uiview.cxx
index 6b608e0ae309..9ab34e995812 100644
--- a/sw/qa/uibase/uiview/uiview.cxx
+++ b/sw/qa/uibase/uiview/uiview.cxx
@@ -39,7 +39,7 @@ class SwUibaseUiviewTest : public SwModelTestBase
CPPUNIT_TEST_FIXTURE(SwUibaseUiviewTest, testUpdateAllObjectReplacements)
{
// Make a temporary copy of the test document
- utl::TempFile tmp;
+ utl::TempFileNamed tmp;
tmp.EnableKillingFile();
OUString sTempCopy = tmp.GetURL();
CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None,
diff --git a/sw/qa/unit/swmodeltestbase.cxx b/sw/qa/unit/swmodeltestbase.cxx
index 963d1f2d49f4..a526f4901331 100644
--- a/sw/qa/unit/swmodeltestbase.cxx
+++ b/sw/qa/unit/swmodeltestbase.cxx
@@ -626,7 +626,7 @@ void SwModelTestBase::reload(const char* pFilter, const char* filename, const ch
calcLayout();
}
-void SwModelTestBase::save(const OUString& aFilterName, utl::TempFile& rTempFile)
+void SwModelTestBase::save(const OUString& aFilterName, utl::TempFileNamed& rTempFile)
{
rTempFile.EnableKillingFile();
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);