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 /forms | |
| 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 'forms')
| -rw-r--r-- | forms/source/component/FormComponent.cxx | 4 | ||||
| -rw-r--r-- | forms/source/inc/FormComponent.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index 9de32950f657..5f970008b50a 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -678,7 +678,7 @@ Sequence<OUString> SAL_CALL OControlModel::getSupportedServiceNames() ); } -Sequence< OUString > SAL_CALL OControlModel::getSupportedServiceNames_Static() +Sequence< OUString > OControlModel::getSupportedServiceNames_Static() { Sequence< OUString > aServiceNames( 2 ); aServiceNames[ 0 ] = FRM_SUN_FORMCOMPONENT; @@ -1511,7 +1511,7 @@ css::uno::Sequence<OUString> SAL_CALL OBoundControlModel::getSupportedServiceNam ); } -Sequence< OUString > SAL_CALL OBoundControlModel::getSupportedServiceNames_Static() +Sequence< OUString > OBoundControlModel::getSupportedServiceNames_Static() { Sequence<OUString> aOwnServiceNames { "com.sun.star.form.DataAwareControlModel" }; return ::comphelper::concatSequences( diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index ff82e1a33357..bef6e81ec25d 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -400,7 +400,7 @@ public: // XSericeInfo - static version(s) /// @throws css::uno::RuntimeException - static css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames_Static(); + static css::uno::Sequence<OUString> getSupportedServiceNames_Static(); // XPersistObject virtual OUString SAL_CALL getServiceName() override = 0; @@ -976,7 +976,7 @@ public: // XServiceInfo - static version /// @throws css::uno::RuntimeException - static css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames_Static(); + static css::uno::Sequence<OUString> getSupportedServiceNames_Static(); // XChild virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override; |