From 6f4f5677acff2711b4cfdae6ba1a0892e62b179a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 14 Dec 2017 08:45:02 +0100 Subject: 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 Reviewed-by: Stephan Bergmann --- framework/inc/macros/xserviceinfo.hxx | 4 ++-- framework/inc/uielement/footermenucontroller.hxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'framework') diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx index dd159460dcab..37274b44eb8d 100644 --- a/framework/inc/macros/xserviceinfo.hxx +++ b/framework/inc/macros/xserviceinfo.hxx @@ -144,8 +144,8 @@ namespace framework{ virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) override; \ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) override; \ /* Helper for XServiceInfo */ \ - static css::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); \ - static OUString SAL_CALL impl_getStaticImplementationName ( ); \ + static css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames( ); \ + static OUString impl_getStaticImplementationName ( ); \ /* Helper for initialization of service by using own reference! */ \ void impl_initService ( ); \ diff --git a/framework/inc/uielement/footermenucontroller.hxx b/framework/inc/uielement/footermenucontroller.hxx index 1609ca557c5d..c560e89b9022 100644 --- a/framework/inc/uielement/footermenucontroller.hxx +++ b/framework/inc/uielement/footermenucontroller.hxx @@ -35,8 +35,8 @@ namespace framework virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) override; /* Helper for XServiceInfo */ - static css::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); - static OUString SAL_CALL impl_getStaticImplementationName ( ); + static css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames( ); + static OUString impl_getStaticImplementationName ( ); /* Helper for registry */ /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); -- cgit