diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-08 15:58:41 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-11 12:13:46 +0100 |
commit | 3af500580b1c82eabd60335c9ebc458a3f68850c (patch) | |
tree | e0ad105be694cfb46221d16e9ce987879794fa04 /bridges/inc | |
parent | 0f9a596aa853b4f2beeff25c131246a7b31492a4 (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 'bridges/inc')
-rw-r--r-- | bridges/inc/bridge.hxx | 20 | ||||
-rw-r--r-- | bridges/inc/cppinterfaceproxy.hxx | 4 | ||||
-rw-r--r-- | bridges/inc/unointerfaceproxy.hxx | 16 |
3 files changed, 20 insertions, 20 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); }; } } } |