INTEGRATION: CWS valgrind02 (1.18.12); FILE MERGED

2004/10/11 17:37:36 mhu 1.18.12.2: #i35209# Moved main() / SAL_IMPLEMENT_MAIN...() into global namespace.
2004/10/11 17:27:11 mhu 1.18.12.1: #i35209# Adapted to use SAL_IMPLEMENT_MAIN_WITH_ARGS() macro instead of plain main() function.

cpputools/source/unoexe/unoexe.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unoexe.cxx,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: kz $ $Date: 2004-06-11 12:33:40 $
+ *  last change: $Author: rt $ $Date: 2004-10-28 16:22:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,6 +62,7 @@
 #include <stdio.h>
 #include <vector>
 
+#include "sal/main.h"
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
 #include <osl/conditn.hxx>
@@ -640,8 +641,11 @@ void ODisposingListener::waitFor( const Reference< XComponent > & xComp )
 
 
 //##################################################################################################
+} // namespace unoexe
 
-extern "C" int SAL_CALL main( int argc, const char * argv[] )
+using namespace unoexe;
+
+SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 {
     if (argc <= 1)
     {
@@ -918,6 +922,5 @@ extern "C" int SAL_CALL main( int argc, const char * argv[] )
     return nRet;
 }
 
-}