diff options
| -rw-r--r-- | i18nutil/source/utility/paper.cxx | 6 | ||||
| -rw-r--r-- | i18nutil/source/utility/unicode.cxx | 4 | ||||
| -rw-r--r-- | include/i18nutil/transliteration.hxx | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/i18nutil/source/utility/paper.cxx b/i18nutil/source/utility/paper.cxx index c12ac29704ef..46034b15ae67 100644 --- a/i18nutil/source/utility/paper.cxx +++ b/i18nutil/source/utility/paper.cxx @@ -49,13 +49,13 @@ struct PageDesc }; #define PT2MM100( v ) \ - (long)(((v) * 35.27777778) + 0.5) + long(((v) * 35.27777778) + 0.5) #define IN2MM100( v ) \ - ((long)(((v) * 2540) + 0.5)) + (long(((v) * 2540) + 0.5)) #define MM2MM100( v ) \ - ((long)((v) * 100)) + (long((v) * 100)) //PostScript Printer Description File Format Specification //http://partners.adobe.com/public/developer/en/ps/5003.PPD_Spec_v4.3.pdf diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx index f225b3adc55d..e32fa1318bcb 100644 --- a/i18nutil/source/utility/unicode.cxx +++ b/i18nutil/source/utility/unicode.cxx @@ -46,7 +46,7 @@ T getScriptType( const sal_Unicode ch, const L* typeList, T unknownType ) { } return (type < UnicodeScript_kScriptCount && - ch >= UnicodeScriptType[static_cast<int>(typeList[i].from)][(int)UnicodeScriptTypeFrom]) ? + ch >= UnicodeScriptType[static_cast<int>(typeList[i].from)][int(UnicodeScriptTypeFrom)]) ? typeList[i].value : unknownType; } @@ -74,7 +74,7 @@ unicode::getUnicodeType( const sal_Unicode ch ) { else c = ch; sal_Int16 address = UnicodeTypeIndex[ch >> 8]; - return r = (sal_Int16)((address < UnicodeTypeNumberBlock) ? UnicodeTypeBlockValue[address] : + return r = static_cast<sal_Int16>((address < UnicodeTypeNumberBlock) ? UnicodeTypeBlockValue[address] : UnicodeTypeValue[((address - UnicodeTypeNumberBlock) << 8) + (ch & 0xff)]); } diff --git a/include/i18nutil/transliteration.hxx b/include/i18nutil/transliteration.hxx index 92709690ac27..b90879eeb239 100644 --- a/include/i18nutil/transliteration.hxx +++ b/include/i18nutil/transliteration.hxx @@ -59,19 +59,19 @@ enum class TransliterationFlags { /** The first character of the sentence is put in upper case */ - SENTENCE_CASE = (int)css::i18n::TransliterationModulesExtra::SENTENCE_CASE, + SENTENCE_CASE = int(css::i18n::TransliterationModulesExtra::SENTENCE_CASE), /** The first character of the word is put in upper case. * This one is part */ - TITLE_CASE = (int)css::i18n::TransliterationModulesExtra::TITLE_CASE, + TITLE_CASE = int(css::i18n::TransliterationModulesExtra::TITLE_CASE), /** All characters of the word are to change their case from small letters * to capital letters and vice versa. */ - TOGGLE_CASE = (int)css::i18n::TransliterationModulesExtra::TOGGLE_CASE, + TOGGLE_CASE = int(css::i18n::TransliterationModulesExtra::TOGGLE_CASE), NON_IGNORE_MASK = (int)css::i18n::TransliterationModules_NON_IGNORE_MASK, IGNORE_MASK = 0x7fffff00, @@ -119,8 +119,8 @@ enum class TransliterationFlags { /// transliterate Japanese normal sized character to small sized character 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 + IGNORE_DIACRITICS_CTL = int(css::i18n::TransliterationModulesExtra::IGNORE_DIACRITICS_CTL), + IGNORE_KASHIDA_CTL = int(css::i18n::TransliterationModulesExtra::IGNORE_KASHIDA_CTL) }; namespace o3tl { template<> struct typed_flags<TransliterationFlags> : is_typed_flags<TransliterationFlags, 0x7fffffff> {}; |