diff options
Diffstat (limited to 'xmlsecurity/source/xmlsec')
10 files changed, 16 insertions, 16 deletions
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* ); |