From 3af500580b1c82eabd60335c9ebc458a3f68850c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 8 Dec 2017 15:58:41 +0200 Subject: 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 Reviewed-by: Noel Grandin --- sdext/source/minimizer/pppoptimizeruno.cxx | 2 +- sdext/source/pdfimport/services.cxx | 4 ++-- sdext/source/presenter/PresenterComponent.cxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sdext/source') diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx b/sdext/source/minimizer/pppoptimizeruno.cxx index 42e77bdf27c8..08a97a7f52d7 100644 --- a/sdext/source/minimizer/pppoptimizeruno.cxx +++ b/sdext/source/minimizer/pppoptimizeruno.cxx @@ -29,7 +29,7 @@ using namespace ::com::sun::star::registry; extern "C" { - SAL_DLLPUBLIC_EXPORT void* SAL_CALL pptminimizer_component_getFactory( + SAL_DLLPUBLIC_EXPORT void* pptminimizer_component_getFactory( const sal_Char * pImplName, void * pServiceManager, SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ ) { diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx index 1f597a65701f..405f0ef5b269 100644 --- a/sdext/source/pdfimport/services.cxx +++ b/sdext/source/pdfimport/services.cxx @@ -73,7 +73,7 @@ namespace namespace { - typedef Reference< XInterface > (SAL_CALL * ComponentFactory)( const Reference< XComponentContext >& ); + typedef Reference< XInterface > (* ComponentFactory)( const Reference< XComponentContext >& ); struct ComponentDescription { @@ -109,7 +109,7 @@ namespace } } -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL pdfimport_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* pdfimport_component_getFactory( const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void* /*pServiceManager*/, SAL_UNUSED_PARAMETER void* /*pRegistryKey*/ ) diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx index 8b35e454cb9a..fc99cd56fceb 100644 --- a/sdext/source/presenter/PresenterComponent.cxx +++ b/sdext/source/presenter/PresenterComponent.cxx @@ -47,7 +47,7 @@ static const struct ImplementationEntry gServiceEntries[] = { nullptr, nullptr, nullptr, nullptr, nullptr, 0 } }; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL presenter_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * presenter_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , gServiceEntries); -- cgit v1.2.3