summaryrefslogtreecommitdiff
path: root/cli_ure
diff options
context:
space:
mode:
Diffstat (limited to 'cli_ure')
-rw-r--r--cli_ure/source/uno_bridge/cli_base.h2
-rw-r--r--cli_ure/source/uno_bridge/cli_bridge.cxx6
-rw-r--r--cli_ure/source/uno_bridge/cli_bridge.h6
3 files changed, 7 insertions, 7 deletions
diff --git a/cli_ure/source/uno_bridge/cli_base.h b/cli_ure/source/uno_bridge/cli_base.h
index 284d44f09106..ebe00c23c5c6 100644
--- a/cli_ure/source/uno_bridge/cli_base.h
+++ b/cli_ure/source/uno_bridge/cli_base.h
@@ -145,7 +145,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/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx
index 4b1a3088ce35..279c4bb10e23 100644
--- a/cli_ure/source/uno_bridge/cli_bridge.cxx
+++ b/cli_ure/source/uno_bridge/cli_bridge.cxx
@@ -177,7 +177,7 @@ namespace cli_uno
calls acquire then they must have kept an unacquired pointer which is
illegal.
*/
-void Bridge::acquire() const SAL_THROW(())
+void Bridge::acquire() const
{
if (1 == osl_atomic_increment( &m_ref ))
{
@@ -196,7 +196,7 @@ void Bridge::acquire() const SAL_THROW(())
}
}
-void Bridge::release() const SAL_THROW(())
+void Bridge::release() const
{
if (! osl_atomic_decrement( &m_ref ))
{
@@ -233,7 +233,7 @@ Bridge::Bridge(
}
-Bridge::~Bridge() SAL_THROW(())
+Bridge::~Bridge()
{
//System::GC::Collect();
(*m_uno_cli_env->release)( m_uno_cli_env );
diff --git a/cli_ure/source/uno_bridge/cli_bridge.h b/cli_ure/source/uno_bridge/cli_bridge.h
index 1b14cd87165f..fc6d92e5ccba 100644
--- a/cli_ure/source/uno_bridge/cli_bridge.h
+++ b/cli_ure/source/uno_bridge/cli_bridge.h
@@ -64,11 +64,11 @@ struct Bridge
Mapping m_uno2cli;
bool m_registered_cli2uno;
- ~Bridge() SAL_THROW(());
+ ~Bridge();
Bridge( uno_Environment * java_env, uno_ExtEnvironment * uno_env, bool registered_java2uno );
- void acquire() const SAL_THROW(());
- void release() const SAL_THROW(());
+ void acquire() const;
+ void release() const;
void map_to_uno(
void * uno_data, System::Object^ cli_data,