loplugin:salcall fix functions

since cdecl is the default calling convention on Windows for
such functions, the annotation is redundant.

Change-Id: I1a85fa27e5ac65ce0e04a19bde74c90800ffaa2d
Reviewed-on: https://gerrit.libreoffice.org/46164
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

8 files changed, 47 insertions, 47 deletions

diff --git a/bridges/inc/bridge.hxx b/bridges/inc/bridge.hxx
index d5c3ba9d9b40..b702dd9b6e07 100644
--- a/bridges/inc/bridge.hxx
+++ b/bridges/inc/bridge.hxx
@@ -33,20 +33,20 @@
 namespace bridges { namespace cpp_uno { namespace shared {
 
 // private:
-extern "C" void SAL_CALL freeMapping(uno_Mapping *);
+extern "C" void freeMapping(uno_Mapping *);
 
 // private:
-extern "C" void SAL_CALL acquireMapping(uno_Mapping *);
+extern "C" void acquireMapping(uno_Mapping *);
 
 // private:
-extern "C" void SAL_CALL releaseMapping(uno_Mapping *);
+extern "C" void releaseMapping(uno_Mapping *);
 
 // private:
-extern "C" void SAL_CALL cpp2unoMapping(
+extern "C" void cpp2unoMapping(
     uno_Mapping *, void **, void *, typelib_InterfaceTypeDescription *);
 
 // private:
-extern "C" void SAL_CALL uno2cppMapping(
+extern "C" void uno2cppMapping(
     uno_Mapping *, void **, void *, typelib_InterfaceTypeDescription *);
 
 /**
@@ -97,17 +97,17 @@ private:
 
     bool bExportCpp2Uno;
 
-    friend void SAL_CALL freeMapping(uno_Mapping * pMapping);
+    friend void freeMapping(uno_Mapping * pMapping);
 
-    friend void SAL_CALL acquireMapping(uno_Mapping * pMapping);
+    friend void acquireMapping(uno_Mapping * pMapping);
 
-    friend void SAL_CALL releaseMapping(uno_Mapping * pMapping);
+    friend void releaseMapping(uno_Mapping * pMapping);
 
-    friend void SAL_CALL cpp2unoMapping(
+    friend void cpp2unoMapping(
         uno_Mapping * pMapping, void ** ppUnoI, void * pCppI,
         typelib_InterfaceTypeDescription * pTypeDescr);
 
-    friend void SAL_CALL uno2cppMapping(
+    friend void uno2cppMapping(
         uno_Mapping * pMapping, void ** ppCppI, void * pUnoI,
         typelib_InterfaceTypeDescription * pTypeDescr);
 };
diff --git a/bridges/inc/cppinterfaceproxy.hxx b/bridges/inc/cppinterfaceproxy.hxx
index dfb1bdbf1e2b..d508146bdcb0 100644
--- a/bridges/inc/cppinterfaceproxy.hxx
+++ b/bridges/inc/cppinterfaceproxy.hxx
@@ -45,7 +45,7 @@ namespace bridges { namespace cpp_uno { namespace shared {
 
 class Bridge;
 
-extern "C" void SAL_CALL freeCppInterfaceProxy(
+extern "C" void freeCppInterfaceProxy(
     uno_ExtEnvironment * pEnv, void * pInterface);
 
 /**
@@ -97,7 +97,7 @@ private:
 
     VtableFactory::Slot * vtables[1];
 
-    friend void SAL_CALL freeCppInterfaceProxy(
+    friend void freeCppInterfaceProxy(
         uno_ExtEnvironment * pEnv, void * pInterface);
 };
 
diff --git a/bridges/inc/unointerfaceproxy.hxx b/bridges/inc/unointerfaceproxy.hxx
index 77cd8e98a346..374ac956caec 100644
--- a/bridges/inc/unointerfaceproxy.hxx
+++ b/bridges/inc/unointerfaceproxy.hxx
@@ -39,21 +39,21 @@ namespace bridges { namespace cpp_uno { namespace shared {
 
 class Bridge;
 
-extern "C" void SAL_CALL freeUnoInterfaceProxy(
+extern "C" void freeUnoInterfaceProxy(
     uno_ExtEnvironment * pEnv, void * pProxy);
 
 // private:
-extern "C" void SAL_CALL unoInterfaceProxyDispatch(
+extern "C" void unoInterfaceProxyDispatch(
     uno_Interface * pUnoI, typelib_TypeDescription const * pMemberDescr,
     void * pReturn, void * pArgs[], uno_Any ** ppException);
     // this function is not defined in the generic part, but instead has to be
     // defined individually for each CPP--UNO bridge
 
 // private:
-extern "C" void SAL_CALL acquireProxy(uno_Interface *);
+extern "C" void acquireProxy(uno_Interface *);
 
 // private:
-extern "C" void SAL_CALL releaseProxy(uno_Interface *);
+extern "C" void releaseProxy(uno_Interface *);
 
 /**
  * A uno proxy wrapping a cpp interface.
@@ -91,16 +91,16 @@ private:
     typelib_InterfaceTypeDescription * pTypeDescr;
     OUString oid;
 
-    friend void SAL_CALL freeUnoInterfaceProxy(
+    friend void freeUnoInterfaceProxy(
         uno_ExtEnvironment * pEnv, void * pProxy);
 
-    friend void SAL_CALL unoInterfaceProxyDispatch(
+    friend void unoInterfaceProxyDispatch(
         uno_Interface * pUnoI, typelib_TypeDescription const * pMemberDescr,
         void * pReturn, void * pArgs[], uno_Any ** ppException);
 
-    friend void SAL_CALL acquireProxy(uno_Interface * pUnoI);
+    friend void acquireProxy(uno_Interface * pUnoI);
 
-    friend void SAL_CALL releaseProxy(uno_Interface * pUnoI);
+    friend void releaseProxy(uno_Interface * pUnoI);
 };
 
 } } }
diff --git a/bridges/source/cpp_uno/shared/component.cxx b/bridges/source/cpp_uno/shared/component.cxx
index 35217307a1b4..48b32331bf2e 100644
--- a/bridges/source/cpp_uno/shared/component.cxx
+++ b/bridges/source/cpp_uno/shared/component.cxx
@@ -42,7 +42,7 @@ namespace {
 static OUString * s_pStaticOidPart = nullptr;
 #endif
 
-const OUString & SAL_CALL cppu_cppenv_getStaticOIdPart()
+const OUString & cppu_cppenv_getStaticOIdPart()
 {
 #if ! (defined(__GNUC__) && defined(__APPLE__))
     static OUString * s_pStaticOidPart = nullptr;
@@ -128,7 +128,7 @@ static void s_stub_computeObjectIdentifier(va_list * pParam)
     }
 }
 
-static void SAL_CALL computeObjectIdentifier(
+static void computeObjectIdentifier(
     uno_ExtEnvironment * pExtEnv, rtl_uString ** ppOId, void * pInterface )
 {
     uno_Environment_invoke(&pExtEnv->aBase, s_stub_computeObjectIdentifier, pExtEnv, ppOId, pInterface);
@@ -142,7 +142,7 @@ static void s_stub_acquireInterface(va_list * pParam)
     static_cast< ::com::sun::star::uno::XInterface * >( pCppI )->acquire();
 }
 
-static void SAL_CALL acquireInterface( uno_ExtEnvironment * pExtEnv, void * pCppI )
+static void acquireInterface( uno_ExtEnvironment * pExtEnv, void * pCppI )
 {
     uno_Environment_invoke(&pExtEnv->aBase, s_stub_acquireInterface, pExtEnv, pCppI);
 }
@@ -155,12 +155,12 @@ static void s_stub_releaseInterface(va_list * pParam)
     static_cast< ::com::sun::star::uno::XInterface * >( pCppI )->release();
 }
 
-static void SAL_CALL releaseInterface( uno_ExtEnvironment * pExtEnv, void * pCppI )
+static void releaseInterface( uno_ExtEnvironment * pExtEnv, void * pCppI )
 {
     uno_Environment_invoke(&pExtEnv->aBase, s_stub_releaseInterface, pExtEnv, pCppI);
 }
 
-static void SAL_CALL environmentDisposing(
+static void environmentDisposing(
     SAL_UNUSED_PARAMETER uno_Environment * )
 {
 }
@@ -169,7 +169,7 @@ static void SAL_CALL environmentDisposing(
 #define uno_initEnvironment CPPU_ENV_uno_initEnvironment
 #endif
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment(uno_Environment * pCppEnv)
+SAL_DLLPUBLIC_EXPORT void uno_initEnvironment(uno_Environment * pCppEnv)
     SAL_THROW_EXTERN_C()
 {
     assert(pCppEnv->pExtEnv);
@@ -189,7 +189,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment(uno_Environment * pCppEnv
 #define uno_ext_getMapping CPPU_ENV_uno_ext_getMapping
 #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/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index 47bd40069f4f..50419298d87f 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -64,7 +64,7 @@ using bridges::cpp_uno::shared::VtableFactory;
 
 namespace {
 
-extern "C" void * SAL_CALL allocExec(
+extern "C" void * allocExec(
     SAL_UNUSED_PARAMETER rtl_arena_type *, sal_Size * size)
 {
     std::size_t pagesize;
@@ -104,7 +104,7 @@ extern "C" void * SAL_CALL allocExec(
     return p;
 }
 
-extern "C" void SAL_CALL freeExec(
+extern "C" void freeExec(
     SAL_UNUSED_PARAMETER rtl_arena_type *, void * address, sal_Size size)
 {
 #if defined SAL_UNX
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);