summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-06-09 12:10:50 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-06-09 12:10:50 +0000
commit41ca65146d95eb88c5027e5aff47833a1c791b64 (patch)
treefcf92c37b4aceb62b2c48458df10f4eb08025e6e
parente083ad3d5c77671acc47c367c18e3c83a9adb234 (diff)
INTEGRATION: CWS sb87 (1.46.40); FILE MERGED
2008/04/24 13:10:56 sb 1.46.40.2: RESYNC: (1.46-1.48); FILE MERGED 2008/04/10 07:40:05 sb 1.46.40.1: #i87730# use tools::getProcessWorkingDir instead of osl_getProcessWorkingDir
-rw-r--r--vcl/aqua/source/app/salinst.cxx12
1 files changed, 5 insertions, 7 deletions
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 1b6f1b5a54b0..d325a858a034 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: salinst.cxx,v $
- * $Revision: 1.49 $
+ * $Revision: 1.50 $
*
* This file is part of OpenOffice.org.
*
@@ -34,6 +34,7 @@
#include <stdio.h>
#include "tools/fsys.hxx"
+#include "tools/getprocessworkingdir.hxx"
#include "osl/process.h"
#include "rtl/ustrbuf.hxx"
#include "vcl/svapp.hxx"
@@ -264,14 +265,11 @@ extern "C" {
void InitSalMain()
{
- rtl_uString *urlWorkDir = NULL;
+ rtl::OUString urlWorkDir;
rtl_uString *sysWorkDir = NULL;
-
- oslProcessError err1 = osl_getProcessWorkingDir(&urlWorkDir);
-
- if (err1 == osl_Process_E_None)
+ if (tools::getProcessWorkingDir(&urlWorkDir))
{
- oslFileError err2 = osl_getSystemPathFromFileURL(urlWorkDir, &sysWorkDir);
+ oslFileError err2 = osl_getSystemPathFromFileURL(urlWorkDir.pData, &sysWorkDir);
if (err2 == osl_File_E_None)
{
ByteString aPath( getenv( "PATH" ) );