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/inputchecker | |
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/inputchecker')
-rw-r--r-- | i18npool/source/inputchecker/inputsequencechecker.cxx | 16 | ||||
-rw-r--r-- | i18npool/source/inputchecker/inputsequencechecker_th.cxx | 2 |
2 files changed, 9 insertions, 9 deletions
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' }, |