summaryrefslogtreecommitdiff
path: root/cppu
diff options
context:
space:
mode:
Diffstat (limited to 'cppu')
-rw-r--r--cppu/source/AffineBridge/AffineBridge.cxx3
-rw-r--r--cppu/source/LogBridge/LogBridge.cxx3
-rw-r--r--cppu/source/UnsafeBridge/UnsafeBridge.cxx3
-rw-r--r--cppu/source/cppu/compat.cxx7
-rw-r--r--cppu/source/cppu/cppu_opt.cxx9
-rw-r--r--cppu/source/helper/purpenv/helper_purpenv_Environment.cxx8
-rw-r--r--cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx12
-rw-r--r--cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx9
-rw-r--r--cppu/source/threadpool/current.cxx6
-rw-r--r--cppu/source/threadpool/threadident.cxx9
-rw-r--r--cppu/source/threadpool/threadpool.cxx15
-rw-r--r--cppu/source/typelib/static_types.cxx24
-rw-r--r--cppu/source/typelib/typelib.cxx87
-rw-r--r--cppu/source/uno/EnvStack.cxx15
-rw-r--r--cppu/source/uno/any.cxx24
-rw-r--r--cppu/source/uno/cascade_mapping.cxx3
-rw-r--r--cppu/source/uno/data.cxx39
-rw-r--r--cppu/source/uno/lbenv.cxx15
-rw-r--r--cppu/source/uno/lbmap.cxx18
-rw-r--r--cppu/source/uno/sequence.cxx27
20 files changed, 117 insertions, 219 deletions
diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx
index 3e2b01df1cca..147c9278bb40 100644
--- a/cppu/source/AffineBridge/AffineBridge.cxx
+++ b/cppu/source/AffineBridge/AffineBridge.cxx
@@ -344,8 +344,7 @@ bool AffineBridge::v_isValid(OUString * pReason)
#endif
-extern "C" void SAL_DLLPUBLIC_EXPORT uno_initEnvironment(uno_Environment * pEnv)
- SAL_THROW_EXTERN_C()
+extern "C" void SAL_DLLPUBLIC_EXPORT uno_initEnvironment(uno_Environment * pEnv) noexcept
{
cppu::helper::purpenv::Environment_initWithEnterable(pEnv, new AffineBridge());
}
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx
index b93b43b64e78..34eb0fcabcba 100644
--- a/cppu/source/LogBridge/LogBridge.cxx
+++ b/cppu/source/LogBridge/LogBridge.cxx
@@ -246,8 +246,7 @@ static void LogProbe(
#endif
-extern "C" void SAL_DLLPUBLIC_EXPORT uno_initEnvironment(uno_Environment * pEnv)
- SAL_THROW_EXTERN_C()
+extern "C" void SAL_DLLPUBLIC_EXPORT uno_initEnvironment(uno_Environment * pEnv) noexcept
{
cppu::helper::purpenv::Environment_initWithEnterable(pEnv, new LogBridge());
}
diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
index 491a888c3921..3f95cf93e625 100644
--- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx
+++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
@@ -128,8 +128,7 @@ bool UnsafeBridge::v_isValid(OUString * pReason)
return result;
}
-extern "C" void SAL_DLLPUBLIC_EXPORT uno_initEnvironment(uno_Environment * pEnv)
- SAL_THROW_EXTERN_C()
+extern "C" void SAL_DLLPUBLIC_EXPORT uno_initEnvironment(uno_Environment * pEnv) noexcept
{
cppu::helper::purpenv::Environment_initWithEnterable(pEnv, new UnsafeBridge());
}
diff --git a/cppu/source/cppu/compat.cxx b/cppu/source/cppu/compat.cxx
index 06181e6efa11..06ae1bf19bc0 100644
--- a/cppu/source/cppu/compat.cxx
+++ b/cppu/source/cppu/compat.cxx
@@ -21,14 +21,14 @@ extern "C" {
SAL_DLLPUBLIC_EXPORT void SAL_CALL typelib_static_array_type_init(
typelib_TypeDescriptionReference **, typelib_TypeDescriptionReference *,
- sal_Int32, ...) SAL_THROW_EXTERN_C()
+ sal_Int32, ...) noexcept
{
std::abort();
}
SAL_DLLPUBLIC_EXPORT void SAL_CALL typelib_typedescription_newArray(
typelib_TypeDescription **, typelib_TypeDescriptionReference *,
- sal_Int32, sal_Int32 *) SAL_THROW_EXTERN_C()
+ sal_Int32, sal_Int32 *) noexcept
{
std::abort();
}
@@ -36,8 +36,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL typelib_typedescription_newArray(
SAL_DLLPUBLIC_EXPORT void SAL_CALL typelib_typedescription_newUnion(
typelib_TypeDescription **, rtl_uString *,
typelib_TypeDescriptionReference *, sal_Int64,
- typelib_TypeDescriptionReference *, sal_Int32, void *)
- SAL_THROW_EXTERN_C()
+ typelib_TypeDescriptionReference *, sal_Int32, void *) noexcept
{
std::abort();
}
diff --git a/cppu/source/cppu/cppu_opt.cxx b/cppu/source/cppu/cppu_opt.cxx
index 40f90de6e347..9522c21ce525 100644
--- a/cppu/source/cppu/cppu_opt.cxx
+++ b/cppu/source/cppu/cppu_opt.cxx
@@ -29,8 +29,7 @@ using namespace ::rtl;
extern "C" rtl_uString * SAL_CALL cppu_unsatisfied_iquery_msg(
- typelib_TypeDescriptionReference * pType )
- SAL_THROW_EXTERN_C()
+ typelib_TypeDescriptionReference * pType ) noexcept
{
OUString ret = "unsatisfied query for interface of type "
+ OUString::unacquired( &pType->pTypeName ) + "!";
@@ -40,8 +39,7 @@ extern "C" rtl_uString * SAL_CALL cppu_unsatisfied_iquery_msg(
extern "C" rtl_uString * SAL_CALL cppu_unsatisfied_iset_msg(
- typelib_TypeDescriptionReference * pType )
- SAL_THROW_EXTERN_C()
+ typelib_TypeDescriptionReference * pType ) noexcept
{
OUString ret = "invalid attempt to assign an empty interface of type "
+ OUString::unacquired( &pType->pTypeName ) + "!";
@@ -51,8 +49,7 @@ extern "C" rtl_uString * SAL_CALL cppu_unsatisfied_iset_msg(
extern "C" rtl_uString * SAL_CALL cppu_Any_extraction_failure_msg(
- uno_Any const * pAny, typelib_TypeDescriptionReference * pType )
- SAL_THROW_EXTERN_C()
+ uno_Any const * pAny, typelib_TypeDescriptionReference * pType ) noexcept
{
OUString ret = "Cannot extract an Any(" +
OUString::unacquired(&pAny->pType->pTypeName) +
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
index a0163939ffb5..50e6eba1c3c4 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
@@ -128,25 +128,25 @@ static void s_acquire(uno_Environment * pEnv) //SAL_THROW_EXTERN_C()
pBase->acquire();
}
-static void s_release(uno_Environment * pEnv) SAL_THROW_EXTERN_C()
+static void s_release(uno_Environment * pEnv) noexcept
{
Base * pBase = static_cast<Base *>(pEnv->pReserved);
pBase->release();
}
-static void s_harden(uno_Environment ** ppHardEnv, uno_Environment * pEnv) SAL_THROW_EXTERN_C()
+static void s_harden(uno_Environment ** ppHardEnv, uno_Environment * pEnv) noexcept
{
Base * pBase = static_cast<Base *>(pEnv->pReserved);
pBase->harden(ppHardEnv);
}
-static void s_acquireWeak(uno_Environment * pEnv) SAL_THROW_EXTERN_C()
+static void s_acquireWeak(uno_Environment * pEnv) noexcept
{
Base * pBase = static_cast<Base *>(pEnv->pReserved);
pBase->acquireWeak();
}
-static void s_releaseWeak(uno_Environment * pEnv) SAL_THROW_EXTERN_C()
+static void s_releaseWeak(uno_Environment * pEnv) noexcept
{
Base * pBase = static_cast<Base *>(pEnv->pReserved);
pBase->releaseWeak();
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
index e5d96658dcf5..1fc4436f4f2f 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
@@ -63,8 +63,7 @@ static void s_mapInterface(
uno_Mapping * puno_Mapping,
void ** ppOut,
void * pUnoI,
- typelib_InterfaceTypeDescription * pTypeDescr )
- SAL_THROW_EXTERN_C()
+ typelib_InterfaceTypeDescription * pTypeDescr ) noexcept
{
Mapping * pMapping = static_cast<Mapping *>(puno_Mapping);
pMapping->mapInterface(
@@ -73,15 +72,13 @@ static void s_mapInterface(
}
extern "C" {
-static void s_acquire(uno_Mapping * puno_Mapping)
- SAL_THROW_EXTERN_C()
+static void s_acquire(uno_Mapping * puno_Mapping) noexcept
{
Mapping * pMapping = static_cast<Mapping *>(puno_Mapping);
pMapping->acquire();
}
-static void s_release(uno_Mapping * puno_Mapping)
- SAL_THROW_EXTERN_C()
+static void s_release(uno_Mapping * puno_Mapping) noexcept
{
Mapping * pMapping = static_cast<Mapping * >(puno_Mapping);
pMapping->release();
@@ -97,8 +94,7 @@ static void s_getIdentifier_v(va_list * pParam)
pEnv->getObjectIdentifier(pEnv, ppOid, pUnoI);
}
-static void s_free(uno_Mapping * puno_Mapping)
- SAL_THROW_EXTERN_C()
+static void s_free(uno_Mapping * puno_Mapping) noexcept
{
Mapping * pMapping = static_cast<Mapping *>(puno_Mapping);
delete pMapping;
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
index db4820fc9a45..fc4f82daf07c 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
@@ -103,8 +103,7 @@ extern "C" { static void s_Proxy_dispatch(
typelib_TypeDescription const * pMemberType,
void * pReturn,
void * pArgs[],
- uno_Any ** ppException)
- SAL_THROW_EXTERN_C()
+ uno_Any ** ppException) noexcept
{
Proxy * pThis = static_cast<Proxy *>(pUnoI);
@@ -158,20 +157,20 @@ extern "C" { static void s_Proxy_dispatch(
ppException );
}}
-extern "C" void Proxy_free(SAL_UNUSED_PARAMETER uno_ExtEnvironment * /*pEnv*/, void * pProxy) SAL_THROW_EXTERN_C()
+extern "C" void Proxy_free(SAL_UNUSED_PARAMETER uno_ExtEnvironment * /*pEnv*/, void * pProxy) noexcept
{
Proxy * pThis = static_cast<Proxy * >(static_cast<uno_Interface *>(pProxy));
delete pThis;
}
extern "C" {
-static void s_Proxy_acquire(uno_Interface * pUnoI) SAL_THROW_EXTERN_C()
+static void s_Proxy_acquire(uno_Interface * pUnoI) noexcept
{
Proxy * pProxy = static_cast<Proxy *>(pUnoI);
pProxy->acquire();
}
-static void s_Proxy_release(uno_Interface * pUnoI) SAL_THROW_EXTERN_C()
+static void s_Proxy_release(uno_Interface * pUnoI) noexcept
{
Proxy * pProxy = static_cast<Proxy *>(pUnoI);
pProxy->release();
diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx
index 0e2a3b70196e..efb66e3166ba 100644
--- a/cppu/source/threadpool/current.cxx
+++ b/cppu/source/threadpool/current.cxx
@@ -117,8 +117,7 @@ IdContainer& getIdContainer()
extern "C" sal_Bool SAL_CALL uno_setCurrentContext(
void * pCurrentContext,
- rtl_uString * pEnvTypeName, void * pEnvContext )
- SAL_THROW_EXTERN_C()
+ rtl_uString * pEnvTypeName, void * pEnvContext ) noexcept
{
IdContainer& id = getIdContainer();
@@ -163,8 +162,7 @@ extern "C" sal_Bool SAL_CALL uno_setCurrentContext(
}
extern "C" sal_Bool SAL_CALL uno_getCurrentContext(
- void ** ppCurrentContext, rtl_uString * pEnvTypeName, void * pEnvContext )
- SAL_THROW_EXTERN_C()
+ void ** ppCurrentContext, rtl_uString * pEnvTypeName, void * pEnvContext ) noexcept
{
IdContainer& id = getIdContainer();
diff --git a/cppu/source/threadpool/threadident.cxx b/cppu/source/threadpool/threadident.cxx
index f2b9511e6b46..8add14a2d5fa 100644
--- a/cppu/source/threadpool/threadident.cxx
+++ b/cppu/source/threadpool/threadident.cxx
@@ -42,8 +42,7 @@ static void createLocalId( sal_Sequence **ppThreadId )
}
extern "C" void SAL_CALL
-uno_getIdOfCurrentThread( sal_Sequence **ppThreadId )
- SAL_THROW_EXTERN_C()
+uno_getIdOfCurrentThread( sal_Sequence **ppThreadId ) noexcept
{
IdContainer& id = getIdContainer();
if (!id.bInit)
@@ -72,8 +71,7 @@ uno_getIdOfCurrentThread( sal_Sequence **ppThreadId )
}
}
-extern "C" void SAL_CALL uno_releaseIdFromCurrentThread()
- SAL_THROW_EXTERN_C()
+extern "C" void SAL_CALL uno_releaseIdFromCurrentThread() noexcept
{
IdContainer& id = getIdContainer();
OSL_ASSERT( id.bInit );
@@ -86,8 +84,7 @@ extern "C" void SAL_CALL uno_releaseIdFromCurrentThread()
}
}
-extern "C" sal_Bool SAL_CALL uno_bindIdToCurrentThread( sal_Sequence *pThreadId )
- SAL_THROW_EXTERN_C()
+extern "C" sal_Bool SAL_CALL uno_bindIdToCurrentThread( sal_Sequence *pThreadId ) noexcept
{
IdContainer& id = getIdContainer();
if (!id.bInit)
diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx
index 7084978a93d0..2e5e7d22657a 100644
--- a/cppu/source/threadpool/threadpool.cxx
+++ b/cppu/source/threadpool/threadpool.cxx
@@ -366,7 +366,7 @@ ThreadPoolHolder getThreadPool( uno_ThreadPool hPool )
}
extern "C" uno_ThreadPool SAL_CALL
-uno_threadpool_create() SAL_THROW_EXTERN_C()
+uno_threadpool_create() noexcept
{
MutexGuard guard( Mutex::getGlobalMutex() );
ThreadPoolHolder p;
@@ -388,7 +388,7 @@ uno_threadpool_create() SAL_THROW_EXTERN_C()
}
extern "C" void SAL_CALL
-uno_threadpool_attach( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C()
+uno_threadpool_attach( uno_ThreadPool hPool ) noexcept
{
sal_Sequence *pThreadId = nullptr;
uno_getIdOfCurrentThread( &pThreadId );
@@ -398,8 +398,7 @@ uno_threadpool_attach( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C()
}
extern "C" void SAL_CALL
-uno_threadpool_enter( uno_ThreadPool hPool , void **ppJob )
- SAL_THROW_EXTERN_C()
+uno_threadpool_enter( uno_ThreadPool hPool , void **ppJob ) noexcept
{
sal_Sequence *pThreadId = nullptr;
uno_getIdOfCurrentThread( &pThreadId );
@@ -412,7 +411,7 @@ uno_threadpool_enter( uno_ThreadPool hPool , void **ppJob )
}
extern "C" void SAL_CALL
-uno_threadpool_detach(SAL_UNUSED_PARAMETER uno_ThreadPool) SAL_THROW_EXTERN_C()
+uno_threadpool_detach(SAL_UNUSED_PARAMETER uno_ThreadPool) noexcept
{
// we might do here some tidying up in case a thread called attach but never detach
}
@@ -423,7 +422,7 @@ uno_threadpool_putJob(
sal_Sequence *pThreadId,
void *pJob,
void ( SAL_CALL * doRequest ) ( void *pThreadSpecificData ),
- sal_Bool bIsOneway ) SAL_THROW_EXTERN_C()
+ sal_Bool bIsOneway ) noexcept
{
if (!getThreadPool(hPool)->addJob( pThreadId, bIsOneway, pJob ,doRequest, hPool ))
{
@@ -434,14 +433,14 @@ uno_threadpool_putJob(
}
extern "C" void SAL_CALL
-uno_threadpool_dispose( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C()
+uno_threadpool_dispose( uno_ThreadPool hPool ) noexcept
{
getThreadPool(hPool)->dispose(
hPool );
}
extern "C" void SAL_CALL
-uno_threadpool_destroy( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C()
+uno_threadpool_destroy( uno_ThreadPool hPool ) noexcept
{
ThreadPoolHolder p( getThreadPool(hPool) );
p->destroy(
diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx
index f91dbed71ddb..c5af49b7164f 100644
--- a/cppu/source/typelib/static_types.cxx
+++ b/cppu/source/typelib/static_types.cxx
@@ -105,8 +105,7 @@ extern "C"
{
typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass(
- typelib_TypeClass eTypeClass )
- SAL_THROW_EXTERN_C()
+ typelib_TypeClass eTypeClass ) noexcept
{
static typelib_TypeDescriptionReference * s_aTypes[] = {
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
@@ -271,8 +270,7 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass(
void SAL_CALL typelib_static_type_init(
typelib_TypeDescriptionReference ** ppRef,
- typelib_TypeClass eTypeClass, const char * pTypeName )
- SAL_THROW_EXTERN_C()
+ typelib_TypeClass eTypeClass, const char * pTypeName ) noexcept
{
if (! *ppRef)
{
@@ -290,8 +288,7 @@ void SAL_CALL typelib_static_type_init(
void SAL_CALL typelib_static_sequence_type_init(
typelib_TypeDescriptionReference ** ppRef,
- typelib_TypeDescriptionReference * pElementType )
- SAL_THROW_EXTERN_C()
+ typelib_TypeDescriptionReference * pElementType ) noexcept
{
if ( *ppRef)
return;
@@ -409,8 +406,7 @@ void SAL_CALL typelib_static_compound_type_init(
typelib_TypeDescriptionReference ** ppRef,
typelib_TypeClass eTypeClass, const char * pTypeName,
typelib_TypeDescriptionReference * pBaseType,
- sal_Int32 nMembers, typelib_TypeDescriptionReference ** ppMembers )
- SAL_THROW_EXTERN_C()
+ sal_Int32 nMembers, typelib_TypeDescriptionReference ** ppMembers ) noexcept
{
init(ppRef, eTypeClass, pTypeName, pBaseType, nMembers, ppMembers, nullptr);
}
@@ -419,8 +415,7 @@ void SAL_CALL typelib_static_struct_type_init(
typelib_TypeDescriptionReference ** ppRef, const char * pTypeName,
typelib_TypeDescriptionReference * pBaseType,
sal_Int32 nMembers, typelib_TypeDescriptionReference ** ppMembers,
- sal_Bool const * pParameterizedTypes )
- SAL_THROW_EXTERN_C()
+ sal_Bool const * pParameterizedTypes ) noexcept
{
init(
ppRef, typelib_TypeClass_STRUCT, pTypeName, pBaseType, nMembers,
@@ -430,8 +425,7 @@ void SAL_CALL typelib_static_struct_type_init(
void SAL_CALL typelib_static_interface_type_init(
typelib_TypeDescriptionReference ** ppRef,
const char * pTypeName,
- typelib_TypeDescriptionReference * pBaseType )
- SAL_THROW_EXTERN_C()
+ typelib_TypeDescriptionReference * pBaseType ) noexcept
{
// coverity[callee_ptr_arith] - not a bug
typelib_static_mi_interface_type_init(
@@ -442,8 +436,7 @@ void SAL_CALL typelib_static_mi_interface_type_init(
typelib_TypeDescriptionReference ** ppRef,
const char * pTypeName,
sal_Int32 nBaseTypes,
- typelib_TypeDescriptionReference ** ppBaseTypes )
- SAL_THROW_EXTERN_C()
+ typelib_TypeDescriptionReference ** ppBaseTypes ) noexcept
{
if ( *ppRef)
return;
@@ -505,8 +498,7 @@ void SAL_CALL typelib_static_mi_interface_type_init(
void SAL_CALL typelib_static_enum_type_init(
typelib_TypeDescriptionReference ** ppRef,
const char * pTypeName,
- sal_Int32 nDefaultValue )
- SAL_THROW_EXTERN_C()
+ sal_Int32 nDefaultValue ) noexcept
{
if ( *ppRef)
return;
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index c482b725f80e..034a1819db91 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -274,8 +274,7 @@ TypeDescriptor_Init_Impl& Init()
}
extern "C" void SAL_CALL typelib_typedescription_registerCallback(
- void * pContext, typelib_typedescription_Callback pCallback )
- SAL_THROW_EXTERN_C()
+ void * pContext, typelib_typedescription_Callback pCallback ) noexcept
{
// todo mt safe: guard is no solution, can not acquire while calling callback!
TypeDescriptor_Init_Impl &rInit = Init();
@@ -285,8 +284,7 @@ extern "C" void SAL_CALL typelib_typedescription_registerCallback(
extern "C" void SAL_CALL typelib_typedescription_revokeCallback(
- void * pContext, typelib_typedescription_Callback pCallback )
- SAL_THROW_EXTERN_C()
+ void * pContext, typelib_typedescription_Callback pCallback ) noexcept
{
TypeDescriptor_Init_Impl &rInit = Init();
{
@@ -471,8 +469,7 @@ bool complete(typelib_TypeDescription ** ppTypeDescr, bool initTables) {
extern "C" void typelib_typedescription_newEmpty(
typelib_TypeDescription ** ppRet,
- typelib_TypeClass eTypeClass, rtl_uString * pTypeName )
- SAL_THROW_EXTERN_C()
+ typelib_TypeClass eTypeClass, rtl_uString * pTypeName ) noexcept
{
if( *ppRet )
{
@@ -768,8 +765,7 @@ extern "C" void SAL_CALL typelib_typedescription_new(
rtl_uString * pTypeName,
typelib_TypeDescriptionReference * pType,
sal_Int32 nMembers,
- typelib_CompoundMember_Init * pMembers )
- SAL_THROW_EXTERN_C()
+ typelib_CompoundMember_Init * pMembers ) noexcept
{
newTypeDescription(
ppRet, eTypeClass, pTypeName, pType, nMembers, pMembers, nullptr);
@@ -780,8 +776,7 @@ extern "C" void SAL_CALL typelib_typedescription_newStruct(
rtl_uString * pTypeName,
typelib_TypeDescriptionReference * pType,
sal_Int32 nMembers,
- typelib_StructMember_Init * pMembers )
- SAL_THROW_EXTERN_C()
+ typelib_StructMember_Init * pMembers ) noexcept
{
newTypeDescription(
ppRet, typelib_TypeClass_STRUCT, pTypeName, pType, nMembers, nullptr,
@@ -795,8 +790,7 @@ extern "C" void SAL_CALL typelib_typedescription_newEnum(
sal_Int32 nDefaultValue,
sal_Int32 nEnumValues,
rtl_uString ** ppEnumNames,
- sal_Int32 * pEnumValues )
- SAL_THROW_EXTERN_C()
+ sal_Int32 * pEnumValues ) noexcept
{
typelib_typedescription_newEmpty( ppRet, typelib_TypeClass_ENUM, pTypeName );
typelib_EnumTypeDescription * pEnum = reinterpret_cast<typelib_EnumTypeDescription *>(*ppRet);
@@ -828,8 +822,7 @@ extern "C" void SAL_CALL typelib_typedescription_newInterface(
SAL_UNUSED_PARAMETER sal_uInt32,
typelib_TypeDescriptionReference * pBaseInterface,
sal_Int32 nMembers,
- typelib_TypeDescriptionReference ** ppMembers )
- SAL_THROW_EXTERN_C()
+ typelib_TypeDescriptionReference ** ppMembers ) noexcept
{
// coverity[callee_ptr_arith] - not a bug
typelib_typedescription_newMIInterface(
@@ -918,8 +911,7 @@ extern "C" void SAL_CALL typelib_typedescription_newMIInterface(
sal_Int32 nBaseInterfaces,
typelib_TypeDescriptionReference ** ppBaseInterfaces,
sal_Int32 nMembers,
- typelib_TypeDescriptionReference ** ppMembers )
- SAL_THROW_EXTERN_C()
+ typelib_TypeDescriptionReference ** ppMembers ) noexcept
{
if (*ppRet != nullptr) {
typelib_typedescription_release(&(*ppRet)->aBase);
@@ -1049,8 +1041,7 @@ extern "C" void SAL_CALL typelib_typedescription_newInterfaceMethod(
sal_Int32 nParams,
typelib_Parameter_Init * pParams,
sal_Int32 nExceptions,
- rtl_uString ** ppExceptionNames )
- SAL_THROW_EXTERN_C()
+ rtl_uString ** ppExceptionNames ) noexcept
{
if (*ppRet != nullptr) {
typelib_typedescription_release(&(*ppRet)->aBase.aBase);
@@ -1123,8 +1114,7 @@ extern "C" void SAL_CALL typelib_typedescription_newInterfaceAttribute(
rtl_uString * pTypeName,
typelib_TypeClass eAttributeTypeClass,
rtl_uString * pAttributeTypeName,
- sal_Bool bReadOnly )
- SAL_THROW_EXTERN_C()
+ sal_Bool bReadOnly ) noexcept
{
typelib_typedescription_newExtendedInterfaceAttribute(
ppRet, nAbsolutePosition, pTypeName, eAttributeTypeClass,
@@ -1140,8 +1130,7 @@ extern "C" void SAL_CALL typelib_typedescription_newExtendedInterfaceAttribute(
rtl_uString * pAttributeTypeName,
sal_Bool bReadOnly,
sal_Int32 nGetExceptions, rtl_uString ** ppGetExceptionNames,
- sal_Int32 nSetExceptions, rtl_uString ** ppSetExceptionNames )
- SAL_THROW_EXTERN_C()
+ sal_Int32 nSetExceptions, rtl_uString ** ppSetExceptionNames ) noexcept
{
if (*ppRet != nullptr) {
typelib_typedescription_release(&(*ppRet)->aBase.aBase);
@@ -1195,8 +1184,7 @@ extern "C" void SAL_CALL typelib_typedescription_newExtendedInterfaceAttribute(
extern "C" void SAL_CALL typelib_typedescription_acquire(
- typelib_TypeDescription * pTypeDescription )
- SAL_THROW_EXTERN_C()
+ typelib_TypeDescription * pTypeDescription ) noexcept
{
osl_atomic_increment( &pTypeDescription->nRefCount );
}
@@ -1323,8 +1311,7 @@ static void typelib_typedescription_destructExtendedMembers(
extern "C" void SAL_CALL typelib_typedescription_release(
- typelib_TypeDescription * pTD )
- SAL_THROW_EXTERN_C()
+ typelib_TypeDescription * pTD ) noexcept
{
sal_Int32 ref = osl_atomic_decrement( &pTD->nRefCount );
OSL_ASSERT(ref >= 0);
@@ -1391,8 +1378,7 @@ extern "C" void SAL_CALL typelib_typedescription_release(
extern "C" void SAL_CALL typelib_typedescription_register(
- typelib_TypeDescription ** ppNewDescription )
- SAL_THROW_EXTERN_C()
+ typelib_TypeDescription ** ppNewDescription ) noexcept
{
// connect the description with the weak reference
TypeDescriptor_Init_Impl &rInit = Init();
@@ -1607,8 +1593,7 @@ static bool type_equals(
rtl_ustr_compare( p1->pTypeName->buffer, p2->pTypeName->buffer ) == 0));
}
extern "C" sal_Bool SAL_CALL typelib_typedescription_equals(
- const typelib_TypeDescription * p1, const typelib_TypeDescription * p2 )
- SAL_THROW_EXTERN_C()
+ const typelib_TypeDescription * p1, const typelib_TypeDescription * p2 ) noexcept
{
return type_equals(
reinterpret_cast<typelib_TypeDescriptionReference const *>(p1), reinterpret_cast<typelib_TypeDescriptionReference const *>(p2) );
@@ -1617,8 +1602,7 @@ extern "C" sal_Bool SAL_CALL typelib_typedescription_equals(
extern "C" sal_Int32 typelib_typedescription_getAlignedUnoSize(
const typelib_TypeDescription * pTypeDescription,
- sal_Int32 nOffset, sal_Int32 & rMaxIntegralTypeSize )
- SAL_THROW_EXTERN_C()
+ sal_Int32 nOffset, sal_Int32 & rMaxIntegralTypeSize ) noexcept
{
sal_Int32 nSize;
if( pTypeDescription->nSize )
@@ -1858,8 +1842,7 @@ bool createDerivedInterfaceMemberDescription(
}
extern "C" void SAL_CALL typelib_typedescription_getByName(
- typelib_TypeDescription ** ppRet, rtl_uString * pName )
- SAL_THROW_EXTERN_C()
+ typelib_TypeDescription ** ppRet, rtl_uString * pName ) noexcept
{
if( *ppRet )
{
@@ -2032,8 +2015,7 @@ extern "C" void SAL_CALL typelib_typedescription_getByName(
extern "C" void SAL_CALL typelib_typedescriptionreference_newByAsciiName(
typelib_TypeDescriptionReference ** ppTDR,
typelib_TypeClass eTypeClass,
- const char * pTypeName )
- SAL_THROW_EXTERN_C()
+ const char * pTypeName ) noexcept
{
OUString aTypeName( OUString::createFromAscii( pTypeName ) );
typelib_typedescriptionreference_new( ppTDR, eTypeClass, aTypeName.pData );
@@ -2041,8 +2023,7 @@ extern "C" void SAL_CALL typelib_typedescriptionreference_newByAsciiName(
extern "C" void SAL_CALL typelib_typedescriptionreference_new(
typelib_TypeDescriptionReference ** ppTDR,
- typelib_TypeClass eTypeClass, rtl_uString * pTypeName )
- SAL_THROW_EXTERN_C()
+ typelib_TypeClass eTypeClass, rtl_uString * pTypeName ) noexcept
{
TypeDescriptor_Init_Impl &rInit = Init();
if( eTypeClass == typelib_TypeClass_TYPEDEF )
@@ -2131,16 +2112,14 @@ extern "C" void SAL_CALL typelib_typedescriptionreference_new(
extern "C" void SAL_CALL typelib_typedescriptionreference_acquire(
- typelib_TypeDescriptionReference * pRef )
- SAL_THROW_EXTERN_C()
+ typelib_TypeDescriptionReference * pRef ) noexcept
{
osl_atomic_increment( &pRef->nRefCount );
}
extern "C" void SAL_CALL typelib_typedescriptionreference_release(
- typelib_TypeDescriptionReference * pRef )
- SAL_THROW_EXTERN_C()
+ typelib_TypeDescriptionReference * pRef ) noexcept
{
// Is it a type description?
if( TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK( pRef->eTypeClass ) )
@@ -2172,8 +2151,7 @@ extern "C" void SAL_CALL typelib_typedescriptionreference_release(
extern "C" void SAL_CALL typelib_typedescriptionreference_getDescription(
- typelib_TypeDescription ** ppRet, typelib_TypeDescriptionReference * pRef )
- SAL_THROW_EXTERN_C()
+ typelib_TypeDescription ** ppRet, typelib_TypeDescriptionReference * pRef ) noexcept
{
if( *ppRet )
{
@@ -2218,8 +2196,7 @@ extern "C" void SAL_CALL typelib_typedescriptionreference_getDescription(
extern "C" void typelib_typedescriptionreference_getByName(
- typelib_TypeDescriptionReference ** ppRet, rtl_uString const * pName )
- SAL_THROW_EXTERN_C()
+ typelib_TypeDescriptionReference ** ppRet, rtl_uString const * pName ) noexcept
{
if( *ppRet )
{
@@ -2251,8 +2228,7 @@ extern "C" void typelib_typedescriptionreference_getByName(
extern "C" sal_Bool SAL_CALL typelib_typedescriptionreference_equals(
const typelib_TypeDescriptionReference * p1,
- const typelib_TypeDescriptionReference * p2 )
- SAL_THROW_EXTERN_C()
+ const typelib_TypeDescriptionReference * p2 ) noexcept
{
return (p1 == p2 ||
(p1->eTypeClass == p2->eTypeClass &&
@@ -2263,8 +2239,7 @@ extern "C" sal_Bool SAL_CALL typelib_typedescriptionreference_equals(
extern "C" void SAL_CALL typelib_typedescriptionreference_assign(
typelib_TypeDescriptionReference ** ppDest,
- typelib_TypeDescriptionReference * pSource )
- SAL_THROW_EXTERN_C()
+ typelib_TypeDescriptionReference * pSource ) noexcept
{
if (*ppDest != pSource)
{
@@ -2275,8 +2250,7 @@ extern "C" void SAL_CALL typelib_typedescriptionreference_assign(
}
-extern "C" void SAL_CALL typelib_setCacheSize( sal_Int32 )
- SAL_THROW_EXTERN_C()
+extern "C" void SAL_CALL typelib_setCacheSize( sal_Int32 ) noexcept
{
}
@@ -2300,8 +2274,7 @@ const bool s_aAssignableFromTab[11][11] =
extern "C" sal_Bool SAL_CALL typelib_typedescriptionreference_isAssignableFrom(
typelib_TypeDescriptionReference * pAssignable,
- typelib_TypeDescriptionReference * pFrom )
- SAL_THROW_EXTERN_C()
+ typelib_TypeDescriptionReference * pFrom ) noexcept
{
if (!pAssignable || !pFrom)
return false;
@@ -2368,8 +2341,7 @@ extern "C" sal_Bool SAL_CALL typelib_typedescriptionreference_isAssignableFrom(
extern "C" sal_Bool SAL_CALL typelib_typedescription_isAssignableFrom(
typelib_TypeDescription * pAssignable,
- typelib_TypeDescription * pFrom )
- SAL_THROW_EXTERN_C()
+ typelib_TypeDescription * pFrom ) noexcept
{
return typelib_typedescriptionreference_isAssignableFrom(
pAssignable->pWeakRef, pFrom->pWeakRef );
@@ -2377,8 +2349,7 @@ extern "C" sal_Bool SAL_CALL typelib_typedescription_isAssignableFrom(
extern "C" sal_Bool SAL_CALL typelib_typedescription_complete(
- typelib_TypeDescription ** ppTypeDescr )
- SAL_THROW_EXTERN_C()
+ typelib_TypeDescription ** ppTypeDescr ) noexcept
{
return complete(ppTypeDescr, true);
}
diff --git a/cppu/source/uno/EnvStack.cxx b/cppu/source/uno/EnvStack.cxx
index 7b7df2cefc5a..c44fa283f1a5 100644
--- a/cppu/source/uno/EnvStack.cxx
+++ b/cppu/source/uno/EnvStack.cxx
@@ -105,8 +105,7 @@ static uno_Environment * s_getCurrent()
}
-extern "C" void SAL_CALL uno_getCurrentEnvironment(uno_Environment ** ppEnv, rtl_uString * pTypeName)
- SAL_THROW_EXTERN_C()
+extern "C" void SAL_CALL uno_getCurrentEnvironment(uno_Environment ** ppEnv, rtl_uString * pTypeName) noexcept
{
if (*ppEnv)
{
@@ -306,14 +305,12 @@ static void s_environment_invoke_v(uno_Environment * pCurrEnv, uno_Environment *
pNextEnv->release(pNextEnv);
}
-extern "C" void SAL_CALL uno_Environment_invoke_v(uno_Environment * pTargetEnv, uno_EnvCallee * pCallee, va_list * pParam)
- SAL_THROW_EXTERN_C()
+extern "C" void SAL_CALL uno_Environment_invoke_v(uno_Environment * pTargetEnv, uno_EnvCallee * pCallee, va_list * pParam) noexcept
{
s_environment_invoke_v(s_getCurrent(), pTargetEnv, pCallee, pParam);
}
-extern "C" void SAL_CALL uno_Environment_invoke(uno_Environment * pEnv, uno_EnvCallee * pCallee, ...)
- SAL_THROW_EXTERN_C()
+extern "C" void SAL_CALL uno_Environment_invoke(uno_Environment * pEnv, uno_EnvCallee * pCallee, ...) noexcept
{
va_list param;
@@ -322,8 +319,7 @@ extern "C" void SAL_CALL uno_Environment_invoke(uno_Environment * pEnv, uno_EnvC
va_end(param);
}
-extern "C" void SAL_CALL uno_Environment_enter(uno_Environment * pTargetEnv)
- SAL_THROW_EXTERN_C()
+extern "C" void SAL_CALL uno_Environment_enter(uno_Environment * pTargetEnv) noexcept
{
uno_Environment * pNextEnv = nullptr;
uno_Environment * pCurrEnv = s_getCurrent();
@@ -355,8 +351,7 @@ extern "C" void SAL_CALL uno_Environment_enter(uno_Environment * pTargetEnv)
}
}
-int SAL_CALL uno_Environment_isValid(uno_Environment * pEnv, rtl_uString ** pReason)
- SAL_THROW_EXTERN_C()
+int SAL_CALL uno_Environment_isValid(uno_Environment * pEnv, rtl_uString ** pReason) noexcept
{
int result = 1;
diff --git a/cppu/source/uno/any.cxx b/cppu/source/uno/any.cxx
index e26b97286d01..342e760d0832 100644
--- a/cppu/source/uno/any.cxx
+++ b/cppu/source/uno/any.cxx
@@ -30,8 +30,7 @@ extern "C"
void SAL_CALL uno_type_any_assign(
uno_Any * pDest, void * pSource,
typelib_TypeDescriptionReference * pType,
- uno_AcquireFunc acquire, uno_ReleaseFunc release )
- SAL_THROW_EXTERN_C()
+ uno_AcquireFunc acquire, uno_ReleaseFunc release ) noexcept
{
_destructAny( pDest, release );
if (pType)
@@ -47,8 +46,7 @@ void SAL_CALL uno_type_any_assign(
void SAL_CALL uno_any_assign(
uno_Any * pDest, void * pSource,
typelib_TypeDescription * pTypeDescr,
- uno_AcquireFunc acquire, uno_ReleaseFunc release )
- SAL_THROW_EXTERN_C()
+ uno_AcquireFunc acquire, uno_ReleaseFunc release ) noexcept
{
_destructAny( pDest, release );
if (pTypeDescr)
@@ -64,8 +62,7 @@ void SAL_CALL uno_any_assign(
void SAL_CALL uno_type_any_construct(
uno_Any * pDest, void * pSource,
typelib_TypeDescriptionReference * pType,
- uno_AcquireFunc acquire )
- SAL_THROW_EXTERN_C()
+ uno_AcquireFunc acquire ) noexcept
{
if (pType)
{
@@ -80,8 +77,7 @@ void SAL_CALL uno_type_any_construct(
void SAL_CALL uno_any_construct(
uno_Any * pDest, void * pSource,
typelib_TypeDescription * pTypeDescr,
- uno_AcquireFunc acquire )
- SAL_THROW_EXTERN_C()
+ uno_AcquireFunc acquire ) noexcept
{
if (pTypeDescr)
{
@@ -96,8 +92,7 @@ void SAL_CALL uno_any_construct(
void SAL_CALL uno_type_any_constructAndConvert(
uno_Any * pDest, void * pSource,
typelib_TypeDescriptionReference * pType,
- uno_Mapping * mapping )
- SAL_THROW_EXTERN_C()
+ uno_Mapping * mapping ) noexcept
{
if (pType)
{
@@ -112,8 +107,7 @@ void SAL_CALL uno_type_any_constructAndConvert(
void SAL_CALL uno_any_constructAndConvert(
uno_Any * pDest, void * pSource,
typelib_TypeDescription * pTypeDescr,
- uno_Mapping * mapping )
- SAL_THROW_EXTERN_C()
+ uno_Mapping * mapping ) noexcept
{
if (pTypeDescr)
{
@@ -125,14 +119,12 @@ void SAL_CALL uno_any_constructAndConvert(
}
}
-void SAL_CALL uno_any_destruct( uno_Any * pValue, uno_ReleaseFunc release )
- SAL_THROW_EXTERN_C()
+void SAL_CALL uno_any_destruct( uno_Any * pValue, uno_ReleaseFunc release ) noexcept
{
_destructAny( pValue, release );
}
-void SAL_CALL uno_any_clear( uno_Any * pValue, uno_ReleaseFunc release )
- SAL_THROW_EXTERN_C()
+void SAL_CALL uno_any_clear( uno_Any * pValue, uno_ReleaseFunc release ) noexcept
{
_destructAny( pValue, release );
CONSTRUCT_EMPTY_ANY( pValue );
diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx
index 97aaa16ca09a..393d00c27f2d 100644
--- a/cppu/source/uno/cascade_mapping.cxx
+++ b/cppu/source/uno/cascade_mapping.cxx
@@ -149,8 +149,7 @@ void MediatorMapping::mapInterface(
*ppOut = ret;
}
-extern "C" { static void s_MediatorMapping_free(uno_Mapping * pMapping)
- SAL_THROW_EXTERN_C()
+extern "C" { static void s_MediatorMapping_free(uno_Mapping * pMapping) noexcept
{
delete static_cast<MediatorMapping *>(pMapping);
}}
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index 339e650fe411..e6279c8bfdbb 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -169,23 +169,20 @@ extern "C"
{
void SAL_CALL uno_type_constructData(
- void * pMem, typelib_TypeDescriptionReference * pType )
- SAL_THROW_EXTERN_C()
+ void * pMem, typelib_TypeDescriptionReference * pType ) noexcept
{
_defaultConstructData( pMem, pType, nullptr );
}
void SAL_CALL uno_constructData(
- void * pMem, typelib_TypeDescription * pTypeDescr )
- SAL_THROW_EXTERN_C()
+ void * pMem, typelib_TypeDescription * pTypeDescr ) noexcept
{
_defaultConstructData( pMem, pTypeDescr->pWeakRef, pTypeDescr );
}
void SAL_CALL uno_type_destructData(
void * pValue, typelib_TypeDescriptionReference * pType,
- uno_ReleaseFunc release )
- SAL_THROW_EXTERN_C()
+ uno_ReleaseFunc release ) noexcept
{
_destructData( pValue, pType, nullptr, release );
}
@@ -193,8 +190,7 @@ void SAL_CALL uno_type_destructData(
void SAL_CALL uno_destructData(
void * pValue,
typelib_TypeDescription * pTypeDescr,
- uno_ReleaseFunc release )
- SAL_THROW_EXTERN_C()
+ uno_ReleaseFunc release ) noexcept
{
_destructData( pValue, pTypeDescr->pWeakRef, pTypeDescr, release );
}
@@ -202,8 +198,7 @@ void SAL_CALL uno_destructData(
void SAL_CALL uno_type_copyData(
void * pDest, void * pSource,
typelib_TypeDescriptionReference * pType,
- uno_AcquireFunc acquire )
- SAL_THROW_EXTERN_C()
+ uno_AcquireFunc acquire ) noexcept
{
_copyConstructData( pDest, pSource, pType, nullptr, acquire, nullptr );
}
@@ -211,8 +206,7 @@ void SAL_CALL uno_type_copyData(
void SAL_CALL uno_copyData(
void * pDest, void * pSource,
typelib_TypeDescription * pTypeDescr,
- uno_AcquireFunc acquire )
- SAL_THROW_EXTERN_C()
+ uno_AcquireFunc acquire ) noexcept
{
_copyConstructData( pDest, pSource, pTypeDescr->pWeakRef, pTypeDescr, acquire, nullptr );
}
@@ -220,8 +214,7 @@ void SAL_CALL uno_copyData(
void SAL_CALL uno_type_copyAndConvertData(
void * pDest, void * pSource,
typelib_TypeDescriptionReference * pType,
- uno_Mapping * mapping )
- SAL_THROW_EXTERN_C()
+ uno_Mapping * mapping ) noexcept
{
_copyConstructData( pDest, pSource, pType, nullptr, nullptr, mapping );
}
@@ -229,8 +222,7 @@ void SAL_CALL uno_type_copyAndConvertData(
void SAL_CALL uno_copyAndConvertData(
void * pDest, void * pSource,
typelib_TypeDescription * pTypeDescr,
- uno_Mapping * mapping )
- SAL_THROW_EXTERN_C()
+ uno_Mapping * mapping ) noexcept
{
_copyConstructData( pDest, pSource, pTypeDescr->pWeakRef, pTypeDescr, nullptr, mapping );
}
@@ -238,8 +230,7 @@ void SAL_CALL uno_copyAndConvertData(
sal_Bool SAL_CALL uno_type_equalData(
void * pVal1, typelib_TypeDescriptionReference * pVal1Type,
void * pVal2, typelib_TypeDescriptionReference * pVal2Type,
- uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
- SAL_THROW_EXTERN_C()
+ uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) noexcept
{
return _equalData(
pVal1, pVal1Type, nullptr,
@@ -250,8 +241,7 @@ sal_Bool SAL_CALL uno_type_equalData(
sal_Bool SAL_CALL uno_equalData(
void * pVal1, typelib_TypeDescription * pVal1TD,
void * pVal2, typelib_TypeDescription * pVal2TD,
- uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
- SAL_THROW_EXTERN_C()
+ uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) noexcept
{
return _equalData(
pVal1, pVal1TD->pWeakRef, pVal1TD,
@@ -262,8 +252,7 @@ sal_Bool SAL_CALL uno_equalData(
sal_Bool SAL_CALL uno_type_assignData(
void * pDest, typelib_TypeDescriptionReference * pDestType,
void * pSource, typelib_TypeDescriptionReference * pSourceType,
- uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release )
- SAL_THROW_EXTERN_C()
+ uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release ) noexcept
{
return _assignData(
pDest, pDestType, nullptr,
@@ -274,8 +263,7 @@ sal_Bool SAL_CALL uno_type_assignData(
sal_Bool SAL_CALL uno_assignData(
void * pDest, typelib_TypeDescription * pDestTD,
void * pSource, typelib_TypeDescription * pSourceTD,
- uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release )
- SAL_THROW_EXTERN_C()
+ uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release ) noexcept
{
return _assignData(
pDest, pDestTD->pWeakRef, pDestTD,
@@ -286,8 +274,7 @@ sal_Bool SAL_CALL uno_assignData(
sal_Bool SAL_CALL uno_type_isAssignableFromData(
typelib_TypeDescriptionReference * pAssignable,
void * pFrom, typelib_TypeDescriptionReference * pFromType,
- uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
- SAL_THROW_EXTERN_C()
+ uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) noexcept
{
if (::typelib_typedescriptionreference_isAssignableFrom( pAssignable, pFromType ))
return true;
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index ef1509f37d04..32a145e3de35 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -682,8 +682,7 @@ void writeLine(
}
extern "C" void SAL_CALL uno_dumpEnvironment(
- void * stream, uno_Environment * pEnv, const char * pFilter )
- SAL_THROW_EXTERN_C()
+ void * stream, uno_Environment * pEnv, const char * pFilter ) noexcept
{
assert(pEnv && "### null ptr!");
OUStringBuffer buf;
@@ -764,8 +763,7 @@ extern "C" void SAL_CALL uno_dumpEnvironment(
extern "C" void SAL_CALL uno_dumpEnvironmentByName(
- void * stream, rtl_uString * pEnvDcp, const char * pFilter )
- SAL_THROW_EXTERN_C()
+ void * stream, rtl_uString * pEnvDcp, const char * pFilter ) noexcept
{
uno_Environment * pEnv = nullptr;
uno_getEnvironment( &pEnv, pEnvDcp, nullptr );
@@ -1089,8 +1087,7 @@ static uno_Environment * initDefaultEnvironment(
void SAL_CALL uno_createEnvironment(
- uno_Environment ** ppEnv, rtl_uString * pEnvDcp, void * pContext )
- SAL_THROW_EXTERN_C()
+ uno_Environment ** ppEnv, rtl_uString * pEnvDcp, void * pContext ) noexcept
{
assert(ppEnv && "### null ptr!");
if (*ppEnv)
@@ -1101,8 +1098,7 @@ void SAL_CALL uno_createEnvironment(
}
void SAL_CALL uno_getEnvironment(
- uno_Environment ** ppEnv, rtl_uString * pEnvDcp, void * pContext )
- SAL_THROW_EXTERN_C()
+ uno_Environment ** ppEnv, rtl_uString * pEnvDcp, void * pContext ) noexcept
{
assert(ppEnv && "### null ptr!");
OUString const & rEnvDcp = OUString::unacquired( &pEnvDcp );
@@ -1124,8 +1120,7 @@ void SAL_CALL uno_getEnvironment(
void SAL_CALL uno_getRegisteredEnvironments(
uno_Environment *** pppEnvs, sal_Int32 * pnLen, uno_memAlloc memAlloc,
- rtl_uString * pEnvDcp )
- SAL_THROW_EXTERN_C()
+ rtl_uString * pEnvDcp ) noexcept
{
EnvironmentsData & rData = theEnvironmentsData();
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index a2a554b84cf6..dc135a2be484 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -578,8 +578,7 @@ extern "C"
void SAL_CALL uno_getMapping(
uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo,
- rtl_uString * pAddPurpose )
- SAL_THROW_EXTERN_C()
+ rtl_uString * pAddPurpose ) noexcept
{
assert(ppMapping != nullptr);
assert(pFrom != nullptr);
@@ -644,8 +643,7 @@ void SAL_CALL uno_getMapping(
void SAL_CALL uno_getMappingByName(
uno_Mapping ** ppMapping, rtl_uString * pFrom, rtl_uString * pTo,
- rtl_uString * pAddPurpose )
- SAL_THROW_EXTERN_C()
+ rtl_uString * pAddPurpose ) noexcept
{
assert(ppMapping && pFrom && pTo && "### null ptr!");
if (*ppMapping)
@@ -674,8 +672,7 @@ void SAL_CALL uno_getMappingByName(
void SAL_CALL uno_registerMapping(
uno_Mapping ** ppMapping, uno_freeMappingFunc freeMapping,
- uno_Environment * pFrom, uno_Environment * pTo, rtl_uString * pAddPurpose )
- SAL_THROW_EXTERN_C()
+ uno_Environment * pFrom, uno_Environment * pTo, rtl_uString * pAddPurpose ) noexcept
{
MappingsData & rData = getMappingsData();
ClearableMutexGuard aGuard( rData.aMappingsMutex );
@@ -708,8 +705,7 @@ void SAL_CALL uno_registerMapping(
}
void SAL_CALL uno_revokeMapping(
- uno_Mapping * pMapping )
- SAL_THROW_EXTERN_C()
+ uno_Mapping * pMapping ) noexcept
{
MappingsData & rData = getMappingsData();
ClearableMutexGuard aGuard( rData.aMappingsMutex );
@@ -730,8 +726,7 @@ void SAL_CALL uno_revokeMapping(
void SAL_CALL uno_registerMappingCallback(
- uno_getMappingFunc pCallback )
- SAL_THROW_EXTERN_C()
+ uno_getMappingFunc pCallback ) noexcept
{
OSL_ENSURE( pCallback, "### null ptr!" );
MappingsData & rData = getMappingsData();
@@ -740,8 +735,7 @@ void SAL_CALL uno_registerMappingCallback(
}
void SAL_CALL uno_revokeMappingCallback(
- uno_getMappingFunc pCallback )
- SAL_THROW_EXTERN_C()
+ uno_getMappingFunc pCallback ) noexcept
{
OSL_ENSURE( pCallback, "### null ptr!" );
MappingsData & rData = getMappingsData();
diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx
index 1a8da6d53c96..e249f7549780 100644
--- a/cppu/source/uno/sequence.cxx
+++ b/cppu/source/uno/sequence.cxx
@@ -668,8 +668,7 @@ extern "C"
sal_Bool SAL_CALL uno_type_sequence_construct(
uno_Sequence ** ppSequence, typelib_TypeDescriptionReference * pType,
void * pElements, sal_Int32 len,
- uno_AcquireFunc acquire )
- SAL_THROW_EXTERN_C()
+ uno_AcquireFunc acquire ) noexcept
{
assert( len >= 0 );
bool ret;
@@ -716,8 +715,7 @@ sal_Bool SAL_CALL uno_type_sequence_construct(
sal_Bool SAL_CALL uno_sequence_construct(
uno_Sequence ** ppSequence, typelib_TypeDescription * pTypeDescr,
void * pElements, sal_Int32 len,
- uno_AcquireFunc acquire )
- SAL_THROW_EXTERN_C()
+ uno_AcquireFunc acquire ) noexcept
{
bool ret;
if (len > 0)
@@ -754,8 +752,7 @@ sal_Bool SAL_CALL uno_sequence_construct(
sal_Bool SAL_CALL uno_type_sequence_realloc(
uno_Sequence ** ppSequence, typelib_TypeDescriptionReference * pType,
- sal_Int32 nSize, uno_AcquireFunc acquire, uno_ReleaseFunc release )
- SAL_THROW_EXTERN_C()
+ sal_Int32 nSize, uno_AcquireFunc acquire, uno_ReleaseFunc release ) noexcept
{
assert(ppSequence && "### null ptr!");
assert(nSize >= 0 && "### new size must be at least 0!");
@@ -776,8 +773,7 @@ sal_Bool SAL_CALL uno_type_sequence_realloc(
sal_Bool SAL_CALL uno_sequence_realloc(
uno_Sequence ** ppSequence, typelib_TypeDescription * pTypeDescr,
- sal_Int32 nSize, uno_AcquireFunc acquire, uno_ReleaseFunc release )
- SAL_THROW_EXTERN_C()
+ sal_Int32 nSize, uno_AcquireFunc acquire, uno_ReleaseFunc release ) noexcept
{
assert(ppSequence && "### null ptr!");
OSL_ENSURE( nSize >= 0, "### new size must be at least 0!" );
@@ -796,8 +792,7 @@ sal_Bool SAL_CALL uno_sequence_realloc(
sal_Bool SAL_CALL uno_type_sequence_reference2One(
uno_Sequence ** ppSequence,
typelib_TypeDescriptionReference * pType,
- uno_AcquireFunc acquire, uno_ReleaseFunc release )
- SAL_THROW_EXTERN_C()
+ uno_AcquireFunc acquire, uno_ReleaseFunc release ) noexcept
{
assert(ppSequence && "### null ptr!");
bool ret = true;
@@ -843,8 +838,7 @@ sal_Bool SAL_CALL uno_type_sequence_reference2One(
sal_Bool SAL_CALL uno_sequence_reference2One(
uno_Sequence ** ppSequence,
typelib_TypeDescription * pTypeDescr,
- uno_AcquireFunc acquire, uno_ReleaseFunc release )
- SAL_THROW_EXTERN_C()
+ uno_AcquireFunc acquire, uno_ReleaseFunc release ) noexcept
{
assert(ppSequence && "### null ptr!");
bool ret = true;
@@ -888,8 +882,7 @@ void SAL_CALL uno_sequence_assign(
uno_Sequence ** ppDest,
uno_Sequence * pSource,
typelib_TypeDescription * pTypeDescr,
- uno_ReleaseFunc release )
- SAL_THROW_EXTERN_C()
+ uno_ReleaseFunc release ) noexcept
{
if (*ppDest != pSource)
{
@@ -904,8 +897,7 @@ void SAL_CALL uno_type_sequence_assign(
uno_Sequence ** ppDest,
uno_Sequence * pSource,
typelib_TypeDescriptionReference * pType,
- uno_ReleaseFunc release )
- SAL_THROW_EXTERN_C()
+ uno_ReleaseFunc release ) noexcept
{
if (*ppDest != pSource)
{
@@ -917,8 +909,7 @@ void SAL_CALL uno_type_sequence_assign(
void uno_type_sequence_destroy(
uno_Sequence * sequence, typelib_TypeDescriptionReference * type,
- uno_ReleaseFunc release)
- SAL_THROW_EXTERN_C()
+ uno_ReleaseFunc release) noexcept
{
idestroySequence(sequence, type, nullptr, release);
}
generated by cgit (git 2.34.1) at 2024-12-25 14:28:40 +0000