diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-19 09:42:08 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-19 12:05:51 +0100 |
commit | 821bdf5f7980de0c67ac17f275d3d2e0710ec6a5 (patch) | |
tree | 2b801c3be46b3975804edeeae6b7ffea7508771e /i18nlangtag | |
parent | 0c5f36e5f77e5b9cd155c29fd54c0878be31de0a (diff) |
sal_Char->char in formula..i18npool
Change-Id: I765979f41842befcf25909944100d1caa97f81a8
Reviewed-on: https://gerrit.libreoffice.org/85476
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'i18nlangtag')
-rw-r--r-- | i18nlangtag/source/isolang/inunx.cxx | 14 | ||||
-rw-r--r-- | i18nlangtag/source/isolang/isolang.cxx | 40 |
2 files changed, 27 insertions, 27 deletions
diff --git a/i18nlangtag/source/isolang/inunx.cxx b/i18nlangtag/source/isolang/inunx.cxx index ce9ea5ee83e9..2f53ed3b349a 100644 --- a/i18nlangtag/source/isolang/inunx.cxx +++ b/i18nlangtag/source/isolang/inunx.cxx @@ -39,10 +39,10 @@ static LanguageType nImplSystemUILanguage = LANGUAGE_DONTKNOW; // Get locale of category LC_CTYPE of environment variables -static const sal_Char* getLangFromEnvironment() +static const char* getLangFromEnvironment() { - static const sal_Char* const pFallback = "C"; - const sal_Char *pLang = nullptr; + static const char* const pFallback = "C"; + const char *pLang = nullptr; pLang = getenv ( "LC_ALL" ); if (! pLang || pLang[0] == 0) @@ -57,10 +57,10 @@ static const sal_Char* getLangFromEnvironment() // Get locale of category LC_MESSAGES of environment variables -static const sal_Char* getUILangFromEnvironment() +static const char* getUILangFromEnvironment() { - static const sal_Char* const pFallback = "C"; - const sal_Char *pLang = nullptr; + static const char* const pFallback = "C"; + const char *pLang = nullptr; pLang = getenv ( "LANGUAGE" ); // respect the GNU extension if (! pLang || pLang[0] == 0) @@ -76,7 +76,7 @@ static const sal_Char* getUILangFromEnvironment() } -typedef const sal_Char * (*getLangFromEnv)(); +typedef const char * (*getLangFromEnv)(); static void getPlatformSystemLanguageImpl( LanguageType& rSystemLanguage, getLangFromEnv pGetLangFromEnv ) diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index 3a915cc56416..68cb253c6b3f 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -58,8 +58,8 @@ LanguageType getOverrideLang( LanguageType nLang, LanguageType nOverride ) struct IsoLanguageCountryEntry { LanguageType mnLang; - sal_Char maLanguage[4]; - sal_Char maCountry[3]; + char maLanguage[4]; + char maCountry[3]; LanguageType mnOverride; /** Obtain a language tag string with '-' separator. */ @@ -72,8 +72,8 @@ struct IsoLanguageCountryEntry struct IsoLanguageScriptCountryEntry { LanguageType mnLang; - sal_Char maLanguageScript[9]; ///< "ll-Ssss" or "lll-Ssss" - sal_Char maCountry[3]; + char maLanguageScript[9]; ///< "ll-Ssss" or "lll-Ssss" + char maCountry[3]; LanguageType mnOverride; /** Obtain a language tag string with '-' separator. */ @@ -92,9 +92,9 @@ struct IsoLanguageScriptCountryEntry struct Bcp47CountryEntry { LanguageType mnLang; - const sal_Char* mpBcp47; - sal_Char maCountry[3]; - const sal_Char* mpFallback; + const char* mpBcp47; + char maCountry[3]; + const char* mpFallback; LanguageType mnOverride; /** Obtain a language tag string with '-' separator. */ @@ -108,21 +108,21 @@ namespace { struct IsoLangEngEntry { - LanguageType mnLang; - sal_Char maCountry[3]; + LanguageType mnLang; + char maCountry[3]; }; struct IsoLangNoneStdEntry { - LanguageType mnLang; - sal_Char maLanguage[4]; - sal_Char maCountry[9]; + LanguageType mnLang; + char maLanguage[4]; + char maCountry[9]; }; struct IsoLangOtherEntry { - LanguageType mnLang; - const sal_Char* mpLanguage; + LanguageType mnLang; + const char* mpLanguage; }; } @@ -1421,9 +1421,9 @@ namespace { struct IsoLangGLIBCModifiersEntry { LanguageType mnLang; - sal_Char maLanguage[4]; - sal_Char maCountry[3]; - sal_Char maAtString[9]; + char maLanguage[4]; + char maCountry[3]; + char maAtString[9]; }; } @@ -1486,11 +1486,11 @@ LanguageType MsLangId::convertUnxByteStringToLanguage( for (const IsoLangGLIBCModifiersEntry* pGLIBCModifiersEntry = aImplIsoLangGLIBCModifiersEntries; pGLIBCModifiersEntry->mnLang != LANGUAGE_DONTKNOW; ++pGLIBCModifiersEntry) { // avoid embedded \0 warning - if (aLowerLang == static_cast< const char* >( pGLIBCModifiersEntry->maLanguage ) && - aAtString == static_cast< const char* >( pGLIBCModifiersEntry->maAtString )) + if (aLowerLang == pGLIBCModifiersEntry->maLanguage && + aAtString == pGLIBCModifiersEntry->maAtString ) { if (aUpperCountry.isEmpty() || - aUpperCountry == static_cast< const char* >( pGLIBCModifiersEntry->maCountry )) + aUpperCountry == pGLIBCModifiersEntry->maCountry ) { return pGLIBCModifiersEntry->mnLang; } |