summaryrefslogtreecommitdiff
path: root/xmlsecurity
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-12-14 08:45:02 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-12-14 13:03:06 +0100
commit6f4f5677acff2711b4cfdae6ba1a0892e62b179a (patch)
treeba97fc99b67b9b139bdf6807ceedcb168fa68fd2 /xmlsecurity
parent581640ac53f8568157ffc3b5c82b2ae7da576e3b (diff)
No need to keep these whitelisted functions decorated with SAL_CALL
The only effect SAL_CALL effectively has on LO-internal code is to change non- static member functions from __thiscall to __cdecl in MSVC (where all other functions are __cdecl by default, anyway). (For 3rd-party code, it could be argued that SAL_CALL is useful on function declarations in the URE stable interface other than non-static member functions, too, in case 3rd-party code uses a compiler switch to change the default calling convention to something other than __cdecl. But loplugin:salcall exempts the URE stable interface, anyway.) One could argue that SAL_CALL, even if today it effectively only affects non- static member functions in MSVC, could be extended in the future to affect more functions on more platforms. However, the current code would already not support that. For example, 3af500580b1c82eabd60335c9ebc458a3f68850c "loplugin:salcall fix functions" changed FrameControl_createInstance in UnoControls/source/base/registercontrols.cxx to no longer be SAL_CALL, even though its address (in ctl_component_getFacrory, in the same file) is passed to cppuhelper::createSingleFactory as an argument of type cppu::ComponentInstantiation, which is a pointer to SAL_CALL function. Change-Id: I3acbf7314a3d7868ed70e35bb5c47bc11a0b7ff6 Reviewed-on: https://gerrit.libreoffice.org/46436 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'xmlsecurity')
-rw-r--r--xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx2
-rw-r--r--xmlsecurity/qa/unit/signing/data/.gpg-v21-migrated0
-rw-r--r--xmlsecurity/source/component/certificatecontainer.cxx6
-rw-r--r--xmlsecurity/source/component/certificatecontainer.hxx6
-rw-r--r--xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx2
5 files changed, 8 insertions, 8 deletions
diff --git a/xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx b/xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx
index bb6452c0256e..e0c9fcaf40c1 100644
--- a/xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx
+++ b/xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx
@@ -91,7 +91,7 @@ class XMLSignatureTemplateImpl : public ::cppu::WeakImplHelper<
//Helper for registry
/// @throws css::uno::RuntimeException
- static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
+ static css::uno::Reference< css::uno::XInterface > impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
};
#endif // INCLUDED_XMLSECURITY_INC_FRAMEWORK_XMLSIGNATURETEMPLATEIMPL_HXX
diff --git a/xmlsecurity/qa/unit/signing/data/.gpg-v21-migrated b/xmlsecurity/qa/unit/signing/data/.gpg-v21-migrated
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/xmlsecurity/qa/unit/signing/data/.gpg-v21-migrated
diff --git a/xmlsecurity/source/component/certificatecontainer.cxx b/xmlsecurity/source/component/certificatecontainer.cxx
index ac52bbf6fde1..bdbaa68b0a94 100644
--- a/xmlsecurity/source/component/certificatecontainer.cxx
+++ b/xmlsecurity/source/component/certificatecontainer.cxx
@@ -101,20 +101,20 @@ CertificateContainer::getSupportedServiceNames( )
return impl_getStaticSupportedServiceNames();
}
-Sequence< OUString > SAL_CALL
+Sequence< OUString >
CertificateContainer::impl_getStaticSupportedServiceNames( )
{
Sequence< OUString > aRet { "com.sun.star.security.CertificateContainer" };
return aRet;
}
-OUString SAL_CALL
+OUString
CertificateContainer::impl_getStaticImplementationName()
{
return OUString("com.sun.star.security.CertificateContainer");
}
-Reference< XInterface > SAL_CALL CertificateContainer::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager )
+Reference< XInterface > CertificateContainer::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager )
{
return Reference< XInterface >( *new CertificateContainer( xServiceManager ) );
}
diff --git a/xmlsecurity/source/component/certificatecontainer.hxx b/xmlsecurity/source/component/certificatecontainer.hxx
index 6bd64f524930..58c3ef82d00a 100644
--- a/xmlsecurity/source/component/certificatecontainer.hxx
+++ b/xmlsecurity/source/component/certificatecontainer.hxx
@@ -54,14 +54,14 @@ class CertificateContainer : public ::cppu::WeakImplHelper< css::lang::XServiceI
// provide factory
/// @throws css::uno::RuntimeException
- static OUString SAL_CALL impl_getStaticImplementationName( );
+ static OUString impl_getStaticImplementationName( );
/// @throws css::uno::RuntimeException
- static css::uno::Sequence< OUString > SAL_CALL
+ static css::uno::Sequence< OUString >
impl_getStaticSupportedServiceNames( );
/// @throws css::uno::RuntimeException
- static css::uno::Reference< css::uno::XInterface > SAL_CALL
+ static css::uno::Reference< css::uno::XInterface >
impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
// XServiceInfo
diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
index 5e20ce85f0ca..6e3b0939cebf 100644
--- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
+++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
@@ -125,7 +125,7 @@ OUString XMLSignatureTemplateImpl::impl_getImplementationName() {
}
//Helper for registry
-Reference< XInterface > SAL_CALL XMLSignatureTemplateImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) {
+Reference< XInterface > XMLSignatureTemplateImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) {
return Reference< XInterface >( *new XMLSignatureTemplateImpl ) ;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */