diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-13 18:03:13 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-13 18:03:13 +0000 |
| commit | d9bacd08c92ed1295c083be0788f943c42938bdb (patch) | |
| tree | b107ad5ea60f4bb48e786dbb1af6af1494ddff7b /stoc | |
| parent | 528bf2b5966d7ee1c076812603c7e042fc567d47 (diff) | |
INTEGRATION: CWS cd02 (1.5.120); FILE MERGED
2004/11/15 17:29:04 dbo 1.5.120.1: #i24030# general cleanup to make buildable again
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/test/javavm/testjavavm.cxx | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx index aafb296514cf..5545b98116e9 100644 --- a/stoc/test/javavm/testjavavm.cxx +++ b/stoc/test/javavm/testjavavm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: testjavavm.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2003-04-23 16:15:36 $ + * last change: $Author: kz $ $Date: 2005-01-13 19:03:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,10 +64,9 @@ //#include <iostream> #include <stdio.h> +#include <sal/main.h> #include <rtl/process.h> -#include <vos/dynload.hxx> - #include <cppuhelper/servicefactory.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/bootstrap.hxx> @@ -84,7 +83,6 @@ using namespace std; using namespace rtl; using namespace cppu; -using namespace vos; using namespace com::sun::star::uno; using namespace com::sun::star::lang; //using namespace com::sun::star::reflection; @@ -187,12 +185,7 @@ sal_Bool testJavaVM(const Reference< XMultiServiceFactory > & xMgr ) return sal_True; } -extern -#if (defined UNX) || (defined OS2) -int main( int argc, char * argv[] ) -#else -int __cdecl main( int argc, char * argv[] ) -#endif +SAL_IMPLEMENT_MAIN() { Reference<XSimpleRegistry> xreg= createSimpleRegistry(); xreg->open( OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")), |