summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-06-09 12:13:29 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-06-09 12:13:29 +0000
commit332aff7f945de304fda3f7305e09652b5fb1526c (patch)
tree80a12593d0d38a6ce67e81fcbe5607e3aca1679d
parent079757ad33d7e88be59d3ed15320d3ea9198a381 (diff)
INTEGRATION: CWS sb87 (1.24.6); FILE MERGED
2008/04/24 13:17:08 sb 1.24.6.2: RESYNC: (1.24-1.25); FILE MERGED 2008/04/10 07:27:19 sb 1.24.6.1: #i87730# use tools::getProcessWorkingDir instead of osl_getProcessWorkingDir
-rw-r--r--unotools/source/config/bootstrap.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx
index 4d31538d3e0a..f89706806268 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: bootstrap.cxx,v $
- * $Revision: 1.25 $
+ * $Revision: 1.26 $
*
* This file is part of OpenOffice.org.
*
@@ -44,6 +44,7 @@
// ---------------------------------------------------------------------------------------
#include <rtl/bootstrap.hxx>
#include <osl/process.h> // for osl_getExecutableFile
+#include "tools/getprocessworkingdir.hxx"
// ---------------------------------------------------------------------------------------
// #define this to a non-zero value, if remembering defaults is not supported properly
@@ -263,8 +264,8 @@ bool implEnsureAbsolute(OUString & _rsURL) // also strips embedded dots !!
{
using osl::File;
- OUString sBasePath = _rsURL;
- OSL_VERIFY(osl_Process_E_None == osl_getProcessWorkingDir(&sBasePath.pData));
+ OUString sBasePath;
+ OSL_VERIFY(tools::getProcessWorkingDir(&sBasePath));
OUString sAbsolute;
if ( File::E_None == File::getAbsoluteFileURL(sBasePath, _rsURL, sAbsolute))