Kaydet (Commit) ac37cb32 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

More loplugin:cstylecast: i18nutil

Change-Id: Ibdfec3e35c6424fdd4d9b15ff4f4d7441a5f7e36
üst e99d632b
......@@ -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];
......
......@@ -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;
}
}
......
......@@ -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
......
......@@ -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);
}
......
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