Skip to content

C
core
Kaydet (Commit) ac37cb32 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

More loplugin:cstylecast: i18nutil 

Change-Id: Ibdfec3e35c6424fdd4d9b15ff4f4d7441a5f7e36
üst e99d632b
Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 46 deletions
i18nutil/source/utility/casefolding.cxx
Dosyayı görüntüle @ ac37cb32
......@@ -50,7 +50,7 @@ static bool cased_letter(sal_Unicode ch)
if (cmi < 0)
return false;
int cmv_idx = (cmi << 8) + (ch & 0xff);
return bool(((MappingType)CaseMappingValue[cmv_idx].type) & MappingType::CasedLetterMask);
return bool(static_cast<MappingType>(CaseMappingValue[cmv_idx].type) & MappingType::CasedLetterMask);
}
// for Lithuanian, condition to make explicit dot above when lowercasing capital I's and J's
......@@ -95,16 +95,16 @@ Mapping& casefolding::getValue(const sal_Unicode* str, sal_Int32 pos, sal_Int32
if (address >= 0) {
address = (address << 8) + (str[pos] & 0xFF);
if ((MappingType)CaseMappingValue[address].type & nMappingType) {
MappingType type = (MappingType) CaseMappingValue[address].type;
if (static_cast<MappingType>(CaseMappingValue[address].type) & nMappingType) {
MappingType type = static_cast<MappingType>(CaseMappingValue[address].type);
if (type & MappingType::NotValue) {
if (CaseMappingValue[address].value == 0)
return getConditionalValue(str, pos, len, aLocale, nMappingType);
else {
for (int map = CaseMappingValue[address].value;
map < CaseMappingValue[address].value + MaxCaseMappingExtras; map++) {
if ((MappingType)CaseMappingExtra[map].type & nMappingType) {
if ((MappingType)CaseMappingExtra[map].type & MappingType::NotValue)
if (static_cast<MappingType>(CaseMappingExtra[map].type) & nMappingType) {
if (static_cast<MappingType>(CaseMappingExtra[map].type) & MappingType::NotValue)
return getConditionalValue(str, pos, len, aLocale, nMappingType);
else
return CaseMappingExtra[map];
......
i18nutil/source/utility/paper.cxx
Dosyayı görüntüle @ ac37cb32
......@@ -173,7 +173,7 @@ bool PaperInfo::doSloppyFit()
{
m_nPaperWidth = aDinTab[i].m_nWidth;
m_nPaperHeight = aDinTab[i].m_nHeight;
m_eType = (Paper)i;
m_eType = static_cast<Paper>(i);
return true;
}
}
......
i18nutil/source/utility/unicode.cxx
Dosyayı görüntüle @ ac37cb32
......@@ -41,7 +41,7 @@ T getScriptType( const sal_Unicode ch, const L* typeList, T unknownType ) {
sal_Int16 i = 0;
css::i18n::UnicodeScript type = typeList[0].to;
while (type < UnicodeScript_kScriptCount && ch > UnicodeScriptType[(int)type][UnicodeScriptTypeTo]) {
while (type < UnicodeScript_kScriptCount && ch > UnicodeScriptType[static_cast<int>(type)][UnicodeScriptTypeTo]) {
type = typeList[++i].to;
}
......@@ -57,12 +57,12 @@ unicode::getUnicodeScriptType( const sal_Unicode ch, const ScriptTypeList* typeL
sal_Unicode
unicode::getUnicodeScriptStart( UnicodeScript type) {
return UnicodeScriptType[(int)type][UnicodeScriptTypeFrom];
return UnicodeScriptType[static_cast<int>(type)][UnicodeScriptTypeFrom];
}
sal_Unicode
unicode::getUnicodeScriptEnd( UnicodeScript type) {
return UnicodeScriptType[(int)type][UnicodeScriptTypeTo];
return UnicodeScriptType[static_cast<int>(type)][UnicodeScriptTypeTo];
}
sal_Int16
......
include/i18nutil/searchopt.hxx
Dosyayı görüntüle @ ac37cb32
......@@ -54,7 +54,7 @@ struct SAL_WARN_UNUSED SearchOptions {
changedChars = other.changedChars;
deletedChars = other.deletedChars;
insertedChars = other.insertedChars;
transliterateFlags = (TransliterationFlags)other.transliterateFlags;
transliterateFlags = static_cast<TransliterationFlags>(other.transliterateFlags);
return *this;
}
......@@ -113,7 +113,7 @@ struct SAL_WARN_UNUSED SearchOptions2 : public SearchOptions {
searchString, replaceString,
Locale,
changedChars, deletedChars, insertedChars,
(sal_Int32)transliterateFlags,
static_cast<sal_Int32>(transliterateFlags),
AlgorithmType2, WildcardEscapeCharacter);
}
......
include/i18nutil/transliteration.hxx
Dosyayı görüntüle @ ac37cb32
......@@ -31,31 +31,31 @@
enum class TransliterationFlags {
NONE = 0,
/// Transliterate a string from upper case to lower case
UPPERCASE_LOWERCASE = (int)css::i18n::TransliterationModules_UPPERCASE_LOWERCASE,
UPPERCASE_LOWERCASE = int(css::i18n::TransliterationModules_UPPERCASE_LOWERCASE),
/// Transliterate a string from lower case to upper case
LOWERCASE_UPPERCASE = (int)css::i18n::TransliterationModules_LOWERCASE_UPPERCASE,
LOWERCASE_UPPERCASE = int(css::i18n::TransliterationModules_LOWERCASE_UPPERCASE),
/// Transliterate a string from half width character to full width character
HALFWIDTH_FULLWIDTH = (int)css::i18n::TransliterationModules_HALFWIDTH_FULLWIDTH,
HALFWIDTH_FULLWIDTH = int(css::i18n::TransliterationModules_HALFWIDTH_FULLWIDTH),
/// Transliterate a string from full width character to half width character
FULLWIDTH_HALFWIDTH = (int)css::i18n::TransliterationModules_FULLWIDTH_HALFWIDTH,
FULLWIDTH_HALFWIDTH = int(css::i18n::TransliterationModules_FULLWIDTH_HALFWIDTH),
/// Transliterate a Japanese string from Katakana to Hiragana
KATAKANA_HIRAGANA = (int)css::i18n::TransliterationModules_KATAKANA_HIRAGANA,
KATAKANA_HIRAGANA = int(css::i18n::TransliterationModules_KATAKANA_HIRAGANA),
/// Transliterate a Japanese string from Hiragana to Katakana
HIRAGANA_KATAKANA = (int)css::i18n::TransliterationModules_HIRAGANA_KATAKANA,
HIRAGANA_KATAKANA = int(css::i18n::TransliterationModules_HIRAGANA_KATAKANA),
/// Transliterate an ASCII number string to Simplified Chinese lower case number string in spellout format
NumToTextLower_zh_CN = (int)css::i18n::TransliterationModules_NumToTextLower_zh_CN,
NumToTextLower_zh_CN = int(css::i18n::TransliterationModules_NumToTextLower_zh_CN),
/// Transliterate an ASCII number string to Simplified Chinese upper case number string in spellout format
NumToTextUpper_zh_CN = (int)css::i18n::TransliterationModules_NumToTextUpper_zh_CN,
NumToTextUpper_zh_CN = int(css::i18n::TransliterationModules_NumToTextUpper_zh_CN),
/// Transliterate an ASCII number string to Traditional Chinese lower case number string in spellout format
NumToTextLower_zh_TW = (int)css::i18n::TransliterationModules_NumToTextLower_zh_TW,
NumToTextLower_zh_TW = int(css::i18n::TransliterationModules_NumToTextLower_zh_TW),
/// Transliterate an ASCII number string to Traditional Chinese upper case number string in spellout format
NumToTextUpper_zh_TW = (int)css::i18n::TransliterationModules_NumToTextUpper_zh_TW,
NumToTextUpper_zh_TW = int(css::i18n::TransliterationModules_NumToTextUpper_zh_TW),
/// Transliterate an ASCII number string to formal Korean Hangul number string in spellout format
NumToTextFormalHangul_ko = (int)css::i18n::TransliterationModules_NumToTextFormalHangul_ko,
NumToTextFormalHangul_ko = int(css::i18n::TransliterationModules_NumToTextFormalHangul_ko),
/// Transliterate an ASCII number string to formal Korean Hanja lower case number string in spellout format
NumToTextFormalLower_ko = (int)css::i18n::TransliterationModules_NumToTextFormalLower_ko,
NumToTextFormalLower_ko = int(css::i18n::TransliterationModules_NumToTextFormalLower_ko),
/// Transliterate an ASCII number string to formal Korean Hanja upper case number string in spellout format
NumToTextFormalUpper_ko = (int)css::i18n::TransliterationModules_NumToTextFormalUpper_ko,
NumToTextFormalUpper_ko = int(css::i18n::TransliterationModules_NumToTextFormalUpper_ko),
/** The first character of the sentence is put in upper case
*/
......@@ -73,51 +73,51 @@ enum class TransliterationFlags {
*/
TOGGLE_CASE = int(css::i18n::TransliterationModulesExtra::TOGGLE_CASE),
NON_IGNORE_MASK = (int)css::i18n::TransliterationModules_NON_IGNORE_MASK,
NON_IGNORE_MASK = int(css::i18n::TransliterationModules_NON_IGNORE_MASK),
IGNORE_MASK = 0x7fffff00,
/// Ignore case when comparing strings by transliteration service
IGNORE_CASE = (int)css::i18n::TransliterationModules_IGNORE_CASE,
IGNORE_CASE = int(css::i18n::TransliterationModules_IGNORE_CASE),
/// Ignore Hiragana and Katakana when comparing strings by transliteration service
IGNORE_KANA = (int)css::i18n::TransliterationModules_IGNORE_KANA, // ja_JP
IGNORE_KANA = int(css::i18n::TransliterationModules_IGNORE_KANA), // ja_JP
/// Ignore full width and half width character when comparing strings by transliteration service
IGNORE_WIDTH = (int)css::i18n::TransliterationModules_IGNORE_WIDTH, // ja_JP
IGNORE_WIDTH = int(css::i18n::TransliterationModules_IGNORE_WIDTH), // ja_JP
/// Ignore Japanese traditional Kanji character in Japanese fuzzy search
ignoreTraditionalKanji_ja_JP = (int)css::i18n::TransliterationModules_ignoreTraditionalKanji_ja_JP,
ignoreTraditionalKanji_ja_JP = int(css::i18n::TransliterationModules_ignoreTraditionalKanji_ja_JP),
/// Ignore Japanese traditional Katakana and Hiragana character in Japanese fuzzy search
ignoreTraditionalKana_ja_JP = (int)css::i18n::TransliterationModules_ignoreTraditionalKana_ja_JP,
ignoreTraditionalKana_ja_JP = int(css::i18n::TransliterationModules_ignoreTraditionalKana_ja_JP),
/// Ignore dash or minus sign in Japanese fuzzy search
ignoreMinusSign_ja_JP = (int)css::i18n::TransliterationModules_ignoreMinusSign_ja_JP,
ignoreMinusSign_ja_JP = int(css::i18n::TransliterationModules_ignoreMinusSign_ja_JP),
/// Ignore Hiragana and Katakana iteration mark in Japanese fuzzy search
ignoreIterationMark_ja_JP = (int)css::i18n::TransliterationModules_ignoreIterationMark_ja_JP,
ignoreIterationMark_ja_JP = int(css::i18n::TransliterationModules_ignoreIterationMark_ja_JP),
/// Ignore separator punctuations in Japanese fuzzy search
ignoreSeparator_ja_JP = (int)css::i18n::TransliterationModules_ignoreSeparator_ja_JP,
ignoreSeparator_ja_JP = int(css::i18n::TransliterationModules_ignoreSeparator_ja_JP),
/// Ignore Katakana and Hiragana Zi/Zi and Zu/Zu in Japanese fuzzy search
ignoreZiZu_ja_JP = (int)css::i18n::TransliterationModules_ignoreZiZu_ja_JP,
ignoreZiZu_ja_JP = int(css::i18n::TransliterationModules_ignoreZiZu_ja_JP),
/// Ignore Katakana and Hiragana Ba/Gua and Ha/Fa in Japanese fuzzy search
ignoreBaFa_ja_JP = (int)css::i18n::TransliterationModules_ignoreBaFa_ja_JP,
ignoreBaFa_ja_JP = int(css::i18n::TransliterationModules_ignoreBaFa_ja_JP),
/// Ignore Katakana and Hiragana Tsui/Tea/Ti and Dyi/Ji in Japanese fuzzy search
ignoreTiJi_ja_JP = (int)css::i18n::TransliterationModules_ignoreTiJi_ja_JP,
ignoreTiJi_ja_JP = int(css::i18n::TransliterationModules_ignoreTiJi_ja_JP),
/// Ignore Katakana and Hiragana Hyu/Fyu and Byu/Gyu in Japanese fuzzy search
ignoreHyuByu_ja_JP = (int)css::i18n::TransliterationModules_ignoreHyuByu_ja_JP,
ignoreHyuByu_ja_JP = int(css::i18n::TransliterationModules_ignoreHyuByu_ja_JP),
/// Ignore Katakana and Hiragana Se/Sye and Ze/Je in Japanese fuzzy search
ignoreSeZe_ja_JP = (int)css::i18n::TransliterationModules_ignoreSeZe_ja_JP,
ignoreSeZe_ja_JP = int(css::i18n::TransliterationModules_ignoreSeZe_ja_JP),
/// Ignore Katakana YA/A which follows the character in either I or E row in Japanese fuzzy search
ignoreIandEfollowedByYa_ja_JP = (int)css::i18n::TransliterationModules_ignoreIandEfollowedByYa_ja_JP,
ignoreIandEfollowedByYa_ja_JP = int(css::i18n::TransliterationModules_ignoreIandEfollowedByYa_ja_JP),
/// Ignore Katakana KI/KU which follows the character in SA column in Japanese fuzzy search
ignoreKiKuFollowedBySa_ja_JP = (int)css::i18n::TransliterationModules_ignoreKiKuFollowedBySa_ja_JP,
ignoreKiKuFollowedBySa_ja_JP = int(css::i18n::TransliterationModules_ignoreKiKuFollowedBySa_ja_JP),
/// Ignore Japanese normal and small sized character in Japanese fuzzy search
ignoreSize_ja_JP = (int)css::i18n::TransliterationModules_ignoreSize_ja_JP,
ignoreSize_ja_JP = int(css::i18n::TransliterationModules_ignoreSize_ja_JP),
/// Ignore Japanese prolonged sound mark in Japanese fuzzy search
ignoreProlongedSoundMark_ja_JP = (int)css::i18n::TransliterationModules_ignoreProlongedSoundMark_ja_JP,
ignoreProlongedSoundMark_ja_JP = int(css::i18n::TransliterationModules_ignoreProlongedSoundMark_ja_JP),
/// Ignore middle dot in Japanese fuzzy search
ignoreMiddleDot_ja_JP = (int)css::i18n::TransliterationModules_ignoreMiddleDot_ja_JP,
ignoreMiddleDot_ja_JP = int(css::i18n::TransliterationModules_ignoreMiddleDot_ja_JP),
/// Ignore white space characters, include space, TAB, return, etc. in Japanese fuzzy search
ignoreSpace_ja_JP = (int)css::i18n::TransliterationModules_ignoreSpace_ja_JP,
ignoreSpace_ja_JP = int(css::i18n::TransliterationModules_ignoreSpace_ja_JP),
/// transliterate Japanese small sized character to normal sized character
smallToLarge_ja_JP = (int)css::i18n::TransliterationModules_smallToLarge_ja_JP,
smallToLarge_ja_JP = int(css::i18n::TransliterationModules_smallToLarge_ja_JP),
/// transliterate Japanese normal sized character to small sized character
largeToSmall_ja_JP = (int)css::i18n::TransliterationModules_largeToSmall_ja_JP,
largeToSmall_ja_JP = int(css::i18n::TransliterationModules_largeToSmall_ja_JP),
IGNORE_DIACRITICS_CTL = int(css::i18n::TransliterationModulesExtra::IGNORE_DIACRITICS_CTL),
IGNORE_KASHIDA_CTL = int(css::i18n::TransliterationModulesExtra::IGNORE_KASHIDA_CTL)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment