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 /scaddins | |
| 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 'scaddins')
| -rw-r--r-- | scaddins/source/analysis/analysis.cxx | 4 | ||||
| -rw-r--r-- | scaddins/source/analysis/analysis.hxx | 2 | ||||
| -rw-r--r-- | scaddins/source/datefunc/datefunc.cxx | 4 | ||||
| -rw-r--r-- | scaddins/source/pricing/pricing.cxx | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx index 862bd2532a8d..6c6a94afdb42 100644 --- a/scaddins/source/analysis/analysis.cxx +++ b/scaddins/source/analysis/analysis.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star; using namespace sca::analysis; using namespace std; -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL analysis_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* analysis_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) { void* pRet = nullptr; @@ -163,7 +163,7 @@ uno::Sequence< OUString > AnalysisAddIn::getSupportedServiceNames_Static() return aRet; } -uno::Reference< uno::XInterface > SAL_CALL AnalysisAddIn_CreateInstance( +uno::Reference< uno::XInterface > AnalysisAddIn_CreateInstance( const uno::Reference< lang::XMultiServiceFactory >& xServiceFact ) { return static_cast<cppu::OWeakObject*>(new AnalysisAddIn( comphelper::getComponentContext(xServiceFact) )); diff --git a/scaddins/source/analysis/analysis.hxx b/scaddins/source/analysis/analysis.hxx index 22e82cddfe15..f187836d4a02 100644 --- a/scaddins/source/analysis/analysis.hxx +++ b/scaddins/source/analysis/analysis.hxx @@ -41,7 +41,7 @@ namespace sca { namespace analysis { class ConvertDataList; } } -css::uno::Reference< css::uno::XInterface > SAL_CALL AnalysisAddIn_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& ); +css::uno::Reference< css::uno::XInterface > AnalysisAddIn_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& ); class AnalysisAddIn : public cppu::WeakImplHelper< diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx index e46924f4c44c..5b6c804c54aa 100644 --- a/scaddins/source/datefunc/datefunc.cxx +++ b/scaddins/source/datefunc/datefunc.cxx @@ -87,7 +87,7 @@ void InitScaFuncDataList(ScaFuncDataList& rList) } // entry points for service registration / instantiation -uno::Reference< uno::XInterface > SAL_CALL ScaDateAddIn_CreateInstance( +uno::Reference< uno::XInterface > ScaDateAddIn_CreateInstance( const uno::Reference< lang::XMultiServiceFactory >& ) { return static_cast<cppu::OWeakObject*>(new ScaDateAddIn()); @@ -95,7 +95,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScaDateAddIn_CreateInstance( extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL date_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * date_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void* pRet = nullptr; diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx index dd18d1f45970..d60e4516cbf4 100644 --- a/scaddins/source/pricing/pricing.cxx +++ b/scaddins/source/pricing/pricing.cxx @@ -90,7 +90,7 @@ void sca::pricing::InitScaFuncDataList(ScaFuncDataList& rList) } // entry points for service registration / instantiation -uno::Reference< uno::XInterface > SAL_CALL ScaPricingAddIn_CreateInstance( +uno::Reference< uno::XInterface > ScaPricingAddIn_CreateInstance( const uno::Reference< lang::XMultiServiceFactory >& ) { return static_cast<cppu::OWeakObject*>(new ScaPricingAddIn()); @@ -98,7 +98,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScaPricingAddIn_CreateInstance( extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL pricing_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * pricing_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void* pRet = nullptr; |