use strong_int for LanguageType

Change-Id: If99a944f7032180355da291ad283b4cfcea4f448
Reviewed-on: https://gerrit.libreoffice.org/36629
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

3 files changed, 35 insertions, 42 deletions

diff --git a/editeng/source/misc/forbiddencharacterstable.cxx b/editeng/source/misc/forbiddencharacterstable.cxx
index 1391d993316a..f52c90eb2b86 100644
--- a/editeng/source/misc/forbiddencharacterstable.cxx
+++ b/editeng/source/misc/forbiddencharacterstable.cxx
@@ -30,7 +30,7 @@ SvxForbiddenCharactersTable::SvxForbiddenCharactersTable( const css::uno::Refere
     m_xContext = rxContext;
 }
 
-const css::i18n::ForbiddenCharacters* SvxForbiddenCharactersTable::GetForbiddenCharacters( sal_uInt16 nLanguage, bool bGetDefault )
+const css::i18n::ForbiddenCharacters* SvxForbiddenCharactersTable::GetForbiddenCharacters( LanguageType nLanguage, bool bGetDefault )
 {
     css::i18n::ForbiddenCharacters* pForbiddenCharacters = nullptr;
     Map::iterator it = maMap.find( nLanguage );
@@ -45,12 +45,12 @@ const css::i18n::ForbiddenCharacters* SvxForbiddenCharactersTable::GetForbiddenC
     return pForbiddenCharacters;
 }
 
-void SvxForbiddenCharactersTable::SetForbiddenCharacters( sal_uInt16 nLanguage, const css::i18n::ForbiddenCharacters& rForbiddenChars )
+void SvxForbiddenCharactersTable::SetForbiddenCharacters( LanguageType nLanguage, const css::i18n::ForbiddenCharacters& rForbiddenChars )
 {
     maMap[ nLanguage ] = rForbiddenChars;
 }
 
-void SvxForbiddenCharactersTable::ClearForbiddenCharacters( sal_uInt16 nLanguage )
+void SvxForbiddenCharactersTable::ClearForbiddenCharacters( LanguageType nLanguage )
 {
     maMap.erase( nLanguage );
 }
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index 56024f280610..5e227a6bfd06 100644
--- a/editeng/source/misc/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -175,7 +175,7 @@ SvxSpellWrapper::SvxSpellWrapper( vcl::Window* pWn,
 
 
 sal_Int16 SvxSpellWrapper::CheckSpellLang(
-        Reference< XSpellChecker1 > const & xSpell, sal_Int16 nLang)
+        Reference< XSpellChecker1 > const & xSpell, LanguageType nLang)
 {
     LangCheckState_map_t &rLCS = GetLangCheckState();
 
@@ -188,7 +188,7 @@ sal_Int16 SvxSpellWrapper::CheckSpellLang(
     if (SVX_LANG_NEED_CHECK == (nVal & 0x00FF))
     {
         sal_uInt16 nTmpVal = SVX_LANG_MISSING_DO_WARN;
-        if (xSpell.is()  &&  xSpell->hasLanguage( nLang ))
+        if (xSpell.is()  &&  xSpell->hasLanguage( (sal_uInt16)nLang ))
             nTmpVal = SVX_LANG_OK;
         nVal &= 0xFF00;
         nVal |= nTmpVal;
@@ -200,7 +200,7 @@ sal_Int16 SvxSpellWrapper::CheckSpellLang(
 }
 
 sal_Int16 SvxSpellWrapper::CheckHyphLang(
-        Reference< XHyphenator > const & xHyph, sal_Int16 nLang)
+        Reference< XHyphenator > const & xHyph, LanguageType nLang)
 {
     LangCheckState_map_t &rLCS = GetLangCheckState();
 
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index f6fd40376a34..720a23bda34a 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -203,7 +203,7 @@ static const LanguageTag& GetAppLang()
 {
     return Application::GetSettings().GetLanguageTag();
 }
-static LocaleDataWrapper& GetLocaleDataWrapper( sal_uInt16 nLang )
+static LocaleDataWrapper& GetLocaleDataWrapper( LanguageType nLang )
 {
     static LocaleDataWrapper aLclDtWrp( GetAppLang() );
     LanguageTag aLcl( nLang );
@@ -276,21 +276,18 @@ long SvxAutoCorrect::GetDefaultFlags()
                     | SaveWordWrdSttLst
                     | CorrectCapsLock;
     LanguageType eLang = GetAppLang().getLanguageType();
-    switch( eLang )
-    {
-    case LANGUAGE_ENGLISH:
-    case LANGUAGE_ENGLISH_US:
-    case LANGUAGE_ENGLISH_UK:
-    case LANGUAGE_ENGLISH_AUS:
-    case LANGUAGE_ENGLISH_CAN:
-    case LANGUAGE_ENGLISH_NZ:
-    case LANGUAGE_ENGLISH_EIRE:
-    case LANGUAGE_ENGLISH_SAFRICA:
-    case LANGUAGE_ENGLISH_JAMAICA:
-    case LANGUAGE_ENGLISH_CARRIBEAN:
+    if( eLang.anyOf(
+        LANGUAGE_ENGLISH,
+        LANGUAGE_ENGLISH_US,
+        LANGUAGE_ENGLISH_UK,
+        LANGUAGE_ENGLISH_AUS,
+        LANGUAGE_ENGLISH_CAN,
+        LANGUAGE_ENGLISH_NZ,
+        LANGUAGE_ENGLISH_EIRE,
+        LANGUAGE_ENGLISH_SAFRICA,
+        LANGUAGE_ENGLISH_JAMAICA,
+        LANGUAGE_ENGLISH_CARRIBEAN))
         nRet &= ~(ChgQuotes|ChgSglQuotes);
-        break;
-    }
     return nRet;
 }
 
@@ -421,10 +418,10 @@ bool SvxAutoCorrect::FnCapitalStartWord( SvxAutoCorrDoc& rDoc, const OUString& r
                 // Check that word isn't correctly spelled before correcting:
                 css::uno::Reference< css::linguistic2::XSpellChecker1 > xSpeller =
                     LinguMgr::GetSpellChecker();
-                if( xSpeller->hasLanguage(eLang) )
+                if( xSpeller->hasLanguage((sal_uInt16)eLang) )
                 {
                     Sequence< css::beans::PropertyValue > aEmptySeq;
-                    if (xSpeller->isValid(sWord, eLang, aEmptySeq))
+                    if (xSpeller->isValid(sWord, (sal_uInt16)eLang, aEmptySeq))
                     {
                         return false;
                     }
@@ -457,12 +454,10 @@ bool SvxAutoCorrect::FnChgOrdinalNumber(
 
     // In some languages ordinal suffixes should never be
     // changed to superscript. Let's break for those languages.
-    switch (eLang)
+    if (!eLang.anyOf(
+         LANGUAGE_SWEDISH,
+         LANGUAGE_SWEDISH_FINLAND))
     {
-    case LANGUAGE_SWEDISH:
-    case LANGUAGE_SWEDISH_FINLAND:
-        break;
-    default:
         CharClass& rCC = GetCharClass(eLang);
 
         for (; nSttPos < nEndPos; ++nSttPos)
@@ -1187,13 +1182,13 @@ void SvxAutoCorrect::InsertQuote( SvxAutoCorrDoc& rDoc, sal_Int32 nInsPos,
     {
         if( LANGUAGE_SYSTEM == eLang )
             eLang = GetAppLang().getLanguageType();
-        switch( eLang )
+        if( eLang.anyOf(
+            LANGUAGE_FRENCH,
+            LANGUAGE_FRENCH_BELGIAN,
+            LANGUAGE_FRENCH_CANADIAN,
+            LANGUAGE_FRENCH_SWISS,
+            LANGUAGE_FRENCH_LUXEMBOURG))
         {
-        case LANGUAGE_FRENCH:
-        case LANGUAGE_FRENCH_BELGIAN:
-        case LANGUAGE_FRENCH_CANADIAN:
-        case LANGUAGE_FRENCH_SWISS:
-        case LANGUAGE_FRENCH_LUXEMBOURG:
             {
                 OUString s( cNonBreakingSpace );
                     // UNICODE code for no break space
@@ -1203,7 +1198,6 @@ void SvxAutoCorrect::InsertQuote( SvxAutoCorrDoc& rDoc, sal_Int32 nInsPos,
                         ++nInsPos;
                 }
             }
-            break;
         }
     }
 
@@ -1222,18 +1216,17 @@ OUString SvxAutoCorrect::GetQuote( SvxAutoCorrDoc& rDoc, sal_Int32 nInsPos,
     {
         if( LANGUAGE_SYSTEM == eLang )
             eLang = GetAppLang().getLanguageType();
-        switch( eLang )
+        if( eLang.anyOf(
+             LANGUAGE_FRENCH,
+             LANGUAGE_FRENCH_BELGIAN,
+             LANGUAGE_FRENCH_CANADIAN,
+             LANGUAGE_FRENCH_SWISS,
+             LANGUAGE_FRENCH_LUXEMBOURG))
         {
-        case LANGUAGE_FRENCH:
-        case LANGUAGE_FRENCH_BELGIAN:
-        case LANGUAGE_FRENCH_CANADIAN:
-        case LANGUAGE_FRENCH_SWISS:
-        case LANGUAGE_FRENCH_LUXEMBOURG:
             if( bSttQuote )
                 sRet += " ";
             else
                 sRet = " " + sRet;
-            break;
         }
     }
     return sRet;