diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-12-14 08:45:02 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-12-14 13:03:06 +0100 |
commit | 6f4f5677acff2711b4cfdae6ba1a0892e62b179a (patch) | |
tree | ba97fc99b67b9b139bdf6807ceedcb168fa68fd2 /embeddedobj | |
parent | 581640ac53f8568157ffc3b5c82b2ae7da576e3b (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 'embeddedobj')
-rw-r--r-- | embeddedobj/source/commonembedding/xfactory.cxx | 12 | ||||
-rw-r--r-- | embeddedobj/source/commonembedding/xfactory.hxx | 12 | ||||
-rw-r--r-- | embeddedobj/source/general/xcreator.cxx | 6 | ||||
-rw-r--r-- | embeddedobj/source/inc/xcreator.hxx | 6 | ||||
-rw-r--r-- | embeddedobj/source/msole/xolefactory.cxx | 6 | ||||
-rw-r--r-- | embeddedobj/source/msole/xolefactory.hxx | 6 |
6 files changed, 24 insertions, 24 deletions
diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx index 8dea70f16ca5..6fdb9e925144 100644 --- a/embeddedobj/source/commonembedding/xfactory.cxx +++ b/embeddedobj/source/commonembedding/xfactory.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star; -uno::Sequence< OUString > SAL_CALL OOoEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > OOoEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() { uno::Sequence< OUString > aRet(2); aRet[0] = "com.sun.star.embed.OOoEmbeddedObjectFactory"; @@ -44,12 +44,12 @@ uno::Sequence< OUString > SAL_CALL OOoEmbeddedObjectFactory::impl_staticGetSuppo return aRet; } -OUString SAL_CALL OOoEmbeddedObjectFactory::impl_staticGetImplementationName() +OUString OOoEmbeddedObjectFactory::impl_staticGetImplementationName() { return OUString("com.sun.star.comp.embed.OOoEmbeddedObjectFactory"); } -uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::impl_staticCreateSelfInstance( +uno::Reference< uno::XInterface > OOoEmbeddedObjectFactory::impl_staticCreateSelfInstance( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) { return uno::Reference< uno::XInterface >( *new OOoEmbeddedObjectFactory( comphelper::getComponentContext(xServiceManager) ) ); @@ -385,7 +385,7 @@ uno::Sequence< OUString > SAL_CALL OOoEmbeddedObjectFactory::getSupportedService return impl_staticGetSupportedServiceNames(); } -uno::Sequence< OUString > SAL_CALL OOoSpecialEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > OOoSpecialEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() { uno::Sequence< OUString > aRet(2); aRet[0] = "com.sun.star.embed.OOoSpecialEmbeddedObjectFactory"; @@ -393,12 +393,12 @@ uno::Sequence< OUString > SAL_CALL OOoSpecialEmbeddedObjectFactory::impl_staticG return aRet; } -OUString SAL_CALL OOoSpecialEmbeddedObjectFactory::impl_staticGetImplementationName() +OUString OOoSpecialEmbeddedObjectFactory::impl_staticGetImplementationName() { return OUString("com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory"); } -uno::Reference< uno::XInterface > SAL_CALL OOoSpecialEmbeddedObjectFactory::impl_staticCreateSelfInstance( +uno::Reference< uno::XInterface > OOoSpecialEmbeddedObjectFactory::impl_staticCreateSelfInstance( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) { return uno::Reference< uno::XInterface >( *new OOoSpecialEmbeddedObjectFactory( comphelper::getComponentContext(xServiceManager) ) ); diff --git a/embeddedobj/source/commonembedding/xfactory.hxx b/embeddedobj/source/commonembedding/xfactory.hxx index 951de92170c3..48bef30ea79d 100644 --- a/embeddedobj/source/commonembedding/xfactory.hxx +++ b/embeddedobj/source/commonembedding/xfactory.hxx @@ -45,11 +45,11 @@ public: OSL_ENSURE( rxContext.is(), "No service manager is provided!" ); } - static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static css::uno::Sequence< OUString > impl_staticGetSupportedServiceNames(); - static OUString SAL_CALL impl_staticGetImplementationName(); + static OUString impl_staticGetImplementationName(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > impl_staticCreateSelfInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); @@ -92,11 +92,11 @@ public: OSL_ENSURE( rxContext.is(), "No service manager is provided!" ); } - static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static css::uno::Sequence< OUString > impl_staticGetSupportedServiceNames(); - static OUString SAL_CALL impl_staticGetImplementationName(); + static OUString impl_staticGetImplementationName(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > impl_staticCreateSelfInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx index 492e02b4a7b4..54d8476d5471 100644 --- a/embeddedobj/source/general/xcreator.cxx +++ b/embeddedobj/source/general/xcreator.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star; -uno::Sequence< OUString > SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > UNOEmbeddedObjectCreator::impl_staticGetSupportedServiceNames() { uno::Sequence< OUString > aRet(2); aRet[0] = "com.sun.star.embed.EmbeddedObjectCreator"; @@ -49,13 +49,13 @@ uno::Sequence< OUString > SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetSuppo } -OUString SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetImplementationName() +OUString UNOEmbeddedObjectCreator::impl_staticGetImplementationName() { return OUString("com.sun.star.comp.embed.EmbeddedObjectCreator"); } -uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::impl_staticCreateSelfInstance( +uno::Reference< uno::XInterface > UNOEmbeddedObjectCreator::impl_staticCreateSelfInstance( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) { return uno::Reference< uno::XInterface >( *new UNOEmbeddedObjectCreator( comphelper::getComponentContext(xServiceManager) ) ); diff --git a/embeddedobj/source/inc/xcreator.hxx b/embeddedobj/source/inc/xcreator.hxx index 23bc62b282e3..3c0118fde37f 100644 --- a/embeddedobj/source/inc/xcreator.hxx +++ b/embeddedobj/source/inc/xcreator.hxx @@ -43,11 +43,11 @@ public: OSL_ENSURE( rxContext.is(), "No service manager is provided!" ); } - static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static css::uno::Sequence< OUString > impl_staticGetSupportedServiceNames(); - static OUString SAL_CALL impl_staticGetImplementationName(); + static OUString impl_staticGetImplementationName(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > impl_staticCreateSelfInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); diff --git a/embeddedobj/source/msole/xolefactory.cxx b/embeddedobj/source/msole/xolefactory.cxx index 9ddf028ae4f1..9049cf024db0 100644 --- a/embeddedobj/source/msole/xolefactory.cxx +++ b/embeddedobj/source/msole/xolefactory.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star; // TODO: do not create OLE objects that represent OOo documents -uno::Sequence< OUString > SAL_CALL OleEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > OleEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() { uno::Sequence< OUString > aRet(2); aRet[0] = "com.sun.star.embed.OLEEmbeddedObjectFactory"; @@ -44,13 +44,13 @@ uno::Sequence< OUString > SAL_CALL OleEmbeddedObjectFactory::impl_staticGetSuppo } -OUString SAL_CALL OleEmbeddedObjectFactory::impl_staticGetImplementationName() +OUString OleEmbeddedObjectFactory::impl_staticGetImplementationName() { return OUString("com.sun.star.comp.embed.OLEEmbeddedObjectFactory"); } -uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::impl_staticCreateSelfInstance( +uno::Reference< uno::XInterface > OleEmbeddedObjectFactory::impl_staticCreateSelfInstance( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) { return uno::Reference< uno::XInterface >( *new OleEmbeddedObjectFactory( xServiceManager ) ); diff --git a/embeddedobj/source/msole/xolefactory.hxx b/embeddedobj/source/msole/xolefactory.hxx index bff4ed6c6d5e..bd58f1080fc7 100644 --- a/embeddedobj/source/msole/xolefactory.hxx +++ b/embeddedobj/source/msole/xolefactory.hxx @@ -42,11 +42,11 @@ public: OSL_ENSURE( xFactory.is(), "No service manager is provided!" ); } - static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static css::uno::Sequence< OUString > impl_staticGetSupportedServiceNames(); - static OUString SAL_CALL impl_staticGetImplementationName(); + static OUString impl_staticGetImplementationName(); - static css::uno::Reference< css::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > impl_staticCreateSelfInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); |