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 /i18npool/source/breakiterator | |
| 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 'i18npool/source/breakiterator')
| -rw-r--r-- | i18npool/source/breakiterator/breakiterator_unicode.cxx | 6 | ||||
| -rw-r--r-- | i18npool/source/breakiterator/gendict.cxx | 2 | ||||
| -rw-r--r-- | i18npool/source/breakiterator/xdictionary.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
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; |