diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-02-07 22:59:52 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-02-07 23:00:14 +0100 |
commit | 5ab2409037bf394c7f5c32986214f38d3421164b (patch) | |
tree | 55ec00ab340639c170030127ac95ef4fd8236969 /stoc | |
parent | use locally built cppunittester (diff) | |
download | core-5ab2409037bf394c7f5c32986214f38d3421164b.tar.gz core-5ab2409037bf394c7f5c32986214f38d3421164b.zip |
Remove dead code
Diffstat (limited to 'stoc')
-rw-r--r-- | stoc/test/javavm/jvm_interaction/interactionhandler.cxx | 6 | ||||
-rw-r--r-- | stoc/test/javavm/testjavavm.cxx | 32 |
2 files changed, 1 insertions, 37 deletions
diff --git a/stoc/test/javavm/jvm_interaction/interactionhandler.cxx b/stoc/test/javavm/jvm_interaction/interactionhandler.cxx index c45fc9a12b6e..a4e961d43466 100644 --- a/stoc/test/javavm/jvm_interaction/interactionhandler.cxx +++ b/stoc/test/javavm/jvm_interaction/interactionhandler.cxx @@ -29,7 +29,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_stoc.hxx" - #include <jni.h> #include <stdio.h> @@ -60,12 +59,12 @@ #include <com/sun/star/java/JavaVMCreationFailureException.hpp> #include <cppuhelper/implbase1.hxx> #include <uno/current_context.hxx> + using namespace std; using namespace rtl; using namespace cppu; using namespace com::sun::star::uno; using namespace com::sun::star::lang; -//using namespace com::sun::star::reflection; using namespace com::sun::star::lang; using namespace com::sun::star::registry; using namespace com::sun::star::java; @@ -119,9 +118,6 @@ void SAL_CALL InteractionHandler::handle( const Reference< XInteractionRequest > break; } -// if( abort.is()) -// abort->select(); - static int cRetry= 0; if( cRetry++ == 5) diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx index e74cf0a8b417..c585e771a293 100644 --- a/stoc/test/javavm/testjavavm.cxx +++ b/stoc/test/javavm/testjavavm.cxx @@ -29,7 +29,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_stoc.hxx" - #include <jni.h> #include <stdio.h> @@ -52,7 +51,6 @@ using namespace rtl; using namespace cppu; using namespace com::sun::star::uno; using namespace com::sun::star::lang; -//using namespace com::sun::star::reflection; using namespace com::sun::star::lang; using namespace com::sun::star::registry; using namespace com::sun::star::java; @@ -102,44 +100,15 @@ sal_Bool testJavaVM(const Reference< XMultiServiceFactory > & xMgr ) if( _jvm->AttachCurrentThread((void**) &p_env, 0)) return sal_False; -// jclass aJProg = p_env->FindClass("TestJavaVM"); -// if( p_env->ExceptionOccurred()){ -// p_env->ExceptionDescribe(); -// p_env->ExceptionClear(); -// } -// -// jmethodID mid= p_env->GetStaticMethodID( aJProg,"main", "([Ljava/lang/String;)V"); - jclass cls = p_env->FindClass( "TestJavaVM"); if (cls == 0) { OSL_TRACE( "Can't find Prog class\n"); exit(1); } -// jmethodID methid = p_env->GetStaticMethodID( cls, "main", "([Ljava/lang/String;)V"); -// if (methid == 0) { -// OSL_TRACE("Can't find Prog.main\n"); -// exit(1); -// } - -// jstring jstr = p_env->NewStringUTF(" from C!"); -// if (jstr == 0) { -// OSL_TRACE("Out of memory\n"); -// exit(1); -// } -// jobjectArray args = p_env->NewObjectArray( 1, -// p_env->FindClass("java/lang/String"), jstr); -// if (args == 0) { -// OSL_TRACE( "Out of memory\n"); -// exit(1); -// } -// p_env->CallStaticVoidMethod( cls, methid, args); - - jmethodID id = p_env->GetStaticMethodID( cls, "getInt", "()I"); if( id) { -// jint _i= p_env->CallStaticIntMethod(cls, id); p_env->CallStaticIntMethod(cls, id); } @@ -193,7 +162,6 @@ SAL_IMPLEMENT_MAIN() Reference< XComponent > xCompContext( context, UNO_QUERY ); xCompContext->dispose(); printf("javavm %s", bSucc ? "succeeded" : "failed"); -// cout << "javavm " << (bSucc ? "succeeded" : "failed") << " !" << endl; return (bSucc ? 0 : -1); } |