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 --- ucb/source/ucp/ext/ucpext_provider.cxx | 4 ++-- ucb/source/ucp/ext/ucpext_provider.hxx | 6 +++--- ucb/source/ucp/file/filtask.cxx | 4 ++-- ucb/source/ucp/file/filtask.hxx | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'ucb') diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx index 46e37a3f93dc..88d00cade588 100644 --- a/ucb/source/ucp/ext/ucpext_provider.cxx +++ b/ucb/source/ucp/ext/ucpext_provider.cxx @@ -54,7 +54,7 @@ namespace ucb { namespace ucp { namespace ext } - OUString SAL_CALL ContentProvider::getImplementationName_static() + OUString ContentProvider::getImplementationName_static() { return OUString( "org.openoffice.comp.ucp.ext.ContentProvider" ); } @@ -66,7 +66,7 @@ namespace ucb { namespace ucp { namespace ext } - Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames_static( ) + Sequence< OUString > ContentProvider::getSupportedServiceNames_static( ) { Sequence< OUString > aServiceNames(2); aServiceNames[0] = "com.sun.star.ucb.ContentProvider"; diff --git a/ucb/source/ucp/ext/ucpext_provider.hxx b/ucb/source/ucp/ext/ucpext_provider.hxx index e69f827b33aa..77f98f8f48b7 100644 --- a/ucb/source/ucp/ext/ucpext_provider.hxx +++ b/ucb/source/ucp/ext/ucpext_provider.hxx @@ -42,10 +42,10 @@ namespace ucb { namespace ucp { namespace ext // XServiceInfo - static versions /// @throws css::uno::RuntimeException - static OUString SAL_CALL getImplementationName_static( ); + static OUString getImplementationName_static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL Create( const css::uno::Reference< css::uno::XComponentContext >& i_rContext ); + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); + static css::uno::Reference< css::uno::XInterface > Create( const css::uno::Reference< css::uno::XComponentContext >& i_rContext ); // XContentProvider virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override; diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx index 5f0186c8ee75..ca8c7cc954be 100644 --- a/ucb/source/ucp/file/filtask.cxx +++ b/ucb/source/ucp/file/filtask.cxx @@ -3067,14 +3067,14 @@ TaskManager::getScheme( OUString& Scheme ) Scheme = "file"; } -OUString SAL_CALL +OUString TaskManager::getImplementationName_static() { return OUString("com.sun.star.comp.ucb.FileProvider"); } -uno::Sequence< OUString > SAL_CALL +uno::Sequence< OUString > TaskManager::getSupportedServiceNames_static() { OUString Supported("com.sun.star.ucb.FileContentProvider"); diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx index e89ca36e2a72..05802f259db5 100644 --- a/ucb/source/ucp/file/filtask.hxx +++ b/ucb/source/ucp/file/filtask.hxx @@ -682,9 +682,9 @@ namespace fileaccess static void getScheme( OUString& Scheme ); - static OUString SAL_CALL getImplementationName_static(); + static OUString getImplementationName_static(); - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); }; } // end namespace TaskHandling -- cgit