summaryrefslogtreecommitdiff
path: root/cppu/source/helper
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-12-08 15:58:41 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-12-11 12:13:46 +0100
commit3af500580b1c82eabd60335c9ebc458a3f68850c (patch)
treee0ad105be694cfb46221d16e9ce987879794fa04 /cppu/source/helper
parent0f9a596aa853b4f2beeff25c131246a7b31492a4 (diff)
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>
Diffstat (limited to 'cppu/source/helper')
-rw-r--r--cppu/source/helper/purpenv/Proxy.hxx2
-rw-r--r--cppu/source/helper/purpenv/helper_purpenv_Environment.cxx46
-rw-r--r--cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx8
-rw-r--r--cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx8
4 files changed, 32 insertions, 32 deletions
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();