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

[Andrzej J.R. Hunt]

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

New commits:
commit 819b72bb03b2be368790d6e603f282ec6ea72ab4
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date:   Fri Aug 30 15:25:18 2013 +0100

    Set path and not url for FIREBIRD_[TMP|LOCK]. (firebird-sdbc)
    
    Otherwise firbird fails to load databases since it can't access a url.
    
    Change-Id: I1bebc6fa18c2d1920291dcf5a7300009ede4452a

diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx
index 89c9cfd..729dc2b 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -61,14 +61,15 @@ const OUString FirebirdDriver::our_sFirebirdLockVar("FIREBIRD_LOCK");
 FirebirdDriver::FirebirdDriver()
     : ODriver_BASE(m_aMutex)
 {
-    OUString sTmpDir;
-    ::osl::FileBase::getTempDirURL(sTmpDir);
+    OUString sTmpDirURL, sTmpDirPath;
+    ::osl::FileBase::getTempDirURL(sTmpDirURL);
+    ::osl::FileBase::getSystemPathFromFileURL(sTmpDirURL, sTmpDirPath);
 
     // Overrides firebird's default of /tmp or c:\temp
-    osl_setEnvironment(our_sFirebirdTmpVar.pData, sTmpDir.pData);
+    osl_setEnvironment(our_sFirebirdTmpVar.pData, sTmpDirPath.pData);
     // Overrides firebird's default of /tmp/firebird or c:\temp\firebird
-    sTmpDir += "/firebird";
-    osl_setEnvironment(our_sFirebirdLockVar.pData, sTmpDir.pData);
+    sTmpDirPath += "/firebird";
+    osl_setEnvironment(our_sFirebirdLockVar.pData, sTmpDirPath.pData);
 }
 
 void FirebirdDriver::disposing()