diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-19 09:14:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-19 09:16:08 +0100 |
| commit | d355bb660be059b1477a5dfb16df620cc3d1fa46 (patch) | |
| tree | 292e722d127f6146b2a7e4f402a24bca2f7113ff /extensions/source/config | |
| parent | 09121d24b667081ba8da9b521dff457d22150214 (diff) | |
sal_Char->char in extensions
Change-Id: I123a5091c5c07de49beba8f4e1d3e4704644ec68
Reviewed-on: https://gerrit.libreoffice.org/85473
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'extensions/source/config')
| -rw-r--r-- | extensions/source/config/WinUserInfo/componentdef.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/config/ldap/componentdef.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/config/ldap/ldapaccess.cxx | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/extensions/source/config/WinUserInfo/componentdef.cxx b/extensions/source/config/WinUserInfo/componentdef.cxx index 7d8ff550445d..e2d38e98866f 100644 --- a/extensions/source/config/WinUserInfo/componentdef.cxx +++ b/extensions/source/config/WinUserInfo/componentdef.cxx @@ -25,7 +25,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] { nullptr, nullptr, nullptr, nullptr, nullptr, 0 } }; extern "C" SAL_DLLPUBLIC_EXPORT void* -WinUserInfoBe_component_getFactory(const sal_Char* aImplementationName, void* aServiceManager, +WinUserInfoBe_component_getFactory(const char* aImplementationName, void* aServiceManager, void* aRegistryKey) { return cppu::component_getFactoryHelper(aImplementationName, aServiceManager, aRegistryKey, diff --git a/extensions/source/config/ldap/componentdef.cxx b/extensions/source/config/ldap/componentdef.cxx index e8abd45fe248..02320f7cbb30 100644 --- a/extensions/source/config/ldap/componentdef.cxx +++ b/extensions/source/config/ldap/componentdef.cxx @@ -44,7 +44,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = } ; -extern "C" SAL_DLLPUBLIC_EXPORT void * ldapbe2_component_getFactory(const sal_Char *aImplementationName, +extern "C" SAL_DLLPUBLIC_EXPORT void * ldapbe2_component_getFactory(const char *aImplementationName, void *aServiceManager, void *aRegistryKey) { return cppu::component_getFactoryHelper(aImplementationName, diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index e6a44aa1b0c1..5f9c6820b6cc 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -61,7 +61,7 @@ void LdapConnection::disconnect() } -static void checkLdapReturnCode(const sal_Char *aOperation, +static void checkLdapReturnCode(const char *aOperation, LdapErrCode aRetCode) { if (aRetCode == LDAP_SUCCESS) { return ; } @@ -75,7 +75,7 @@ static void checkLdapReturnCode(const sal_Char *aOperation, message += OUString::createFromAscii(ldap_err2string(aRetCode)) + " (" ; #ifndef LDAP_OPT_SIZELIMIT // for use with OpenLDAP - sal_Char* stub = nullptr; + char* stub = nullptr; ldap_get_lderrno(aConnection, NULL, &stub) ; if (stub != nullptr) { @@ -251,7 +251,7 @@ void LdapConnection::initConnection() LDAP_SCOPE_SUBTREE, const_cast<PWSTR>(o3tl::toW(filter.getStr())), attributes, 0, &result.msg) ; #else - sal_Char * attributes [2] = { const_cast<sal_Char *>(LDAP_NO_ATTRS), nullptr }; + char * attributes [2] = { const_cast<char *>(LDAP_NO_ATTRS), nullptr }; LdapErrCode retCode = ldap_search_s(mConnection, OUStringToOString( mLdapDefinition.mBaseDN, RTL_TEXTENCODING_UTF8 ).getStr(), LDAP_SCOPE_SUBTREE, @@ -269,7 +269,7 @@ void LdapConnection::initConnection() userDn = OUString( o3tl::toU( charsDn ) ); ldap_memfreeW(charsDn) ; #else - sal_Char *charsDn = ldap_get_dn(mConnection, entry) ; + char *charsDn = ldap_get_dn(mConnection, entry) ; userDn = OStringToOUString( charsDn, RTL_TEXTENCODING_UTF8 ); ldap_memfree(charsDn) ; |