INTEGRATION: CWS sb87 (1.10.76); FILE MERGED

2008/04/24 13:16:04 sb 1.10.76.2: RESYNC: (1.10-1.11); FILE MERGED
2008/04/09 15:20:03 sb 1.10.76.1: #i87730# use tools::getProcessWorkingDir instead of osl_getProcessWorkingDir
This commit is contained in:
Rüdiger Timm
2008-06-09 11:43:11 +00:00
parent c3dab2ca11
commit b0ca60184b

View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: localhierarchybrowsersvc.cxx,v $ * $RCSfile: localhierarchybrowsersvc.cxx,v $
* $Revision: 1.11 $ * $Revision: 1.12 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -317,7 +317,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL
#include "filehelper.hxx" #include "filehelper.hxx"
#include <osl/file.hxx> #include <osl/file.hxx>
#include <osl/process.h> #include "tools/getprocessworkingdir.hxx"
#include <vector> #include <vector>
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@@ -363,7 +363,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL
bool makeAbsoluteURL(OUString & rURL ) bool makeAbsoluteURL(OUString & rURL )
{ {
using osl::File; using osl::File;
OUString aBaseDir; osl_getProcessWorkingDir(&aBaseDir.pData); OUString aBaseDir; tools::getProcessWorkingDir(&aBaseDir);
File::RC errcode = osl::File::getAbsoluteFileURL(aBaseDir,rURL,rURL); File::RC errcode = osl::File::getAbsoluteFileURL(aBaseDir,rURL,rURL);