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>

38 files changed, 120 insertions, 120 deletions

diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 2f691f534f6f..2c18b8fd3567 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -41,7 +41,7 @@ namespace formula
 {
     using namespace ::com::sun::star;
 
-    static const sal_Char* pInternal[2] = { "TTT", "__DEBUG_VAR" };
+    static const char* pInternal[2] = { "TTT", "__DEBUG_VAR" };
 
 namespace {
 
diff --git a/helpcompiler/source/BasCodeTagger.cxx b/helpcompiler/source/BasCodeTagger.cxx
index 1b4797b403b9..deaaa0f5253d 100644
--- a/helpcompiler/source/BasCodeTagger.cxx
+++ b/helpcompiler/source/BasCodeTagger.cxx
@@ -134,7 +134,7 @@ void BasicCodeTagger::tagParagraph( xmlNodePtr paragraph )
     }
 
     //3. create new paragraph content
-    OUString strLine( reinterpret_cast<const sal_Char*>(codeSnippet),
+    OUString strLine( reinterpret_cast<const char*>(codeSnippet),
                                 strlen(reinterpret_cast<const char*>(codeSnippet)),
                                 RTL_TEXTENCODING_UTF8 );
     std::vector<HighlightPortion> portions;
diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx
index 16459320a4d1..0f14e1cfde36 100644
--- a/hwpfilter/source/hwpreader.hxx
+++ b/hwpfilter/source/hwpreader.hxx
@@ -288,7 +288,7 @@ Sequence< OUString> HwpImportFilter::getSupportedServiceNames()
 
 extern "C"
 {
-    SAL_DLLPUBLIC_EXPORT void * hwp_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void *  )
+    SAL_DLLPUBLIC_EXPORT void * hwp_component_getFactory( const char * pImplName, void * pServiceManager, void *  )
     {
         void * pRet = nullptr;
 
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;
                 }
diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx
index b0e0850f09bc..ebb193ea2d68 100644
--- a/i18npool/inc/breakiterator_unicode.hxx
+++ b/i18npool/inc/breakiterator_unicode.hxx
@@ -71,7 +71,7 @@ public:
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 protected:
-    const sal_Char *cBreakIterator, *lineRule;
+    const char *cBreakIterator, *lineRule;
 
     /** Used as map value. */
     struct BI_ValueData
@@ -98,7 +98,7 @@ protected:
 
     /// @throws css::uno::RuntimeException
     void loadICUBreakIterator(const css::lang::Locale& rLocale,
-        sal_Int16 rBreakType, sal_Int16 rWordType, const sal_Char* name, const OUString& rText);
+        sal_Int16 rBreakType, sal_Int16 rWordType, const char* name, const OUString& rText);
 
 public:
     typedef std::unordered_map< OString, std::shared_ptr< BI_ValueData > > BIMap;
diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx
index c0541d7443b0..d579ee735f00 100644
--- a/i18npool/inc/calendar_gregorian.hxx
+++ b/i18npool/inc/calendar_gregorian.hxx
@@ -103,7 +103,7 @@ protected:
     const Era *eraArray;
     std::unique_ptr<icu::Calendar> body;
     rtl::Reference<NativeNumberSupplierService> mxNatNum;
-    const sal_Char* cCalendar;
+    const char* cCalendar;
     css::lang::Locale aLocale;
     sal_uInt32 fieldSet;
     sal_Int16 fieldValue[FIELD_INDEX_COUNT];
diff --git a/i18npool/inc/indexentrysupplier_common.hxx b/i18npool/inc/indexentrysupplier_common.hxx
index a6cfcb3b7964..72685fda9aa2 100644
--- a/i18npool/inc/indexentrysupplier_common.hxx
+++ b/i18npool/inc/indexentrysupplier_common.hxx
@@ -78,7 +78,7 @@ public:
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 protected:
-    const sal_Char *   implementationName;
+    const char *       implementationName;
     bool               usePhonetic;
     rtl::Reference<CollatorImpl>
                        collator;
diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx
index bbd76025d30c..52963b3be171 100644
--- a/i18npool/inc/inputsequencechecker.hxx
+++ b/i18npool/inc/inputsequencechecker.hxx
@@ -55,12 +55,12 @@ public:
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
-    const sal_Char *serviceName;
+    const char *serviceName;
 
     struct lookupTableItem {
-        lookupTableItem(const sal_Char* rLanguage, const css::uno::Reference < css::i18n::XExtendedInputSequenceChecker >& rxISC) :
+        lookupTableItem(const char* rLanguage, const css::uno::Reference < css::i18n::XExtendedInputSequenceChecker >& rxISC) :
             aLanguage(rLanguage), xISC(rxISC) {}
-        const sal_Char* aLanguage;
+        const char* aLanguage;
         css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > xISC;
     };
     std::vector<std::unique_ptr<lookupTableItem>> lookupTable;
@@ -69,8 +69,8 @@ private:
     css::uno::Reference < css::uno::XComponentContext > m_xContext;
 
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::i18n::XExtendedInputSequenceChecker >& getInputSequenceChecker(sal_Char const * rLanguage);
-    static sal_Char* getLanguageByScripType(sal_Unicode cChar, sal_Unicode nChar);
+    css::uno::Reference< css::i18n::XExtendedInputSequenceChecker >& getInputSequenceChecker(char const * rLanguage);
+    static char* getLanguageByScripType(sal_Unicode cChar, sal_Unicode nChar);
 };
 
 }
diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx
index b707ed3596b1..d8612a362bf0 100644
--- a/i18npool/inc/localedata.hxx
+++ b/i18npool/inc/localedata.hxx
@@ -131,7 +131,7 @@ private:
     OUString ref_name;
 
     /// @throws css::uno::RuntimeException
-    oslGenericFunction getFunctionSymbol( const css::lang::Locale& rLocale, const sal_Char* pFunction );
+    oslGenericFunction getFunctionSymbol( const css::lang::Locale& rLocale, const char* pFunction );
     sal_Unicode ** getIndexArray(const css::lang::Locale& rLocale, sal_Int16& indexCount);
     sal_Unicode ** getIndexArrayForAlgorithm(const css::lang::Locale& rLocale, const OUString& rAlgorithm);
     /// @throws css::uno::RuntimeException
diff --git a/i18npool/inc/textToPronounce_zh.hxx b/i18npool/inc/textToPronounce_zh.hxx
index 931817b9075a..df948148c315 100644
--- a/i18npool/inc/textToPronounce_zh.hxx
+++ b/i18npool/inc/textToPronounce_zh.hxx
@@ -35,7 +35,7 @@ protected:
 
 public:
 #ifndef DISABLE_DYNLOADING
-        TextToPronounce_zh(const sal_Char* func_name);
+        TextToPronounce_zh(const char* func_name);
 #else
         TextToPronounce_zh(sal_uInt16 ** (*function)());
 #endif
diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx
index b3096ecf86f2..76ec8abf06e7 100644
--- a/i18npool/inc/textconversion.hxx
+++ b/i18npool/inc/textconversion.hxx
@@ -66,11 +66,11 @@ public:
     css::uno::Sequence< OUString > SAL_CALL
         getSupportedServiceNames() override;
 private:
-    const sal_Char* implementationName;
+    const char* implementationName;
 protected:
 #ifndef DISABLE_DYNLOADING
     oslModule hModule;
-    oslGenericFunction getFunctionBySymbol(const sal_Char* func);
+    oslGenericFunction getFunctionBySymbol(const char* func);
 #endif
 };
 
diff --git a/i18npool/inc/transliteration_commonclass.hxx b/i18npool/inc/transliteration_commonclass.hxx
index 5cb7dd24b91e..97f716c082a5 100644
--- a/i18npool/inc/transliteration_commonclass.hxx
+++ b/i18npool/inc/transliteration_commonclass.hxx
@@ -95,8 +95,8 @@ protected:
         foldingImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset, bool useOffset ) = 0;
 
         css::lang::Locale   aLocale;
-        const sal_Char* transliterationName;
-        const sal_Char* implementationName;
+        const char*         transliterationName;
+        const char*         implementationName;
 };
 
 }
diff --git a/i18npool/inc/xdictionary.hxx b/i18npool/inc/xdictionary.hxx
index 38d5ac72e195..dbb07f75652b 100644
--- a/i18npool/inc/xdictionary.hxx
+++ b/i18npool/inc/xdictionary.hxx
@@ -60,13 +60,13 @@ class xdictionary
 {
 private:
     xdictionarydata data;
-    void initDictionaryData(const sal_Char *lang);
+    void initDictionaryData(const char *lang);
 
     css::i18n::Boundary boundary;
     bool japaneseWordBreak;
 
 public:
-    xdictionary(const sal_Char *lang);
+    xdictionary(const char *lang);
     ~xdictionary();
     css::i18n::Boundary nextWord( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType);
     css::i18n::Boundary previousWord( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType);
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 93f81fa9cc6c..61da86bdf48c 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -85,7 +85,7 @@ class OOoRuleBasedBreakIterator : public icu::RuleBasedBreakIterator
 
 // loading ICU breakiterator on demand.
 void BreakIterator_Unicode::loadICUBreakIterator(const css::lang::Locale& rLocale,
-        sal_Int16 rBreakType, sal_Int16 nWordType, const sal_Char *rule, const OUString& rText)
+        sal_Int16 rBreakType, sal_Int16 nWordType, const char *rule, const OUString& rText)
 {
     bool bNewBreak = false;
     UErrorCode status = U_ZERO_ERROR;
@@ -130,8 +130,8 @@ void BreakIterator_Unicode::loadICUBreakIterator(const css::lang::Locale& rLocal
     aKeyBuf.append( aLangtagStr).append(';');
     if (rule)
         aKeyBuf.append(rule);
-    aKeyBuf.append(';').append( static_cast<sal_Char>('0'+breakType)).append(';').
-        append( static_cast<sal_Char>('0'+rBreakType)).append(';').append( static_cast<sal_Char>('0'+nWordType));
+    aKeyBuf.append(';').append( static_cast<char>('0'+breakType)).append(';').
+        append( static_cast<char>('0'+rBreakType)).append(';').append( static_cast<char>('0'+nWordType));
     // langtag;rule;breakType;rBreakType;nWordType
     const OString aBIMapGlobalKey( aKeyBuf.makeStringAndClear());
 
diff --git a/i18npool/source/breakiterator/gendict.cxx b/i18npool/source/breakiterator/gendict.cxx
index 082ad2416bad..5380e20fdc01 100644
--- a/i18npool/source/breakiterator/gendict.cxx
+++ b/i18npool/source/breakiterator/gendict.cxx
@@ -112,7 +112,7 @@ static void printDataArea(FILE *dictionary_fp, FILE *source_fp, vector<sal_uInt3
 #else
     dataAreaOffset = ftell(source_fp);
 #endif
-    sal_Char str[1024];
+    char str[1024];
     sal_uInt32 lenArrayCurr = 0;
     sal_Unicode current = 0;
 
diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx
index b349066d06d7..3e1398422f77 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -61,7 +61,7 @@ sal_Unicode* getDataArea_zh();
 
 #endif
 
-xdictionary::xdictionary(const sal_Char *lang) :
+xdictionary::xdictionary(const char *lang) :
     boundary(),
     japaneseWordBreak( false )
 {
@@ -145,7 +145,7 @@ namespace {
 
 #if !defined(DICT_JA_ZH_IN_DATAFILE) && !defined(DISABLE_DYNLOADING)
 
-void xdictionary::initDictionaryData(const sal_Char *pLang)
+void xdictionary::initDictionaryData(const char *pLang)
 {
     // Global cache, never released for performance
     static std::vector< datacache > aLoadedCache;
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
index f3dc6ede1f66..a4eaf3dcde9f 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -893,7 +893,7 @@ Calendar_gregorian::getDisplayStringImpl( sal_Int32 nCalendarDisplayCode, sal_In
         // The "#100211# - checked" comments serve for detection of "use of
         // sprintf is safe here" conditions. An sprintf encountered without
         // having that comment triggers alarm ;-)
-        sal_Char aStr[10];
+        char aStr[10];
         switch( nCalendarDisplayCode ) {
             case CalendarDisplayCode::SHORT_MONTH:
                 value += 1;     // month is zero based
diff --git a/i18npool/source/collator/chaptercollator.cxx b/i18npool/source/collator/chaptercollator.cxx
index 5b57f5cad03a..fb4128a6c7c3 100644
--- a/i18npool/source/collator/chaptercollator.cxx
+++ b/i18npool/source/collator/chaptercollator.cxx
@@ -72,7 +72,7 @@ ChapterCollator::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int
     return res1.Value == res2.Value ? 0 : res1.Value > res2.Value ? 1 : -1;
 }
 
-const sal_Char cChapCollator[] = "com.sun.star.i18n.ChapterCollator";
+const char cChapCollator[] = "com.sun.star.i18n.ChapterCollator";
 
 OUString SAL_CALL
 ChapterCollator::getImplementationName()
diff --git a/i18npool/source/collator/gencoll_rule.cxx b/i18npool/source/collator/gencoll_rule.cxx
index 33be2a5a2c56..5eb659c280b1 100644
--- a/i18npool/source/collator/gencoll_rule.cxx
+++ b/i18npool/source/collator/gencoll_rule.cxx
@@ -92,7 +92,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     int fileSize = ftell(fp);
     rewind(fp);
 
-    sal_Char str[1024];
+    char str[1024];
     OUStringBuffer Obuf(fileSize);
     while (fgets(str, 1024, fp)) {
         // don't convert last new line character to Ostr.
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index a81b00143989..7e746bb14d95 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -315,8 +315,8 @@ static OUString toRoman( sal_Int32 n )
 
 //              i, ii, iii, iv, v, vi, vii, vii, viii, ix
 //                                                      (Dummy),1000,500,100,50,10,5,1
-    static const sal_Char coRomanArr[] = "MDCLXVI--";       // +2 Dummy entries !!
-    const sal_Char* cRomanStr = coRomanArr;
+    static const char coRomanArr[] = "MDCLXVI--";       // +2 Dummy entries !!
+    const char* cRomanStr = coRomanArr;
     sal_uInt16 nMask = 1000;
     sal_uInt32 nOver1000 = n / nMask;
     n -= ( nOver1000 * nMask );
@@ -942,9 +942,9 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
 
 struct Supported_NumberingType
 {
-        sal_Int16               nType;
-        const sal_Char* cSymbol;
-        sal_Int16               langOption;
+        sal_Int16    nType;
+        const char*  cSymbol;
+        sal_Int16    langOption;
 };
 static const Supported_NumberingType aSupportedTypes[] =
 {
diff --git a/i18npool/source/indexentry/genindex_data.cxx b/i18npool/source/indexentry/genindex_data.cxx
index 128fad664bfb..36e17bb19d4d 100644
--- a/i18npool/source/indexentry/genindex_data.cxx
+++ b/i18npool/source/indexentry/genindex_data.cxx
@@ -53,7 +53,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     result.append(sep);
     sal_Int32 max=0;
 
-    sal_Char str[1024];
+    char str[1024];
     while (fgets(str, 1024, fp)) {
         // don't convert last new line character to Ostr.
         sal_Int32 len = strlen(str) - 1;
diff --git a/i18npool/source/indexentry/indexentrysupplier_asian.cxx b/i18npool/source/indexentry/indexentrysupplier_asian.cxx
index 975c9221872d..ed7e74f63d0b 100644
--- a/i18npool/source/indexentry/indexentrysupplier_asian.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_asian.cxx
@@ -165,7 +165,7 @@ IndexEntrySupplier_asian::getPhoneticCandidate( const OUString& rIndexEntry,
     sal_uInt16 **(*func)(sal_Int16*)=nullptr;
 #ifndef DISABLE_DYNLOADING
     if (hModule) {
-        const sal_Char *func_name=nullptr;
+        const char *func_name=nullptr;
         if ( rLocale.Language == "zh" )
             func_name=(OUString("TW HK MO").indexOf(rLocale.Country) >= 0) ?  "get_zh_zhuyin" : "get_zh_pinyin";
         else if ( rLocale.Language == "ko" )
diff --git a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx
index 012dbf3b65cb..e4636d348469 100644
--- a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx
@@ -63,7 +63,7 @@ sal_Int16 SAL_CALL IndexEntrySupplier_ja_phonetic::compareIndexEntry(
     return result;
 }
 
-static const sal_Char first[] = "ja_phonetic (alphanumeric first)";
+static const char first[] = "ja_phonetic (alphanumeric first)";
 sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_first_by_syllable::loadAlgorithm(
     const css::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/,
     sal_Int32 collatorOptions )
@@ -77,7 +77,7 @@ sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_first_by_consonant
     return collator->loadCollatorAlgorithm(first, rLocale, collatorOptions) == 0;
 }
 
-static const sal_Char last[] = "ja_phonetic (alphanumeric last)";
+static const char last[] = "ja_phonetic (alphanumeric last)";
 sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_last_by_syllable::loadAlgorithm(
     const css::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/,
     sal_Int32 collatorOptions )
diff --git a/i18npool/source/inputchecker/inputsequencechecker.cxx b/i18npool/source/inputchecker/inputsequencechecker.cxx
index 46e7f9def6fc..747b8c569223 100644
--- a/i18npool/source/inputchecker/inputsequencechecker.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker.cxx
@@ -52,7 +52,7 @@ InputSequenceCheckerImpl::checkInputSequence(const OUString& Text, sal_Int32 nSt
     if (inputCheckMode == InputSequenceCheckMode::PASSTHROUGH)
         return true;
 
-    sal_Char* language = getLanguageByScripType(Text[nStartPos], inputChar);
+    char* language = getLanguageByScripType(Text[nStartPos], inputChar);
 
     if (language)
         return getInputSequenceChecker(language)->checkInputSequence(Text, nStartPos, inputChar, inputCheckMode);
@@ -65,7 +65,7 @@ InputSequenceCheckerImpl::correctInputSequence(OUString& Text, sal_Int32 nStartP
         sal_Unicode inputChar, sal_Int16 inputCheckMode)
 {
     if (inputCheckMode != InputSequenceCheckMode::PASSTHROUGH) {
-        sal_Char* language = getLanguageByScripType(Text[nStartPos], inputChar);
+        char* language = getLanguageByScripType(Text[nStartPos], inputChar);
 
         if (language)
             return getInputSequenceChecker(language)->correctInputSequence(Text, nStartPos, inputChar, inputCheckMode);
@@ -83,7 +83,7 @@ static ScriptTypeList const typeList[] = {
     { UnicodeScript_kScriptCount, UnicodeScript_kScriptCount,   sal_Int16(UnicodeScript_kScriptCount) }    // 88
 };
 
-sal_Char*
+char*
 InputSequenceCheckerImpl::getLanguageByScripType(sal_Unicode cChar, sal_Unicode nChar)
 {
     css::i18n::UnicodeScript type = static_cast<css::i18n::UnicodeScript>(unicode::getUnicodeScriptType( cChar, typeList, sal_Int16(UnicodeScript_kScriptCount) ));
@@ -91,10 +91,10 @@ InputSequenceCheckerImpl::getLanguageByScripType(sal_Unicode cChar, sal_Unicode
     if (type != UnicodeScript_kScriptCount &&
             type == static_cast<css::i18n::UnicodeScript>(unicode::getUnicodeScriptType( nChar, typeList, sal_Int16(UnicodeScript_kScriptCount) ))) {
         switch(type) {
-            case UnicodeScript_kThai:           return const_cast<sal_Char*>("th");
-                                                //case UnicodeScript_kArabic:       return (sal_Char*)"ar";
-                                                //case UnicodeScript_kHebrew:       return (sal_Char*)"he";
-            case UnicodeScript_kDevanagari:   return const_cast<sal_Char*>("hi");
+            case UnicodeScript_kThai:           return const_cast<char*>("th");
+                                                //case UnicodeScript_kArabic:       return (char*)"ar";
+                                                //case UnicodeScript_kHebrew:       return (char*)"he";
+            case UnicodeScript_kDevanagari:   return const_cast<char*>("hi");
             default: break;
         }
     }
@@ -102,7 +102,7 @@ InputSequenceCheckerImpl::getLanguageByScripType(sal_Unicode cChar, sal_Unicode
 }
 
 Reference< XExtendedInputSequenceChecker >&
-InputSequenceCheckerImpl::getInputSequenceChecker(sal_Char const * rLanguage)
+InputSequenceCheckerImpl::getInputSequenceChecker(char const * rLanguage)
 {
     if (cachedItem && cachedItem->aLanguage == rLanguage) {
         return cachedItem->xISC;
diff --git a/i18npool/source/inputchecker/inputsequencechecker_th.cxx b/i18npool/source/inputchecker/inputsequencechecker_th.cxx
index 0aa2074d77a0..cf686be78633 100644
--- a/i18npool/source/inputchecker/inputsequencechecker_th.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker_th.cxx
@@ -34,7 +34,7 @@ InputSequenceChecker_th::~InputSequenceChecker_th()
 }
 
 /* Table for Thai Cell Manipulation */
-sal_Char const TAC_celltype_inputcheck[17][17] = {
+char const TAC_celltype_inputcheck[17][17] = {
 /* Cn */ /*  0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   A,   B,   C,   D,   E,   F       */
 /* Cn-1 00 */{  'X', 'A', 'A', 'A', 'A', 'A', 'A', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
      /* 10 */{  'X', 'A', 'A', 'A', 'S', 'S', 'A', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R' },
diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index 80972f61092c..fe627d343767 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -70,7 +70,7 @@ const LocaleNode* LocaleNode::getRoot() const
     return pRoot;
 }
 
-const LocaleNode * LocaleNode::findNode ( const sal_Char *name) const {
+const LocaleNode * LocaleNode::findNode ( const char *name) const {
     if (aName.equalsAscii(name))
         return this;
     for (size_t i = 0; i< children.size(); i++)  {
@@ -1464,7 +1464,7 @@ void LCIndexNode::generateCode (const OFileWriter &of) const
 
 
 static void lcl_writeAbbrFullNarrNames( const OFileWriter & of, const LocaleNode* currNode,
-        const sal_Char* elementTag, sal_Int16 i, sal_Int16 j )
+        const char* elementTag, sal_Int16 i, sal_Int16 j )
 {
     OUString aAbbrName = currNode->getChildAt(1)->getValue();
     OUString aFullName = currNode->getChildAt(2)->getValue();
@@ -1483,7 +1483,7 @@ static void lcl_writeAbbrFullNarrNames( const OFileWriter & of, const LocaleNode
     of.writeParameter( elementTag, "DefaultNarrowName", aNarrName, i, j);
 }
 
-static void lcl_writeTabTagString( const OFileWriter & of, const sal_Char* pTag, const sal_Char* pStr )
+static void lcl_writeTabTagString( const OFileWriter & of, const char* pTag, const char* pStr )
 {
     of.writeAsciiString("\t");
     of.writeAsciiString( pTag);
@@ -1491,14 +1491,14 @@ static void lcl_writeTabTagString( const OFileWriter & of, const sal_Char* pTag,
 }
 
 static void lcl_writeTabTagStringNums( const OFileWriter & of,
-        const sal_Char* pTag, const sal_Char* pStr, sal_Int16 i, sal_Int16 j )
+        const char* pTag, const char* pStr, sal_Int16 i, sal_Int16 j )
 {
     lcl_writeTabTagString( of, pTag, pStr);
     of.writeInt(i); of.writeInt(j); of.writeAsciiString(",\n");
 }
 
 static void lcl_writeAbbrFullNarrArrays( const OFileWriter & of, sal_Int16 nCount,
-        const sal_Char* elementTag, sal_Int16 i, bool bNarrow )
+        const char* elementTag, sal_Int16 i, bool bNarrow )
 {
     if (nCount == 0)
     {
@@ -1553,7 +1553,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
         sal_Int16 nChild = 0;
 
         // Generate Days of Week
-        const sal_Char *elementTag;
+        const char *elementTag;
         LocaleNode * daysNode = nullptr;
         OUString ref_name = calNode->getChildAt(nChild)->getAttr().getValueByName("ref");
         ref_name = ref_name.replace( '-', '_');
@@ -1969,8 +1969,8 @@ void LCTransliterationNode::generateCode (const OFileWriter &of) const
 namespace {
 
 struct NameValuePair {
-    const sal_Char *name;
-    const sal_Char *value;
+    const char *name;
+    const char *value;
 };
 
 }
@@ -2305,7 +2305,7 @@ Attr::Attr (const Reference< XAttributeList > & attr) {
     }
 }
 
-OUString Attr::getValueByName (const sal_Char *str) const {
+OUString Attr::getValueByName (const char *str) const {
     auto pName = std::find_if(std::cbegin(name), std::cend(name),
         [&str](const OUString& rName) { return rName.equalsAscii(str); });
     if (pName != std::cend(name))
diff --git a/i18npool/source/localedata/LocaleNode.hxx b/i18npool/source/localedata/LocaleNode.hxx
index 66f954352607..3663478853a3 100644
--- a/i18npool/source/localedata/LocaleNode.hxx
+++ b/i18npool/source/localedata/LocaleNode.hxx
@@ -48,13 +48,13 @@ public:
     void  writeRefFunction2(const char *func, const OUString& useLocale) const;
     void  writeFunction3(const char *func, const char *style, const char* levels, const char* attr, const char *array) const;
     void  writeRefFunction3(const char *func, const OUString& useLocale) const;
-    void  writeIntParameter(const sal_Char* pAsciiStr, const sal_Int16 count, sal_Int16 val) const;
-    bool  writeDefaultParameter(const sal_Char* pAsciiStr, const OUString& str, sal_Int16 count) const;
-    void  writeParameter(const sal_Char* pAsciiStr, const OUString& aChars) const;
-    void  writeParameter(const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count) const;
-    void  writeParameter(const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const;
-    void  writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, const sal_Int16 count) const;
-    void  writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const;
+    void  writeIntParameter(const char* pAsciiStr, const sal_Int16 count, sal_Int16 val) const;
+    bool  writeDefaultParameter(const char* pAsciiStr, const OUString& str, sal_Int16 count) const;
+    void  writeParameter(const char* pAsciiStr, const OUString& aChars) const;
+    void  writeParameter(const char* pAsciiStr, const OUString& aChars, sal_Int16 count) const;
+    void  writeParameter(const char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const;
+    void  writeParameter(const char* pTagStr, const char* pAsciiStr, const OUString& aChars, const sal_Int16 count) const;
+    void  writeParameter(const char* pTagStr, const char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const;
     void  closeOutput() const;
     /// Return the locale string, something like en_US or de_DE
     const char * getLocale() const { return theLocale.c_str(); }
@@ -69,7 +69,7 @@ class Attr {
 
 public:
     explicit Attr (const Reference< XAttributeList > & attr);
-    OUString getValueByName (const sal_Char *str) const;
+    OUString getValueByName (const char *str) const;
     const OUString& getValueByIndex (sal_Int32 idx) const ;
 };
 
@@ -92,7 +92,7 @@ public:
     const Attr& getAttr() const { return aAttribs; };
     sal_Int32 getNumberOfChildren () const { return sal_Int32(children.size()); };
     LocaleNode * getChildAt (sal_Int32 idx) const { return children[idx].get(); };
-    const LocaleNode * findNode ( const sal_Char *name) const;
+    const LocaleNode * findNode ( const char *name) const;
     virtual ~LocaleNode();
     void addChild (  LocaleNode * node);
     const LocaleNode* getRoot() const;
diff --git a/i18npool/source/localedata/filewriter.cxx b/i18npool/source/localedata/filewriter.cxx
index 02540996e3ea..f4652fefd610 100644
--- a/i18npool/source/localedata/filewriter.cxx
+++ b/i18npool/source/localedata/filewriter.cxx
@@ -121,47 +121,47 @@ void OFileWriter::writeRefFunction3(const char *func, const OUString& useLocale)
     fprintf(m_f, "\treturn %s%s(nStyles, nLevels, nAttributes);\n}\n", func, locale);
 }
 
-void OFileWriter::writeIntParameter(const sal_Char* pAsciiStr, const sal_Int16 count, sal_Int16 val) const
+void OFileWriter::writeIntParameter(const char* pAsciiStr, const sal_Int16 count, sal_Int16 val) const
 {
     fprintf(m_f, "static const sal_Unicode %s%d[] = {%d};\n", pAsciiStr, count, val);
 }
 
-bool OFileWriter::writeDefaultParameter(const sal_Char* pAsciiStr, const OUString& str, sal_Int16 count) const
+bool OFileWriter::writeDefaultParameter(const char* pAsciiStr, const OUString& str, sal_Int16 count) const
 {
     bool bBool = str == "true";
     fprintf(m_f,"static const sal_Unicode default%s%d[] = {%d};\n", pAsciiStr, count, bBool);
     return bBool;
 }
 
-void OFileWriter::writeParameter(const sal_Char* pAsciiStr, const OUString& aChars) const
+void OFileWriter::writeParameter(const char* pAsciiStr, const OUString& aChars) const
 {
     fprintf(m_f, "static const sal_Unicode %s[] = {", pAsciiStr);
     writeStringCharacters(aChars);
     fprintf(m_f, "0x0};\n");
 }
 
-void OFileWriter::writeParameter(const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count) const
+void OFileWriter::writeParameter(const char* pAsciiStr, const OUString& aChars, sal_Int16 count) const
 {
     fprintf(m_f, "static const sal_Unicode %s%d[] = {", pAsciiStr, count);
     writeStringCharacters(aChars);
     fprintf(m_f, "0x0};\n");
 }
 
-void OFileWriter::writeParameter(const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const
+void OFileWriter::writeParameter(const char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const
 {
     fprintf(m_f, "static const sal_Unicode %s%d%d[] = {", pAsciiStr, count0, count1);
     writeStringCharacters(aChars);
     fprintf(m_f, "0x0};\n");
 }
 
-void OFileWriter::writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, const sal_Int16 count) const
+void OFileWriter::writeParameter(const char* pTagStr, const char* pAsciiStr, const OUString& aChars, const sal_Int16 count) const
 {
     fprintf(m_f, "static const sal_Unicode %s%s%d[] = {", pTagStr, pAsciiStr, count);
     writeStringCharacters(aChars);
     fprintf(m_f, "0x0};\n");
 }
 
-void OFileWriter::writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const
+void OFileWriter::writeParameter(const char* pTagStr, const char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const
 {
     fprintf(m_f, "static const sal_Unicode %s%s%d%d[] = {", pTagStr, pAsciiStr, count0, count1);
     writeStringCharacters(aChars);
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 91e4c5de21bb..f8ffd6e775bb 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -343,12 +343,12 @@ static const sal_Int16 nbOfLocales = SAL_N_ELEMENTS(aLibTable);
 
 struct LocaleDataLookupTableItem
 {
-    const sal_Char* dllName;
+    const char* dllName;
     osl::Module *module;
-    const sal_Char* localeName;
+    const char* localeName;
     css::lang::Locale aLocale;
 
-    LocaleDataLookupTableItem(const sal_Char *name, osl::Module* m, const sal_Char* lname) : dllName(name), module(m), localeName(lname)
+    LocaleDataLookupTableItem(const char *name, osl::Module* m, const char* lname) : dllName(name), module(m), localeName(lname)
     {
     }
     bool equals(const css::lang::Locale& rLocale)
@@ -485,7 +485,7 @@ public:
     ~lcl_LookupTableHelper();
 
     oslGenericFunction getFunctionSymbolByName(
-            const OUString& localeName, const sal_Char* pFunction,
+            const OUString& localeName, const char* pFunction,
             std::unique_ptr<LocaleDataLookupTableItem>* pOutCachedItem );
 
 private:
@@ -513,7 +513,7 @@ lcl_LookupTableHelper::~lcl_LookupTableHelper()
 }
 
 oslGenericFunction lcl_LookupTableHelper::getFunctionSymbolByName(
-        const OUString& localeName, const sal_Char* pFunction,
+        const OUString& localeName, const char* pFunction,
         std::unique_ptr<LocaleDataLookupTableItem>* pOutCachedItem )
 {
     OUString aFallback;
@@ -1427,7 +1427,7 @@ LocaleDataImpl::getOutlineNumberingLevels( const lang::Locale& rLocale )
 
 // helper functions
 
-oslGenericFunction LocaleDataImpl::getFunctionSymbol( const Locale& rLocale, const sal_Char* pFunction )
+oslGenericFunction LocaleDataImpl::getFunctionSymbol( const Locale& rLocale, const char* pFunction )
 {
     lcl_LookupTableHelper & rLookupTable = lcl_LookupTableStatic::get();
 
diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index 89d56a97826d..d10db0953e47 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -453,7 +453,7 @@ const Number natnum11 = { NumberChar_Hangul_ko, MultiplierChar_6_CJK[Multiplier_
 
 //! ATTENTION: Do not change order of elements!
 //! Append new languages to the end of the list!
-const sal_Char *natnum1Locales[] = {
+const char *natnum1Locales[] = {
     "zh_CN",
     "zh_TW",
     "ja",
@@ -867,7 +867,7 @@ NativeNumberXmlAttributes SAL_CALL NativeNumberSupplierService::convertToXmlAttr
     static const sal_Int16 attShort         = 0;
     static const sal_Int16 attMedium        = 1;
     static const sal_Int16 attLong          = 2;
-    static const sal_Char *attType[] = { "short", "medium", "long" };
+    static const char *attType[] = { "short", "medium", "long" };
 
     sal_Int16 number = NumberChar_HalfWidth, type = attShort;
 
@@ -1219,7 +1219,7 @@ OUString getCyrillicNativeNumberString(const OUString& aNumberString)
         return aNumberString;
 }
 
-static const sal_Char implementationName[] = "com.sun.star.i18n.NativeNumberSupplier";
+static const char implementationName[] = "com.sun.star.i18n.NativeNumberSupplier";
 
 OUString SAL_CALL NativeNumberSupplierService::getImplementationName()
 {
diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
index 09b1a91fd2c3..69cf0cad795e 100644
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
@@ -134,7 +134,7 @@ uno::Sequence< OUString > SAL_CALL OrdinalSuffixService::getOrdinalSuffix( sal_I
     return comphelper::containerToSequence(retVec);
 }
 
-const sal_Char cOrdinalSuffix[] = "com.sun.star.i18n.OrdinalSuffix";
+const char cOrdinalSuffix[] = "com.sun.star.i18n.OrdinalSuffix";
 
 OUString SAL_CALL OrdinalSuffixService::getImplementationName()
 {
diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx
index eb71012e90eb..2ad7876d2a49 100644
--- a/i18npool/source/registerservices/registerservices.cxx
+++ b/i18npool/source/registerservices/registerservices.cxx
@@ -250,8 +250,8 @@ IMPL_CREATEINSTANCE( halfwidthToFullwidthLikeJIS )
 namespace {
 
 struct InstancesArray {
-        const sal_Char* pServiceNm;
-        const sal_Char* pImplementationNm;
+        const char* pServiceNm;
+        const char* pImplementationNm;
         FN_CreateInstance pFn;
 };
 
@@ -567,7 +567,7 @@ static const InstancesArray aInstances[] = {
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void* i18npool_component_getFactory( const sal_Char* sImplementationName, void* _pServiceManager, SAL_UNUSED_PARAMETER void* /*_pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void* i18npool_component_getFactory( const char* sImplementationName, void* _pServiceManager, SAL_UNUSED_PARAMETER void* /*_pRegistryKey*/ )
 {
     void* pRet = nullptr;
 
diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx
index c74e158780f4..2bb947f9ec73 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -1523,7 +1523,7 @@ SearchResult TextSearch::WildcardSrchBkwrd( const OUString& searchStr, sal_Int32
 }
 
 
-static const sal_Char cSearchImpl[] = "com.sun.star.util.TextSearch_i18n";
+static const char cSearchImpl[] = "com.sun.star.util.TextSearch_i18n";
 
 static uno::Sequence< OUString > getServiceName_Static()
 {
@@ -1570,7 +1570,7 @@ TextSearch_CreateInstance(
 extern "C"
 {
 SAL_DLLPUBLIC_EXPORT void*
-i18nsearch_component_getFactory( const sal_Char* sImplementationName,
+i18nsearch_component_getFactory( const char* sImplementationName,
                                  void* _pServiceManager,
                                  SAL_UNUSED_PARAMETER void* )
 {
diff --git a/i18npool/source/textconversion/genconv_dict.cxx b/i18npool/source/textconversion/genconv_dict.cxx
index 8cebdb7f1a52..5cfd458090f6 100644
--- a/i18npool/source/textconversion/genconv_dict.cxx
+++ b/i18npool/source/textconversion/genconv_dict.cxx
@@ -93,7 +93,7 @@ void make_hhc_char(FILE *sfp, FILE *cfp)
     // generate main dict. data array
     fprintf(cfp, "\nstatic const sal_Unicode Hangul2HanjaData[] = {");
 
-    sal_Char Cstr[1024];
+    char Cstr[1024];
     count = 0;
     address = 0;
     while (fgets(Cstr, 1024, sfp)) {
@@ -182,7 +182,7 @@ void make_stc_char(FILE *sfp, FILE *cfp)
         TChinese2SChineseData[i] = 0;
     }
 
-    sal_Char Cstr[1024];
+    char Cstr[1024];
     while (fgets(Cstr, 1024, sfp)) {
         // input file is in UTF-8 encoding (SChinese:TChinese)
         // don't convert last new line character to Ostr.
@@ -349,7 +349,7 @@ void make_stc_word(FILE *sfp, FILE *cfp)
     std::vector<Index> STC_WordEntry_T2S(0x10000);
     sal_Int32 count_S2T = 0, count_T2S = 0;
     sal_Int32 line = 0, char_total = 0;
-    sal_Char Cstr[1024];
+    char Cstr[1024];
 
     while (fgets(Cstr, 1024, sfp)) {
         // input file is in UTF-8 encoding (SChinese:TChinese)
diff --git a/i18npool/source/textconversion/textconversion.cxx b/i18npool/source/textconversion/textconversion.cxx
index 7510efb45d82..a64f4072cc06 100644
--- a/i18npool/source/textconversion/textconversion.cxx
+++ b/i18npool/source/textconversion/textconversion.cxx
@@ -59,7 +59,7 @@ static void* nullFunc()
 }
 
 oslGenericFunction
-TextConversionService::getFunctionBySymbol(const sal_Char* func)
+TextConversionService::getFunctionBySymbol(const char* func)
 {
     if (hModule)
         return osl_getFunctionSymbol(hModule, OUString::createFromAscii(func).pData);
diff --git a/i18npool/source/transliteration/textToPronounce_zh.cxx b/i18npool/source/transliteration/textToPronounce_zh.cxx
index 9e84ed90320d..42fdb5280ed3 100644
--- a/i18npool/source/transliteration/textToPronounce_zh.cxx
+++ b/i18npool/source/transliteration/textToPronounce_zh.cxx
@@ -157,7 +157,7 @@ TextToChuyin_zh_TW::TextToChuyin_zh_TW() :
 
 extern "C" { static void thisModule() {} }
 
-TextToPronounce_zh::TextToPronounce_zh(const sal_Char* func_name)
+TextToPronounce_zh::TextToPronounce_zh(const char* func_name)
 {
 #ifdef SAL_DLLPREFIX
     OUString lib(SAL_DLLPREFIX"index_data" SAL_DLLEXTENSION);
diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx
index 6a1c13d2b677..04819e2f5158 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.cxx
@@ -54,7 +54,7 @@ namespace {
 struct TMList {
   TransliterationModules        tm;
   TransliterationModulesNew     tmn;
-  const sal_Char               *implName;
+  const char                   *implName;
 };
 
 }