summaryrefslogtreecommitdiff
path: root/fpicker
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 /fpicker
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 'fpicker')
-rw-r--r--fpicker/source/office/OfficeFilePicker.cxx4
-rw-r--r--fpicker/source/office/OfficeFilePicker.hxx4
-rw-r--r--fpicker/source/office/OfficeFolderPicker.cxx2
-rw-r--r--fpicker/source/office/OfficeFolderPicker.hxx2
4 files changed, 6 insertions, 6 deletions
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index fc9a65b8e7e0..27b6b905b006 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -1121,7 +1121,7 @@ OUString SvtFilePicker::impl_getStaticImplementationName()
}
/* Helper for registry */
-Reference< XInterface > SAL_CALL SvtFilePicker::impl_createInstance(
+Reference< XInterface > SvtFilePicker::impl_createInstance(
const Reference< XComponentContext >& )
{
return Reference< XInterface >( *new SvtFilePicker );
@@ -1185,7 +1185,7 @@ OUString SvtRemoteFilePicker::impl_getStaticImplementationName()
}
/* Helper for registry */
-Reference< XInterface > SAL_CALL SvtRemoteFilePicker::impl_createInstance(
+Reference< XInterface > SvtRemoteFilePicker::impl_createInstance(
const Reference< XComponentContext >& )
{
return Reference< XInterface >( *new SvtRemoteFilePicker );
diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx
index be50fc211e8f..27e761f39f05 100644
--- a/fpicker/source/office/OfficeFilePicker.hxx
+++ b/fpicker/source/office/OfficeFilePicker.hxx
@@ -195,7 +195,7 @@ public:
/* Helper for registry */
/// @throws css::uno::Exception
- static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance (
+ static css::uno::Reference< css::uno::XInterface > impl_createInstance (
const css::uno::Reference< css::uno::XComponentContext >& rxContext );
protected:
@@ -252,7 +252,7 @@ public:
/* Helper for registry */
/// @throws css::uno::Exception
- static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance (
+ static css::uno::Reference< css::uno::XInterface > impl_createInstance (
const css::uno::Reference< css::uno::XComponentContext >& rxContext );
};
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx
index adc7203a304a..5ace5400eedf 100644
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -180,7 +180,7 @@ OUString SvtFolderPicker::impl_getStaticImplementationName()
}
/* Helper for registry */
-Reference< XInterface > SAL_CALL SvtFolderPicker::impl_createInstance( const Reference< XComponentContext >& )
+Reference< XInterface > SvtFolderPicker::impl_createInstance( const Reference< XComponentContext >& )
{
return Reference< XInterface >( *new SvtFolderPicker );
}
diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx
index 3883bd6c46ba..4dd96a833151 100644
--- a/fpicker/source/office/OfficeFolderPicker.hxx
+++ b/fpicker/source/office/OfficeFolderPicker.hxx
@@ -91,7 +91,7 @@ public:
/* Helper for registry */
/// @throws css::uno::Exception
- static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance (
+ static css::uno::Reference< css::uno::XInterface > impl_createInstance (
const css::uno::Reference< css::uno::XComponentContext >& rxContext );
protected: