diff options
Diffstat (limited to 'shell/source')
-rw-r--r-- | shell/source/backends/desktopbe/desktopbackend.cxx | 8 | ||||
-rw-r--r-- | shell/source/backends/localebe/localebecdef.cxx | 4 | ||||
-rw-r--r-- | shell/source/cmdmail/cmdmailentry.cxx | 4 | ||||
-rw-r--r-- | shell/source/cmdmail/cmdmailsuppl.cxx | 2 | ||||
-rw-r--r-- | shell/source/sessioninstall/services.cxx | 4 | ||||
-rw-r--r-- | shell/source/unix/exec/shellexec.cxx | 2 | ||||
-rw-r--r-- | shell/source/unix/exec/shellexecentry.cxx | 4 |
7 files changed, 14 insertions, 14 deletions
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index f86ceb2ad413..1ce27ebbc8fb 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -53,12 +53,12 @@ namespace { -OUString SAL_CALL getDefaultImplementationName() { +OUString getDefaultImplementationName() { return OUString( "com.sun.star.comp.configuration.backend.DesktopBackend"); } -css::uno::Sequence< OUString > SAL_CALL getDefaultSupportedServiceNames() { +css::uno::Sequence< OUString > getDefaultSupportedServiceNames() { OUString name( "com.sun.star.configuration.backend.DesktopBackend"); return css::uno::Sequence< OUString >(&name, 1); @@ -287,7 +287,7 @@ css::uno::Reference< css::uno::XInterface > createBackend( } } -css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( +css::uno::Reference< css::uno::XInterface > createInstance( css::uno::Reference< css::uno::XComponentContext > const & context) { OUString desktop; @@ -321,7 +321,7 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL desktopbe1_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * desktopbe1_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/shell/source/backends/localebe/localebecdef.cxx b/shell/source/backends/localebe/localebecdef.cxx index b377c28027d9..93d2bc45e012 100644 --- a/shell/source/backends/localebe/localebecdef.cxx +++ b/shell/source/backends/localebe/localebecdef.cxx @@ -26,7 +26,7 @@ namespace uno = com::sun::star::uno ; -static uno::Reference<uno::XInterface> SAL_CALL createLocaleBackend( +static uno::Reference<uno::XInterface> createLocaleBackend( SAL_UNUSED_PARAMETER const uno::Reference<uno::XComponentContext>&){ return * LocaleBackend::createInstance(); @@ -47,7 +47,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = } ; -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL localebe1_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * localebe1_component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx index 1e17dde9b3b4..217343612fe8 100644 --- a/shell/source/cmdmail/cmdmailentry.cxx +++ b/shell/source/cmdmail/cmdmailentry.cxx @@ -33,7 +33,7 @@ using com::sun::star::system::XSimpleMailClientSupplier; namespace { - Reference< XInterface > SAL_CALL createInstance( const Reference< XComponentContext >& xContext ) + Reference< XInterface > createInstance( const Reference< XComponentContext >& xContext ) { return Reference< XInterface >( static_cast< XSimpleMailClientSupplier* >( new CmdMailSuppl( xContext ) ) ); } @@ -42,7 +42,7 @@ namespace extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL cmdmail_component_getFactory( +SAL_DLLPUBLIC_EXPORT void* cmdmail_component_getFactory( const sal_Char* pImplName, SAL_UNUSED_PARAMETER void* /*pSrvManager*/, SAL_UNUSED_PARAMETER void* /*pRegistryKey*/ ) diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx index 77285609648f..687bee4a09ff 100644 --- a/shell/source/cmdmail/cmdmailsuppl.cxx +++ b/shell/source/cmdmail/cmdmailsuppl.cxx @@ -55,7 +55,7 @@ using namespace com::sun::star::configuration; namespace { - Sequence< OUString > SAL_CALL Component_getSupportedServiceNames() + Sequence< OUString > Component_getSupportedServiceNames() { Sequence< OUString > aRet { "com.sun.star.system.SimpleCommandMail" }; return aRet; diff --git a/shell/source/sessioninstall/services.cxx b/shell/source/sessioninstall/services.cxx index bb86e036383a..fbb6641d8eb5 100644 --- a/shell/source/sessioninstall/services.cxx +++ b/shell/source/sessioninstall/services.cxx @@ -21,14 +21,14 @@ const sdecl::ServiceDecl SyncDbusSessionHelperServiceDecl( "org.freedesktop.PackageKit.SyncDbusSessionHelper"); extern "C" -SAL_DLLPUBLIC_EXPORT void* SAL_CALL losessioninstall_component_getFactory( sal_Char const* pImplName, +SAL_DLLPUBLIC_EXPORT void* losessioninstall_component_getFactory( sal_Char const* pImplName, void*, void* ) { return sdecl::component_getFactoryHelper( pImplName, {&SyncDbusSessionHelperServiceDecl} ); } extern "C" -SAL_DLLPUBLIC_EXPORT void* SAL_CALL sessioninstall_component_getFactory( sal_Char const* pImplName, void* pServiceManager, void* pRegistryKey ) +SAL_DLLPUBLIC_EXPORT void* sessioninstall_component_getFactory( sal_Char const* pImplName, void* pServiceManager, void* pRegistryKey ) { return losessioninstall_component_getFactory(pImplName, pServiceManager, pRegistryKey); } diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index 3411f2c446fe..d66a27668d06 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -51,7 +51,7 @@ using namespace cppu; namespace { - Sequence< OUString > SAL_CALL ShellExec_getSupportedServiceNames() + Sequence< OUString > ShellExec_getSupportedServiceNames() { Sequence< OUString > aRet { "com.sun.star.system.SystemShellExecute" }; return aRet; diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx index bb6cd0c297fc..3b1792ef58db 100644 --- a/shell/source/unix/exec/shellexecentry.cxx +++ b/shell/source/unix/exec/shellexecentry.cxx @@ -31,7 +31,7 @@ using com::sun::star::system::XSystemShellExecute; namespace { - Reference< XInterface > SAL_CALL createInstance(const Reference< XComponentContext >& xContext) + Reference< XInterface > createInstance(const Reference< XComponentContext >& xContext) { return Reference< XInterface >( static_cast< XSystemShellExecute* >( new ShellExec(xContext) ) ); } @@ -40,7 +40,7 @@ namespace extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL syssh_component_getFactory( +SAL_DLLPUBLIC_EXPORT void* syssh_component_getFactory( const sal_Char* pImplName, SAL_UNUSED_PARAMETER void* /*pSrvManager*/, SAL_UNUSED_PARAMETER void* /*pRegistryKey*/ ) |