diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2011-11-30 11:05:16 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2011-11-30 11:27:42 +0900 |
commit | 7113c7152d1ec875e65e97548fa6243fc83fbc53 (patch) | |
tree | 9fa8fb3e89086e2ed06c8f210ed519331b254414 /bridges/source/jni_uno | |
parent | 2b2f6abfcc83c4701b42c92c6209a1052324f0a5 (diff) |
catch by constant reference
Diffstat (limited to 'bridges/source/jni_uno')
-rw-r--r-- | bridges/source/jni_uno/jni_bridge.cxx | 12 | ||||
-rw-r--r-- | bridges/source/jni_uno/jni_java2uno.cxx | 4 | ||||
-rw-r--r-- | bridges/source/jni_uno/nativethreadpool.cxx | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx index 2911ee200bff..170ba8d69b0c 100644 --- a/bridges/source/jni_uno/jni_bridge.cxx +++ b/bridges/source/jni_uno/jni_bridge.cxx @@ -106,7 +106,7 @@ void SAL_CALL Mapping_map_to_uno( } *ppUnoI = pUnoI; } - catch (BridgeRuntimeError & err) + catch (const BridgeRuntimeError & err) { #if OSL_DEBUG_LEVEL > 0 OString cstr_msg( @@ -118,7 +118,7 @@ void SAL_CALL Mapping_map_to_uno( (void) err; // unused #endif } - catch (::jvmaccess::VirtualMachine::AttachGuard::CreationException &) + catch (const ::jvmaccess::VirtualMachine::AttachGuard::CreationException &) { OSL_FAIL( "[jni_uno bridge error] attaching current thread " @@ -175,7 +175,7 @@ void SAL_CALL Mapping_map_to_java( jni->DeleteLocalRef( jlocal ); } } - catch (BridgeRuntimeError & err) + catch (const BridgeRuntimeError & err) { #if OSL_DEBUG_LEVEL > 0 OString cstr_msg( @@ -187,7 +187,7 @@ void SAL_CALL Mapping_map_to_java( (void) err; // unused #endif } - catch (::jvmaccess::VirtualMachine::AttachGuard::CreationException &) + catch (const ::jvmaccess::VirtualMachine::AttachGuard::CreationException &) { OSL_FAIL( "[jni_uno bridge error] attaching current thread to java failed!" ); @@ -537,7 +537,7 @@ void SAL_CALL uno_ext_getMapping( (uno_Environment *)pFrom->pExtEnv, pTo, 0 ); } } - catch (BridgeRuntimeError & err) + catch (const BridgeRuntimeError & err) { #if OSL_DEBUG_LEVEL > 0 OString cstr_msg( @@ -549,7 +549,7 @@ void SAL_CALL uno_ext_getMapping( (void) err; // unused #endif } - catch (::jvmaccess::VirtualMachine::AttachGuard::CreationException &) + catch (const ::jvmaccess::VirtualMachine::AttachGuard::CreationException &) { OSL_FAIL( "[jni_uno bridge error] attaching current thread " diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx index 845eb4241d13..d8496f049841 100644 --- a/bridges/source/jni_uno/jni_java2uno.cxx +++ b/bridges/source/jni_uno/jni_java2uno.cxx @@ -615,7 +615,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call( buf.append( jni.get_stack_trace() ); throw BridgeRuntimeError( buf.makeStringAndClear() ); } - catch (BridgeRuntimeError & err) + catch (const BridgeRuntimeError & err) { OUStringBuffer buf( 128 ); buf.appendAscii( @@ -636,7 +636,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call( } return 0; } - catch (::jvmaccess::VirtualMachine::AttachGuard::CreationException &) + catch (const ::jvmaccess::VirtualMachine::AttachGuard::CreationException &) { OString cstr_msg( OString( RTL_CONSTASCII_STRINGPARAM( diff --git a/bridges/source/jni_uno/nativethreadpool.cxx b/bridges/source/jni_uno/nativethreadpool.cxx index f068a0f7b30d..b51031756889 100644 --- a/bridges/source/jni_uno/nativethreadpool.cxx +++ b/bridges/source/jni_uno/nativethreadpool.cxx @@ -84,7 +84,7 @@ static void SAL_CALL executeRequest(void * data) { env->CallObjectMethod(job->job, job->pool->execute); env->DeleteGlobalRef(job->job); delete job; - } catch (jvmaccess::VirtualMachine::AttachGuard::CreationException &) { + } catch (const jvmaccess::VirtualMachine::AttachGuard::CreationException &) { //TODO: DeleteGlobalRef(job->job) delete job; } @@ -141,7 +141,7 @@ Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_create( return reinterpret_cast< jlong >(new Pool( new jvmaccess::VirtualMachine(vm, env->GetVersion(), false, env), execute, uno_threadpool_create())); - } catch (std::bad_alloc) { + } catch (const std::bad_alloc &) { throwOutOfMemory(env); return 0; } |