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 /cppuhelper | |
| 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 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/exc_thrower.cxx | 4 | ||||
| -rw-r--r-- | cppuhelper/source/implbase_ex.cxx | 2 | ||||
| -rw-r--r-- | cppuhelper/source/macro_expander.cxx | 2 | ||||
| -rw-r--r-- | cppuhelper/source/servicemanager.hxx | 2 | ||||
| -rw-r--r-- | cppuhelper/source/tdmgr.cxx | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx index 4e39ae6c8b5a..9b0a060ef26b 100644 --- a/cppuhelper/source/exc_thrower.cxx +++ b/cppuhelper/source/exc_thrower.cxx @@ -65,12 +65,12 @@ extern "C" { -void SAL_CALL ExceptionThrower_acquire_release_nop( +void ExceptionThrower_acquire_release_nop( SAL_UNUSED_PARAMETER uno_Interface * ) {} -void SAL_CALL ExceptionThrower_dispatch( +void ExceptionThrower_dispatch( uno_Interface * pUnoI, typelib_TypeDescription const * pMemberType, void * pReturn, void * pArgs [], uno_Any ** ppException ) { diff --git a/cppuhelper/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx index d01f61983a91..a3ee6708ca17 100644 --- a/cppuhelper/source/implbase_ex.cxx +++ b/cppuhelper/source/implbase_ex.cxx @@ -47,7 +47,7 @@ namespace cppu /** Shared mutex for implementation helper initialization. Not for public use. */ -::osl::Mutex & SAL_CALL getImplHelperInitMutex() +::osl::Mutex & getImplHelperInitMutex() { return theImplHelperInitMutex::get(); } diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx index c0b2cda55fee..01971f695c03 100644 --- a/cppuhelper/source/macro_expander.cxx +++ b/cppuhelper/source/macro_expander.cxx @@ -167,7 +167,7 @@ OUString Bootstrap_MacroExpander::expandMacros( OUString const & exp ) } -Reference< XInterface > SAL_CALL service_create( +Reference< XInterface > service_create( SAL_UNUSED_PARAMETER Reference< XComponentContext > const & ) { return static_cast< ::cppu::OWeakObject * >( new Bootstrap_MacroExpander ); diff --git a/cppuhelper/source/servicemanager.hxx b/cppuhelper/source/servicemanager.hxx index 9838841403c1..2f7a749058bd 100644 --- a/cppuhelper/source/servicemanager.hxx +++ b/cppuhelper/source/servicemanager.hxx @@ -45,7 +45,7 @@ namespace cppuhelper { extern "C" { -typedef css::uno::XInterface * SAL_CALL ImplementationConstructorFn( +typedef css::uno::XInterface * ImplementationConstructorFn( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &); } diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx index f86dca136753..6a1ca23740b0 100644 --- a/cppuhelper/source/tdmgr.cxx +++ b/cppuhelper/source/tdmgr.cxx @@ -564,7 +564,7 @@ static typelib_TypeDescription * createCTD( extern "C" { -static void SAL_CALL typelib_callback( +static void typelib_callback( void * pContext, typelib_TypeDescription ** ppRet, rtl_uString * pTypeName ) { OSL_ENSURE( pContext && ppRet && pTypeName, "### null ptr!" ); |