mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS sb87 (1.24.6); FILE MERGED

Browse Source 
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
This commit is contained in:
Rüdiger Timm
2008-06-09 12:13:29 +00:00
parent 079757ad33
commit 332aff7f94
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
unotools/source/config/bootstrap.cxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: bootstrap.cxx,v $ * $RCSfile: bootstrap.cxx,v $
* $Revision: 1.25 $ * $Revision: 1.26 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -44,6 +44,7 @@
// --------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------
#include <rtl/bootstrap.hxx> #include <rtl/bootstrap.hxx>
#include <osl/process.h> // for osl_getExecutableFile #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 // #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; using osl::File;
OUString sBasePath = _rsURL; OUString sBasePath;
OSL_VERIFY(osl_Process_E_None == osl_getProcessWorkingDir(&sBasePath.pData)); OSL_VERIFY(tools::getProcessWorkingDir(&sBasePath));
OUString sAbsolute; OUString sAbsolute;
if ( File::E_None == File::getAbsoluteFileURL(sBasePath, _rsURL, sAbsolute)) if ( File::E_None == File::getAbsoluteFileURL(sBasePath, _rsURL, sAbsolute))