From 011dae60e2170f71ddf647d5ea2b844432480dc7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sun, 22 Dec 2019 16:59:23 +0200 Subject: sal_Char->char in sfx2..slideshow Change-Id: I59667664fc097989e0a78d8876f2be8353911236 Reviewed-on: https://gerrit.libreoffice.org/85701 Tested-by: Jenkins Reviewed-by: Noel Grandin --- shell/source/backends/localebe/localebecdef.cxx | 2 +- shell/source/backends/macbe/macbecdef.cxx | 2 +- shell/source/backends/wininetbe/wininetbecdef.cxx | 2 +- shell/source/cmdmail/cmdmailentry.cxx | 2 +- shell/source/sessioninstall/services.cxx | 4 ++-- shell/source/unix/exec/shellexec.cxx | 2 +- shell/source/unix/exec/shellexecentry.cxx | 2 +- shell/source/win32/SysShentry.cxx | 2 +- shell/source/win32/simplemail/smplmailentry.cxx | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) (limited to 'shell/source') diff --git a/shell/source/backends/localebe/localebecdef.cxx b/shell/source/backends/localebe/localebecdef.cxx index 93d2bc45e012..fbbd63690d55 100644 --- a/shell/source/backends/localebe/localebecdef.cxx +++ b/shell/source/backends/localebe/localebecdef.cxx @@ -48,7 +48,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = extern "C" SAL_DLLPUBLIC_EXPORT void * localebe1_component_getFactory( - const sal_Char *aImplementationName, + const char *aImplementationName, void *aServiceManager, void *aRegistryKey) { diff --git a/shell/source/backends/macbe/macbecdef.cxx b/shell/source/backends/macbe/macbecdef.cxx index 7d10f6a2dfaa..3e4803c48f2a 100644 --- a/shell/source/backends/macbe/macbecdef.cxx +++ b/shell/source/backends/macbe/macbecdef.cxx @@ -48,7 +48,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = }; -extern "C" SAL_DLLPUBLIC_EXPORT void * macbe1_component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) +extern "C" SAL_DLLPUBLIC_EXPORT void * macbe1_component_getFactory( const char *aImplementationName, void *aServiceManager, void *aRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/shell/source/backends/wininetbe/wininetbecdef.cxx b/shell/source/backends/wininetbe/wininetbecdef.cxx index 92bb5c8f65ce..72fca9378d35 100644 --- a/shell/source/backends/wininetbe/wininetbecdef.cxx +++ b/shell/source/backends/wininetbe/wininetbecdef.cxx @@ -48,7 +48,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = } ; -extern "C" SAL_DLLPUBLIC_EXPORT void * wininetbe1_component_getFactory( const sal_Char *aImplementationName, +extern "C" SAL_DLLPUBLIC_EXPORT void * wininetbe1_component_getFactory( const char *aImplementationName, void *aServiceManager, void *aRegistryKey) { diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx index 80c6ca85b752..c82f67493226 100644 --- a/shell/source/cmdmail/cmdmailentry.cxx +++ b/shell/source/cmdmail/cmdmailentry.cxx @@ -44,7 +44,7 @@ extern "C" { SAL_DLLPUBLIC_EXPORT void* cmdmail_component_getFactory( - const sal_Char* pImplName, + const char* pImplName, SAL_UNUSED_PARAMETER void* /*pSrvManager*/, SAL_UNUSED_PARAMETER void* /*pRegistryKey*/ ) { diff --git a/shell/source/sessioninstall/services.cxx b/shell/source/sessioninstall/services.cxx index fbb6641d8eb5..4b72bff193f9 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* losessioninstall_component_getFactory( sal_Char const* pImplName, +SAL_DLLPUBLIC_EXPORT void* losessioninstall_component_getFactory( char const* pImplName, void*, void* ) { return sdecl::component_getFactoryHelper( pImplName, {&SyncDbusSessionHelperServiceDecl} ); } extern "C" -SAL_DLLPUBLIC_EXPORT void* sessioninstall_component_getFactory( sal_Char const* pImplName, void* pServiceManager, void* pRegistryKey ) +SAL_DLLPUBLIC_EXPORT void* sessioninstall_component_getFactory( 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 3daea4a2b18a..58c5ef4661d8 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -69,7 +69,7 @@ namespace for(sal_Int32 n=0; n < nmax; ++n) { // escape every non alpha numeric characters (excluding a few "known good") by prepending a '\' - sal_Char c = rURL[n]; + char c = rURL[n]; if( ( c < 'A' || c > 'Z' ) && ( c < 'a' || c > 'z' ) && ( c < '0' || c > '9' ) && c != '/' && c != '.' ) rBuffer.append( '\\' ); diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx index baa304476a3d..dbd9cba0a80a 100644 --- a/shell/source/unix/exec/shellexecentry.cxx +++ b/shell/source/unix/exec/shellexecentry.cxx @@ -42,7 +42,7 @@ extern "C" { SAL_DLLPUBLIC_EXPORT void* syssh_component_getFactory( - const sal_Char* pImplName, + const char* pImplName, SAL_UNUSED_PARAMETER void* /*pSrvManager*/, SAL_UNUSED_PARAMETER void* /*pRegistryKey*/ ) { diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx index 7306ea5e7a5a..130ba8de7dd5 100644 --- a/shell/source/win32/SysShentry.cxx +++ b/shell/source/win32/SysShentry.cxx @@ -44,7 +44,7 @@ extern "C" { SAL_DLLPUBLIC_EXPORT void* syssh_component_getFactory( - const sal_Char* pImplName, void*, void* /*pRegistryKey*/ ) + const char* pImplName, void*, void* /*pRegistryKey*/ ) { void* pRet = nullptr; diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx index d34aa12f0fb3..f4293144b13a 100644 --- a/shell/source/win32/simplemail/smplmailentry.cxx +++ b/shell/source/win32/simplemail/smplmailentry.cxx @@ -45,7 +45,7 @@ extern "C" { SAL_DLLPUBLIC_EXPORT void* smplmail_component_getFactory( - const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ ) + const char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ ) { void* pRet = nullptr; -- cgit