summaryrefslogtreecommitdiff
path: root/connectivity
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 /connectivity
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 'connectivity')
-rw-r--r--connectivity/source/cpool/ZPoolCollection.cxx6
-rw-r--r--connectivity/source/cpool/ZPoolCollection.hxx6
-rw-r--r--connectivity/source/manager/mdrivermanager.cxx8
-rw-r--r--connectivity/source/manager/mdrivermanager.hxx8
4 files changed, 14 insertions, 14 deletions
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index 313ee07246ef..1d86449a0386 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -149,19 +149,19 @@ Sequence< OUString > SAL_CALL OPoolCollection::getSupportedServiceNames( )
}
//---------------------------------------OPoolCollection----------------------------------
-Reference< XInterface > SAL_CALL OPoolCollection::CreateInstance(const Reference< XMultiServiceFactory >& _rxFactory)
+Reference< XInterface > OPoolCollection::CreateInstance(const Reference< XMultiServiceFactory >& _rxFactory)
{
return static_cast<XDriverManager*>(new OPoolCollection(comphelper::getComponentContext(_rxFactory)));
}
-OUString SAL_CALL OPoolCollection::getImplementationName_Static( )
+OUString OPoolCollection::getImplementationName_Static( )
{
return OUString("com.sun.star.sdbc.OConnectionPool");
}
-Sequence< OUString > SAL_CALL OPoolCollection::getSupportedServiceNames_Static( )
+Sequence< OUString > OPoolCollection::getSupportedServiceNames_Static( )
{
Sequence< OUString > aSupported { "com.sun.star.sdbc.ConnectionPool" };
return aSupported;
diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx
index 7e218a944e22..3f4a99369a2e 100644
--- a/connectivity/source/cpool/ZPoolCollection.hxx
+++ b/connectivity/source/cpool/ZPoolCollection.hxx
@@ -124,11 +124,11 @@ namespace connectivity
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
// XServiceInfo - static methods
- static css::uno::Reference< css::uno::XInterface > SAL_CALL CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+ static css::uno::Reference< css::uno::XInterface > CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
/// @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::Sequence< OUString > getSupportedServiceNames_Static( );
// XEventListener
virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index e2a3d0ddf360..696bf3bcf911 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -520,26 +520,26 @@ Sequence< OUString > SAL_CALL OSDBCDriverManager::getSupportedServiceNames( )
}
-Reference< XInterface > SAL_CALL OSDBCDriverManager::Create( const Reference< XMultiServiceFactory >& _rxFactory )
+Reference< XInterface > OSDBCDriverManager::Create( const Reference< XMultiServiceFactory >& _rxFactory )
{
return *( new OSDBCDriverManager( comphelper::getComponentContext(_rxFactory) ) );
}
-OUString SAL_CALL OSDBCDriverManager::getImplementationName_static( )
+OUString OSDBCDriverManager::getImplementationName_static( )
{
return OUString("com.sun.star.comp.sdbc.OSDBCDriverManager");
}
-Sequence< OUString > SAL_CALL OSDBCDriverManager::getSupportedServiceNames_static( )
+Sequence< OUString > OSDBCDriverManager::getSupportedServiceNames_static( )
{
Sequence< OUString > aSupported { getSingletonName_static() };
return aSupported;
}
-OUString SAL_CALL OSDBCDriverManager::getSingletonName_static( )
+OUString OSDBCDriverManager::getSingletonName_static( )
{
return OUString( "com.sun.star.sdbc.DriverManager" );
}
diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx
index 51316a8425d1..ece23dcc0210 100644
--- a/connectivity/source/manager/mdrivermanager.hxx
+++ b/connectivity/source/manager/mdrivermanager.hxx
@@ -105,12 +105,12 @@ namespace drivermanager
// XServiceInfo - static methods
/// @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::Sequence< OUString > getSupportedServiceNames_static( );
/// @throws css::uno::RuntimeException
- static OUString SAL_CALL getSingletonName_static( );
- static css::uno::Reference< css::uno::XInterface > SAL_CALL Create( const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxContext );
+ static OUString getSingletonName_static( );
+ static css::uno::Reference< css::uno::XInterface > Create( const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxContext );
// XNamingService
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRegisteredObject( const OUString& Name ) override;