diff options
| author | Juergen Schmidt <jsc@openoffice.org> | 2001-03-14 08:37:08 +0000 |
|---|---|---|
| committer | Juergen Schmidt <jsc@openoffice.org> | 2001-03-14 08:37:08 +0000 |
| commit | f4f9916b9b4dfaf63fca105f6481c129813d21f1 (patch) | |
| tree | 7b9a3a11dea6f497cf97c709009adf1f1f8c38bc /registry/source/registry.cxx | |
| parent | 9d73b17cac0df14084a659379eaae7e5ca6be222 (diff) | |
remove vos dependencies
Diffstat (limited to 'registry/source/registry.cxx')
| -rw-r--r-- | registry/source/registry.cxx | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx index c3b438722..37ae7a7d3 100644 --- a/registry/source/registry.cxx +++ b/registry/source/registry.cxx @@ -2,9 +2,9 @@ * * $RCSfile: registry.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: svesik $ $Date: 2001-02-02 13:59:38 $ + * last change: $Author: jsc $ $Date: 2001-03-14 09:36:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,22 +59,23 @@ * ************************************************************************/ -#include <registry/registry.h> - +#ifndef _REGISTRY_REGISTRY_H_ +#include <registry/registry.h> +#endif #ifndef _REGISTRY_REGISTRY_HXX_ -#include <registry/registry.hxx> +#include <registry/registry.hxx> +#endif +#ifndef _OSL_PROCESS_H_ +#include <osl/process.h> #endif #ifndef _REGIMPL_HXX_ -#include "regimpl.hxx" +#include "regimpl.hxx" #endif - #ifndef _REGKEY_HXX_ -#include "keyimpl.hxx" +#include "keyimpl.hxx" #endif -#include <vos/process.hxx> - #if defined(WIN32) || defined(WNT) || defined(__OS2__) #include <io.h> #endif @@ -84,7 +85,7 @@ #include <unistd.h> #endif -using namespace vos; +using namespace salhelper; #if defined ( GCC ) && ( defined ( SCO ) ) ORealDynamicLoader* ODynamicLoader<Registry_Api>::m_pLoader = NULL; @@ -92,19 +93,18 @@ ORealDynamicLoader* ODynamicLoader<Registry_Api>::m_pLoader = NULL; OString getTempName() { + static OUString TMP(RTL_CONSTASCII_USTRINGPARAM("TMP")); + static OUString TEMP(RTL_CONSTASCII_USTRINGPARAM("TEMP")); + OUString uTmpPattern; sal_Char tmpPattern[512] = ""; sal_Char *pTmpName = NULL; - OStartupInfo StartupInfo; - - if (StartupInfo.getEnvironment(OUString( RTL_CONSTASCII_USTRINGPARAM("TMP") ), - uTmpPattern) != OStartupInfo::E_None) + if ( osl_getEnvironment(TMP.pData, &uTmpPattern.pData) != osl_Process_E_None ) { - if (StartupInfo.getEnvironment( OUString( RTL_CONSTASCII_USTRINGPARAM("TEMP") ), - uTmpPattern) != NAMESPACE_VOS(OStartupInfo)::E_None) + if ( osl_getEnvironment(TEMP.pData, &uTmpPattern.pData) != osl_Process_E_None ) { -#if defined(WIN32) || defined(WNT) || defined(OS2) +#if defined(SAL_W32) || defined(SAL_OS2) strcpy(tmpPattern, "."); #else strcpy(tmpPattern, "/tmp"); |