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 /mysqlc | |
| 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 'mysqlc')
| -rw-r--r-- | mysqlc/source/mysqlc_driver.cxx | 4 | ||||
| -rw-r--r-- | mysqlc/source/mysqlc_driver.hxx | 4 | ||||
| -rw-r--r-- | mysqlc/source/mysqlc_services.cxx | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx index 319fc963cc39..c4e0ba2f7a60 100644 --- a/mysqlc/source/mysqlc_driver.cxx +++ b/mysqlc/source/mysqlc_driver.cxx @@ -100,7 +100,7 @@ Sequence< rtl::OUString > SAL_CALL MysqlCDriver::getSupportedServiceNames() } #ifndef SYSTEM_MYSQL_CPPCONN -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } #endif void MysqlCDriver::impl_initCppConn_lck_throw() @@ -256,7 +256,7 @@ namespace connectivity namespace mysqlc { -Reference< XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< XMultiServiceFactory >& _rxFactory) +Reference< XInterface > MysqlCDriver_CreateInstance(const Reference< XMultiServiceFactory >& _rxFactory) { return(*(new MysqlCDriver(_rxFactory))); } diff --git a/mysqlc/source/mysqlc_driver.hxx b/mysqlc/source/mysqlc_driver.hxx index 7649fc51539e..0a8337d9b347 100644 --- a/mysqlc/source/mysqlc_driver.hxx +++ b/mysqlc/source/mysqlc_driver.hxx @@ -49,12 +49,12 @@ namespace connectivity using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; /// @throws Exception - Reference< css::uno::XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFactory); + Reference< css::uno::XInterface > MysqlCDriver_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFactory); typedef ::cppu::WeakComponentImplHelper2< css::sdbc::XDriver, css::lang::XServiceInfo > ODriver_BASE; - typedef void* (SAL_CALL * OMysqlCConnection_CreateInstanceFunction)(void* _pDriver); + typedef void* (* OMysqlCConnection_CreateInstanceFunction)(void* _pDriver); class MysqlCDriver : public ODriver_BASE { diff --git a/mysqlc/source/mysqlc_services.cxx b/mysqlc/source/mysqlc_services.cxx index df98a405510b..262859aec953 100644 --- a/mysqlc/source/mysqlc_services.cxx +++ b/mysqlc/source/mysqlc_services.cxx @@ -29,7 +29,7 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; -typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) +typedef Reference< XSingleServiceFactory > (*createFactoryFunc) ( const Reference< XMultiServiceFactory > & rServiceManager, const rtl::OUString & rComponentName, @@ -71,7 +71,7 @@ struct ProviderRequest void* getProvider() const { return xRet.get(); } }; -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* component_getFactory( const sal_Char * pImplementationName, void * pServiceManager, void * /* pRegistryKey */) @@ -96,7 +96,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( return pRet; }; -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT void component_getImplementationEnvironment( char const ** ppEnvTypeName, uno_Environment **) { |