diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-08 15:58:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-11 12:13:46 +0100 |
| commit | 3af500580b1c82eabd60335c9ebc458a3f68850c (patch) | |
| tree | e0ad105be694cfb46221d16e9ce987879794fa04 /cui | |
| parent | 0f9a596aa853b4f2beeff25c131246a7b31492a4 (diff) | |
loplugin:salcall fix functions
since cdecl is the default calling convention on Windows for
such functions, the annotation is redundant.
Change-Id: I1a85fa27e5ac65ce0e04a19bde74c90800ffaa2d
Reviewed-on: https://gerrit.libreoffice.org/46164
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/dialogs/colorpicker.cxx | 6 | ||||
| -rw-r--r-- | cui/source/inc/colorpicker.hxx | 6 | ||||
| -rw-r--r-- | cui/source/uno/services.cxx | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 2d9d0c4e53ed..8431201742fd 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -1406,17 +1406,17 @@ private: Reference<css::awt::XWindow> mxParent; }; -OUString SAL_CALL ColorPicker_getImplementationName() +OUString ColorPicker_getImplementationName() { return OUString( "com.sun.star.cui.ColorPicker" ); } -Reference< XInterface > SAL_CALL ColorPicker_createInstance( Reference< XComponentContext > const & ) +Reference< XInterface > ColorPicker_createInstance( Reference< XComponentContext > const & ) { return static_cast<XWeak*>( new ColorPicker ); } -Sequence< OUString > SAL_CALL ColorPicker_getSupportedServiceNames() +Sequence< OUString > ColorPicker_getSupportedServiceNames() { Sequence< OUString > seq { "com.sun.star.ui.dialogs.ColorPicker" }; return seq; diff --git a/cui/source/inc/colorpicker.hxx b/cui/source/inc/colorpicker.hxx index b2b24ba0d7c0..53f0fa611142 100644 --- a/cui/source/inc/colorpicker.hxx +++ b/cui/source/inc/colorpicker.hxx @@ -36,13 +36,13 @@ namespace com { namespace sun { namespace star { namespace uno { namespace cui { -OUString SAL_CALL ColorPicker_getImplementationName(); +OUString ColorPicker_getImplementationName(); -css::uno::Reference<css::uno::XInterface> SAL_CALL ColorPicker_createInstance( +css::uno::Reference<css::uno::XInterface> ColorPicker_createInstance( css::uno::Reference<css::uno::XComponentContext> const &); /// @throws css::uno::RuntimeException -css::uno::Sequence<OUString> SAL_CALL ColorPicker_getSupportedServiceNames(); +css::uno::Sequence<OUString> ColorPicker_getSupportedServiceNames(); } #endif diff --git a/cui/source/uno/services.cxx b/cui/source/uno/services.cxx index 34799d37bf8d..af06b9d07659 100644 --- a/cui/source/uno/services.cxx +++ b/cui/source/uno/services.cxx @@ -34,7 +34,7 @@ namespace }; } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL cui_component_getFactory( char const * implName, void * serviceManager, void * registryKey) +extern "C" SAL_DLLPUBLIC_EXPORT void * cui_component_getFactory( char const * implName, void * serviceManager, void * registryKey) { return cppu::component_getFactoryHelper(implName, serviceManager, registryKey, entries); } |