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>

15 files changed, 74 insertions, 74 deletions

diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx
index bf0455f689a1..b63b8777a0dd 100644
--- a/cppu/source/AffineBridge/AffineBridge.cxx
+++ b/cppu/source/AffineBridge/AffineBridge.cxx
@@ -340,13 +340,13 @@ bool AffineBridge::v_isValid(rtl::OUString * pReason)
 
 #endif
 
-extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_initEnvironment(uno_Environment * pEnv)
+extern "C" void SAL_DLLPUBLIC_EXPORT uno_initEnvironment(uno_Environment * pEnv)
     SAL_THROW_EXTERN_C()
 {
     cppu::helper::purpenv::Environment_initWithEnterable(pEnv, new AffineBridge());
 }
 
-extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_ext_getMapping(uno_Mapping     ** ppMapping,
+extern "C" void SAL_DLLPUBLIC_EXPORT uno_ext_getMapping(uno_Mapping     ** ppMapping,
                                                         uno_Environment  * pFrom,
                                                         uno_Environment  * pTo )
 {
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx
index 2e891603c152..395d7d8ef164 100644
--- a/cppu/source/LogBridge/LogBridge.cxx
+++ b/cppu/source/LogBridge/LogBridge.cxx
@@ -249,13 +249,13 @@ void LogProbe(
 
 #endif
 
-extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_initEnvironment(uno_Environment * pEnv)
+extern "C" void SAL_DLLPUBLIC_EXPORT uno_initEnvironment(uno_Environment * pEnv)
     SAL_THROW_EXTERN_C()
 {
     cppu::helper::purpenv::Environment_initWithEnterable(pEnv, new LogBridge());
 }
 
-extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_ext_getMapping(uno_Mapping     ** ppMapping,
+extern "C" void SAL_DLLPUBLIC_EXPORT uno_ext_getMapping(uno_Mapping     ** ppMapping,
                                    uno_Environment  * pFrom,
                                    uno_Environment  * pTo )
 {
diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
index 772f2a7bd703..892390b7a263 100644
--- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx
+++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
@@ -124,13 +124,13 @@ bool UnsafeBridge::v_isValid(rtl::OUString * pReason)
     return result;
 }
 
-extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_initEnvironment(uno_Environment * pEnv)
+extern "C" void SAL_DLLPUBLIC_EXPORT uno_initEnvironment(uno_Environment * pEnv)
     SAL_THROW_EXTERN_C()
 {
     cppu::helper::purpenv::Environment_initWithEnterable(pEnv, new UnsafeBridge());
 }
 
-extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_ext_getMapping(uno_Mapping     ** ppMapping,
+extern "C" void SAL_DLLPUBLIC_EXPORT uno_ext_getMapping(uno_Mapping     ** ppMapping,
                                    uno_Environment  * pFrom,
                                    uno_Environment  * pTo )
 {
diff --git a/cppu/source/helper/purpenv/Proxy.hxx b/cppu/source/helper/purpenv/Proxy.hxx
index 3c270fa6421a..f53702ef93d3 100644
--- a/cppu/source/helper/purpenv/Proxy.hxx
+++ b/cppu/source/helper/purpenv/Proxy.hxx
@@ -72,7 +72,7 @@ public:
 
 };
 
-extern "C" void SAL_CALL Proxy_free(uno_ExtEnvironment * pEnv, void * pProxy) SAL_THROW_EXTERN_C();
+extern "C" void Proxy_free(uno_ExtEnvironment * pEnv, void * pProxy) SAL_THROW_EXTERN_C();
 
 #endif
 
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
index 4143e4838515..8d24442faa11 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
@@ -28,32 +28,32 @@
 #include <osl/interlck.h>
 
 extern "C" {
-typedef void SAL_CALL EnvFun_P   (uno_Environment *);
-typedef void SAL_CALL EnvFun_PP_P(uno_Environment ** ppHardEnv, uno_Environment *);
-typedef void SAL_CALL ExtEnv_registerProxyInterface (uno_ExtEnvironment                 *,
+typedef void EnvFun_P   (uno_Environment *);
+typedef void EnvFun_PP_P(uno_Environment ** ppHardEnv, uno_Environment *);
+typedef void ExtEnv_registerProxyInterface (uno_ExtEnvironment                 *,
                                                      void                              ** ppProxy,
                                                      uno_freeProxyFunc                    freeProxy,
                                                      rtl_uString * pOId,
                                                      typelib_InterfaceTypeDescription   * pTypeDescr);
-typedef void SAL_CALL ExtEnv_revokeInterface        (uno_ExtEnvironment                 *,
+typedef void ExtEnv_revokeInterface        (uno_ExtEnvironment                 *,
                                                      void                               * pInterface);
-typedef void SAL_CALL ExtEnv_getObjectIdentifier    (uno_ExtEnvironment                 *,
+typedef void ExtEnv_getObjectIdentifier    (uno_ExtEnvironment                 *,
                                                      rtl_uString                       **,
                                                      void                               *);
-typedef void SAL_CALL ExtEnv_getRegisteredInterface (uno_ExtEnvironment                 *,
+typedef void ExtEnv_getRegisteredInterface (uno_ExtEnvironment                 *,
                                                      void                              **,
                                                      rtl_uString                        *,
                                                      typelib_InterfaceTypeDescription   *);
-typedef void SAL_CALL ExtEnv_getRegisteredInterfaces(uno_ExtEnvironment                 *,
+typedef void ExtEnv_getRegisteredInterfaces(uno_ExtEnvironment                 *,
                                                      void                             *** pppInterfaces,
                                                      sal_Int32                          * pnLen,
                                                      uno_memAlloc                         memAlloc);
-typedef void SAL_CALL ExtEnv_computeObjectIdentifier(uno_ExtEnvironment                 *,
+typedef void ExtEnv_computeObjectIdentifier(uno_ExtEnvironment                 *,
                                                      rtl_uString                       ** ppOId,
                                                      void                               * pInterface);
-typedef void SAL_CALL ExtEnv_acquireInterface       (uno_ExtEnvironment                 *,
+typedef void ExtEnv_acquireInterface       (uno_ExtEnvironment                 *,
                                                      void                               * pInterface);
-typedef void SAL_CALL ExtEnv_releaseInterface       (uno_ExtEnvironment                 *,
+typedef void ExtEnv_releaseInterface       (uno_ExtEnvironment                 *,
                                                      void                               * pInterface);
 }
 
@@ -116,38 +116,38 @@ protected:
 };
 
 extern "C" {
-static void SAL_CALL s_acquire(uno_Environment * pEnv) //SAL_THROW_EXTERN_C()
+static void s_acquire(uno_Environment * pEnv) //SAL_THROW_EXTERN_C()
 {
     Base * pBase = static_cast<Base *>(pEnv->pReserved);
     pBase->acquire();
 }
 
-static void SAL_CALL s_release(uno_Environment * pEnv) SAL_THROW_EXTERN_C()
+static void s_release(uno_Environment * pEnv) SAL_THROW_EXTERN_C()
 {
     Base * pBase = static_cast<Base *>(pEnv->pReserved);
     pBase->release();
 }
 
-static void SAL_CALL s_harden(uno_Environment ** ppHardEnv, uno_Environment * pEnv) SAL_THROW_EXTERN_C()
+static void s_harden(uno_Environment ** ppHardEnv, uno_Environment * pEnv) SAL_THROW_EXTERN_C()
 {
     Base * pBase = static_cast<Base *>(pEnv->pReserved);
     pBase->harden(ppHardEnv);
 }
 
-static void SAL_CALL s_acquireWeak(uno_Environment * pEnv) SAL_THROW_EXTERN_C()
+static void s_acquireWeak(uno_Environment * pEnv) SAL_THROW_EXTERN_C()
 {
     Base * pBase = static_cast<Base *>(pEnv->pReserved);
     pBase->acquireWeak();
 }
 
-static void SAL_CALL s_releaseWeak(uno_Environment * pEnv) SAL_THROW_EXTERN_C()
+static void s_releaseWeak(uno_Environment * pEnv) SAL_THROW_EXTERN_C()
 {
     Base * pBase = static_cast<Base *>(pEnv->pReserved);
     pBase->releaseWeak();
 }
 
 
-static void SAL_CALL s_registerProxyInterface(uno_ExtEnvironment                * pExtEnv,
+static void s_registerProxyInterface(uno_ExtEnvironment                * pExtEnv,
                                                          void                             ** ppProxy,
                                                          uno_freeProxyFunc                   freeProxy,
                                                          rtl_uString                       * pOId,
@@ -157,13 +157,13 @@ static void SAL_CALL s_registerProxyInterface(uno_ExtEnvironment
     pBase->registerProxyInterface(ppProxy, freeProxy, pOId, pTypeDescr);
 }
 
-static void SAL_CALL s_revokeInterface(uno_ExtEnvironment * pExtEnv, void * pInterface)
+static void s_revokeInterface(uno_ExtEnvironment * pExtEnv, void * pInterface)
 {
     Base * pBase = static_cast<Base *>(pExtEnv->aBase.pReserved);
     pBase->revokeInterface(pInterface);
 }
 
-static void SAL_CALL s_getObjectIdentifier(uno_ExtEnvironment *  pExtEnv,
+static void s_getObjectIdentifier(uno_ExtEnvironment *  pExtEnv,
                                                       rtl_uString        ** ppOId,
                                                       void               *  pInterface)
 {
@@ -171,7 +171,7 @@ static void SAL_CALL s_getObjectIdentifier(uno_ExtEnvironment *  pExtEnv,
     pBase->getObjectIdentifier(pInterface, reinterpret_cast<rtl::OUString *>(ppOId));
 }
 
-static void SAL_CALL s_getRegisteredInterface(uno_ExtEnvironment *  pExtEnv,
+static void s_getRegisteredInterface(uno_ExtEnvironment *  pExtEnv,
                                                          void               ** ppInterface,
                                                          rtl_uString        *  pOId,
                                                          typelib_InterfaceTypeDescription * pTypeDescr)
@@ -180,7 +180,7 @@ static void SAL_CALL s_getRegisteredInterface(uno_ExtEnvironment *  pExtEnv,
     pBase->getRegisteredInterface(ppInterface, pOId, pTypeDescr);
 }
 
-static void SAL_CALL s_getRegisteredInterfaces(uno_ExtEnvironment   * pExtEnv,
+static void s_getRegisteredInterfaces(uno_ExtEnvironment   * pExtEnv,
                                                           void               *** pppInterface,
                                                           sal_Int32            * pnLen,
                                                           uno_memAlloc           memAlloc)
@@ -189,7 +189,7 @@ static void SAL_CALL s_getRegisteredInterfaces(uno_ExtEnvironment   * pExtEnv,
     pBase->getRegisteredInterfaces(pppInterface, pnLen, memAlloc);
 }
 
-static void SAL_CALL s_computeObjectIdentifier(uno_ExtEnvironment *  pExtEnv,
+static void s_computeObjectIdentifier(uno_ExtEnvironment *  pExtEnv,
                                                           rtl_uString        ** ppOId,
                                                           void               *  pInterface)
 {
@@ -197,12 +197,12 @@ static void SAL_CALL s_computeObjectIdentifier(uno_ExtEnvironment *  pExtEnv,
     pBase->computeObjectIdentifier(pInterface, reinterpret_cast<rtl::OUString *>(ppOId));
 }
 
-static void SAL_CALL s_acquireInterface(uno_ExtEnvironment * pExtEnv, void * pInterface) {
+static void s_acquireInterface(uno_ExtEnvironment * pExtEnv, void * pInterface) {
     Base * pBase = static_cast<Base *>(pExtEnv->aBase.pReserved);
     pBase->acquireInterface(pInterface);
 }
 
-static void SAL_CALL s_releaseInterface(uno_ExtEnvironment * pExtEnv, void * pInterface) {
+static void s_releaseInterface(uno_ExtEnvironment * pExtEnv, void * pInterface) {
     Base * pBase = static_cast<Base *>(pExtEnv->aBase.pReserved);
     pBase->releaseInterface(pInterface);
 }
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
index f065d3c7ecca..41a338f27a53 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
@@ -55,7 +55,7 @@ public:
     void release();
 };
 
-static void SAL_CALL s_mapInterface(
+static void s_mapInterface(
     uno_Mapping                       * puno_Mapping,
     void                             ** ppOut,
     void                              * pUnoI,
@@ -69,14 +69,14 @@ static void SAL_CALL s_mapInterface(
 }
 
 extern "C" {
-static void SAL_CALL s_acquire(uno_Mapping * puno_Mapping)
+static void s_acquire(uno_Mapping * puno_Mapping)
     SAL_THROW_EXTERN_C()
 {
     Mapping * pMapping = static_cast<Mapping *>(puno_Mapping);
     pMapping->acquire();
 }
 
-static void SAL_CALL s_release(uno_Mapping * puno_Mapping)
+static void s_release(uno_Mapping * puno_Mapping)
     SAL_THROW_EXTERN_C()
 {
     Mapping * pMapping = static_cast<Mapping * >(puno_Mapping);
@@ -93,7 +93,7 @@ static void s_getIdentifier_v(va_list * pParam)
     pEnv->getObjectIdentifier(pEnv, ppOid, pUnoI);
 }
 
-static void SAL_CALL s_free(uno_Mapping * puno_Mapping)
+static void s_free(uno_Mapping * puno_Mapping)
     SAL_THROW_EXTERN_C()
 {
     Mapping * pMapping = static_cast<Mapping *>(puno_Mapping);
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
index 048f393d6466..e0ce8b74aa27 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
@@ -98,7 +98,7 @@ static bool relatesToInterface(typelib_TypeDescription * pTypeDescr)
     return false;
 }
 
-extern "C" { static void SAL_CALL s_Proxy_dispatch(
+extern "C" { static void s_Proxy_dispatch(
     uno_Interface                 * pUnoI,
     typelib_TypeDescription const * pMemberType,
     void                          * pReturn,
@@ -158,20 +158,20 @@ extern "C" { static void SAL_CALL s_Proxy_dispatch(
                      ppException );
 }}
 
-extern "C" void SAL_CALL 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) SAL_THROW_EXTERN_C()
 {
     Proxy * pThis = static_cast<Proxy * >(static_cast<uno_Interface *>(pProxy));
     delete pThis;
 }
 
 extern "C" {
-static void SAL_CALL s_Proxy_acquire(uno_Interface * pUnoI) SAL_THROW_EXTERN_C()
+static void s_Proxy_acquire(uno_Interface * pUnoI) SAL_THROW_EXTERN_C()
 {
     Proxy * pProxy = static_cast<Proxy *>(pUnoI);
     pProxy->acquire();
 }
 
-static void SAL_CALL s_Proxy_release(uno_Interface * pUnoI) SAL_THROW_EXTERN_C()
+static void s_Proxy_release(uno_Interface * pUnoI) SAL_THROW_EXTERN_C()
 {
     Proxy * pProxy = static_cast<Proxy *>(pUnoI);
     pProxy->release();
diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx
index f0bb7e750a94..fa2545d05e1c 100644
--- a/cppu/source/threadpool/current.cxx
+++ b/cppu/source/threadpool/current.cxx
@@ -134,7 +134,7 @@ public:
     }
 };
 
-extern "C" void SAL_CALL delete_IdContainer( void * p )
+extern "C" void delete_IdContainer( void * p )
 {
     if (p)
     {
diff --git a/cppu/source/threadpool/jobqueue.hxx b/cppu/source/threadpool/jobqueue.hxx
index 9dc20f3cd75e..abfdfa19d661 100644
--- a/cppu/source/threadpool/jobqueue.hxx
+++ b/cppu/source/threadpool/jobqueue.hxx
@@ -29,7 +29,7 @@
 
 namespace cppu_threadpool
 {
-    extern "C" typedef void (SAL_CALL RequestFun)(void *);
+    extern "C" typedef void (RequestFun)(void *);
 
     struct Job
     {
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 4ef5aaf18ac7..a99746ef0600 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -540,7 +540,7 @@ bool complete(typelib_TypeDescription ** ppTypeDescr, bool initTables) {
 }
 
 
-extern "C" void SAL_CALL typelib_typedescription_newEmpty(
+extern "C" void typelib_typedescription_newEmpty(
     typelib_TypeDescription ** ppRet,
     typelib_TypeClass eTypeClass, rtl_uString * pTypeName )
     SAL_THROW_EXTERN_C()
@@ -1605,7 +1605,7 @@ extern "C" sal_Bool SAL_CALL typelib_typedescription_equals(
 }
 
 
-extern "C" sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize(
+extern "C" sal_Int32 typelib_typedescription_getAlignedUnoSize(
     const typelib_TypeDescription * pTypeDescription,
     sal_Int32 nOffset, sal_Int32 & rMaxIntegralTypeSize )
     SAL_THROW_EXTERN_C()
@@ -2215,7 +2215,7 @@ extern "C" void SAL_CALL typelib_typedescriptionreference_getDescription(
 }
 
 
-extern "C" void SAL_CALL typelib_typedescriptionreference_getByName(
+extern "C" void typelib_typedescriptionreference_getByName(
     typelib_TypeDescriptionReference ** ppRet, rtl_uString const * pName )
     SAL_THROW_EXTERN_C()
 {
diff --git a/cppu/source/typelib/typelib.hxx b/cppu/source/typelib/typelib.hxx
index 30f0f22c986c..b10b6eba8757 100644
--- a/cppu/source/typelib/typelib.hxx
+++ b/cppu/source/typelib/typelib.hxx
@@ -20,20 +20,20 @@
 #ifndef INCLUDED_CPPU_SOURCE_TYPELIB_HXX
 #define INCLUDED_CPPU_SOURCE_TYPELIB_HXX
 
-extern "C" sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize(
+extern "C" sal_Int32 typelib_typedescription_getAlignedUnoSize(
     const typelib_TypeDescription * pTypeDescription,
     sal_Int32 nOffset,
     sal_Int32 & rMaxIntegralTypeSize )
     SAL_THROW_EXTERN_C();
 
 
-extern "C" void SAL_CALL typelib_typedescription_newEmpty(
+extern "C" void typelib_typedescription_newEmpty(
     typelib_TypeDescription ** ppRet,
     typelib_TypeClass eTypeClass,
     rtl_uString * pTypeName )
     SAL_THROW_EXTERN_C();
 
-extern "C" void SAL_CALL typelib_typedescriptionreference_getByName(
+extern "C" void typelib_typedescriptionreference_getByName(
     typelib_TypeDescriptionReference ** ppRet,
     rtl_uString const * pName )
     SAL_THROW_EXTERN_C();
diff --git a/cppu/source/uno/IdentityMapping.cxx b/cppu/source/uno/IdentityMapping.cxx
index 659c9cdc7385..36f0d15192c4 100644
--- a/cppu/source/uno/IdentityMapping.cxx
+++ b/cppu/source/uno/IdentityMapping.cxx
@@ -39,12 +39,12 @@ struct IdentityMapping : public uno_Mapping
 extern "C"
 {
 
-static void SAL_CALL s_free(uno_Mapping * pMapping)
+static void s_free(uno_Mapping * pMapping)
 {
     delete static_cast<IdentityMapping *>(pMapping);
 }
 
-static void SAL_CALL s_acquire(uno_Mapping * pMapping)
+static void s_acquire(uno_Mapping * pMapping)
 {
     static rtl::OUString s_purpose;
 
@@ -59,13 +59,13 @@ static void SAL_CALL s_acquire(uno_Mapping * pMapping)
     }
 }
 
-static void SAL_CALL s_release(uno_Mapping * pMapping)
+static void s_release(uno_Mapping * pMapping)
 {
     if (!osl_atomic_decrement(&static_cast<IdentityMapping *>(pMapping )->m_nRef))
         uno_revokeMapping(pMapping);
 }
 
-static void SAL_CALL s_mapInterface(uno_Mapping                       * pMapping,
+static void s_mapInterface(uno_Mapping                       * pMapping,
                                     void                             ** ppOut,
                                     void                              * pInterface,
                                     SAL_UNUSED_PARAMETER typelib_InterfaceTypeDescription * /*pInterfaceTypeDescr*/)
diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx
index 81ef313cfcf3..60a8704e8347 100644
--- a/cppu/source/uno/cascade_mapping.cxx
+++ b/cppu/source/uno/cascade_mapping.cxx
@@ -54,19 +54,19 @@ public:
 };
 
 extern "C" {
-static void SAL_CALL s_acquire(uno_Mapping * mapping)
+static void s_acquire(uno_Mapping * mapping)
 {
     MediatorMapping * pMediatorMapping = static_cast<MediatorMapping *>(mapping);
     pMediatorMapping->acquire();
 }
 
-static void SAL_CALL s_release(uno_Mapping * mapping)
+static void s_release(uno_Mapping * mapping)
 {
     MediatorMapping * pMediatorMapping = static_cast<MediatorMapping *>(mapping);
     pMediatorMapping->release();
 }
 
-static void SAL_CALL s_mapInterface(
+static void s_mapInterface(
     uno_Mapping                      * mapping,
     void                            ** ppOut,
     void                             * pInterface,
@@ -144,7 +144,7 @@ void MediatorMapping::mapInterface(
     *ppOut = ret;
 }
 
-extern "C" { static void SAL_CALL s_MediatorMapping_free(uno_Mapping * pMapping)
+extern "C" { static void s_MediatorMapping_free(uno_Mapping * pMapping)
     SAL_THROW_EXTERN_C()
 {
     delete static_cast<MediatorMapping *>(pMapping);
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 76bf88e6e002..8ca96dc0a7ae 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -226,7 +226,7 @@ extern "C"
 {
 
 
-static void SAL_CALL defenv_registerInterface(
+static void defenv_registerInterface(
     uno_ExtEnvironment * pEnv, void ** ppInterface,
     rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr )
 {
@@ -273,7 +273,7 @@ static void SAL_CALL defenv_registerInterface(
 }
 
 
-static void SAL_CALL defenv_registerProxyInterface(
+static void defenv_registerProxyInterface(
     uno_ExtEnvironment * pEnv, void ** ppInterface, uno_freeProxyFunc freeProxy,
     rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr )
 {
@@ -331,7 +331,7 @@ static void SAL_CALL defenv_registerProxyInterface(
 }
 
 
-static void SAL_CALL s_stub_defenv_revokeInterface(va_list * pParam)
+static void s_stub_defenv_revokeInterface(va_list * pParam)
 {
     uno_ExtEnvironment * pEnv       = va_arg(*pParam, uno_ExtEnvironment *);
     void               * pInterface = va_arg(*pParam, void *);
@@ -418,13 +418,13 @@ static void SAL_CALL s_stub_defenv_revokeInterface(va_list * pParam)
     }
 }
 
-static void SAL_CALL defenv_revokeInterface(uno_ExtEnvironment * pEnv, void * pInterface)
+static void defenv_revokeInterface(uno_ExtEnvironment * pEnv, void * pInterface)
 {
     uno_Environment_invoke(&pEnv->aBase, s_stub_defenv_revokeInterface, pEnv, pInterface);
 }
 
 
-static void SAL_CALL defenv_getObjectIdentifier(
+static void defenv_getObjectIdentifier(
     uno_ExtEnvironment * pEnv, rtl_uString ** ppOId, void * pInterface )
 {
     OSL_ENSURE( pEnv && ppOId && pInterface, "### null ptr!" );
@@ -454,7 +454,7 @@ static void SAL_CALL defenv_getObjectIdentifier(
 }
 
 
-static void SAL_CALL defenv_getRegisteredInterface(
+static void defenv_getRegisteredInterface(
     uno_ExtEnvironment * pEnv, void ** ppInterface,
     rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr )
 {
@@ -484,7 +484,7 @@ static void SAL_CALL defenv_getRegisteredInterface(
 }
 
 
-static void SAL_CALL defenv_getRegisteredInterfaces(
+static void defenv_getRegisteredInterfaces(
     uno_ExtEnvironment * pEnv, void *** pppInterfaces, sal_Int32 * pnLen,
     uno_memAlloc memAlloc )
 {
@@ -510,7 +510,7 @@ static void SAL_CALL defenv_getRegisteredInterfaces(
 }
 
 
-static void SAL_CALL defenv_acquire( uno_Environment * pEnv )
+static void defenv_acquire( uno_Environment * pEnv )
 {
     uno_DefaultEnvironment * that = reinterpret_cast<uno_DefaultEnvironment *>(pEnv);
     osl_atomic_increment( &that->nWeakRef );
@@ -518,7 +518,7 @@ static void SAL_CALL defenv_acquire( uno_Environment * pEnv )
 }
 
 
-static void SAL_CALL defenv_release( uno_Environment * pEnv )
+static void defenv_release( uno_Environment * pEnv )
 {
     uno_DefaultEnvironment * that = reinterpret_cast<uno_DefaultEnvironment *>(pEnv);
     if (! osl_atomic_decrement( &that->nRef ))
@@ -539,14 +539,14 @@ static void SAL_CALL defenv_release( uno_Environment * pEnv )
 }
 
 
-static void SAL_CALL defenv_acquireWeak( uno_Environment * pEnv )
+static void defenv_acquireWeak( uno_Environment * pEnv )
 {
     uno_DefaultEnvironment * that = reinterpret_cast<uno_DefaultEnvironment *>(pEnv);
     osl_atomic_increment( &that->nWeakRef );
 }
 
 
-static void SAL_CALL defenv_releaseWeak( uno_Environment * pEnv )
+static void defenv_releaseWeak( uno_Environment * pEnv )
 {
     uno_DefaultEnvironment * that = reinterpret_cast<uno_DefaultEnvironment *>(pEnv);
     if (! osl_atomic_decrement( &that->nWeakRef ))
@@ -556,7 +556,7 @@ static void SAL_CALL defenv_releaseWeak( uno_Environment * pEnv )
 }
 
 
-static void SAL_CALL defenv_harden(
+static void defenv_harden(
     uno_Environment ** ppHardEnv, uno_Environment * pEnv )
 {
     if (*ppHardEnv)
@@ -584,7 +584,7 @@ static void SAL_CALL defenv_harden(
 }
 
 
-static void SAL_CALL defenv_dispose( SAL_UNUSED_PARAMETER uno_Environment * )
+static void defenv_dispose( SAL_UNUSED_PARAMETER uno_Environment * )
 {
 }
 }
@@ -837,7 +837,7 @@ extern "C"
 {
 
 
-static void SAL_CALL unoenv_computeObjectIdentifier(
+static void unoenv_computeObjectIdentifier(
     uno_ExtEnvironment * pEnv, rtl_uString ** ppOId, void * pInterface )
 {
     assert(pEnv && ppOId && pInterface && "### null ptr!");
@@ -872,7 +872,7 @@ static void SAL_CALL unoenv_computeObjectIdentifier(
 }
 
 
-static void SAL_CALL unoenv_acquireInterface(
+static void unoenv_acquireInterface(
     SAL_UNUSED_PARAMETER uno_ExtEnvironment *, void * pUnoI_ )
 {
     uno_Interface * pUnoI = static_cast< uno_Interface * >(pUnoI_);
@@ -880,7 +880,7 @@ static void SAL_CALL unoenv_acquireInterface(
 }
 
 
-static void SAL_CALL unoenv_releaseInterface(
+static void unoenv_releaseInterface(
     SAL_UNUSED_PARAMETER uno_ExtEnvironment *, void * pUnoI_ )
 {
     uno_Interface * pUnoI = static_cast< uno_Interface * >(pUnoI_);
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 74e167eb336c..4c8aa60895ab 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -197,12 +197,12 @@ struct uno_Mediate_Mapping : public uno_Mapping
 extern "C"
 {
 
-static void SAL_CALL mediate_free( uno_Mapping * pMapping )
+static void mediate_free( uno_Mapping * pMapping )
 {
     delete static_cast< uno_Mediate_Mapping * >( pMapping );
 }
 
-static void SAL_CALL mediate_acquire( uno_Mapping * pMapping )
+static void mediate_acquire( uno_Mapping * pMapping )
 {
     if (1 == osl_atomic_increment(
         & static_cast< uno_Mediate_Mapping * >( pMapping )->nRef ))
@@ -215,7 +215,7 @@ static void SAL_CALL mediate_acquire( uno_Mapping * pMapping )
     }
 }
 
-static void SAL_CALL mediate_release( uno_Mapping * pMapping )
+static void mediate_release( uno_Mapping * pMapping )
 {
     if (! osl_atomic_decrement(
         & static_cast< uno_Mediate_Mapping * >( pMapping )->nRef ))
@@ -224,7 +224,7 @@ static void SAL_CALL mediate_release( uno_Mapping * pMapping )
     }
 }
 
-static void SAL_CALL mediate_mapInterface(
+static void mediate_mapInterface(
     uno_Mapping * pMapping,
     void ** ppOut, void * pInterface,
     typelib_InterfaceTypeDescription * pInterfaceTypeDescr )