diff options
39 files changed, 304 insertions, 254 deletions
diff --git a/basic/inc/basic/process.hxx b/basic/inc/basic/process.hxx index 9a593322b896..df698096b2d8 100644 --- a/basic/inc/basic/process.hxx +++ b/basic/inc/basic/process.hxx @@ -29,7 +29,7 @@ #define _PROCESS_HXX #include <tools/string.hxx> -#include <vos/process.hxx> +#include <osl/process.h> #include <map> @@ -39,9 +39,12 @@ typedef Environment::value_type EnvironmentVariable; class Process { // Internal members and methods - vos::OArgumentList *pArgumentList; - vos::OEnvironment *pEnvList; - vos::OProcess *pProcess; + sal_uInt32 m_nArgumentCount; + rtl_uString **m_pArgumentList; + sal_uInt32 m_nEnvCount; + rtl_uString **m_pEnvList; + rtl::OUString m_aProcessName; + oslProcess m_pProcess; BOOL ImplIsRunning(); long ImplGetExitCode(); BOOL bWasGPF; diff --git a/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx index 502097724f9c..77ee37b7a470 100644 --- a/basic/inc/pch/precompiled_basic.hxx +++ b/basic/inc/pch/precompiled_basic.hxx @@ -148,6 +148,7 @@ #include "i18npool/lang.h" +#include "osl/diagnose.h" #include "osl/file.hxx" #include "osl/module.h" #include "osl/mutex.hxx" @@ -275,10 +276,6 @@ #include "vcl/wintypes.hxx" #include "vcl/wrkwin.hxx" -#include "osl/diagnose.h" -#include "osl/mutex.hxx" -#include "vos/process.hxx" - #include "xmlscript/xmldlg_imexp.hxx" #include "xmlscript/xmllib_imexp.hxx" #include "xmlscript/xmlmod_imexp.hxx" diff --git a/basic/source/app/process.cxx b/basic/source/app/process.cxx index 7054fc99ff12..837820eb1234 100644 --- a/basic/source/app/process.cxx +++ b/basic/source/app/process.cxx @@ -36,10 +36,10 @@ #include <tools/postwin.h> #endif #include <tools/errcode.hxx> -#include <vos/process.hxx> #include <basic/sbxcore.hxx> #include <tools/string.hxx> #include <osl/file.hxx> +#include <osl/process.h> #include <basic/ttstrhlp.hxx> @@ -51,29 +51,46 @@ #include <basic/process.hxx> Process::Process() -: pArgumentList( NULL ) -, pEnvList( NULL ) -, pProcess( NULL ) +: m_nArgumentCount( 0 ) +, m_pArgumentList( NULL ) +, m_nEnvCount( 0 ) +, m_pEnvList( NULL ) +, m_aProcessName() +, m_pProcess( NULL ) , bWasGPF( FALSE ) , bHasBeenStarted( FALSE ) { } +#define FREE_USTRING_LIST( count, list ) \ + if ( count && list ) \ + { \ + for ( unsigned int i = 0; i < count; ++i ) \ + { \ + rtl_uString_release( list[i] ); \ + list[i] = NULL; \ + } \ + delete[] list; \ + } \ + count = 0; \ + list = NULL; + Process::~Process() { -// delete pArgumentList; -// delete pEnvList; - delete pProcess; + FREE_USTRING_LIST( m_nArgumentCount, m_pArgumentList ); + FREE_USTRING_LIST( m_nEnvCount, m_pEnvList ); + if ( m_pProcess ) + osl_freeProcessHandle( m_pProcess ); } BOOL Process::ImplIsRunning() { - if ( pProcess && bHasBeenStarted ) + if ( m_pProcess && bHasBeenStarted ) { - vos::OProcess::TProcessInfo aProcessInfo; - pProcess->getInfo( vos::OProcess::TData_ExitCode, &aProcessInfo ); - if ( !(aProcessInfo.Fields & vos::OProcess::TData_ExitCode) ) + oslProcessInfo aProcessInfo; + osl_getProcessInfo(m_pProcess, osl_Process_EXITCODE, &aProcessInfo ); + if ( !(aProcessInfo.Fields & osl_Process_EXITCODE) ) return TRUE; else return FALSE; @@ -84,11 +101,11 @@ BOOL Process::ImplIsRunning() long Process::ImplGetExitCode() { - if ( pProcess ) + if ( m_pProcess ) { - vos::OProcess::TProcessInfo aProcessInfo; - pProcess->getInfo( vos::OProcess::TData_ExitCode, &aProcessInfo ); - if ( !(aProcessInfo.Fields & vos::OProcess::TData_ExitCode) ) + oslProcessInfo aProcessInfo; + osl_getProcessInfo(m_pProcess, osl_Process_EXITCODE, &aProcessInfo ); + if ( !(aProcessInfo.Fields & osl_Process_EXITCODE) ) SbxBase::SetError( SbxERR_NO_ACTIVE_OBJECT ); return aProcessInfo.Code; } @@ -102,13 +119,14 @@ long Process::ImplGetExitCode() void Process::SetImage( const String &aAppPath, const String &aAppParams, const Environment *pEnv ) { // Set image file of executable - if ( pProcess && ImplIsRunning() ) + if ( m_pProcess && ImplIsRunning() ) SbxBase::SetError( SbxERR_NO_ACTIVE_OBJECT ); else { - delete pArgumentList; pArgumentList = NULL; - delete pEnvList; pEnvList = NULL; - delete pProcess; pProcess = NULL; + FREE_USTRING_LIST( m_nArgumentCount, m_pArgumentList ); + FREE_USTRING_LIST( m_nEnvCount, m_pEnvList ); + osl_freeProcessHandle( m_pProcess ); + m_pProcess = NULL; xub_StrLen i, nCount = aAppParams.GetQuotedTokenCount( CUniString("\"\"" ), ' ' ); ::rtl::OUString *pParamList = new ::rtl::OUString[nCount]; @@ -123,42 +141,45 @@ void Process::SetImage( const String &aAppPath, const String &aAppParams, const nParamCount++; } } - pArgumentList = new vos::OArgumentList( pParamList, nCount ); - + m_nArgumentCount = nParamCount; + m_pArgumentList = new rtl_uString*[m_nArgumentCount]; + for ( i = 0 ; i < m_nArgumentCount ; i++ ) + { + m_pArgumentList[i] = NULL; + rtl_uString_assign( &(m_pArgumentList[i]), pParamList[i].pData ); + } + delete [] pParamList; - ::rtl::OUString *pEnvArray = NULL; if ( pEnv ) { - pEnvArray = new ::rtl::OUString[pEnv->size()]; + m_pEnvList = new rtl_uString*[pEnv->size()]; - xub_StrLen nEnvCount = 0; + m_nEnvCount = 0; Environment::const_iterator aIter = pEnv->begin(); while ( aIter != pEnv->end() ) { ::rtl::OUString aTemp = ::rtl::OUString( (*aIter).first ); aTemp += ::rtl::OUString::createFromAscii( "=" ); aTemp += ::rtl::OUString( (*aIter).second ); - pEnvArray[nEnvCount] = aTemp; - nEnvCount++; + m_pEnvList[m_nEnvCount] = NULL; + rtl_uString_assign( &(m_pEnvList[m_nEnvCount]), aTemp.pData ); + m_nEnvCount++; aIter++; } - pEnvList = new vos::OEnvironment( pEnvArray, nEnvCount ); } ::rtl::OUString aNormalizedAppPath; osl::FileBase::getFileURLFromSystemPath( ::rtl::OUString(aAppPath), aNormalizedAppPath ); - pProcess = new vos::OProcess( aNormalizedAppPath ); + m_aProcessName = aNormalizedAppPath;; bHasBeenStarted = FALSE; - delete [] pParamList; - delete [] pEnvArray; } } BOOL Process::Start() { // Start program BOOL bSuccess=FALSE; - if ( pProcess && !ImplIsRunning() ) + if ( m_pProcess && !ImplIsRunning() ) { bWasGPF = FALSE; #ifdef WNT @@ -167,17 +188,19 @@ BOOL Process::Start() try { #endif - if ( pEnvList ) - { - bSuccess = pProcess->execute( (vos::OProcess::TProcessOption)(vos::OProcess::TOption_SearchPath), - *pArgumentList, - *pEnvList ) == vos::OProcess::E_None; - } - else - { - bSuccess = pProcess->execute( (vos::OProcess::TProcessOption)(vos::OProcess::TOption_SearchPath), - *pArgumentList ) == vos::OProcess::E_None; - } + bSuccess = osl_executeProcess( + m_aProcessName.pData, + m_pArgumentList, + m_nArgumentCount, + osl_Process_SEARCHPATH + /*| osl_Process_DETACHED*/ + /*| osl_Process_WAIT*/, + NULL, + NULL, + m_pEnvList, + m_nEnvCount, + &m_pProcess ) == osl_Process_E_None; + #ifdef WNT } catch( ... ) @@ -216,7 +239,7 @@ BOOL Process::WasGPF() BOOL Process::Terminate() { if ( ImplIsRunning() ) - return pProcess->terminate() == vos::OProcess::E_None; + return osl_terminateProcess(m_pProcess) == osl_Process_E_None; return TRUE; } diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 475ea515d313..1e06e74d48ff 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -32,7 +32,7 @@ #include <tools/date.hxx> #include <basic/sbxvar.hxx> -#include <vos/process.hxx> +#include <osl/process.h> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/sound.hxx> @@ -3486,8 +3486,8 @@ RTLFUNC(Shell) } else { - USHORT nOptions = vos::OProcess::TOption_SearchPath| - vos::OProcess::TOption_Detached; + oslProcessOption nOptions = osl_Process_SEARCHPATH | osl_Process_DETACHED; + String aCmdLine = rPar.Get(1)->GetString(); // Zusaetzliche Parameter anhaengen, es muss eh alles geparsed werden if( nArgCount >= 4 ) @@ -3564,76 +3564,75 @@ RTLFUNC(Shell) nWinStyle = rPar.Get(2)->GetInteger(); switch( nWinStyle ) { - case 2: - nOptions |= vos::OProcess::TOption_Minimized; - break; - case 3: - nOptions |= vos::OProcess::TOption_Maximized; - break; - case 10: - nOptions |= vos::OProcess::TOption_FullScreen; - break; + case 2: + nOptions |= osl_Process_MINIMIZED; + break; + case 3: + nOptions |= osl_Process_MAXIMIZED; + break; + case 10: + nOptions |= osl_Process_FULLSCREEN; + break; } BOOL bSync = FALSE; if( nArgCount >= 5 ) bSync = rPar.Get(4)->GetBool(); if( bSync ) - nOptions |= vos::OProcess::TOption_Wait; + nOptions |= osl_Process_WAIT; } - vos::OProcess::TProcessOption eOptions = - (vos::OProcess::TProcessOption)nOptions; - // #72471 Parameter aufbereiten std::list<String>::const_iterator iter = aTokenList.begin(); const String& rStr = *iter; ::rtl::OUString aOUStrProg( rStr.GetBuffer(), rStr.Len() ); - String aOUStrProgUNC = getFullPathUNC( aOUStrProg ); + ::rtl::OUString aOUStrProgUNC = getFullPathUNC( aOUStrProg ); iter++; USHORT nParamCount = sal::static_int_cast< USHORT >( aTokenList.size() - 1 ); - ::rtl::OUString* pArgumentList = NULL; - //const char** pParamList = NULL; + rtl_uString** pParamList = NULL; if( nParamCount ) { - pArgumentList = new ::rtl::OUString[ nParamCount ]; - //pParamList = new const char*[ nParamCount ]; - USHORT iList = 0; - while( iter != aTokenList.end() ) + pParamList = new rtl_uString*[nParamCount]; + for(int iList = 0; iter != aTokenList.end(); ++iList, ++iter) { const String& rParamStr = (*iter); - pArgumentList[iList++] = ::rtl::OUString( rParamStr.GetBuffer(), rParamStr.Len() ); - //pParamList[iList++] = (*iter).GetStr(); - iter++; + const ::rtl::OUString aTempStr( rParamStr.GetBuffer(), rParamStr.Len()); + pParamList[iList] = NULL; + rtl_uString_assign(&(pParamList[iList]), aTempStr.pData); } } - //const char* pParams = aParams.Len() ? aParams.GetStr() : 0; - vos::OProcess* pApp; - pApp = new vos::OProcess( aOUStrProgUNC ); - BOOL bSucc; - if( nParamCount == 0 ) - { - bSucc = pApp->execute( eOptions ) == vos::OProcess::E_None; - } - else + oslProcess pApp; + BOOL bSucc = osl_executeProcess( + aOUStrProgUNC.pData, + pParamList, + nParamCount, + nOptions, + NULL, + NULL, + NULL, 0, + &pApp ) == osl_Process_E_None; + + osl_freeProcessHandle( pApp ); + + for(int j = 0; i < nParamCount; i++) { - vos::OArgumentList aArgList( pArgumentList, nParamCount ); - bSucc = pApp->execute( eOptions, aArgList ) == vos::OProcess::E_None; + rtl_uString_release(pParamList[j]); + pParamList[j] = NULL; } + long nResult = 0; - vos::OProcess::TProcessInfo aInfo; // We should return the identifier of the executing process when is running VBA, because method Shell(...) returns it in Excel. - if ( bSucc && SbiRuntime::isVBAEnabled() && pApp->getInfo( vos::OProcess::TData_Identifier, &aInfo ) == vos::OProcess::E_None ) + if ( bSucc && SbiRuntime::isVBAEnabled()) { + oslProcessInfo aInfo; + osl_getProcessInfo( pApp, osl_Process_IDENTIFIER, &aInfo ); nResult = aInfo.Ident; } - delete pApp; - delete[] pArgumentList; if( !bSucc ) StarBASIC::Error( SbERR_FILE_NOT_FOUND ); else diff --git a/connectivity/inc/pch/precompiled_connectivity.hxx b/connectivity/inc/pch/precompiled_connectivity.hxx index 141367ed714a..75ad405f9780 100644 --- a/connectivity/inc/pch/precompiled_connectivity.hxx +++ b/connectivity/inc/pch/precompiled_connectivity.hxx @@ -327,7 +327,7 @@ #include "unotools/sharedunocomponent.hxx" #include "osl/mutex.hxx" -#include "vos/process.hxx" +#include "osl/process.h" //---MARKER--- diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx index e42b405f7cb6..fb1df922ccfb 100644 --- a/connectivity/source/drivers/adabas/BDriver.cxx +++ b/connectivity/source/drivers/adabas/BDriver.cxx @@ -38,7 +38,7 @@ #include "connectivity/dbexception.hxx" #include "TConnection.hxx" #include "diagnose_ex.h" -#include <vos/process.hxx> + #include <osl/process.h> #include <unotools/ucbhelper.hxx> #include <unotools/ucbstreamhelper.hxx> @@ -64,8 +64,8 @@ const char sNewLine[] = "\015\012"; // \015\012 and not \n #define CURRENT_DB_VERSION "13.01.00" #define CURRENT_KERNEL_VERSION "13.01" -#define OPROCESS_ADABAS (OProcess::TOption_Hidden | OProcess::TOption_Wait | OProcess::TOption_SearchPath) -#define OPROCESS_ADABAS_DBG (OProcess::TOption_Wait | OProcess::TOption_SearchPath) +#define OPROCESS_ADABAS (osl_Process_HIDDEN | osl_Process_WAIT | osl_Process_SEARCHPATH) +#define OPROCESS_ADABAS_DBG (osl_Process_WAIT | osl_Process_SEARCHPATH) using namespace connectivity; @@ -144,7 +144,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace utl; using namespace osl; -using namespace vos; using namespace ::dbtools; sal_Bool LoadFunctions(oslModule pODBCso); @@ -882,19 +881,23 @@ void ODriver::clearDatabase(const ::rtl::OUString& sDBName) ::rtl::OUString sCommand; #if defined(WIN) || defined(WNT) ::rtl::OUString sStop = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("stop")); - OArgumentList aArgs(2,&sDBName,&sStop); - sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x_cons.exe")); + const sal_uInt32 nArgsCount = 2; + rtl_uString *pArgs[nArgsCount] = { sDBName.pData, sStop.pData }; #else - OArgumentList aArgs(1,&sDBName); sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x_clear")); + const sal_uInt32 nArgsCount = 1; + rtl_uString* pArgs[nArgsCount] = { sDBName.pData }; #endif - OProcess aApp( sCommand,m_sDbWorkURL); + oslProcess aApp; + #if OSL_DEBUG_LEVEL > 0 - OProcess::TProcessError eError = + oslProcessError eError = #endif - aApp.execute( (OProcess::TProcessOption) OPROCESS_ADABAS, aArgs ); - OSL_ENSURE( eError == OProcess::E_None, "ODriver::clearDatabase: calling the executable failed!" ); + osl_executeProcess(sCommand.pData, pArgs, nArgsCount, + OPROCESS_ADABAS, NULL, m_sDbWorkURL.pData, + NULL, 0, &aApp); + OSL_ENSURE( eError == osl_Process_E_None, "ODriver::clearDatabase: calling the executable failed!" ); } // ----------------------------------------------------------------------------- void ODriver::createDb( const TDatabaseStruct& _aInfo) @@ -988,7 +991,7 @@ int ODriver::X_PARAM(const ::rtl::OUString& _DBNAME, const ::rtl::OUString& _CMD) { // %XPARAM% -u %CONUSR%,%CONPWD% BINIT - String sCommandFile = generateInitFile(); + ::rtl::OUString sCommandFile = generateInitFile(); { ::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE)); pFileStream->Seek(STREAM_SEEK_TO_END); @@ -1022,12 +1025,16 @@ int ODriver::X_PARAM(const ::rtl::OUString& _DBNAME, pFileStream->Flush(); } - OProcess aApp(sCommandFile ,m_sDbWorkURL); + oslProcess aApp; + #if OSL_DEBUG_LEVEL > 0 - OProcess::TProcessError eError = + oslProcesError eError = #endif - aApp.execute( (OProcess::TProcessOption)(OProcess::TOption_Hidden | OProcess::TOption_Wait)); - OSL_ENSURE( eError == OProcess::E_None, "ODriver::X_PARAM: calling the executable failed!" ); + osl_executeProcess(sCommandFile.pData, NULL, 0, + osl_Process_HIDDEN | osl_Process_WAIT, + NULL, m_sDbWorkURL.pData, NULL, 0, &aApp); + OSL_ENSURE( eError == osl_Process_E_None, "ODriver::X_PARAM: calling the executable failed!" ); + #if OSL_DEBUG_LEVEL < 2 if(UCBContentHelper::Exists(sCommandFile)) UCBContentHelper::Kill(sCommandFile); @@ -1052,18 +1059,25 @@ void ODriver::PutParam(const ::rtl::OUString& sDBName, const ::rtl::OUString& rWhat, const ::rtl::OUString& rHow) { - OArgumentList aArgs(3,&sDBName,&rWhat,&rHow); + const sal_uInt32 nArgsCount = 3; + rtl_uString* pArgs[nArgsCount] = { sDBName.pData, rWhat.pData, rHow.pData }; + ::rtl::OUString sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("putparam")); #if defined(WIN) || defined(WNT) sCommand += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".exe")); #endif - OProcess aApp(sCommand,m_sDbWorkURL); + oslProcess aApp; + + #if OSL_DEBUG_LEVEL > 0 - OProcess::TProcessError eError = + oslProcesError eError = #endif - aApp.execute( (OProcess::TProcessOption)OPROCESS_ADABAS,aArgs ); - OSL_ENSURE( eError == OProcess::E_None, "ODriver::PutParam: calling the executable failed!" ); + osl_executeProcess(sCommand.pData, pArgs, nArgsCount, + OPROCESS_ADABAS, + NULL, m_sDbWorkURL.pData, NULL, 0, &aApp); + + OSL_ENSURE( eError == osl_Process_E_None, "ODriver::PutParam: calling the executable failed!" ); } // ----------------------------------------------------------------------------- sal_Bool ODriver::CreateFile(const ::rtl::OUString &_FileName, @@ -1122,17 +1136,22 @@ int ODriver::X_START(const ::rtl::OUString& sDBName) ::rtl::OUString sArg3 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-NoDBService")); ::rtl::OUString sArg4 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-NoDBWindow")); - OArgumentList aArgs(4,&sArg1,&sDBName,&sArg3,&sArg4); + const sal_uInt32 nArgsCount = 4; + rtl_uString* pArgs[nArgsCount] = { sArg1.pData, sDBName.pData, sArg3.pData, sArg4.pData }; sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("strt.exe")); #else - OArgumentList aArgs(1,&sDBName); + const sal_uInt32 nArgsCount = 1; + rtl_uString* pArgs[nArgsCount] = { sDBName.pData }; sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x_start")); #endif - OProcess aApp( sCommand ,m_sDbWorkURL); - OProcess::TProcessError eError = aApp.execute((OProcess::TProcessOption)OPROCESS_ADABAS,aArgs); + oslProcess aApp; + + oslProcessError eError = osl_executeProcess(sCommand.pData, pArgs, nArgsCount, + OPROCESS_ADABAS, NULL, m_sDbWorkURL.pData, + NULL, 0, &aApp); - if(eError == OProcess::E_NotFound) + if(eError == osl_Process_E_NotFound) { ::connectivity::SharedResources aResources; const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution( @@ -1142,10 +1161,11 @@ int ODriver::X_START(const ::rtl::OUString& sDBName) ) ); ::dbtools::throwGenericSQLException(sError,*this); } - OSL_ASSERT(eError == OProcess::E_None); + OSL_ASSERT(eError == osl_Process_E_None); + + oslProcessInfo aInfo; - OProcess::TProcessInfo aInfo; - if(aApp.getInfo(OProcess::TData_ExitCode,&aInfo) == OProcess::E_None && aInfo.Code) + if(osl_getProcessInfo(aApp, osl_Process_EXITCODE, &aInfo) == osl_Process_E_None && aInfo.Code) return aInfo.Code; return 0; @@ -1159,22 +1179,28 @@ int ODriver::X_STOP(const ::rtl::OUString& sDBName) ::rtl::OUString sArg1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-d")); ::rtl::OUString sArg2 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-NoDBService")); - OArgumentList aArgs(3,&sArg1,&sDBName,&sArg2); + const sal_uInt32 nArgsCount = 3; + rtl_uString* pArgs[nArgsCount] = { sArg1.pData, sDBName.pData, sArg3.pData }; sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("stp.exe")); #else - OArgumentList aArgs(1,&sDBName); + const sal_uInt32 nArgsCount = 1; + rtl_uString* pArgs[nArgsCount] = { sDBName.pData }; sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x_stop")); #endif - OProcess aApp( sCommand ,m_sDbWorkURL); - OProcess::TProcessError eError = aApp.execute((OProcess::TProcessOption)OPROCESS_ADABAS,aArgs); + oslProcess aApp; + oslProcessError eError = osl_executeProcess(sCommand.pData, pArgs, nArgsCount, + OPROCESS_ADABAS, NULL, m_sDbWorkURL.pData, + NULL, 0, &aApp); - OSL_ASSERT(eError == OProcess::E_None); - if(eError != OProcess::E_None) + OSL_ASSERT(eError == osl_Process_E_None); + if(eError != osl_Process_E_None) return 1; - OProcess::TProcessInfo aInfo; - if(aApp.getInfo(OProcess::TData_ExitCode,&aInfo) == OProcess::E_None && aInfo.Code) + + oslProcessInfo aInfo; + + if(osl_getProcessInfo(aApp, osl_Process_EXITCODE, &aInfo) == osl_Process_E_None && aInfo.Code) return aInfo.Code; return 0; @@ -1193,7 +1219,7 @@ void ODriver::XUTIL(const ::rtl::OUString& _rParam, String sPhysicalPath; LocalFileHelper::ConvertURLToPhysicalName(aCmdFile.GetURL(),sPhysicalPath); - String sCommandFile = generateInitFile(); + ::rtl::OUString sCommandFile = generateInitFile(); { ::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE)); @@ -1219,12 +1245,17 @@ void ODriver::XUTIL(const ::rtl::OUString& _rParam, pFileStream->Flush(); } - OProcess aApp(sCommandFile ,m_sDbWorkURL); + oslProcess aApp; + + #if OSL_DEBUG_LEVEL > 0 - OProcess::TProcessError eError = + oslProcesError eError = #endif - aApp.execute( (OProcess::TProcessOption)(OProcess::TOption_Hidden | OProcess::TOption_Wait)); - OSL_ENSURE( eError == OProcess::E_None, "ODriver::XUTIL: calling the executable failed!" ); + osl_executeProcess(sCommandFile.pData, NULL, 0, + osl_Process_HIDDEN | osl_Process_WAIT, + NULL, m_sDbWorkURL.pData, NULL, 0, &aApp); + OSL_ENSURE( eError == osl_Process_E_None, "ODriver::XUTIL: calling the executable failed!" ); + #if OSL_DEBUG_LEVEL < 2 if(UCBContentHelper::Exists(sCommandFile)) UCBContentHelper::Kill(sCommandFile); @@ -1247,7 +1278,7 @@ void ODriver::LoadBatch(const ::rtl::OUString& sDBName, String sPhysicalPath; LocalFileHelper::ConvertURLToPhysicalName(aCmdFile.GetURL(),sPhysicalPath); - String sCommandFile = generateInitFile(); + ::rtl::OUString sCommandFile = generateInitFile(); { ::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE)); pFileStream->Seek(STREAM_SEEK_TO_END); @@ -1276,12 +1307,17 @@ void ODriver::LoadBatch(const ::rtl::OUString& sDBName, pFileStream->Flush(); } - OProcess aApp(sCommandFile ,m_sDbWorkURL); + oslProcess aApp; + + #if OSL_DEBUG_LEVEL > 0 - OProcess::TProcessError eError = + oslProcesError eError = #endif - aApp.execute( (OProcess::TProcessOption)(OProcess::TOption_Hidden | OProcess::TOption_Wait)); - OSL_ENSURE( eError == OProcess::E_None, "ODriver::LoadBatch: calling the executable failed!" ); + osl_executeProcess(sCommandFile.pData, NULL, 0, + osl_Process_HIDDEN | osl_Process_WAIT, + NULL, m_sDbWorkURL.pData, NULL, 0, &aApp); + OSL_ENSURE( eError == osl_Process_E_None, "ODriver::LoadBatch: calling the executable failed!" ); + #if OSL_DEBUG_LEVEL < 2 if(UCBContentHelper::Exists(sCommandFile)) UCBContentHelper::Kill(sCommandFile); @@ -1439,7 +1475,7 @@ void ODriver::X_CONS(const ::rtl::OUString& sDBName,const ::rtl::OString& _ACTIO String sPhysicalPath; LocalFileHelper::ConvertURLToPhysicalName(_FILENAME,sPhysicalPath); - String sCommandFile = generateInitFile(); + ::rtl::OUString sCommandFile = generateInitFile(); { ::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE)); pFileStream->Seek(STREAM_SEEK_TO_END); @@ -1458,8 +1494,12 @@ void ODriver::X_CONS(const ::rtl::OUString& sDBName,const ::rtl::OString& _ACTIO pFileStream->Flush(); } - OProcess aApp(sCommandFile ,m_sDbWorkURL); - aApp.execute( (OProcess::TProcessOption)(OProcess::TOption_Hidden | OProcess::TOption_Wait)); + oslProcess aApp; + + osl_executeProcess(sCommandFile.pData, NULL, 0, + osl_Process_HIDDEN | osl_Process_WAIT, + NULL, m_sDbWorkURL.pData, NULL, 0, &aApp); + #if OSL_DEBUG_LEVEL < 2 if(UCBContentHelper::Exists(sCommandFile)) UCBContentHelper::Kill(sCommandFile); @@ -1522,7 +1562,7 @@ sal_Bool ODriver::isVersion(const ::rtl::OUString& sDBName, const char* _pVersio String sPhysicalPath; LocalFileHelper::ConvertURLToPhysicalName(aCmdFile.GetURL(),sPhysicalPath); - String sCommandFile = generateInitFile(); + ::rtl::OUString sCommandFile = generateInitFile(); { ::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE)); pFileStream->Seek(STREAM_SEEK_TO_END); @@ -1538,8 +1578,12 @@ sal_Bool ODriver::isVersion(const ::rtl::OUString& sDBName, const char* _pVersio << sNewLine; } - OProcess aApp(sCommandFile ,m_sDbWorkURL); - aApp.execute( (OProcess::TProcessOption)OPROCESS_ADABAS); + oslProcess aApp; + + osl_executeProcess(sCommandFile.pData, NULL, 0, + OPROCESS_ADABAS, + NULL, m_sDbWorkURL.pData, NULL, 0, &aApp); + #if OSL_DEBUG_LEVEL < 2 if(UCBContentHelper::Exists(sCommandFile)) UCBContentHelper::Kill(sCommandFile); @@ -1572,7 +1616,7 @@ void ODriver::checkAndInsertNewDevSpace(const ::rtl::OUString& sDBName, String sPhysicalPath; LocalFileHelper::ConvertURLToPhysicalName(aCmdFile.GetURL(),sPhysicalPath); - String sCommandFile = generateInitFile(); + ::rtl::OUString sCommandFile = generateInitFile(); { ::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE)); pFileStream->Seek(STREAM_SEEK_TO_END); @@ -1588,8 +1632,11 @@ void ODriver::checkAndInsertNewDevSpace(const ::rtl::OUString& sDBName, << sNewLine; } - OProcess aApp(sCommandFile ,m_sDbWorkURL); - aApp.execute( (OProcess::TProcessOption)OPROCESS_ADABAS); + oslProcess aApp; + osl_executeProcess(sCommandFile.pData, NULL, 0, + OPROCESS_ADABAS, + NULL, m_sDbWorkURL.pData, NULL, 0, &aApp); + #if OSL_DEBUG_LEVEL < 2 if(UCBContentHelper::Exists(sCommandFile)) UCBContentHelper::Kill(sCommandFile); @@ -1622,7 +1669,7 @@ sal_Bool ODriver::isKernelVersion(const char* _pVersion) String sPhysicalPath; LocalFileHelper::ConvertURLToPhysicalName(aCmdFile.GetURL(),sPhysicalPath); - String sCommandFile = generateInitFile(); + ::rtl::OUString sCommandFile = generateInitFile(); { ::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE)); pFileStream->Seek(STREAM_SEEK_TO_END); @@ -1633,8 +1680,11 @@ sal_Bool ODriver::isKernelVersion(const char* _pVersion) << sNewLine; } - OProcess aApp(sCommandFile ,m_sDbWorkURL); - aApp.execute( (OProcess::TProcessOption)OPROCESS_ADABAS); + oslProcess aApp; + osl_executeProcess(sCommandFile.pData, NULL, 0, + OPROCESS_ADABAS, + NULL, m_sDbWorkURL.pData, NULL, 0, &aApp); + #if OSL_DEBUG_LEVEL < 2 if(UCBContentHelper::Exists(sCommandFile)) UCBContentHelper::Kill(sCommandFile); @@ -1733,7 +1783,7 @@ void ODriver::installSystemTables( const TDatabaseStruct& _aInfo) XUTIL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RESTART")),_aInfo.sDBName,_aInfo.sControlUser,_aInfo.sControlPassword); #else // UNX - String sCommandFile = generateInitFile(); + ::rtl::OUString sCommandFile = generateInitFile(); { ::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE)); pFileStream->Seek(STREAM_SEEK_TO_END); @@ -1761,8 +1811,11 @@ void ODriver::installSystemTables( const TDatabaseStruct& _aInfo) pFileStream->Flush(); } // now execute the command - OProcess aApp(sCommandFile ,m_sDbWorkURL); - aApp.execute( (OProcess::TProcessOption)(OProcess::TOption_Hidden | OProcess::TOption_Wait)); + + oslProcess aApp; + osl_executeProcess(sCommandFile.pData, NULL, 0, + osl_Process_WAIT | osl_Process_HIDDEN, + NULL, m_sDbWorkURL.pData, NULL, 0, &aApp); #if OSL_DEBUG_LEVEL < 2 if(UCBContentHelper::Exists(sCommandFile)) UCBContentHelper::Kill(sCommandFile); diff --git a/connectivity/source/drivers/evoab/LConnection.cxx b/connectivity/source/drivers/evoab/LConnection.cxx index d6bbed5b4f87..cc0d8b9639a3 100644 --- a/connectivity/source/drivers/evoab/LConnection.cxx +++ b/connectivity/source/drivers/evoab/LConnection.cxx @@ -39,7 +39,7 @@ #include <connectivity/dbcharset.hxx> #include <connectivity/dbexception.hxx> #include <comphelper/processfactory.hxx> -#include <vos/process.hxx> +#include <osl/process.h> #include <tools/debug.hxx> #include "LDebug.hxx" #include "diagnose_ex.h" @@ -116,18 +116,30 @@ void OEvoabConnection::construct(const ::rtl::OUString& url,const Sequence< Prop ::rtl::OUString aArg2 = ::rtl::OUString::createFromAscii(OEvoabDriver::getEVOAB_CLI_ARG_OUTPUT_FILE_PREFIX()); aArg2 += aWorkingDirPath; aArg2 += getDriver()->getEvoFolderListFileName(); - OArgumentList aArgs(2,&aArg1,&aArg2); + + const sal_uInt32 nArgsCount = 2; + rtl_uString* pPargs[nArgsCount] = { aArg1.pData, aArgs2.pData }; EVO_TRACE_STRING("OEvoabConnection::construct()::aCLICommand = %s\n", aCLICommand ); EVO_TRACE_STRING("OEvoabConnection::construct()::aWorkingDirPath = %s\n", aWorkingDirPath ); EVO_TRACE_STRING("OEvoabConnection::construct()::aArg1 = %s\n", aArg1 ); EVO_TRACE_STRING("OEvoabConnection::construct()::aArg2 = %s\n", aArg2 ); - OProcess aApp( aCLICommand,aWorkingDirPath); - OSL_VERIFY_EQUALS( - aApp.execute( (OProcess::TProcessOption)(OProcess::TOption_Hidden | OProcess::TOption_Wait | OProcess::TOption_SearchPath),aArgs), - OProcess::E_None, - "Error at execute evolution-addressbook-export to get VCards"); + oslProcess aProcess; + if ( osl_Process_E_None != osl_executeProcess( + aCLICommand.pData, + pArgs, + nArgsCount, + osl_Process_HIDDEN | osl_Process_WAIT | osl_Process_SEARCHPATH, + NULL, + aWorkingDirPath.pData, + NULL, 0, + &aProcess ) ) + { + OSL_TRACE("Error at execute evolution-addressbook-export to get VCards"); + ::dbtools::throwGenericSQLException( + ::rtl::OUString::createFromAscii("Error at execute evolution-addressbook-export to get VCards"),NULL); + } Sequence<PropertyValue> aDriverParam; ::std::vector<PropertyValue> aParam; diff --git a/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx b/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx index 85d0aba00b30..e8ef5ae53ab1 100644 --- a/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx +++ b/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx @@ -46,7 +46,6 @@ #include <comphelper/types.hxx> #include "LFolderList.hxx" #include "connectivity/CommonTools.hxx" -#include <vos/process.hxx> #include <osl/process.h> #include <tools/debug.hxx> #include <map> @@ -359,7 +358,8 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( aArg2 += ::rtl::OUString(pOEvoabConnection->getExtension()); ::rtl::OUString aArg3 = ::rtl::OUString::createFromAscii(pOEvoabConnection->getDriver()->getEVOAB_CLI_ARG_OUTPUT_FORMAT()); - OArgumentList aArgs(3,&aArg1,&aArg2,&aArg3); + const sal_uInt32 nArgsCount = 3; + rtl_uString *pArgs[nArgsCount] = { aArg1.pData, aArg2.pData, aArg3.pData }; EVO_TRACE_STRING( "OEvoabDatabaseMetaData::getTables()::aCLICommand = %s\n", aCLICommand ); EVO_TRACE_STRING( "OEvoabDatabaseMetaData::getTables()::aWorkingDir = %s\n", aWorkingDir ); @@ -367,11 +367,20 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( EVO_TRACE_STRING( "OEvoabDatabaseMetaData::getTables()::aArg2 = %s\n", aArg2 ); EVO_TRACE_STRING( "OEvoabDatabaseMetaData::getTables()::aArg3 = %s\n", aArg3 ); - OProcess aApp( aCLICommand,aWorkingDir); - OSL_VERIFY_EQUALS( - aApp.execute( (OProcess::TProcessOption)(OProcess::TOption_Hidden | OProcess::TOption_Wait | OProcess::TOption_SearchPath),aArgs), - OProcess::E_None, - "Error at execute evolution-addressbook-exporter to get VCards" ); + oslProcess aProcess; + if ( osl_Process_E_None != osl_executeProcess( + aCLICommand.pData, + pArgs, + nArgsCount, + osl_Process_HIDDEN | osl_Process_WAIT | osl_Process_SEARCHPATH, + NULL, + aWorkingDir.pData, + NULL, 0, + &aProcess ) ) + { + OSL_TRACE("Error at execute evolution-addressbook-export to get VCards"); + throw SQLException(); + } bMoreData = pFolderList->next(); } diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx index 08989dfd59c5..a49f2683a106 100644 --- a/connectivity/source/drivers/evoab2/NConnection.cxx +++ b/connectivity/source/drivers/evoab2/NConnection.cxx @@ -39,7 +39,6 @@ #include <comphelper/extract.hxx> #include <connectivity/dbexception.hxx> #include <comphelper/processfactory.hxx> -#include <vos/process.hxx> #include <tools/debug.hxx> #include "NDebug.hxx" #include <comphelper/sequence.hxx> diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx index 04a5d0b58b96..5b342a2e4f2a 100644 --- a/connectivity/source/drivers/jdbc/Object.cxx +++ b/connectivity/source/drivers/jdbc/Object.cxx @@ -35,7 +35,6 @@ #include <com/sun/star/uno/Exception.hpp> #include "java/tools.hxx" #include "java/sql/SQLException.hxx" -#include <vos/process.hxx> #include <osl/mutex.hxx> #include <osl/thread.h> #include <com/sun/star/uno/Sequence.hxx> diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 7d25c4e5af51..8f790b24a806 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -115,6 +115,7 @@ #include <unotools/moduleoptions.hxx> #include <osl/module.h> #include <osl/file.hxx> +#include <osl/process.h> #include <osl/signal.h> #include <rtl/uuid.h> #include <rtl/uri.hxx> @@ -143,8 +144,6 @@ #include <unotools/bootstrap.hxx> #include <cppuhelper/bootstrap.hxx> -#include "vos/process.hxx" - #include <svtools/fontsubstconfig.hxx> #include <svtools/accessibilityoptions.hxx> #include <svtools/apearcfg.hxx> @@ -162,7 +161,6 @@ #define DEFINE_CONST_UNICODE(CONSTASCII) UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII)) #define U2S(STRING) ::rtl::OUStringToOString(STRING, RTL_TEXTENCODING_UTF8) -using namespace vos; using rtl::OUString; using rtl::OUStringBuffer; @@ -313,8 +311,7 @@ void FatalError(const ::rtl::OUString& sMessage) ::rtl::OUString sProductKey = ::utl::Bootstrap::getProductKey(); if ( ! sProductKey.getLength()) { - ::vos::OStartupInfo aInfo; - aInfo.getExecutableFile( sProductKey ); + osl_getExecutableFile( &sProductKey.pData ); ::sal_uInt32 nLastIndex = sProductKey.lastIndexOf('/'); if ( nLastIndex > 0 ) @@ -845,9 +842,8 @@ void Desktop::HandleBootstrapPathErrors( ::utl::Bootstrap::Status aBootstrapStat ::rtl::OUString aUserInstallURL; ::rtl::OUString aProductKey; ::rtl::OUString aTemp; - ::vos::OStartupInfo aInfo; - aInfo.getExecutableFile( aProductKey ); + osl_getExecutableFile( &aProductKey.pData ); sal_uInt32 lastIndex = aProductKey.lastIndexOf('/'); if ( lastIndex > 0 ) aProductKey = aProductKey.copy( lastIndex+1 ); @@ -2646,9 +2642,8 @@ void Desktop::OpenClients() else { OUString aIniName; - ::vos::OStartupInfo aInfo; - aInfo.getExecutableFile( aIniName ); + osl_getExecutableFile( &aIniName.pData ); sal_uInt32 lastIndex = aIniName.lastIndexOf('/'); if ( lastIndex > 0 ) { diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index e81dc65d2154..82ae6571d953 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -53,7 +53,6 @@ #include <osl/file.hxx> #include <osl/module.h> #include <osl/security.hxx> -#include <vos/process.hxx> #include <rtl/uri.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/bootstrap.hxx> @@ -84,7 +83,6 @@ #define DESKTOP_TEMPDIRNAME "soffice.tmp" using namespace rtl; -using namespace vos; using namespace desktop; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 000cf828c0da..065a665e2427 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -35,7 +35,7 @@ #include "dispatchwatcher.hxx" #include <memory> #include <stdio.h> -#include <vos/process.hxx> +#include <osl/process.h> #include <unotools/bootstrap.hxx> #include <vcl/svapp.hxx> #include <vcl/help.hxx> @@ -436,7 +436,6 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() ::rtl::OUString aUserInstallPath; ::rtl::OUString aDummy; - ::vos::OStartupInfo aInfo; OfficeIPCThread* pThread = new OfficeIPCThread; pThread->maPipeIdent = OUString( RTL_CONSTASCII_USTRINGPARAM( "SingleOfficeIPC_" ) ); @@ -460,7 +459,8 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() OUString aIniName; - aInfo.getExecutableFile( aIniName ); + osl_getExecutableFile( &aIniName.pData ); + sal_uInt32 lastIndex = aIniName.lastIndexOf('/'); if ( lastIndex > 0 ) { diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx index 2d53f5ba8ec4..f1afda0590d7 100644 --- a/desktop/source/app/userinstall.cxx +++ b/desktop/source/app/userinstall.cxx @@ -42,7 +42,6 @@ #include <osl/diagnose.h> #include <osl/security.hxx> #include <rtl/ref.hxx> -#include <vos/process.hxx> #include <tools/resmgr.hxx> #include <unotools/bootstrap.hxx> diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx index 7c652db100a1..01c445630290 100644 --- a/desktop/source/offacc/acceptor.cxx +++ b/desktop/source/offacc/acceptor.cxx @@ -31,7 +31,6 @@ #include "acceptor.hxx" #include <unotools/bootstrap.hxx> -#include <vos/process.hxx> #include <tools/urlobj.hxx> #include <tools/stream.hxx> #include <vcl/svapp.hxx> diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index dd7359a42c2a..c12532ba98f3 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -32,7 +32,6 @@ #include "splash.hxx" #include <stdio.h> #include <unotools/bootstrap.hxx> -#include <vos/process.hxx> #include <tools/urlobj.hxx> #include <tools/stream.hxx> #include <sfx2/sfx.hrc> diff --git a/desktop/unx/splash/unxsplash.cxx b/desktop/unx/splash/unxsplash.cxx index edb3603d8c39..710d326c683b 100644 --- a/desktop/unx/splash/unxsplash.cxx +++ b/desktop/unx/splash/unxsplash.cxx @@ -28,7 +28,7 @@ #include "unxsplash.hxx" #include <stdio.h> #include <unotools/bootstrap.hxx> -#include <vos/process.hxx> +#include <osl/process.h> #include <tools/urlobj.hxx> #include <tools/stream.hxx> #include <sfx2/sfx.hrc> @@ -107,11 +107,10 @@ void SAL_CALL UnxSplashScreen::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& aArguments ) throw ( RuntimeException ) { - ::vos::OStartupInfo aInfo; - for ( sal_uInt32 i = 0; i < aInfo.getCommandArgCount(); i++ ) + for ( sal_uInt32 i = 0; i < osl_getCommandArgCount(); i++ ) { rtl::OUString aArg; - if ( aInfo.getCommandArg( i, aArg ) ) + if ( osl_getCommandArg( i, &aArg.pData ) ) break; if ( aArg.matchIgnoreAsciiCaseAsciiL( PIPE_ARG, sizeof( PIPE_ARG ) - 1, 0 ) ) { diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx index d9c29b4e5cad..2bc0ca41f09d 100644 --- a/editeng/inc/pch/precompiled_editeng.hxx +++ b/editeng/inc/pch/precompiled_editeng.hxx @@ -877,9 +877,6 @@ #include "vcl/unohelp2.hxx" #include "vcl/wall.hxx" #include "vcl/wintypes.hxx" -#include "osl/mutex.hxx" -#include "vos/thread.hxx" -#include "vos/xception.hxx" #include "xmloff/DashStyle.hxx" #include "xmloff/GradientStyle.hxx" #include "xmloff/HatchStyle.hxx" diff --git a/framework/inc/commands.h b/framework/inc/commands.h index fac23bd26648..182dbff8ceac 100644 --- a/framework/inc/commands.h +++ b/framework/inc/commands.h @@ -33,7 +33,6 @@ //_________________________________________________________________________________________________________________ #include <macros/generic.hxx> -#include <vos/process.hxx> #include <rtl/ustring.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/inc/pch/precompiled_framework.hxx b/framework/inc/pch/precompiled_framework.hxx index cebdb1ee7c50..a1aca2d52808 100644 --- a/framework/inc/pch/precompiled_framework.hxx +++ b/framework/inc/pch/precompiled_framework.hxx @@ -487,9 +487,7 @@ #include "vcl/window.hxx" #include "vcl/wintypes.hxx" -#include "osl/mutex.hxx" -#include "vos/process.hxx" -#include "vos/thread.hxx" + //---MARKER--- #endif diff --git a/framework/source/application/framework.cxx b/framework/source/application/framework.cxx index 817a0ed2b4db..f7e82da58413 100644 --- a/framework/source/application/framework.cxx +++ b/framework/source/application/framework.cxx @@ -36,6 +36,7 @@ #include <helper/oinstanceprovider.hxx> #include <classes/servicemanager.hxx> #include <macros/debug.hxx> +#include <osl/process.h> #include <defines.hxx> @@ -68,14 +69,12 @@ #include <svtools/unoiface.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> -#include <vos/process.hxx> //_________________________________________________________________________________________________________________ // namespace //_________________________________________________________________________________________________________________ using namespace ::rtl ; -using namespace ::vos ; using namespace ::comphelper ; using namespace ::framework ; using namespace ::com::sun::star::uno ; @@ -167,13 +166,12 @@ void FrameWork::impl_analyzeCommandArguments() m_bUsePlugIn = sal_False; // depends from "/plugin" // Then step over all given arguments and search for supported one. - OStartupInfo aInfo ; OUString sArgument ; - sal_uInt32 nCount = aInfo.getCommandArgCount(); + sal_uInt32 nCount = osl_getCommandArgCount(); for ( sal_uInt32 nArgument=0; nArgument<nCount; ++nArgument ) { // If extraction of current argument successfull ... - if ( aInfo.getCommandArg( nArgument, sArgument ) == osl_Process_E_None ) + if ( osl_getCommandArg( nArgument, &sArgument.pData ) == osl_Process_E_None ) { // ... search for matching with supported values. if ( sArgument == COMMANDARGUMENT_PLUGIN ) diff --git a/framework/source/application/login.cxx b/framework/source/application/login.cxx index 22bd8bfe291c..45a2d0329ff8 100644 --- a/framework/source/application/login.cxx +++ b/framework/source/application/login.cxx @@ -51,7 +51,7 @@ //_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> #include <com/sun/star/uno/Reference.hxx> -#include <vos/process.hxx> +#include <osl/process.h> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> #include <vcl/event.hxx> @@ -81,7 +81,6 @@ //_________________________________________________________________________________________________________________ using namespace ::rtl ; -using namespace ::vos ; using namespace ::comphelper ; using namespace ::framework ; using namespace ::com::sun::star::uno ; @@ -250,12 +249,10 @@ void LoginApplication::Main() //***************************************************************************************************************** void LoginApplication::impl_parseCommandline() { - // Use vos::OStartupInfo for access to command line. // Step over all arguments, search for supported ones and try to get his values. // Set it on our member. Caller of this method must control setted values. - OStartupInfo aInfo; - sal_uInt32 nCount = aInfo.getCommandArgCount() ; + sal_uInt32 nCount = osl_getCommandArgCount(); sal_uInt32 nArgument = 0 ; OUString sArgument ; OUString sValue ; @@ -272,7 +269,7 @@ void LoginApplication::impl_parseCommandline() { // .. but work with valid ones only! // Don't check values here. Caller of this method must decide between wrong and allowed values! - aInfo.getCommandArg( nArgument, sArgument ); + osl_getCommandArg( nArgument, &sArgument.pData ); //_____________________________________________________________________________________________________ // Look for "-f=<temp. file name>" diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 4bfe4d9e4de2..16f2f9d7e01b 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -54,7 +54,7 @@ #include <osl/file.hxx> #include <osl/security.hxx> #include <osl/socket.hxx> -#include <vos/process.hxx> +#include <osl/process.h> #include <i18npool/mslangid.hxx> #include <tools/urlobj.hxx> #include <tools/resmgr.hxx> diff --git a/framework/source/threadhelp/lockhelper.cxx b/framework/source/threadhelp/lockhelper.cxx index 49bb0245f49b..b3956cd5544f 100644 --- a/framework/source/threadhelp/lockhelper.cxx +++ b/framework/source/threadhelp/lockhelper.cxx @@ -46,7 +46,7 @@ //_________________________________________________________________________________________________________________ // other includes //_________________________________________________________________________________________________________________ -#include <vos/process.hxx> +#include <osl/process.h> //_________________________________________________________________________________________________________________ // namespace @@ -533,9 +533,9 @@ ELockType& LockHelper::implts_getLockType() { static ELockType eType = FALLBACK_LOCKTYPE; - ::vos::OStartupInfo aEnvironment; + ::rtl::OUString aEnvVar( ENVVAR_LOCKTYPE ); ::rtl::OUString sValue ; - if( aEnvironment.getEnvironment( ENVVAR_LOCKTYPE, sValue ) == ::vos::OStartupInfo::E_None ) + if( osl_getEnvironment( aEnvVar.pData, &sValue.pData ) == osl_Process_E_None ) { eType = (ELockType)(sValue.toInt32()); } diff --git a/framework/test/threadtest.cxx b/framework/test/threadtest.cxx index 66343c0f5be4..d7f15304d85f 100644 --- a/framework/test/threadtest.cxx +++ b/framework/test/threadtest.cxx @@ -51,8 +51,7 @@ // other includes //_________________________________________________________________________________________________________________ #include <rtl/random.h> -#include <vos/process.hxx> -#include <vos/thread.hxx> +#include <osl/process.h> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> #include <osl/time.h> @@ -78,7 +77,6 @@ using namespace ::rtl ; using namespace ::osl ; -using namespace ::vos ; using namespace ::framework ; //_________________________________________________________________________________________________________________ @@ -693,16 +691,15 @@ void TestApplication::Main() // Parse command line. // Attention: All parameter are required and must exist! // syntax: "threadtest.exe <testcount> <threadcount> <loops> <owner>" - OStartupInfo aInfo ; OUString sArgument ; sal_Int32 nArgument ; - sal_Int32 nCount = aInfo.getCommandArgCount(); + sal_Int32 nCount = osl_getCommandArgCount(); LOG_ASSERT2( nCount!=4 ,"TestApplication::Main()" , "Wrong argument line detected!") for( nArgument=0; nArgument<nCount; ++nArgument ) { - aInfo.getCommandArg( nArgument, sArgument ); + osl_getCommandArg( nArgument, &sArgument.pData ); if( nArgument== 0 ) nTestCount =sArgument.toInt32(); if( nArgument== 1 ) nThreadCount=sArgument.toInt32(); if( nArgument== 2 ) nLoops =sArgument.toInt32(); diff --git a/framework/test/threadtest/threadtest.cxx b/framework/test/threadtest/threadtest.cxx index 633d48b9b858..e82fff4e454c 100644 --- a/framework/test/threadtest/threadtest.cxx +++ b/framework/test/threadtest/threadtest.cxx @@ -50,7 +50,7 @@ // other includes //_________________________________________________________________________________________________________________ #include <rtl/random.h> -#include <vos/process.hxx> +#include <osl/process.h> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> #include <osl/time.h> @@ -691,16 +691,15 @@ void TestApplication::Main() // Parse command line. // Attention: All parameter are required and must exist! // syntax: "threadtest.exe <testcount> <threadcount> <loops> <owner>" - OStartupInfo aInfo ; OUString sArgument ; sal_Int32 nArgument ; - sal_Int32 nCount = aInfo.getCommandArgCount(); + sal_Int32 nCount = osl_getCommandArgCount(); LOG_ASSERT2( nCount!=4 ,"TestApplication::Main()" , "Wrong argument line detected!") for( nArgument=0; nArgument<nCount; ++nArgument ) { - aInfo.getCommandArg( nArgument, sArgument ); + osl_getCommandArg( nArgument, &sArgument.pData ); if( nArgument== 0 ) nTestCount =sArgument.toInt32(); if( nArgument== 1 ) nThreadCount=sArgument.toInt32(); if( nArgument== 2 ) nLoops =sArgument.toInt32(); diff --git a/framework/test/typecfg/cfgview.cxx b/framework/test/typecfg/cfgview.cxx index 2b8c453a94c7..8d000666191a 100644 --- a/framework/test/typecfg/cfgview.cxx +++ b/framework/test/typecfg/cfgview.cxx @@ -51,7 +51,7 @@ // other includes //_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> -#include <vos/process.hxx> +#include <osl/process.h> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> @@ -115,7 +115,6 @@ //_________________________________________________________________________________________________________________ using namespace ::std ; -using namespace ::vos ; using namespace ::rtl ; using namespace ::framework ; using namespace ::comphelper ; @@ -249,16 +248,14 @@ void CFGView::impl_printSyntax() *//*-*************************************************************************************************************/ void CFGView::impl_parseCommandLine( AppMember& rMember ) { - ::vos::OStartupInfo aInfo ; ::rtl::OUString sArgument ; sal_Int32 nArgument = 0 ; - sal_Int32 nCount = aInfo.getCommandArgCount(); + sal_Int32 nCount = osl_getCommandArgCount(); sal_Int32 nMinCount = 0 ; while( nArgument<nCount ) { - aInfo.getCommandArg( nArgument, sArgument ); - + osl_getCommandArg( nArgument, &sArgument.pData ); //_____________________________________________________________________________________________________ // look for "-dir=" if( sArgument.compareTo( ARGUMENT_DIRNAME, ARGUMENTLENGTH ) == ARGUMENTFOUND ) diff --git a/framework/test/typecfg/typecfg.cxx b/framework/test/typecfg/typecfg.cxx index 597e42f93ebb..4072b92790a6 100644 --- a/framework/test/typecfg/typecfg.cxx +++ b/framework/test/typecfg/typecfg.cxx @@ -49,7 +49,7 @@ // other includes //_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> -#include <vos/process.hxx> +#include <osl/process.h> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> @@ -73,7 +73,6 @@ //_________________________________________________________________________________________________________________ using namespace ::std ; -using namespace ::vos ; using namespace ::rtl ; using namespace ::framework ; using namespace ::comphelper ; @@ -158,14 +157,13 @@ void TypeApplication::Main() //***************************************************************************************************************** void TypeApplication::impl_parseCommandLine() { - OStartupInfo aInfo ; OUString sArgument ; sal_Int32 nArgument = 0 ; - sal_Int32 nCount = aInfo.getCommandArgCount(); + sal_Int32 nCount = osl_getCommandArgCount(); while( nArgument<nCount ) { - aInfo.getCommandArg( nArgument, sArgument ); + osl_getCommandArg( nArgument, &sArgument.pData ); if( sArgument == ARGUMENT_GENERATE_CFGVIEW ) { diff --git a/framework/test/typecfg/xml2xcd.cxx b/framework/test/typecfg/xml2xcd.cxx index ff2b989abe83..0013542bfce1 100644 --- a/framework/test/typecfg/xml2xcd.cxx +++ b/framework/test/typecfg/xml2xcd.cxx @@ -54,7 +54,7 @@ //_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> #include <unotools/processfactory.hxx> -#include <vos/process.hxx> +#include <osl/process.h> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> @@ -335,15 +335,14 @@ void XCDGenerator::impl_printSyntax() *//*-*************************************************************************************************************/ void XCDGenerator::impl_parseCommandLine( AppMember& rMember ) { - ::vos::OStartupInfo aInfo ; ::rtl::OUString sArgument ; sal_Int32 nArgument = 0 ; - sal_Int32 nCount = aInfo.getCommandArgCount(); + sal_Int32 nCount = osl_getCommandArgCount(); sal_Int32 nMinCount = 0 ; while( nArgument<nCount ) { - aInfo.getCommandArg( nArgument, sArgument ); + osl_getCommandArg( nArgument, &sArgument.pData ); /*OBSOLETE //_____________________________________________________________________________________________________ // look for "-fis=..." diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx index be3853fcc06c..e800aa374086 100644 --- a/linguistic/source/lngopt.hxx +++ b/linguistic/source/lngopt.hxx @@ -47,7 +47,6 @@ #include <svl/itemprop.hxx> #include "misc.hxx" #include "defs.hxx" -#include <vos/refernce.hxx> namespace com { namespace sun { namespace star { namespace beans { diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx index 4ddfbaae527d..71b00d159eff 100644 --- a/sfx2/inc/pch/precompiled_sfx2.hxx +++ b/sfx2/inc/pch/precompiled_sfx2.hxx @@ -660,8 +660,7 @@ #include "osl/diagnose.h" #include "osl/module.hxx" #include "osl/mutex.hxx" -#include "vos/process.hxx" -#include "vos/xception.hxx" +#include "osl/process.h" //---MARKER--- #endif diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 5a639f589055..d801b3a14ecc 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -38,7 +38,6 @@ #include <sfx2/app.hxx> #include <sfx2/frame.hxx> -#include <vos/process.hxx> #include <tools/simplerm.hxx> #include <tools/config.hxx> #include <basic/basrdll.hxx> diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx index 66f44ef423e1..019f46c460a6 100644 --- a/sfx2/source/appl/appmain.cxx +++ b/sfx2/source/appl/appmain.cxx @@ -41,7 +41,6 @@ #include <svl/itempool.hxx> #include <svl/urihelper.hxx> #include <svtools/helpopt.hxx> -#include <vos/process.hxx> #include <framework/sfxhelperfunctions.hxx> #include <rtl/ustring.hxx> #include <com/sun/star/uno/Exception.hpp> diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 51e78740c72b..cefcde75a60e 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -30,8 +30,6 @@ #include "precompiled_sfx2.hxx" #include <vcl/status.hxx> #include <vcl/msgbox.hxx> -#include <vos/process.hxx> -#include <vos/xception.hxx> #include <svl/whiter.hxx> #include <svl/stritem.hxx> #include <svl/intitem.hxx> diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index dc49827f34bf..8c3716b56177 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -83,7 +83,6 @@ #include <toolkit/helper/vclunohelper.hxx> #include <tools/shl.hxx> #include <unotools/bootstrap.hxx> -#include <vos/process.hxx> #include <rtl/bootstrap.hxx> #include <cppuhelper/exc_hlp.hxx> #include <rtl/ustrbuf.hxx> diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 5b54302a6a09..d059b29f94ba 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -86,7 +86,6 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/ucb/XContent.hpp> #include <rtl/ustring.hxx> -#include <vos/process.hxx> #include <unotools/pathoptions.hxx> #include <unotools/moduleoptions.hxx> #include <comphelper/mediadescriptor.hxx> diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 3d801720decd..fa5989d03013 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -945,7 +945,6 @@ #include "vcl/wall.hxx" #include "vcl/wintypes.hxx" #include "osl/mutex.hxx" -#include "vos/xception.hxx" #include "xmloff/DashStyle.hxx" #include "xmloff/GradientStyle.hxx" #include "xmloff/HatchStyle.hxx" diff --git a/ucb/inc/pch/precompiled_ucb.hxx b/ucb/inc/pch/precompiled_ucb.hxx index bdbfee17a650..9c55abc99fac 100644 --- a/ucb/inc/pch/precompiled_ucb.hxx +++ b/ucb/inc/pch/precompiled_ucb.hxx @@ -175,9 +175,6 @@ #include "ucbhelper/macros.hxx" #include "ucbhelper/proxydecider.hxx" -#include "osl/diagnose.h" -#include "osl/mutex.hxx" -#include "vos/process.hxx" //---MARKER--- #endif diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx index 4d95f95febe5..7e64bacf23e4 100644 --- a/ucb/workben/ucb/ucbdemo.cxx +++ b/ucb/workben/ucb/ucbdemo.cxx @@ -32,7 +32,6 @@ #include <stack> #include <rtl/ustrbuf.hxx> #include <osl/mutex.hxx> -#include <vos/process.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/bootstrap.hxx> #include <com/sun/star/ucb/ContentAction.hpp> @@ -80,6 +79,7 @@ #include <vcl/svapp.hxx> #include <vcl/help.hxx> #include <srcharg.hxx> +#include <osl/security.hxx> using ucbhelper::getLocalFileURL; using ucbhelper::getSystemPathFromFileURL; @@ -433,7 +433,7 @@ sal_Bool Ucb::init() try { rtl::OUString aPipe; - vos::OSecurity().getUserIdent(aPipe); + osl::Security().getUserIdent(aPipe); uno::Sequence< uno::Any > aArgs(4); aArgs[0] <<= m_aConfigurationKey1; aArgs[1] <<= m_aConfigurationKey2; |