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 /desktop | |
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 'desktop')
18 files changed, 27 insertions, 27 deletions
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 5b60248f6a7a..afcdba68629f 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -298,7 +298,7 @@ void ImplPostProcessDocumentsEvent( ProcessDocumentsRequest* pEvent ) Application::PostUserEvent( LINK( nullptr, ProcessEventsClass_Impl, ProcessDocumentsEvent ), pEvent ); } -oslSignalAction SAL_CALL SalMainPipeExchangeSignal_impl(SAL_UNUSED_PARAMETER void* /*pData*/, oslSignalInfo* pInfo) +oslSignalAction SalMainPipeExchangeSignal_impl(SAL_UNUSED_PARAMETER void* /*pData*/, oslSignalInfo* pInfo) { if( pInfo->Signal == osl_Signal_Terminate ) RequestHandler::SetDowning(); diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx index 4450e98aebdb..4634aef87590 100644 --- a/desktop/source/app/officeipcthread.hxx +++ b/desktop/source/app/officeipcthread.hxx @@ -39,7 +39,7 @@ namespace desktop { -oslSignalAction SAL_CALL SalMainPipeExchangeSignal_impl(void* /*pData*/, oslSignalInfo* pInfo); +oslSignalAction SalMainPipeExchangeSignal_impl(void* /*pData*/, oslSignalInfo* pInfo); // A request for the current office // that was given by command line or by IPC pipe communication. diff --git a/desktop/source/deployment/dp_services.cxx b/desktop/source/deployment/dp_services.cxx index 18c2f882c721..ba642fdbff10 100644 --- a/desktop/source/deployment/dp_services.cxx +++ b/desktop/source/deployment/dp_services.cxx @@ -27,7 +27,7 @@ namespace sdecl = comphelper::service_decl; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL deployment_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * deployment_component_getFactory( sal_Char const * pImplName, void *, void *) { return sdecl::component_getFactoryHelper( diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index 489a0dd8497f..c3d7638c00fa 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -315,7 +315,7 @@ sdecl::ServiceDecl const updateDecl( extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL deploymentgui_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * deploymentgui_component_getFactory( sal_Char const * pImplName, void *, void *) { return sdecl::component_getFactoryHelper( diff --git a/desktop/source/deployment/inc/dp_registry.hxx b/desktop/source/deployment/inc/dp_registry.hxx index 7a3eda34f08a..43746ddfc642 100644 --- a/desktop/source/deployment/inc/dp_registry.hxx +++ b/desktop/source/deployment/inc/dp_registry.hxx @@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace dp_registry { -css::uno::Reference<css::deployment::XPackageRegistry> SAL_CALL create( +css::uno::Reference<css::deployment::XPackageRegistry> create( OUString const & context, OUString const & cachePath, css::uno::Reference<css::uno::XComponentContext> const & xComponentContext); diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index a14b0fe6bbf2..09180c066a83 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -528,7 +528,7 @@ PackageRegistryImpl::getSupportedPackageTypes() } // anon namespace -Reference<deployment::XPackageRegistry> SAL_CALL create( +Reference<deployment::XPackageRegistry> create( OUString const & context, OUString const & cachePath, Reference<XComponentContext> const & xComponentContext ) diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx index dc0c47d0be05..1b407adba228 100644 --- a/desktop/source/migration/services/basicmigration.cxx +++ b/desktop/source/migration/services/basicmigration.cxx @@ -208,7 +208,7 @@ namespace migration // component operations - Reference< XInterface > SAL_CALL BasicMigration_create( + Reference< XInterface > BasicMigration_create( Reference< XComponentContext > const & ) { return static_cast< lang::XTypeProvider * >( new BasicMigration() ); diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx index d2d18463b297..8a0c45f664e1 100644 --- a/desktop/source/migration/services/basicmigration.hxx +++ b/desktop/source/migration/services/basicmigration.hxx @@ -37,9 +37,9 @@ namespace migration { - OUString SAL_CALL BasicMigration_getImplementationName(); - css::uno::Sequence< OUString > SAL_CALL BasicMigration_getSupportedServiceNames(); - css::uno::Reference< css::uno::XInterface > SAL_CALL BasicMigration_create( + OUString BasicMigration_getImplementationName(); + css::uno::Sequence< OUString > BasicMigration_getSupportedServiceNames(); + css::uno::Reference< css::uno::XInterface > BasicMigration_create( css::uno::Reference< css::uno::XComponentContext > const & xContext ); diff --git a/desktop/source/migration/services/cexports.cxx b/desktop/source/migration/services/cexports.cxx index 9877705130c4..a56f0dae9458 100644 --- a/desktop/source/migration/services/cexports.cxx +++ b/desktop/source/migration/services/cexports.cxx @@ -50,7 +50,7 @@ extern "C" }; -SAL_DLLPUBLIC_EXPORT void * SAL_CALL migrationoo2_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * migrationoo2_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/desktop/source/migration/services/cexportsoo3.cxx b/desktop/source/migration/services/cexportsoo3.cxx index eecb5ee929dc..a53884760d0b 100644 --- a/desktop/source/migration/services/cexportsoo3.cxx +++ b/desktop/source/migration/services/cexportsoo3.cxx @@ -35,7 +35,7 @@ extern "C" }; -SAL_DLLPUBLIC_EXPORT void * SAL_CALL migrationoo3_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * migrationoo3_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx index b8672ee44c7d..4510c93d2831 100644 --- a/desktop/source/migration/services/oo3extensionmigration.cxx +++ b/desktop/source/migration/services/oo3extensionmigration.cxx @@ -429,7 +429,7 @@ void TmpRepositoryCommandEnv::pop() // component operations -Reference< XInterface > SAL_CALL OO3ExtensionMigration_create( +Reference< XInterface > OO3ExtensionMigration_create( Reference< XComponentContext > const & ctx ) { return static_cast< lang::XTypeProvider * >( new OO3ExtensionMigration( diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx index c237f54020d3..62eb936dccdb 100644 --- a/desktop/source/migration/services/oo3extensionmigration.hxx +++ b/desktop/source/migration/services/oo3extensionmigration.hxx @@ -46,9 +46,9 @@ class INetURLObject; namespace migration { - OUString SAL_CALL OO3ExtensionMigration_getImplementationName(); - css::uno::Sequence< OUString > SAL_CALL OO3ExtensionMigration_getSupportedServiceNames(); - css::uno::Reference< css::uno::XInterface > SAL_CALL OO3ExtensionMigration_create( + OUString OO3ExtensionMigration_getImplementationName(); + css::uno::Sequence< OUString > OO3ExtensionMigration_getSupportedServiceNames(); + css::uno::Reference< css::uno::XInterface > OO3ExtensionMigration_create( css::uno::Reference< css::uno::XComponentContext > const & xContext ); diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx index 1830c65a362c..ab2264e4d683 100644 --- a/desktop/source/migration/services/wordbookmigration.cxx +++ b/desktop/source/migration/services/wordbookmigration.cxx @@ -242,7 +242,7 @@ bool IsUserWordbook( const OUString& rFile ) // component operations - Reference< XInterface > SAL_CALL WordbookMigration_create( + Reference< XInterface > WordbookMigration_create( Reference< XComponentContext > const & ) { return static_cast< lang::XTypeProvider * >( new WordbookMigration() ); diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx index 4fd535b1738b..81a60f7ee3c8 100644 --- a/desktop/source/migration/services/wordbookmigration.hxx +++ b/desktop/source/migration/services/wordbookmigration.hxx @@ -37,9 +37,9 @@ namespace migration { - OUString SAL_CALL WordbookMigration_getImplementationName(); - css::uno::Sequence< OUString > SAL_CALL WordbookMigration_getSupportedServiceNames(); - css::uno::Reference< css::uno::XInterface > SAL_CALL WordbookMigration_create( + OUString WordbookMigration_getImplementationName(); + css::uno::Sequence< OUString > WordbookMigration_getSupportedServiceNames(); + css::uno::Reference< css::uno::XInterface > WordbookMigration_create( css::uno::Reference< css::uno::XComponentContext > const & xContext ); diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx index 80c9a7cc722a..6244b79e2c4e 100644 --- a/desktop/source/offacc/acceptor.cxx +++ b/desktop/source/offacc/acceptor.cxx @@ -259,7 +259,7 @@ extern "C" { using namespace desktop; -SAL_DLLPUBLIC_EXPORT void * SAL_CALL offacc_component_getFactory(char const *pImplementationName, void *pServiceManager, void *) +SAL_DLLPUBLIC_EXPORT void * offacc_component_getFactory(char const *pImplementationName, void *pServiceManager, void *) { void* pReturn = nullptr ; if ( pImplementationName && pServiceManager ) diff --git a/desktop/source/splash/services_spl.cxx b/desktop/source/splash/services_spl.cxx index 7993b09f56eb..dfa8728fd0d3 100644 --- a/desktop/source/splash/services_spl.cxx +++ b/desktop/source/splash/services_spl.cxx @@ -46,7 +46,7 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL spl_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * spl_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/desktop/source/splash/splash.hxx b/desktop/source/splash/splash.hxx index 813e17248a12..1561308dbb90 100644 --- a/desktop/source/splash/splash.hxx +++ b/desktop/source/splash/splash.hxx @@ -35,12 +35,12 @@ namespace com { namespace sun { namespace star { namespace desktop { namespace splash { -css::uno::Reference< css::uno::XInterface > SAL_CALL +css::uno::Reference< css::uno::XInterface > create( css::uno::Reference< css::uno::XComponentContext > const & ); -OUString SAL_CALL getImplementationName(); +OUString getImplementationName(); -css::uno::Sequence< OUString > SAL_CALL +css::uno::Sequence< OUString > getSupportedServiceNames(); } } diff --git a/desktop/source/splash/unxsplash.hxx b/desktop/source/splash/unxsplash.hxx index faf4233a9bef..d4ca29fd1be4 100644 --- a/desktop/source/splash/unxsplash.hxx +++ b/desktop/source/splash/unxsplash.hxx @@ -65,9 +65,9 @@ public: } /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL UnxSplash_createInstance(const css::uno::Reference< css::uno::XComponentContext > & xCtx ); +css::uno::Reference< css::uno::XInterface > UnxSplash_createInstance(const css::uno::Reference< css::uno::XComponentContext > & xCtx ); OUString UnxSplash_getImplementationName(); -css::uno::Sequence< OUString > SAL_CALL UnxSplash_getSupportedServiceNames() throw (); +css::uno::Sequence< OUString > UnxSplash_getSupportedServiceNames() throw (); #endif // INCLUDED_DESKTOP_SOURCE_SPLASH_UNXSPLASH_HXX |