summaryrefslogtreecommitdiff
path: root/xmlsecurity
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 /xmlsecurity
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 'xmlsecurity')
-rw-r--r--xmlsecurity/inc/framework/saxeventkeeperimpl.hxx2
-rw-r--r--xmlsecurity/inc/framework/signaturecreatorimpl.hxx2
-rw-r--r--xmlsecurity/inc/framework/signatureverifierimpl.hxx2
-rw-r--r--xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx4
-rw-r--r--xmlsecurity/inc/xmlsec/xmlelementwrapper_xmlsecimpl.hxx4
-rw-r--r--xmlsecurity/source/component/documentdigitalsignatures.hxx2
-rw-r--r--xmlsecurity/source/component/registerservices.cxx2
-rw-r--r--xmlsecurity/source/framework/saxeventkeeperimpl.cxx2
-rw-r--r--xmlsecurity/source/framework/signaturecreatorimpl.cxx2
-rw-r--r--xmlsecurity/source/framework/signatureverifierimpl.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/nss/nssinitializer.cxx4
-rw-r--r--xmlsecurity/source/xmlsec/nss/nssinitializer.hxx4
-rw-r--r--xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx4
-rw-r--r--xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx4
-rw-r--r--xmlsecurity/source/xmlsec/nss/xsec_nss.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/serialnumberadapter.hxx2
-rw-r--r--xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx4
-rw-r--r--xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx4
-rw-r--r--xmlsecurity/source/xmlsec/xsec_xmlsec.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/xsec_xmlsec.hxx2
20 files changed, 28 insertions, 28 deletions
diff --git a/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx b/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx
index 89331ab0b427..9b6a8d472754 100644
--- a/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx
+++ b/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx
@@ -286,7 +286,7 @@ public:
OUString SAXEventKeeperImpl_getImplementationName();
/// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames( );
+css::uno::Sequence< OUString > SAXEventKeeperImpl_getSupportedServiceNames( );
#endif
diff --git a/xmlsecurity/inc/framework/signaturecreatorimpl.hxx b/xmlsecurity/inc/framework/signaturecreatorimpl.hxx
index 5e6d85169452..65e9c6a8ee1f 100644
--- a/xmlsecurity/inc/framework/signaturecreatorimpl.hxx
+++ b/xmlsecurity/inc/framework/signaturecreatorimpl.hxx
@@ -92,7 +92,7 @@ public:
OUString SignatureCreatorImpl_getImplementationName();
/// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames( );
+css::uno::Sequence< OUString > SignatureCreatorImpl_getSupportedServiceNames( );
#endif
diff --git a/xmlsecurity/inc/framework/signatureverifierimpl.hxx b/xmlsecurity/inc/framework/signatureverifierimpl.hxx
index 3dbef1b9a501..a1bc82213fb8 100644
--- a/xmlsecurity/inc/framework/signatureverifierimpl.hxx
+++ b/xmlsecurity/inc/framework/signatureverifierimpl.hxx
@@ -85,7 +85,7 @@ public:
OUString SignatureVerifierImpl_getImplementationName();
/// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNames( );
+css::uno::Sequence< OUString > SignatureVerifierImpl_getSupportedServiceNames( );
#endif
diff --git a/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx b/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
index e3d109f1993a..3140ce93587b 100644
--- a/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
+++ b/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
@@ -215,12 +215,12 @@ public:
OUString XMLDocumentWrapper_XmlSecImpl_getImplementationName();
/// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL
+css::uno::Sequence< OUString >
XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames( );
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface >
-SAL_CALL XMLDocumentWrapper_XmlSecImpl_createInstance(
+XMLDocumentWrapper_XmlSecImpl_createInstance(
const css::uno::Reference< css::uno::XComponentContext > &);
#endif
diff --git a/xmlsecurity/inc/xmlsec/xmlelementwrapper_xmlsecimpl.hxx b/xmlsecurity/inc/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
index 04bc35c5bbb0..f9ab86b7cd92 100644
--- a/xmlsecurity/inc/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
+++ b/xmlsecurity/inc/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
@@ -86,11 +86,11 @@ public:
OUString XMLElementWrapper_XmlSecImpl_getImplementationName();
/// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedServiceNames( );
+css::uno::Sequence< OUString > XMLElementWrapper_XmlSecImpl_getSupportedServiceNames( );
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface >
-SAL_CALL XMLElementWrapper_XmlSecImpl_createInstance(
+XMLElementWrapper_XmlSecImpl_createInstance(
const css::uno::Reference< css::uno::XComponentContext > &);
#endif
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.hxx b/xmlsecurity/source/component/documentdigitalsignatures.hxx
index 9ef24ab36e5e..4bb8de8ebf6d 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.hxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.hxx
@@ -111,7 +111,7 @@ public:
};
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL DocumentDigitalSignatures_CreateInstance(
+css::uno::Reference< css::uno::XInterface > DocumentDigitalSignatures_CreateInstance(
const css::uno::Reference< css::uno::XComponentContext >& rCtx);
#endif // INCLUDED_XMLSECURITY_SOURCE_COMPONENT_DOCUMENTDIGITALSIGNATURES_HXX
diff --git a/xmlsecurity/source/component/registerservices.cxx b/xmlsecurity/source/component/registerservices.cxx
index 24de5116abc9..1ee0290f22b2 100644
--- a/xmlsecurity/source/component/registerservices.cxx
+++ b/xmlsecurity/source/component/registerservices.cxx
@@ -30,7 +30,7 @@ using namespace ::com::sun::star::uno;
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL xmlsecurity_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void* xmlsecurity_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void* pRet = nullptr;
uno::Reference< XInterface > xFactory;
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
index f082b452bad0..9ed84bb165fa 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
@@ -1169,7 +1169,7 @@ OUString SAXEventKeeperImpl_getImplementationName ()
return OUString ( IMPLEMENTATION_NAME );
}
-cssu::Sequence< OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames( )
+cssu::Sequence< OUString > SAXEventKeeperImpl_getSupportedServiceNames( )
{
cssu::Sequence<OUString> aRet { "com.sun.star.xml.crypto.sax.SAXEventKeeper" };
return aRet;
diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
index 00e635667a16..953a8f6ea3bb 100644
--- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx
+++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
@@ -180,7 +180,7 @@ OUString SignatureCreatorImpl_getImplementationName ()
return OUString ( IMPLEMENTATION_NAME );
}
-cssu::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames( )
+cssu::Sequence< OUString > SignatureCreatorImpl_getSupportedServiceNames( )
{
cssu::Sequence<OUString> aRet { "com.sun.star.xml.crypto.sax.SignatureCreator" };
return aRet;
diff --git a/xmlsecurity/source/framework/signatureverifierimpl.cxx b/xmlsecurity/source/framework/signatureverifierimpl.cxx
index e861356a86f5..f6982ae88dc4 100644
--- a/xmlsecurity/source/framework/signatureverifierimpl.cxx
+++ b/xmlsecurity/source/framework/signatureverifierimpl.cxx
@@ -134,7 +134,7 @@ OUString SignatureVerifierImpl_getImplementationName ()
return OUString( IMPLEMENTATION_NAME );
}
-cssu::Sequence< OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNames( )
+cssu::Sequence< OUString > SignatureVerifierImpl_getSupportedServiceNames( )
{
cssu::Sequence<OUString> aRet { "com.sun.star.xml.crypto.sax.SignatureVerifier" };
return aRet;
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index 14722cb8b474..15b85566e201 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -469,13 +469,13 @@ OUString ONSSInitializer_getImplementationName ()
return OUString ( IMPLEMENTATION_NAME );
}
-cssu::Sequence< OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames( )
+cssu::Sequence< OUString > ONSSInitializer_getSupportedServiceNames( )
{
cssu::Sequence<OUString> aRet { NSS_SERVICE_NAME };
return aRet;
}
-cssu::Reference< cssu::XInterface > SAL_CALL ONSSInitializer_createInstance( const cssu::Reference< cssl::XMultiServiceFactory > & rSMgr)
+cssu::Reference< cssu::XInterface > ONSSInitializer_createInstance( const cssu::Reference< cssl::XMultiServiceFactory > & rSMgr)
{
return static_cast<cppu::OWeakObject*>(new ONSSInitializer( comphelper::getComponentContext(rSMgr) ));
}
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
index 9e07b6eda444..c018f5af4bb6 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
@@ -64,11 +64,11 @@ public:
OUString ONSSInitializer_getImplementationName();
/// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames();
+css::uno::Sequence< OUString > ONSSInitializer_getSupportedServiceNames();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface >
-SAL_CALL ONSSInitializer_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
+ONSSInitializer_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
#endif
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
index a45f34ee9714..19e92fc2113b 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
@@ -113,7 +113,7 @@ OUString SEInitializer_NssImpl_getImplementationName ()
return OUString ("com.sun.star.xml.security.bridge.xmlsec.SEInitializer_NssImpl" );
}
-uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceNames( )
+uno::Sequence< OUString > SEInitializer_NssImpl_getSupportedServiceNames( )
{
uno::Sequence < OUString > aRet(2);
OUString* pArray = aRet.getArray();
@@ -122,7 +122,7 @@ uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceName
return aRet;
}
-uno::Reference< uno::XInterface > SAL_CALL SEInitializer_NssImpl_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rxMSF)
+uno::Reference< uno::XInterface > SEInitializer_NssImpl_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rxMSF)
{
return static_cast<cppu::OWeakObject*>(new SEInitializer_NssImpl(comphelper::getComponentContext(rxMSF)));
}
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
index 29335e780bb4..03485e199408 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
@@ -58,11 +58,11 @@ public:
OUString SEInitializer_NssImpl_getImplementationName();
/// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceNames( );
+css::uno::Sequence< OUString > SEInitializer_NssImpl_getSupportedServiceNames( );
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface >
-SAL_CALL SEInitializer_NssImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rxMSF);
+SEInitializer_NssImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rxMSF);
#endif
diff --git a/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx b/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx
index 9e424a4e5d79..1776c8f86af7 100644
--- a/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star::registry;
extern "C"
{
-void* SAL_CALL nss_component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* /*pRegistryKey*/ )
+void* nss_component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* /*pRegistryKey*/ )
{
void* pRet = nullptr;
Reference< XSingleServiceFactory > xFactory ;
diff --git a/xmlsecurity/source/xmlsec/serialnumberadapter.hxx b/xmlsecurity/source/xmlsec/serialnumberadapter.hxx
index 2eb976afdced..e6ddc0dad1fa 100644
--- a/xmlsecurity/source/xmlsec/serialnumberadapter.hxx
+++ b/xmlsecurity/source/xmlsec/serialnumberadapter.hxx
@@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star { namespace uno {
namespace xml_security { namespace serial_number_adapter {
-css::uno::Reference< css::uno::XInterface > SAL_CALL create(
+css::uno::Reference< css::uno::XInterface > create(
css::uno::Reference< css::uno::XComponentContext > const &);
/// @throws css::uno::RuntimeException
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
index 75da47627c18..42b749225f23 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
@@ -898,13 +898,13 @@ OUString XMLDocumentWrapper_XmlSecImpl_getImplementationName ()
return OUString ( IMPLEMENTATION_NAME );
}
-cssu::Sequence< OUString > SAL_CALL XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames( )
+cssu::Sequence< OUString > XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames( )
{
cssu::Sequence<OUString> aRet { "com.sun.star.xml.wrapper.XMLDocumentWrapper" };
return aRet;
}
-cssu::Reference< cssu::XInterface > SAL_CALL XMLDocumentWrapper_XmlSecImpl_createInstance(
+cssu::Reference< cssu::XInterface > XMLDocumentWrapper_XmlSecImpl_createInstance(
const cssu::Reference< cssu::XComponentContext > &)
{
return static_cast<cppu::OWeakObject*>(new XMLDocumentWrapper_XmlSecImpl( ));
diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
index b9e20e782120..76f9bd16d2c4 100644
--- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
@@ -66,13 +66,13 @@ OUString XMLElementWrapper_XmlSecImpl_getImplementationName ()
return OUString ( IMPLEMENTATION_NAME );
}
-cssu::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedServiceNames( )
+cssu::Sequence< OUString > XMLElementWrapper_XmlSecImpl_getSupportedServiceNames( )
{
cssu::Sequence<OUString> aRet { "com.sun.star.xml.wrapper.XMLElementWrapper" };
return aRet;
}
-cssu::Reference< cssu::XInterface > SAL_CALL
+cssu::Reference< cssu::XInterface >
XMLElementWrapper_XmlSecImpl_createInstance(
const cssu::Reference< cssu::XComponentContext > &)
{
diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
index 296c1c847d49..edc0a3a6e97d 100644
--- a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
+++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
@@ -40,7 +40,7 @@ using namespace ::com::sun::star::lang;
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL xsec_xmlsec_component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* pRegistryKey )
+SAL_DLLPUBLIC_EXPORT void* xsec_xmlsec_component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* pRegistryKey )
{
void* pRet = nullptr;
Reference< XInterface > xFactory ;
diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.hxx b/xmlsecurity/source/xmlsec/xsec_xmlsec.hxx
index 7db284869e56..5ecdf4e9de68 100644
--- a/xmlsecurity/source/xmlsec/xsec_xmlsec.hxx
+++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.hxx
@@ -24,7 +24,7 @@
extern "C" {
-void* SAL_CALL nss_component_getFactory( const sal_Char*, void*, void* );
+void* nss_component_getFactory( const sal_Char*, void*, void* );
#if defined( XMLSEC_CRYPTO_MSCRYPTO )
void* mscrypt_component_getFactory( const sal_Char*, void*, void* );