codecleanup02: #i52551# Removed old stuff: VOS_NAMESPACE, use vos:: directly

5 files changed, 41 insertions, 41 deletions

diff --git a/basic/inc/basic/process.hxx b/basic/inc/basic/process.hxx
index 20cdbe1d4aa4..9a593322b896 100644
--- a/basic/inc/basic/process.hxx
+++ b/basic/inc/basic/process.hxx
@@ -39,9 +39,9 @@ typedef Environment::value_type EnvironmentVariable;
 class Process
 {
     // Internal members and methods
-    NAMESPACE_VOS(OArgumentList) *pArgumentList;
-    NAMESPACE_VOS(OEnvironment) *pEnvList;
-    NAMESPACE_VOS(OProcess) *pProcess;
+    vos::OArgumentList *pArgumentList;
+    vos::OEnvironment *pEnvList;
+    vos::OProcess *pProcess;
     BOOL ImplIsRunning();
     long ImplGetExitCode();
     BOOL bWasGPF;
diff --git a/basic/source/app/process.cxx b/basic/source/app/process.cxx
index c37af05ac8da..0eec05e1697c 100644
--- a/basic/source/app/process.cxx
+++ b/basic/source/app/process.cxx
@@ -72,9 +72,9 @@ BOOL Process::ImplIsRunning()
 {
     if ( pProcess && bHasBeenStarted )
     {
-        NAMESPACE_VOS(OProcess::TProcessInfo) aProcessInfo;
-        pProcess->getInfo( NAMESPACE_VOS(OProcess::TData_ExitCode), &aProcessInfo );
-        if ( !(aProcessInfo.Fields & NAMESPACE_VOS(OProcess::TData_ExitCode)) )
+        vos::OProcess::TProcessInfo aProcessInfo;
+        pProcess->getInfo( vos::OProcess::TData_ExitCode, &aProcessInfo );
+        if ( !(aProcessInfo.Fields & vos::OProcess::TData_ExitCode) )
             return TRUE;
         else
             return FALSE;
@@ -87,9 +87,9 @@ long Process::ImplGetExitCode()
 {
     if ( pProcess )
     {
-        NAMESPACE_VOS(OProcess::TProcessInfo) aProcessInfo;
-        pProcess->getInfo( NAMESPACE_VOS(OProcess::TData_ExitCode), &aProcessInfo );
-        if ( !(aProcessInfo.Fields & NAMESPACE_VOS(OProcess::TData_ExitCode)) )
+        vos::OProcess::TProcessInfo aProcessInfo;
+        pProcess->getInfo( vos::OProcess::TData_ExitCode, &aProcessInfo );
+        if ( !(aProcessInfo.Fields & vos::OProcess::TData_ExitCode) )
             SbxBase::SetError( SbxERR_NO_ACTIVE_OBJECT );
         return aProcessInfo.Code;
     }
@@ -124,7 +124,7 @@ void Process::SetImage( const String &aAppPath, const String &aAppParams, const
                 nParamCount++;
             }
         }
-        pArgumentList = new NAMESPACE_VOS(OArgumentList)( pParamList, nCount );
+        pArgumentList = new vos::OArgumentList( pParamList, nCount );
 
 
         ::rtl::OUString *pEnvArray = NULL;
@@ -143,12 +143,12 @@ void Process::SetImage( const String &aAppPath, const String &aAppParams, const
                 nEnvCount++;
                 aIter++;
             }
-            pEnvList = new NAMESPACE_VOS(OEnvironment)( pEnvArray, nEnvCount );
+            pEnvList = new vos::OEnvironment( pEnvArray, nEnvCount );
         }
 
         ::rtl::OUString aNormalizedAppPath;
         osl::FileBase::getFileURLFromSystemPath( ::rtl::OUString(aAppPath), aNormalizedAppPath );
-        pProcess = new NAMESPACE_VOS(OProcess)( aNormalizedAppPath );
+        pProcess = new vos::OProcess( aNormalizedAppPath );
         bHasBeenStarted = FALSE;
 
         delete [] pParamList;
@@ -170,20 +170,20 @@ BOOL Process::Start()
 #endif
             if ( pEnvList )
             {
-                bSuccess = pProcess->execute( (NAMESPACE_VOS(OProcess)::TProcessOption)
-                            ( NAMESPACE_VOS(OProcess)::TOption_SearchPath
-                            /*| NAMESPACE_VOS(OProcess)::TOption_Detached*/
-                            /*| NAMESPACE_VOS(OProcess)::TOption_Wait*/ ),
+                bSuccess = pProcess->execute( (vos::OProcess::TProcessOption)
+                            ( vos::OProcess::TOption_SearchPath
+                            /*| vos::OProcess::TOption_Detached*/
+                            /*| vos::OProcess::TOption_Wait*/ ),
                             *pArgumentList,
-                            *pEnvList ) == NAMESPACE_VOS(OProcess)::E_None;
+                            *pEnvList ) == vos::OProcess::E_None;
             }
             else
             {
-                bSuccess = pProcess->execute( (NAMESPACE_VOS(OProcess)::TProcessOption)
-                            ( NAMESPACE_VOS(OProcess)::TOption_SearchPath
-                            /*| NAMESPACE_VOS(OProcess)::TOption_Detached*/
-                            /*| NAMESPACE_VOS(OProcess)::TOption_Wait*/ ),
-                            *pArgumentList ) == NAMESPACE_VOS(OProcess)::E_None;
+                bSuccess = pProcess->execute( (vos::OProcess::TProcessOption)
+                            ( vos::OProcess::TOption_SearchPath
+                            /*| vos::OProcess::TOption_Detached*/
+                            /*| vos::OProcess::TOption_Wait*/ ),
+                            *pArgumentList ) == vos::OProcess::E_None;
             }
 #ifdef WNT
         }
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index 791e9fe5a8c1..78682a633fe3 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -255,7 +255,7 @@ Any BasicScriptListener_Impl::approveFiring( const ScriptEvent& aScriptEvent )
 void BasicScriptListener_Impl::disposing(const EventObject& ) throw ( RuntimeException )
 {
     // TODO: ???
-    //NAMESPACE_VOS(OGuard) guard( Application::GetSolarMutex() );
+    //vos::OGuard guard( Application::GetSolarMutex() );
     //xSbxObj.Clear();
 }
 
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 849fd839bfd1..80b5721be65f 100644..100755
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -3744,7 +3744,7 @@ BasicAllListener_Impl::~BasicAllListener_Impl()
 
 void BasicAllListener_Impl::firing_impl( const AllEventObject& Event, Any* pRet )
 {
-    NAMESPACE_VOS(OGuard) guard( Application::GetSolarMutex() );
+    vos::OGuard guard( Application::GetSolarMutex() );
 
     if( xSbxObj.Is() )
     {
@@ -3809,7 +3809,7 @@ Any BasicAllListener_Impl::approveFiring( const AllEventObject& Event ) throw (
 // Methoden von XEventListener
 void BasicAllListener_Impl ::disposing(const EventObject& ) throw ( RuntimeException )
 {
-    NAMESPACE_VOS(OGuard) guard( Application::GetSolarMutex() );
+    vos::OGuard guard( Application::GetSolarMutex() );
 
     xSbxObj.Clear();
 }
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index dbeb7c619b9d..7f492ced6aeb 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -3371,8 +3371,8 @@ RTLFUNC(Shell)
     }
     else
     {
-        USHORT nOptions = NAMESPACE_VOS(OProcess)::TOption_SearchPath|
-                          NAMESPACE_VOS(OProcess)::TOption_Detached;
+        USHORT nOptions = vos::OProcess::TOption_SearchPath|
+                          vos::OProcess::TOption_Detached;
         String aCmdLine = rPar.Get(1)->GetString();
         // Zusaetzliche Parameter anhaengen, es muss eh alles geparsed werden
         if( nArgCount >= 4 )
@@ -3450,13 +3450,13 @@ RTLFUNC(Shell)
             switch( nWinStyle )
             {
                 case 2:
-                    nOptions |= NAMESPACE_VOS(OProcess)::TOption_Minimized;
+                    nOptions |= vos::OProcess::TOption_Minimized;
                     break;
                 case 3:
-                    nOptions |= NAMESPACE_VOS(OProcess)::TOption_Maximized;
+                    nOptions |= vos::OProcess::TOption_Maximized;
                     break;
                 case 10:
-                    nOptions |= NAMESPACE_VOS(OProcess)::TOption_FullScreen;
+                    nOptions |= vos::OProcess::TOption_FullScreen;
                     break;
             }
 
@@ -3464,10 +3464,10 @@ RTLFUNC(Shell)
             if( nArgCount >= 5 )
                 bSync = rPar.Get(4)->GetBool();
             if( bSync )
-                nOptions |= NAMESPACE_VOS(OProcess)::TOption_Wait;
+                nOptions |= vos::OProcess::TOption_Wait;
         }
-        NAMESPACE_VOS(OProcess)::TProcessOption eOptions =
-            (NAMESPACE_VOS(OProcess)::TProcessOption)nOptions;
+        vos::OProcess::TProcessOption eOptions =
+            (vos::OProcess::TProcessOption)nOptions;
 
 
         // #72471 Parameter aufbereiten
@@ -3497,25 +3497,25 @@ RTLFUNC(Shell)
         }
 
         //const char* pParams = aParams.Len() ? aParams.GetStr() : 0;
-        NAMESPACE_VOS(OProcess)* pApp;
-        pApp = new NAMESPACE_VOS(OProcess)( aOUStrProgUNC );
+        vos::OProcess* pApp;
+        pApp = new vos::OProcess( aOUStrProgUNC );
         BOOL bSucc;
         if( nParamCount == 0 )
         {
-            bSucc = pApp->execute( eOptions ) == NAMESPACE_VOS(OProcess)::E_None;
+            bSucc = pApp->execute( eOptions ) == vos::OProcess::E_None;
         }
         else
         {
-            NAMESPACE_VOS(OArgumentList) aArgList( pArgumentList, nParamCount );
-            bSucc = pApp->execute( eOptions, aArgList ) == NAMESPACE_VOS(OProcess)::E_None;
+            vos::OArgumentList aArgList( pArgumentList, nParamCount );
+            bSucc = pApp->execute( eOptions, aArgList ) == vos::OProcess::E_None;
         }
 
         /*
         if( nParamCount == 0 )
-            pApp = new NAMESPACE_VOS(OProcess)( pProg );
+            pApp = new vos::OProcess( pProg );
         else
-            pApp = new NAMESPACE_VOS(OProcess)( pProg, pParamList, nParamCount );
-        BOOL bSucc = pApp->execute( eOptions ) == NAMESPACE_VOS(OProcess)::E_None;
+            pApp = new vos::OProcess( pProg, pParamList, nParamCount );
+        BOOL bSucc = pApp->execute( eOptions ) == vos::OProcess::E_None;
         */
 
         delete pApp;