diff options
Diffstat (limited to 'bridges/source/jni_uno')
-rw-r--r-- | bridges/source/jni_uno/jni_base.h | 6 | ||||
-rw-r--r-- | bridges/source/jni_uno/jni_bridge.cxx | 6 | ||||
-rw-r--r-- | bridges/source/jni_uno/jni_bridge.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h index 163530437fd9..5e29c12674b0 100644 --- a/bridges/source/jni_uno/jni_base.h +++ b/bridges/source/jni_uno/jni_base.h @@ -149,7 +149,7 @@ public: m_jo( jo ) {} inline JLocalAutoRef( JLocalAutoRef & auto_ref ); - inline ~JLocalAutoRef() SAL_THROW(()); + inline ~JLocalAutoRef(); inline jobject get() const { return m_jo; } @@ -161,7 +161,7 @@ public: inline JLocalAutoRef & operator = ( JLocalAutoRef & auto_ref ); }; -inline JLocalAutoRef::~JLocalAutoRef() SAL_THROW(()) +inline JLocalAutoRef::~JLocalAutoRef() { if (0 != m_jo) m_jni->DeleteLocalRef( m_jo ); @@ -240,7 +240,7 @@ class TypeDescr public: inline explicit TypeDescr( typelib_TypeDescriptionReference * td_ref ); - inline ~TypeDescr() SAL_THROW(()) + inline ~TypeDescr() { TYPELIB_DANGER_RELEASE( m_td ); } inline typelib_TypeDescription * get() const diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx index 1cc914541e27..ed71b694788f 100644 --- a/bridges/source/jni_uno/jni_bridge.cxx +++ b/bridges/source/jni_uno/jni_bridge.cxx @@ -190,7 +190,7 @@ namespace jni_uno { -void Bridge::acquire() const SAL_THROW(()) +void Bridge::acquire() const { if (1 == osl_atomic_increment( &m_ref )) { @@ -212,7 +212,7 @@ void Bridge::acquire() const SAL_THROW(()) } -void Bridge::release() const SAL_THROW(()) +void Bridge::release() const { if (! osl_atomic_decrement( &m_ref )) { @@ -255,7 +255,7 @@ Bridge::Bridge( } -Bridge::~Bridge() SAL_THROW(()) +Bridge::~Bridge() { (*m_java_env->release)( m_java_env ); (*((uno_Environment *)m_uno_env)->release)( (uno_Environment *)m_uno_env ); diff --git a/bridges/source/jni_uno/jni_bridge.h b/bridges/source/jni_uno/jni_bridge.h index 5779ae71c866..e1a2aadecbb6 100644 --- a/bridges/source/jni_uno/jni_bridge.h +++ b/bridges/source/jni_uno/jni_bridge.h @@ -56,7 +56,7 @@ struct Bridge JNI_info const * m_jni_info; - ~Bridge() SAL_THROW(()); + ~Bridge(); explicit Bridge( uno_Environment * java_env, uno_ExtEnvironment * uno_env, bool registered_java2uno ); |