[Libreoffice-commits] core.git: connectivity/source

Mike Kaganski (via logerrit) logerrit at kemper.freedesktop.org
Wed Sep 1 15:54:14 UTC 2021


 connectivity/source/drivers/firebird/Driver.cxx |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit d4acc83fbca384a24404bab816c2ed1c23343171
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Wed Sep 1 15:26:02 2021 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Wed Sep 1 17:53:39 2021 +0200

    Use utl::TempFile::EnableKillingFile
    
    Change-Id: If3c6f95220d3888e7ec981a7899886f5a7e00b64
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121429
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx
index 1d452eb1c593..857352583c39 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -62,6 +62,8 @@ FirebirdDriver::FirebirdDriver(const css::uno::Reference< css::uno::XComponentCo
     // ::utl::TempFile uses a unique temporary directory (subdirectory of
     // /tmp or other user specific tmp directory) per instance in which
     // we can create directories for firebird at will.
+    m_firebirdTMPDirectory.EnableKillingFile(true);
+    m_firebirdLockDirectory.EnableKillingFile(true);
 
     // Overrides firebird's default of /tmp or c:\temp
     osl_setEnvironment(OUString(our_sFirebirdTmpVar).pData, m_firebirdTMPDirectory.GetFileName().pData);
@@ -89,11 +91,7 @@ FirebirdDriver::FirebirdDriver(const css::uno::Reference< css::uno::XComponentCo
 #endif /*!SYSTEM_FIREBIRD*/
 }
 
-FirebirdDriver::~FirebirdDriver()
-{
-    utl::removeTree(m_firebirdTMPDirectory.GetURL());
-    utl::removeTree(m_firebirdLockDirectory.GetURL());
-}
+FirebirdDriver::~FirebirdDriver() = default;
 
 void FirebirdDriver::disposing()
 {


More information about the Libreoffice-commits mailing list