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 /avmedia | |
| 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 'avmedia')
| -rw-r--r-- | avmedia/source/framework/soundhandler.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/gstreamer/gstuno.cxx | 4 | ||||
| -rw-r--r-- | avmedia/source/vlc/vlcuno.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index 3f2ffcd9771f..0fb8a2b7d5a0 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -336,7 +336,7 @@ IMPL_LINK_NOARG(SoundHandler, implts_PlayerNotify, Timer *, void) } // namespace framework -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_framework_SoundHandler_get_implementation(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) { diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx index b4126fd9f9e5..abd01f5cfb62 100644 --- a/avmedia/source/gstreamer/gstuno.cxx +++ b/avmedia/source/gstreamer/gstuno.cxx @@ -34,12 +34,12 @@ using namespace ::com::sun::star; # define SERVICE_NAME AVMEDIA_MANAGER_SERVICE_NAME // "com.sun.star.comp.avmedia.Manager_GStreamer" #endif -static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& ) +static uno::Reference< uno::XInterface > create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& ) { return uno::Reference< uno::XInterface >( *new ::avmedia::gstreamer::Manager ); } -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediagst_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) +extern "C" SAL_DLLPUBLIC_EXPORT void* avmediagst_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) { uno::Reference< lang::XSingleServiceFactory > xFactory; void* pRet = nullptr; diff --git a/avmedia/source/vlc/vlcuno.cxx b/avmedia/source/vlc/vlcuno.cxx index 0c505696261a..99ffd3522026 100644 --- a/avmedia/source/vlc/vlcuno.cxx +++ b/avmedia/source/vlc/vlcuno.cxx @@ -29,7 +29,7 @@ using namespace ::com::sun::star; #define IMPL_NAME "com.sun.star.comp.media.Manager_VLC" #define SERVICE_NAME "com.sun.star.comp.avmedia.Manager_VLC" -static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& rxFact ) +static uno::Reference< uno::XInterface > create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& rxFact ) { SAL_INFO("avmedia", "create VLC Media player !"); @@ -42,7 +42,7 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno: return manager; } -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediavlc_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) +extern "C" SAL_DLLPUBLIC_EXPORT void* avmediavlc_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) { uno::Reference< lang::XSingleServiceFactory > xFactory; void* pRet = nullptr; |