diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-21 15:46:17 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:38 -0500 |
| commit | 08be4cfe51342b5b08511951b9c5ff13b3eeee8d (patch) | |
| tree | 9a5394379bda57ec3d52f499a71898da0aea995f /comphelper | |
| parent | 854ff7bfc802d47d2a7419f7185af069a216b0bd (diff) | |
convert vos/process.hxx and related API
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/source/misc/regpathhelper.cxx | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/comphelper/source/misc/regpathhelper.cxx b/comphelper/source/misc/regpathhelper.cxx index 5b4fc8b88cdf..898d1224b091 100644 --- a/comphelper/source/misc/regpathhelper.cxx +++ b/comphelper/source/misc/regpathhelper.cxx @@ -33,12 +33,11 @@ #include <osl/file.hxx> #include <osl/security.hxx> #include <osl/thread.h> -#include <vos/process.hxx> +#include <osl/process.h> #include <rtl/textenc.h> #include <rtl/uri.h> #include <rtl/uri.hxx> -using namespace vos; using namespace osl; using namespace rtl; @@ -66,18 +65,17 @@ namespace comphelper */ static sal_Bool retrievePortalUserDir( OUString *pDirectory ) { - OStartupInfo startInfo; - sal_uInt32 nArgs = startInfo.getCommandArgCount(); + sal_uInt32 nArgs = osl_getCommandArgCount(); sal_Bool bIsPortalUser = sal_False; OUString sArg; while( nArgs > 0 ) - { - if ( !startInfo.getCommandArg(--nArgs, sArg) ) - { + { + if ( !osl_getCommandArg(--nArgs, &sArg.pData) ) + { if ( sArg.indexOf(OUString::createFromAscii("-userid")) == 0 ) { - bIsPortalUser = sal_True; + bIsPortalUser = sal_True; sal_Int32 nStart = sArg.lastIndexOf( '[' ); sal_Int32 nEnd = sArg.lastIndexOf( ']' ); if( -1 == nStart || -1 == nEnd || nEnd < nStart) @@ -189,8 +187,7 @@ OUString getPathToSystemRegistry() FILE *f=NULL; // search in the directory of the executable - OStartupInfo info; - if( OStartupInfo::E_None == info.getExecutableFile(uBuffer) ) + if(osl_Process_E_None == osl_getExecutableFile(&uBuffer.pData)) { sal_uInt32 lastIndex = uBuffer.lastIndexOf(PATH_DELEMITTER); if (lastIndex > 0) |