summaryrefslogtreecommitdiff
path: root/xmloff/source/transform
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-12-08 15:58:41 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-12-11 12:13:46 +0100
commit3af500580b1c82eabd60335c9ebc458a3f68850c (patch)
treee0ad105be694cfb46221d16e9ce987879794fa04 /xmloff/source/transform
parent0f9a596aa853b4f2beeff25c131246a7b31492a4 (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 'xmloff/source/transform')
-rw-r--r--xmloff/source/transform/OOo2Oasis.cxx6
-rw-r--r--xmloff/source/transform/Oasis2OOo.cxx6
-rw-r--r--xmloff/source/transform/XMLFilterRegistration.cxx8
-rw-r--r--xmloff/source/transform/XMLFilterRegistration.hxx12
4 files changed, 16 insertions, 16 deletions
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx
index 741cc56c9f43..6756fb50199d 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -1985,19 +1985,19 @@ Sequence< css::uno::Type > SAL_CALL
// Service registration
-OUString SAL_CALL OOo2OasisTransformer_getImplementationName() throw()
+OUString OOo2OasisTransformer_getImplementationName() throw()
{
return OUString( "com.sun.star.comp.OOo2OasisTransformer" );
}
-Sequence< OUString > SAL_CALL OOo2OasisTransformer_getSupportedServiceNames() throw()
+Sequence< OUString > OOo2OasisTransformer_getSupportedServiceNames() throw()
{
const OUString aServiceName( OOo2OasisTransformer_getImplementationName() );
const Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
}
-Reference< XInterface > SAL_CALL OOo2OasisTransformer_createInstance(
+Reference< XInterface > OOo2OasisTransformer_createInstance(
const Reference< XMultiServiceFactory > & )
{
return static_cast<cppu::OWeakObject*>(new OOo2OasisTransformer());
diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx
index 3c1d47121d8d..5a981090c6ff 100644
--- a/xmloff/source/transform/Oasis2OOo.cxx
+++ b/xmloff/source/transform/Oasis2OOo.cxx
@@ -1956,12 +1956,12 @@ Sequence< OUString > SAL_CALL Oasis2OOoTransformer::getSupportedServiceNames( )
// Service registration
-OUString SAL_CALL Oasis2OOoTransformer_getImplementationName() throw()
+OUString Oasis2OOoTransformer_getImplementationName() throw()
{
return OUString( "com.sun.star.comp.Oasis2OOoTransformer" );
}
-Sequence< OUString > SAL_CALL Oasis2OOoTransformer_getSupportedServiceNames()
+Sequence< OUString > Oasis2OOoTransformer_getSupportedServiceNames()
throw()
{
const OUString aServiceName( Oasis2OOoTransformer_getImplementationName() );
@@ -1969,7 +1969,7 @@ Sequence< OUString > SAL_CALL Oasis2OOoTransformer_getSupportedServiceNames()
return aSeq;
}
-Reference< XInterface > SAL_CALL Oasis2OOoTransformer_createInstance(
+Reference< XInterface > Oasis2OOoTransformer_createInstance(
const Reference< XMultiServiceFactory > &)
{
SAL_INFO("xmloff.transform", "Creating Oasis2OOoTransformer");
diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx
index 8e1fe66d1080..2c35501227b2 100644
--- a/xmloff/source/transform/XMLFilterRegistration.cxx
+++ b/xmloff/source/transform/XMLFilterRegistration.cxx
@@ -31,9 +31,9 @@ using namespace ::com::sun::star;
namespace
{
- typedef OUString (SAL_CALL * GetImplementationName)();
- typedef uno::Sequence< OUString > (SAL_CALL * GetSupportedServiceNames)();
- typedef uno::Reference< ::uno::XInterface > (SAL_CALL * CreateInstance)(
+ typedef OUString (* GetImplementationName)();
+ typedef uno::Sequence< OUString > (* GetSupportedServiceNames)();
+ typedef uno::Reference< ::uno::XInterface > (* CreateInstance)(
const uno::Reference< lang::XMultiServiceFactory >& );
struct ServiceDescriptor
@@ -86,7 +86,7 @@ namespace
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL xof_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void* xof_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = nullptr;
if( pServiceManager )
diff --git a/xmloff/source/transform/XMLFilterRegistration.hxx b/xmloff/source/transform/XMLFilterRegistration.hxx
index 67747352c621..767bcfae4a7b 100644
--- a/xmloff/source/transform/XMLFilterRegistration.hxx
+++ b/xmloff/source/transform/XMLFilterRegistration.hxx
@@ -22,16 +22,16 @@
#include <sal/config.h>
-OUString SAL_CALL OOo2OasisTransformer_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL OOo2OasisTransformer_getSupportedServiceNames() throw();
+OUString OOo2OasisTransformer_getImplementationName() throw();
+css::uno::Sequence< OUString > OOo2OasisTransformer_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL OOo2OasisTransformer_createInstance(
+css::uno::Reference< css::uno::XInterface > OOo2OasisTransformer_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL Oasis2OOoTransformer_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL Oasis2OOoTransformer_getSupportedServiceNames() throw();
+OUString Oasis2OOoTransformer_getImplementationName() throw();
+css::uno::Sequence< OUString > Oasis2OOoTransformer_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL Oasis2OOoTransformer_createInstance(
+css::uno::Reference< css::uno::XInterface > Oasis2OOoTransformer_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLAutoTextEventImportOOO_getImplementationName() throw();