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>

4 files changed, 15 insertions, 15 deletions

diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index 49c51dba6c07..90be10172ba7 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -629,7 +629,7 @@ BrowseNodeFactoryImpl::getOrganizerHierarchy()
 // Namespace global methods for setting up BrowseNodeFactory service
 
 
-Sequence< OUString > SAL_CALL
+Sequence< OUString >
 bnf_getSupportedServiceNames( )
 {
     OUString str_name(
@@ -638,14 +638,14 @@ bnf_getSupportedServiceNames( )
     return Sequence< OUString >( &str_name, 1 );
 }
 
-OUString SAL_CALL
+OUString
 bnf_getImplementationName( )
 {
     return OUString(
         "com.sun.star.script.browse.BrowseNodeFactory" );
 }
 
-Reference< XInterface > SAL_CALL
+Reference< XInterface >
 bnf_create( Reference< XComponentContext > const & xComponentContext )
 {
     return static_cast< ::cppu::OWeakObject * >(
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index 12c336caf84f..d82d70f3f1dd 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -708,7 +708,7 @@ Sequence< OUString > SAL_CALL MasterScriptProvider::getSupportedServiceNames( )
 namespace scripting_runtimemgr
 {
 
-Reference< XInterface > SAL_CALL sp_create(
+Reference< XInterface > sp_create(
     const Reference< XComponentContext > & xCompC )
 {
     return static_cast<cppu::OWeakObject *>(new ::func_provider::MasterScriptProvider( xCompC ));
@@ -733,7 +733,7 @@ OUString sp_getImplementationName( )
 }
 
 // ***** registration or ScriptingFrameworkURIHelper
-Reference< XInterface > SAL_CALL urihelper_create(
+Reference< XInterface > urihelper_create(
     const Reference< XComponentContext > & xCompC )
 {
     return static_cast<cppu::OWeakObject *>(
@@ -801,7 +801,7 @@ extern "C"
      *                        data
      * @return a component factory
      */
-    SAL_DLLPUBLIC_EXPORT void * SAL_CALL scriptframe_component_getFactory(
+    SAL_DLLPUBLIC_EXPORT void * scriptframe_component_getFactory(
         const sal_Char * pImplName,
         void * pServiceManager,
         void * pRegistryKey )
diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx
index 303418f94b3a..bb1ffe9306d8 100644
--- a/scripting/source/provider/MasterScriptProvider.hxx
+++ b/scripting/source/provider/MasterScriptProvider.hxx
@@ -127,17 +127,17 @@ private:
     OUString m_sCtxString;
 };
 
-OUString SAL_CALL mspf_getImplementationName() ;
-css::uno::Reference< css::uno::XInterface > SAL_CALL mspf_create( css::uno::Reference< css::uno::XComponentContext > const & xComponentContext );
-css::uno::Sequence< OUString > SAL_CALL mspf_getSupportedServiceNames();
+OUString mspf_getImplementationName() ;
+css::uno::Reference< css::uno::XInterface > mspf_create( css::uno::Reference< css::uno::XComponentContext > const & xComponentContext );
+css::uno::Sequence< OUString > mspf_getSupportedServiceNames();
 
 }
 
 namespace browsenodefactory
 {
-OUString SAL_CALL bnf_getImplementationName() ;
-css::uno::Reference< css::uno::XInterface > SAL_CALL bnf_create( css::uno::Reference< css::uno::XComponentContext > const & xComponentContext );
-css::uno::Sequence< OUString > SAL_CALL bnf_getSupportedServiceNames();
+OUString bnf_getImplementationName() ;
+css::uno::Reference< css::uno::XInterface > bnf_create( css::uno::Reference< css::uno::XComponentContext > const & xComponentContext );
+css::uno::Sequence< OUString > bnf_getSupportedServiceNames();
 }
 
 #endif // INCLUDED_SCRIPTING_SOURCE_PROVIDER_MASTERSCRIPTPROVIDER_HXX
diff --git a/scripting/source/provider/MasterScriptProviderFactory.cxx b/scripting/source/provider/MasterScriptProviderFactory.cxx
index a805015d0c3e..f7798f8d195e 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.cxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.cxx
@@ -62,7 +62,7 @@ MasterScriptProviderFactory::getActiveMSPList() const
     return m_MSPList;
 }
 
-Sequence< OUString > SAL_CALL mspf_getSupportedServiceNames( )
+Sequence< OUString > mspf_getSupportedServiceNames( )
 {
     OUString str_name(
         "com.sun.star.script.provider.MasterScriptProviderFactory");
@@ -70,13 +70,13 @@ Sequence< OUString > SAL_CALL mspf_getSupportedServiceNames( )
     return Sequence< OUString >( &str_name, 1 );
 }
 
-OUString SAL_CALL mspf_getImplementationName( )
+OUString mspf_getImplementationName( )
 {
     return OUString(
         "com.sun.star.script.provider.MasterScriptProviderFactory");
 }
 
-Reference< XInterface > SAL_CALL
+Reference< XInterface >
 mspf_create( Reference< XComponentContext > const & xComponentContext )
 {
     return static_cast< ::cppu::OWeakObject * >(