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 --- linguistic/source/convdiclist.cxx | 4 ++-- linguistic/source/dlistimp.cxx | 4 ++-- linguistic/source/gciterator.cxx | 4 ++-- linguistic/source/hhconvdic.cxx | 2 +- linguistic/source/lngopt.cxx | 4 ++-- linguistic/source/lngreg.cxx | 2 +- linguistic/source/lngreg.hxx | 10 +++++----- linguistic/source/lngsvcmgr.cxx | 4 ++-- linguistic/source/misc.cxx | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) (limited to 'linguistic') diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 335589d6a8d0..ca57f4aa373d 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -558,13 +558,13 @@ uno::Sequence< OUString > ConvDicList::getSupportedServiceNames_Static() } /// @throws css::uno::Exception -uno::Reference< uno::XInterface > SAL_CALL ConvDicList_CreateInstance( +uno::Reference< uno::XInterface > ConvDicList_CreateInstance( const uno::Reference< XMultiServiceFactory > & /*rSMgr*/ ) { return StaticConvDicList::get(); } -void * SAL_CALL ConvDicList_getFactory( +void * ConvDicList_getFactory( const sal_Char * pImplName, XMultiServiceFactory * pServiceManager ) { diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 1c4d71187fa1..b2a63d6e9480 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -359,7 +359,7 @@ sal_Int32 DicList::GetDicPos(const uno::Reference< XDictionary > &xDic) } /// @throws Exception -uno::Reference< XInterface > SAL_CALL +uno::Reference< XInterface > DicList_CreateInstance( const uno::Reference< XMultiServiceFactory > & /*rSMgr*/ ) { uno::Reference< XInterface > xService = static_cast(new DicList); @@ -703,7 +703,7 @@ uno::Sequence< OUString > DicList::getSupportedServiceNames_Static() throw() return aSNS; } -void * SAL_CALL DicList_getFactory( const sal_Char * pImplName, +void * DicList_getFactory( const sal_Char * pImplName, XMultiServiceFactory * pServiceManager ) { void * pRet = nullptr; diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index aed7f1d28249..4ecfffa8603b 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -1122,14 +1122,14 @@ static uno::Sequence< OUString > GrammarCheckingIterator_getSupportedServiceName } /// @throws uno::Exception -static uno::Reference< uno::XInterface > SAL_CALL GrammarCheckingIterator_createInstance( +static uno::Reference< uno::XInterface > GrammarCheckingIterator_createInstance( const uno::Reference< lang::XMultiServiceFactory > & /*rxSMgr*/ ) { return static_cast< ::cppu::OWeakObject * >(new GrammarCheckingIterator()); } -void * SAL_CALL GrammarCheckingIterator_getFactory( +void * GrammarCheckingIterator_getFactory( const sal_Char *pImplName, lang::XMultiServiceFactory *pServiceManager ) { diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx index fab215f92284..2e8969b0dff6 100644 --- a/linguistic/source/hhconvdic.cxx +++ b/linguistic/source/hhconvdic.cxx @@ -56,7 +56,7 @@ using namespace i18n; // from i18npool/source/textconversion/textconversion_ko.cxx /// @throws RuntimeException -sal_Int16 SAL_CALL checkScriptType(sal_Unicode c) +sal_Int16 checkScriptType(sal_Unicode c) { UErrorCode status = U_ZERO_ERROR; diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 66f97b161f80..aa003349c7d2 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -209,7 +209,7 @@ void LinguProps::launchEvent( const PropertyChangeEvent &rEvt ) const } /// @throws Exception -Reference< XInterface > SAL_CALL LinguProps_CreateInstance( +Reference< XInterface > LinguProps_CreateInstance( const Reference< XMultiServiceFactory > & /*rSMgr*/ ) { Reference< XInterface > xService = static_cast(new LinguProps); @@ -449,7 +449,7 @@ Locale LinguProps::getPropertyLocale(const OUString& aPropertyName) return b; } -void * SAL_CALL LinguProps_getFactory( const sal_Char * pImplName, +void * LinguProps_getFactory( const sal_Char * pImplName, XMultiServiceFactory *pServiceManager ) { void * pRet = nullptr; diff --git a/linguistic/source/lngreg.cxx b/linguistic/source/lngreg.cxx index 203bcc00af14..671aecc0f54b 100644 --- a/linguistic/source/lngreg.cxx +++ b/linguistic/source/lngreg.cxx @@ -31,7 +31,7 @@ using namespace com::sun::star::registry; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL lng_component_getFactory( +SAL_DLLPUBLIC_EXPORT void * lng_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = diff --git a/linguistic/source/lngreg.hxx b/linguistic/source/lngreg.hxx index fb6800ab1c8d..129b0e95c498 100644 --- a/linguistic/source/lngreg.hxx +++ b/linguistic/source/lngreg.hxx @@ -28,31 +28,31 @@ namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } -extern void * SAL_CALL LngSvcMgr_getFactory +extern void * LngSvcMgr_getFactory ( const sal_Char * pImplName, css::lang::XMultiServiceFactory * pServiceManager ); -extern void * SAL_CALL DicList_getFactory +extern void * DicList_getFactory ( const sal_Char * pImplName, css::lang::XMultiServiceFactory * pServiceManager ); -void * SAL_CALL LinguProps_getFactory +void * LinguProps_getFactory ( const sal_Char * pImplName, css::lang::XMultiServiceFactory * pServiceManager ); -extern void * SAL_CALL ConvDicList_getFactory +extern void * ConvDicList_getFactory ( const sal_Char * pImplName, css::lang::XMultiServiceFactory * pServiceManager ); -extern void * SAL_CALL GrammarCheckingIterator_getFactory +extern void * GrammarCheckingIterator_getFactory ( const sal_Char * pImplName, css::lang::XMultiServiceFactory * pServiceManager diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index b028a9f1cadf..c15c72e4f5e5 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -1961,14 +1961,14 @@ uno::Sequence< OUString > LngSvcMgr::getSupportedServiceNames_Static() } /// @throws uno::Exception -uno::Reference< uno::XInterface > SAL_CALL LngSvcMgr_CreateInstance( +uno::Reference< uno::XInterface > LngSvcMgr_CreateInstance( const uno::Reference< lang::XMultiServiceFactory > & /*rSMgr*/ ) { uno::Reference< uno::XInterface > xService = static_cast(new LngSvcMgr); return xService; } -void * SAL_CALL LngSvcMgr_getFactory( +void * LngSvcMgr_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager ) { diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index 847353c5372c..585aaba16468 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -604,7 +604,7 @@ bool IsUpper( const OUString &rText, sal_Int32 nPos, sal_Int32 nLen, LanguageTyp && !(nFlags & KCharacterType::LOWER); } -CapType SAL_CALL capitalType(const OUString& aTerm, CharClass const * pCC) +CapType capitalType(const OUString& aTerm, CharClass const * pCC) { sal_Int32 tlen = aTerm.getLength(); if (pCC && tlen) -- cgit