From 332aff7f945de304fda3f7305e09652b5fb1526c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Mon, 9 Jun 2008 12:13:29 +0000 Subject: [PATCH] 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 --- unotools/source/config/bootstrap.cxx | 7 ++++--- 1 file 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 #include // 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))