diff options
Diffstat (limited to 'bridges/source/jni_uno')
| -rw-r--r-- | bridges/source/jni_uno/jni_bridge.cxx | 18 | ||||
| -rw-r--r-- | bridges/source/jni_uno/jni_uno2java.cxx | 16 | ||||
| -rw-r--r-- | bridges/source/jni_uno/nativethreadpool.cxx | 2 |
3 files changed, 18 insertions, 18 deletions
diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx index 3859b148c541..ac671d173e9c 100644 --- a/bridges/source/jni_uno/jni_bridge.cxx +++ b/bridges/source/jni_uno/jni_bridge.cxx @@ -39,7 +39,7 @@ extern "C" { -void SAL_CALL Mapping_acquire( uno_Mapping * mapping ) +void Mapping_acquire( uno_Mapping * mapping ) SAL_THROW_EXTERN_C() { Mapping const * that = static_cast< Mapping const * >( mapping ); @@ -47,7 +47,7 @@ void SAL_CALL Mapping_acquire( uno_Mapping * mapping ) } -void SAL_CALL Mapping_release( uno_Mapping * mapping ) +void Mapping_release( uno_Mapping * mapping ) SAL_THROW_EXTERN_C() { Mapping const * that = static_cast< Mapping const * >( mapping ); @@ -55,7 +55,7 @@ void SAL_CALL Mapping_release( uno_Mapping * mapping ) } -void SAL_CALL Mapping_map_to_uno( +void Mapping_map_to_uno( uno_Mapping * mapping, void ** ppOut, void * pIn, typelib_InterfaceTypeDescription * td ) SAL_THROW_EXTERN_C() @@ -114,7 +114,7 @@ void SAL_CALL Mapping_map_to_uno( } -void SAL_CALL Mapping_map_to_java( +void Mapping_map_to_java( uno_Mapping * mapping, void ** ppOut, void * pIn, typelib_InterfaceTypeDescription * td ) SAL_THROW_EXTERN_C() @@ -177,7 +177,7 @@ void SAL_CALL Mapping_map_to_java( } -void SAL_CALL Bridge_free( uno_Mapping * mapping ) +void Bridge_free( uno_Mapping * mapping ) SAL_THROW_EXTERN_C() { Mapping * that = static_cast< Mapping * >( mapping ); @@ -421,7 +421,7 @@ using namespace ::jni_uno; extern "C" { -void SAL_CALL java_env_dispose(uno_Environment * env) { +void java_env_dispose(uno_Environment * env) { auto * envData = static_cast<jni_uno::JniUnoEnvironmentData *>(env->pContext); if (envData != nullptr) { @@ -455,7 +455,7 @@ void SAL_CALL java_env_dispose(uno_Environment * env) { } } -void SAL_CALL java_env_disposing(uno_Environment * env) { +void java_env_disposing(uno_Environment * env) { java_env_dispose(env); delete static_cast<jni_uno::JniUnoEnvironmentData *>(env->pContext); } @@ -465,7 +465,7 @@ void SAL_CALL java_env_disposing(uno_Environment * env) { #endif -SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment( uno_Environment * java_env ) +SAL_DLLPUBLIC_EXPORT void uno_initEnvironment( uno_Environment * java_env ) SAL_THROW_EXTERN_C() { try { @@ -510,7 +510,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment( uno_Environment * java_e #endif -SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping( +SAL_DLLPUBLIC_EXPORT void uno_ext_getMapping( uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo ) SAL_THROW_EXTERN_C() { diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx index 45bcbaedc3f0..ecdab00e4512 100644 --- a/bridges/source/jni_uno/jni_uno2java.cxx +++ b/bridges/source/jni_uno/jni_uno2java.cxx @@ -39,19 +39,19 @@ extern "C" { -void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy ) +void UNO_proxy_free( uno_ExtEnvironment * env, void * proxy ) SAL_THROW_EXTERN_C(); -void SAL_CALL UNO_proxy_acquire( uno_Interface * pUnoI ) +void UNO_proxy_acquire( uno_Interface * pUnoI ) SAL_THROW_EXTERN_C(); -void SAL_CALL UNO_proxy_release( uno_Interface * pUnoI ) +void UNO_proxy_release( uno_Interface * pUnoI ) SAL_THROW_EXTERN_C(); -void SAL_CALL UNO_proxy_dispatch( +void UNO_proxy_dispatch( uno_Interface * pUnoI, typelib_TypeDescription const * member_td, void * uno_ret, void * uno_args[], uno_Any ** uno_exc ) SAL_THROW_EXTERN_C(); @@ -502,7 +502,7 @@ extern "C" { -void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy ) +void UNO_proxy_free( uno_ExtEnvironment * env, void * proxy ) SAL_THROW_EXTERN_C() { UNO_proxy * that = static_cast< UNO_proxy * >( proxy ); @@ -540,7 +540,7 @@ void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy ) } -void SAL_CALL UNO_proxy_acquire( uno_Interface * pUnoI ) +void UNO_proxy_acquire( uno_Interface * pUnoI ) SAL_THROW_EXTERN_C() { UNO_proxy const * that = static_cast< UNO_proxy const * >( pUnoI ); @@ -548,7 +548,7 @@ void SAL_CALL UNO_proxy_acquire( uno_Interface * pUnoI ) } -void SAL_CALL UNO_proxy_release( uno_Interface * pUnoI ) +void UNO_proxy_release( uno_Interface * pUnoI ) SAL_THROW_EXTERN_C() { UNO_proxy const * that = static_cast< UNO_proxy const * >( pUnoI ); @@ -556,7 +556,7 @@ void SAL_CALL UNO_proxy_release( uno_Interface * pUnoI ) } -void SAL_CALL UNO_proxy_dispatch( +void UNO_proxy_dispatch( uno_Interface * pUnoI, typelib_TypeDescription const * member_td, void * uno_ret, void * uno_args [], uno_Any ** uno_exc ) SAL_THROW_EXTERN_C() diff --git a/bridges/source/jni_uno/nativethreadpool.cxx b/bridges/source/jni_uno/nativethreadpool.cxx index 547001a7f51e..4fe4a0a2fb8d 100644 --- a/bridges/source/jni_uno/nativethreadpool.cxx +++ b/bridges/source/jni_uno/nativethreadpool.cxx @@ -64,7 +64,7 @@ void throwOutOfMemory(JNIEnv * env) { extern "C" { -static void SAL_CALL executeRequest(void * data) { +static void executeRequest(void * data) { Job * job = static_cast< Job * >(data); try { jvmaccess::VirtualMachine::AttachGuard guard(job->pool->virtualMachine); |