convert vos/process.hxx and related API

7 files changed, 10 insertions, 21 deletions

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 187ade718e..0fa5d8a9b2 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 1f591cc77b..c33e7c0077 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 6315b25068..c685596d26 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 e2c6b48bbd..ca68ab00ad 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 8e3dfe94d4..1989937597 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 f286b7ef7f..57e96829e1 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 edb3603d8c..710d326c68 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 ) )
         {