diff options
| author | Noel Grandin <noel@peralex.com> | 2014-06-05 08:13:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-06-05 08:17:49 +0200 |
| commit | 41e35159786a2bcad416e3541ba90a69b9d2f0db (patch) | |
| tree | 4c4e232aed4240dcb891a362981fceaf819f50a2 /cppu/source/helper | |
| parent | bf37694ab8c984e3cbbe666c408e0f168ba61f52 (diff) | |
cppu: remove SAL_THROW macro
Change-Id: I2f1909f953846f0d0b6fb402b4beb373bba8b2a8
Diffstat (limited to 'cppu/source/helper')
| -rw-r--r-- | cppu/source/helper/purpenv/Proxy.hxx | 3 | ||||
| -rw-r--r-- | cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx | 8 | ||||
| -rw-r--r-- | cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/cppu/source/helper/purpenv/Proxy.hxx b/cppu/source/helper/purpenv/Proxy.hxx index 68ff3faf6797..4791d7d6d67e 100644 --- a/cppu/source/helper/purpenv/Proxy.hxx +++ b/cppu/source/helper/purpenv/Proxy.hxx @@ -58,8 +58,7 @@ public: typelib_InterfaceTypeDescription * pTypeDescr, rtl::OUString const & rOId, cppu::helper::purpenv::ProbeFun * probeFun, - void * pProbeContext) - SAL_THROW(()); + void * pProbeContext); ~Proxy(void); void acquire(void); diff --git a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx index 074b8a1efcae..9375dd7fdfb0 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx @@ -119,14 +119,14 @@ Mapping::Mapping(uno_Environment * pFrom, uno_Environment * pTo, cppu::helper::purpenv::ProbeFun * probeFun, void * pProbeContext -) SAL_THROW(()) +) : m_from (pFrom), m_to (pTo), m_nCount (1), m_probeFun(probeFun), m_pContext(pProbeContext) { - LOG_LIFECYCLE_cppu_helper_purpenv_Mapping_emit(fprintf(stderr, "LIFE: %s -> %p\n", "Mapping::Mapping(uno_Environment * pFrom, uno_Environment * pTo) SAL_THROW(())", this)); + LOG_LIFECYCLE_cppu_helper_purpenv_Mapping_emit(fprintf(stderr, "LIFE: %s -> %p\n", "Mapping::Mapping(uno_Environment * pFrom, uno_Environment * pTo)", this)); uno_Mapping::acquire = s_acquire; uno_Mapping::release = s_release; @@ -189,7 +189,7 @@ void Mapping::mapInterface( } -void Mapping::acquire() SAL_THROW(()) +void Mapping::acquire() { if (osl_atomic_increment(&m_nCount) == 1) { @@ -199,7 +199,7 @@ void Mapping::acquire() SAL_THROW(()) } } -void Mapping::release() SAL_THROW(()) +void Mapping::release() { if (osl_atomic_decrement(&m_nCount) == 0) ::uno_revokeMapping(this); diff --git a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx index b02439eb6f21..d8e0dd40f98e 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx @@ -41,7 +41,6 @@ using namespace com::sun::star; static bool relatesToInterface(typelib_TypeDescription * pTypeDescr) - SAL_THROW(()) { switch (pTypeDescr->eTypeClass) { @@ -211,7 +210,6 @@ Proxy::Proxy(uno::Mapping const & to_from, cppu::helper::purpenv::ProbeFun * probeFun, void * pProbeContext ) - SAL_THROW(()) : m_nRef (1), m_from (pFrom), m_to (pTo), |