More loplugin:cstylecast: i18npool

Change-Id: Iafdc3593b7136f24e741dc63e3c46344636154eb

i18npool/qa/cppunit/test_textsearch.cxx

@@ -149,7 +149,7 @@ void TestTextSearch::testWildcardSearch()
     aOptions.WildcardEscapeCharacter = '~';
     // aOptions.searchFlag = ::css::util::SearchFlags::WILD_MATCH_SELECTION;
     // is not set, so substring match is allowed.
-    aOptions.transliterateFlags = (sal_Int32)::css::i18n::TransliterationModules::TransliterationModules_IGNORE_CASE;
+    aOptions.transliterateFlags = sal_Int32(::css::i18n::TransliterationModules::TransliterationModules_IGNORE_CASE);
     aText = "abAca";
 
     aOptions.searchString = "a";

i18npool/source/indexentry/indexentrysupplier_default.cxx

@@ -269,9 +269,9 @@ void Index::init(const lang::Locale &rLocale, const OUString& algorithm)
 
     collator->loadCollatorAlgorithm(algorithm, rLocale, CollatorOptions::CollatorOptions_IGNORE_CASE_ACCENT);
     sal_Int16 j=0;
-    sal_Unicode start = unicode::getUnicodeScriptStart((UnicodeScript)0);
-    sal_Unicode end = unicode::getUnicodeScriptEnd((UnicodeScript)0);
-    for (sal_Int32 i= (scriptList[0] == (UnicodeScript)0) ? 1 : 0; i< scriptList.getLength(); i++) {
+    sal_Unicode start = unicode::getUnicodeScriptStart(UnicodeScript(0));
+    sal_Unicode end = unicode::getUnicodeScriptEnd(UnicodeScript(0));
+    for (sal_Int32 i= (scriptList[0] == UnicodeScript(0)) ? 1 : 0; i< scriptList.getLength(); i++) {
         if (unicode::getUnicodeScriptStart(scriptList[i]) != end+1) {
             tables[j++].init(start, end, keys, key_count, this);
             start = unicode::getUnicodeScriptStart(scriptList[i]);

i18npool/source/inputchecker/inputsequencechecker.cxx

@@ -82,19 +82,19 @@ InputSequenceCheckerImpl::correctInputSequence(OUString& Text, sal_Int32 nStartP
 static ScriptTypeList typeList[] = {
     //{ UnicodeScript_kHebrew,              UnicodeScript_kHebrew },        // 10,
     //{ UnicodeScript_kArabic,              UnicodeScript_kArabic },        // 11,
-    { UnicodeScript_kDevanagari,  UnicodeScript_kDevanagari,    (sal_Int16)UnicodeScript_kDevanagari },    // 14,
-    { UnicodeScript_kThai,        UnicodeScript_kThai,          (sal_Int16)UnicodeScript_kThai },          // 24,
+    { UnicodeScript_kDevanagari,  UnicodeScript_kDevanagari,    sal_Int16(UnicodeScript_kDevanagari) },    // 14,
+    { UnicodeScript_kThai,        UnicodeScript_kThai,          sal_Int16(UnicodeScript_kThai) },          // 24,
 
-    { UnicodeScript_kScriptCount, UnicodeScript_kScriptCount,   (sal_Int16)UnicodeScript_kScriptCount }    // 88
+    { UnicodeScript_kScriptCount, UnicodeScript_kScriptCount,   sal_Int16(UnicodeScript_kScriptCount) }    // 88
 };
 
 sal_Char*
 InputSequenceCheckerImpl::getLanguageByScripType(sal_Unicode cChar, sal_Unicode nChar)
 {
-    css::i18n::UnicodeScript type = (css::i18n::UnicodeScript)unicode::getUnicodeScriptType( cChar, typeList, (sal_Int16)UnicodeScript_kScriptCount );
+    css::i18n::UnicodeScript type = static_cast<css::i18n::UnicodeScript>(unicode::getUnicodeScriptType( cChar, typeList, sal_Int16(UnicodeScript_kScriptCount) ));
 
     if (type != UnicodeScript_kScriptCount &&
-            type == (css::i18n::UnicodeScript)unicode::getUnicodeScriptType( nChar, typeList, (sal_Int16)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";

i18npool/source/search/textsearch.cxx

@@ -147,7 +147,7 @@ void TextSearch::setOptions2( const SearchOptions2& rOptions )
     pJumpTable2 = nullptr;
     maWildcardReversePattern.clear();
     maWildcardReversePattern2.clear();
-    TransliterationFlags transliterateFlags = (TransliterationFlags) aSrchPara.transliterateFlags;
+    TransliterationFlags transliterateFlags = static_cast<TransliterationFlags>(aSrchPara.transliterateFlags);
 
     // Create Transliteration class
     if( isSimpleTrans( transliterateFlags) )
@@ -155,7 +155,7 @@ void TextSearch::setOptions2( const SearchOptions2& rOptions )
         if( !xTranslit.is() )
             xTranslit.set( Transliteration::create( m_xContext ) );
         xTranslit->loadModule(
-             (TransliterationModules)maskSimpleTrans(transliterateFlags),
+             static_cast<TransliterationModules>(maskSimpleTrans(transliterateFlags)),
              aSrchPara.Locale);
     }
     else if( xTranslit.is() )
@@ -168,7 +168,7 @@ void TextSearch::setOptions2( const SearchOptions2& rOptions )
             xTranslit2.set( Transliteration::create( m_xContext ) );
         // Load transliteration module
         xTranslit2->loadModule(
-             (TransliterationModules) maskComplexTrans(transliterateFlags),
+             static_cast<TransliterationModules>(maskComplexTrans(transliterateFlags)),
              aSrchPara.Locale);
     }
 
@@ -190,7 +190,7 @@ void TextSearch::setOptions2( const SearchOptions2& rOptions )
                 if (xTranslitPattern.is())
                 {
                     xTranslitPattern->loadModule(
-                            (TransliterationModules) maskSimpleRegexTrans(transliterateFlags),
+                            static_cast<TransliterationModules>(maskSimpleRegexTrans(transliterateFlags)),
                             aSrchPara.Locale);
                     sSrchStr = xTranslitPattern->transliterateString2String(
                             aSrchPara.searchString, 0, aSrchPara.searchString.getLength());
@@ -837,7 +837,7 @@ SearchResult TextSearch::NSrchBkwrd( const OUString& searchStr, sal_Int32 startP
 
 void TextSearch::RESrchPrepare( const css::util::SearchOptions2& rOptions)
 {
-    TransliterationFlags transliterateFlags = (TransliterationFlags)rOptions.transliterateFlags;
+    TransliterationFlags transliterateFlags = static_cast<TransliterationFlags>(rOptions.transliterateFlags);
     // select the transliterated pattern string
     const OUString& rPatternStr =
         (isSimpleTrans(transliterateFlags) ? sSrchStr

i18npool/source/transliteration/transliterationImpl.cxx

@@ -48,7 +48,7 @@ namespace i18npool {
   {TransliterationModules_##name, TransliterationModulesNew_##name, #name}
 
 #define TmItem2( name ) \
-  {(TransliterationModules)0, TransliterationModulesNew_##name, #name}
+  {TransliterationModules(0), TransliterationModulesNew_##name, #name}
 
 // Ignore Module list
 static struct TMlist {
@@ -131,7 +131,7 @@ static struct TMlist {
 //  TmItem2 (NumToCharEstern_Arabic_Indic),// () (68)
 //  TmItem2 (NumToCharIndic),           // () (69)
 //  TmItem2 (NumToCharThai),            // () (70)
-  {(TransliterationModules)0, (TransliterationModulesNew)0,  nullptr}
+  {TransliterationModules(0), TransliterationModulesNew(0),  nullptr}
 };
 
 // Constructor/Destructor
@@ -199,12 +199,12 @@ TransliterationImpl::loadModule( TransliterationModules modType, const Locale& r
                     numCascade++;
         }
         // additional transliterations from TranslationModuleExtra (we cannot extend TransliterationModule)
-        if (bool(modType & (TransliterationModules)TransliterationModulesExtra::IGNORE_DIACRITICS_CTL))
+        if (bool(modType & TransliterationModules(TransliterationModulesExtra::IGNORE_DIACRITICS_CTL)))
         {
             if (loadModuleByName("ignoreDiacritics_CTL", bodyCascade[numCascade], rLocale))
                 numCascade++;
         }
-        if (bool(modType & (TransliterationModules)TransliterationModulesExtra::IGNORE_KASHIDA_CTL))
+        if (bool(modType & TransliterationModules(TransliterationModulesExtra::IGNORE_KASHIDA_CTL)))
             if (loadModuleByName("ignoreKashida_CTL", bodyCascade[numCascade], rLocale))
                 numCascade++;
 
@@ -617,7 +617,7 @@ TransliterationImpl::loadModuleByName( const OUString& implName,
     OUString cname = TRLT_IMPLNAME_PREFIX + implName;
     loadBody(cname, body);
     if (body.is()) {
-        body->loadModule((TransliterationModules)0, rLocale); // toUpper/toLoad need rLocale
+        body->loadModule(TransliterationModules(0), rLocale); // toUpper/toLoad need rLocale
 
         // if the module is ignore case/kana/width, load caseignore for equals/compareString mothed
         for (sal_Int16 i = 0; i < 3; i++) {

i18npool/source/transliteration/transliteration_caseignore.cxx

@@ -43,7 +43,7 @@ Transliteration_caseignore::Transliteration_caseignore()
 void SAL_CALL
 Transliteration_caseignore::loadModule( TransliterationModules modName, const Locale& rLocale )
 {
-    moduleLoaded |= (TransliterationFlags)modName;
+    moduleLoaded |= static_cast<TransliterationFlags>(modName);
     aLocale = rLocale;
 }
 
@@ -63,8 +63,8 @@ Transliteration_caseignore::transliterateRange( const OUString& str1, const OUSt
     static rtl::Reference< Transliteration_u2l > u2l(new Transliteration_u2l);
     static rtl::Reference< Transliteration_l2u > l2u(new Transliteration_l2u);
 
-    u2l->loadModule((TransliterationModules)0, aLocale);
-    l2u->loadModule((TransliterationModules)0, aLocale);
+    u2l->loadModule(TransliterationModules(0), aLocale);
+    l2u->loadModule(TransliterationModules(0), aLocale);
 
     OUString l1 = u2l->transliterateString2String(str1, 0, str1.getLength());
     OUString u1 = l2u->transliterateString2String(str1, 0, str1.getLength());