diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-09-02 10:45:50 +0200 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-09-02 17:20:20 +0200 |
| commit | 846fcc03b89a7131f565de95396757c8e0da1dfd (patch) | |
| tree | 2d741d9fd114a229f72e0f6a46ca68bc6e3b25d5 /sw | |
| parent | 34a9f93018804044b756e0e49c7ea759a65d3dc4 (diff) | |
Use utl::TempFile::EnableKillingFile
Helps keep temp directory clean also on exceptions
Change-Id: I81c17d90d6905653db946e68faf2a7f59c17da15
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121466
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/mailmerge/mailmerge.cxx | 2 | ||||
| -rw-r--r-- | sw/qa/extras/uiwriter/uiwriter4.cxx | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx index 98c626d07f0c..a1c71e0a0d49 100644 --- a/sw/qa/extras/mailmerge/mailmerge.cxx +++ b/sw/qa/extras/mailmerge/mailmerge.cxx @@ -84,6 +84,7 @@ public: preTest(filename); utl::TempFile aTempDir(nullptr, true); + aTempDir.EnableKillingFile(); const OUString aWorkDir = aTempDir.GetURL(); const OUString aURI( m_directories.getURLFromSrc(mpTestDocumentPath) + OUString::createFromAscii(datasource) ); const OUString aPrefix = column ? OUString::createFromAscii( column ) : "LOMM_"; @@ -93,7 +94,6 @@ public: verify(); finish(); - ::utl::removeTree(aWorkDir); mnCurOutputType = 0; } diff --git a/sw/qa/extras/uiwriter/uiwriter4.cxx b/sw/qa/extras/uiwriter/uiwriter4.cxx index 154b46704510..431eafe06d23 100644 --- a/sw/qa/extras/uiwriter/uiwriter4.cxx +++ b/sw/qa/extras/uiwriter/uiwriter4.cxx @@ -2657,6 +2657,7 @@ void SwUiWriterTest4::testTdf115013() const OUString sColumnName("Name with spaces, \"quotes\" and \\backslashes"); utl::TempFile aTempDir(nullptr, true); + aTempDir.EnableKillingFile(); const OUString aWorkDir = aTempDir.GetURL(); //create new writer document @@ -2701,8 +2702,6 @@ void SwUiWriterTest4::testTdf115013() OUString sColumn = static_cast<SwDBFieldType*>(pField->GetTyp())->GetColumnName(); // The column name must come correct after round trip CPPUNIT_ASSERT_EQUAL(sColumnName, sColumn); - - utl::removeTree(aWorkDir); } void SwUiWriterTest4::testTdf115065() |