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>

14 files changed, 94 insertions, 87 deletions

diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index f69fcc862b62..6ce6d04ce0c4 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -124,7 +124,7 @@ void ReadThroughDic( const OUString &rMainURL, ConvDicXMLImport &rImport )
     }
 }
 
-bool IsConvDic( const OUString &rFileURL, sal_Int16 &nLang, sal_Int16 &nConvType )
+bool IsConvDic( const OUString &rFileURL, LanguageType &nLang, sal_Int16 &nConvType )
 {
     bool bRes = false;
 
@@ -164,7 +164,7 @@ bool IsConvDic( const OUString &rFileURL, sal_Int16 &nLang, sal_Int16 &nConvType
 
 ConvDic::ConvDic(
         const OUString &rName,
-        sal_Int16 nLang,
+        LanguageType nLang,
         sal_Int16 nConvType,
         bool bBiDirectional,
         const OUString &rMainURL) :
diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx
index 950df21b8099..53167b7123a7 100644
--- a/linguistic/source/convdic.hxx
+++ b/linguistic/source/convdic.hxx
@@ -39,7 +39,7 @@
 #define SN_CONV_DICTIONARY      "com.sun.star.linguistic2.ConversionDictionary"
 
 
-bool    IsConvDic( const OUString &rFileURL, sal_Int16 &nLang, sal_Int16 &nConvType );
+bool    IsConvDic( const OUString &rFileURL, LanguageType &nLang, sal_Int16 &nConvType );
 
 typedef std::unordered_multimap<OUString, OUString, const OUStringHash> ConvMap;
 
@@ -69,7 +69,7 @@ protected:
 
     OUString        aMainURL;   // URL to file
     OUString        aName;
-    sal_Int16       nLanguage;
+    LanguageType    nLanguage;
     sal_Int16       nConversionType;
     sal_Int16       nMaxLeftCharCount;
     sal_Int16       nMaxRightCharCount;
@@ -89,7 +89,7 @@ protected:
 
 public:
     ConvDic( const OUString &rName,
-             sal_Int16 nLanguage,
+             LanguageType nLanguage,
              sal_Int16 nConversionType,
              bool bBiDirectional,
              const OUString &rMainURL);
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index 36b357ce138c..b852077ab3e8 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -293,7 +293,7 @@ void ConvDicNameContainer::AddConvDics(
         if(aExt != aSearchExt)
             continue;          // skip other files
 
-        sal_Int16 nLang;
+        LanguageType nLang;
         sal_Int16 nConvType;
         if (IsConvDic( aURL, nLang, nConvType ))
         {
@@ -413,7 +413,7 @@ uno::Reference< XConversionDictionary > SAL_CALL ConvDicList::addNewDictionary(
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    sal_Int16 nLang = LinguLocaleToLanguage( rLocale );
+    LanguageType nLang = LinguLocaleToLanguage( rLocale );
 
     if (GetNameContainer().hasByName( rName ))
         throw ElementExistException();
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index 36bf36679c30..08c160c1b0a4 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -106,8 +106,8 @@ public:
 class ConvDicXMLDictionaryContext_Impl :
     public ConvDicXMLImportContext
 {
-    sal_Int16       nLanguage;
-    sal_Int16   nConversionType;
+    LanguageType nLanguage;
+    sal_Int16    nConversionType;
 
 public:
     ConvDicXMLDictionaryContext_Impl( ConvDicXMLImport &rImport,
diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx
index c806e1b9f9c7..132d270f3fd2 100644
--- a/linguistic/source/convdicxml.hxx
+++ b/linguistic/source/convdicxml.hxx
@@ -72,7 +72,7 @@ class ConvDicXMLImport : public SvXMLImport
                                 //   but the language and conversion type will
                                 //   still be determined!
 
-    sal_Int16       nLanguage;          // language of the dictionary
+    LanguageType    nLanguage;          // language of the dictionary
     sal_Int16       nConversionType;    // conversion type the dictionary is used for
 
 public:
@@ -92,12 +92,12 @@ public:
         sal_uInt16 nPrefix, const OUString &rLocalName,
         const css::uno::Reference < css::xml::sax::XAttributeList > &rxAttrList ) override;
 
-    ConvDic *   GetDic()                    { return pDic; }
-    sal_Int16   GetLanguage() const         { return nLanguage; }
-    sal_Int16   GetConversionType() const   { return nConversionType; }
+    ConvDic *    GetDic()                    { return pDic; }
+    LanguageType GetLanguage() const         { return nLanguage; }
+    sal_Int16    GetConversionType() const   { return nConversionType; }
 
-    void        SetLanguage( sal_Int16 nLang )              { nLanguage = nLang; }
-    void        SetConversionType( sal_Int16 nType )    { nConversionType = nType; }
+    void         SetLanguage( LanguageType nLang )              { nLanguage = nLang; }
+    void         SetConversionType( sal_Int16 nType )    { nConversionType = nType; }
 };
 
 
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 266ab5a9f7a8..488c62bf454a 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -83,7 +83,7 @@ static bool getTag(const OString &rLine, const sal_Char *pTagName,
 }
 
 
-sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, bool &bNeg )
+sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, LanguageType &nLng, bool &bNeg )
 {
     // Sniff the header
     sal_Int16 nDicVersion = DIC_VERSION_DONTKNOW;
@@ -167,9 +167,10 @@ sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, bool &bNeg )
             DIC_VERSION_6 == nDicVersion)
         {
             // The language of the dictionary
-            rpStream->ReadUInt16( nLng );
-
-            if (VERS2_NOLANGUAGE == nLng)
+            sal_uInt16 nTmp = 0;
+            rpStream->ReadUInt16( nTmp );
+            nLng = LanguageType(nTmp);
+            if (VERS2_NOLANGUAGE == static_cast<sal_uInt16>(nLng))
                 nLng = LANGUAGE_NONE;
 
             // Negative Flag
@@ -181,7 +182,7 @@ sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, bool &bNeg )
 }
 
 DictionaryNeo::DictionaryNeo(const OUString &rName,
-                             sal_Int16 nLang, DictionaryType eType,
+                             LanguageType nLang, DictionaryType eType,
                              const OUString &rMainURL,
                              bool bWriteable) :
     aDicEvtListeners( GetLinguMutex() ),
@@ -259,7 +260,7 @@ sal_uLong DictionaryNeo::loadEntries(const OUString &rMainURL)
 
     // read header
     bool bNegativ;
-    sal_uInt16 nLang;
+    LanguageType nLang;
     nDicVersion = ReadDicVersion(pStream, nLang, bNegativ);
     sal_uLong nErr = pStream->GetError();
     if (0 != nErr)
@@ -753,7 +754,7 @@ Locale SAL_CALL DictionaryNeo::getLocale(  )
 void SAL_CALL DictionaryNeo::setLocale( const Locale& aLocale )
 {
     MutexGuard  aGuard( GetLinguMutex() );
-    sal_Int16 nLanguageP = LinguLocaleToLanguage( aLocale );
+    LanguageType nLanguageP = LinguLocaleToLanguage( aLocale );
     if (!bIsReadonly  &&  nLanguage != nLanguageP)
     {
         nLanguage = nLanguageP;
diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx
index 6bc7e7853306..6fef2c4f10b1 100644
--- a/linguistic/source/dicimp.hxx
+++ b/linguistic/source/dicimp.hxx
@@ -33,7 +33,7 @@
 
 #define DIC_MAX_ENTRIES     30000
 
-sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, bool &bNeg );
+sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, LanguageType &nLng, bool &bNeg );
 
 class DictionaryNeo :
     public ::cppu::WeakImplHelper
@@ -49,7 +49,7 @@ class DictionaryNeo :
     OUString                                                    aDicName;
     OUString                                                    aMainURL;
     css::linguistic2::DictionaryType                            eDicType;
-    sal_Int16                                                   nLanguage;
+    LanguageType                                                nLanguage;
     sal_Int16                                                   nDicVersion;
     bool                                                        bNeedEntries;
     bool                                                        bIsModified;
@@ -75,7 +75,7 @@ class DictionaryNeo :
                                           bool bIsLoadEntries = false);
 
 public:
-    DictionaryNeo(const OUString &rName, sal_Int16 nLang,
+    DictionaryNeo(const OUString &rName, LanguageType nLang,
                     css::linguistic2::DictionaryType eType,
                     const OUString &rMainURL,
                     bool bWriteable );
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index 64bd279a95aa..5ac22f539e54 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -52,7 +52,7 @@ using namespace com::sun::star::linguistic2;
 using namespace linguistic;
 
 
-static bool IsVers2OrNewer( const OUString& rFileURL, sal_uInt16& nLng, bool& bNeg );
+static bool IsVers2OrNewer( const OUString& rFileURL, LanguageType& nLng, bool& bNeg );
 
 static void AddInternal( const uno::Reference< XDictionary > &rDic,
                          const OUString& rNew );
@@ -295,9 +295,9 @@ void DicList::SearchForDictionaries(
     OUString aDCP("dcp");
     for (sal_Int32 i = 0;  i < nEntries;  ++i)
     {
-        OUString  aURL( pDirCnt[i] );
-        sal_uInt16  nLang = LANGUAGE_NONE;
-        bool        bNeg  = false;
+        OUString     aURL( pDirCnt[i] );
+        LanguageType nLang = LANGUAGE_NONE;
+        bool         bNeg  = false;
 
         if(!::IsVers2OrNewer( aURL, nLang, bNeg ))
         {
@@ -315,7 +315,7 @@ void DicList::SearchForDictionaries(
 
         // Record in the list of Dictionaries
         // When it already exists don't record
-        sal_Int16 nSystemLanguage = MsLangId::getSystemLanguage();
+        LanguageType nSystemLanguage = MsLangId::getSystemLanguage();
         OUString aTmp1 = ToLower( aURL, nSystemLanguage );
         sal_Int32 nPos = aTmp1.lastIndexOf( '/' );
         if (-1 != nPos)
@@ -520,7 +520,7 @@ uno::Reference< XDictionary > SAL_CALL
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
-    sal_Int16 nLanguage = LinguLocaleToLanguage( rLocale );
+    LanguageType nLanguage = LinguLocaleToLanguage( rLocale );
     bool bIsWriteablePath = rURL.match( GetDictionaryWriteablePath() );
     return new DictionaryNeo( rName, nLanguage, eDicType, rURL, bIsWriteablePath );
 }
@@ -801,7 +801,7 @@ static void AddUserData( const uno::Reference< XDictionary > &rDic )
     }
 }
 
-static bool IsVers2OrNewer( const OUString& rFileURL, sal_uInt16& nLng, bool& bNeg )
+static bool IsVers2OrNewer( const OUString& rFileURL, LanguageType& nLng, bool& bNeg )
 {
     if (rFileURL.isEmpty())
         return false;
diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx
index bef72839a1b3..9dcaceee26ab 100644
--- a/linguistic/source/hyphdta.cxx
+++ b/linguistic/source/hyphdta.cxx
@@ -40,7 +40,7 @@ namespace linguistic
 {
 
 
-HyphenatedWord::HyphenatedWord(const OUString &rWord, sal_uInt16 nLang, sal_Int16 nHPos,
+HyphenatedWord::HyphenatedWord(const OUString &rWord, LanguageType nLang, sal_Int16 nHPos,
                                const OUString &rHyphWord, sal_Int16 nPos ) :
     aWord           (rWord),
     aHyphenatedWord (rHyphWord),
@@ -113,7 +113,7 @@ sal_Bool SAL_CALL HyphenatedWord::isAlternativeSpelling()
 }
 
 
-PossibleHyphens::PossibleHyphens(const OUString &rWord, sal_uInt16 nLang,
+PossibleHyphens::PossibleHyphens(const OUString &rWord, LanguageType nLang,
             const OUString &rHyphWord,
             const Sequence< sal_Int16 > &rPositions) :
     aWord           (rWord),
@@ -157,14 +157,14 @@ Sequence< sal_Int16 > SAL_CALL PossibleHyphens::getHyphenationPositions()
 }
 
 css::uno::Reference <css::linguistic2::XHyphenatedWord> HyphenatedWord::CreateHyphenatedWord(
-        const OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos,
+        const OUString &rWord, LanguageType nLang, sal_Int16 nHyphenationPos,
         const OUString &rHyphenatedWord, sal_Int16 nHyphenPos )
 {
     return new HyphenatedWord( rWord, nLang, nHyphenationPos, rHyphenatedWord, nHyphenPos );
 }
 
 css::uno::Reference < css::linguistic2::XPossibleHyphens > PossibleHyphens::CreatePossibleHyphens
-        (const OUString &rWord, sal_Int16 nLang,
+        (const OUString &rWord, LanguageType nLang,
          const OUString &rHyphWord,
          const css::uno::Sequence< sal_Int16 > &rPositions)
 {
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 1a3b732f21cb..380b30f61acf 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -146,31 +146,27 @@ static uno::Sequence< lang::Locale > GetAvailLocales(
 struct SvcInfo
 {
     const OUString                  aSvcImplName;
-    const uno::Sequence< sal_Int16 >    aSuppLanguages;
+    const std::vector< LanguageType >    aSuppLanguages;
 
     SvcInfo( const OUString &rSvcImplName,
-             const uno::Sequence< sal_Int16 >  &rSuppLanguages ) :
+             const std::vector< LanguageType >  &rSuppLanguages ) :
         aSvcImplName    (rSvcImplName),
         aSuppLanguages  (rSuppLanguages)
     {
     }
 
-    bool    HasLanguage( sal_Int16 nLanguage ) const;
+    bool    HasLanguage( LanguageType nLanguage ) const;
 };
 
 
-bool SvcInfo::HasLanguage( sal_Int16 nLanguage ) const
+bool SvcInfo::HasLanguage( LanguageType nLanguage ) const
 {
-    sal_Int32 nCnt = aSuppLanguages.getLength();
-    const sal_Int16 *pLang = aSuppLanguages.getConstArray();
-    sal_Int32 i;
-
-    for ( i = 0;  i < nCnt;  ++i)
+    for ( auto const & i : aSuppLanguages)
     {
-        if (nLanguage == pLang[i])
-            break;
+        if (nLanguage == i)
+            return true;
     }
-    return i < nCnt;
+    return false;
 }
 
 class LngSvcMgrListenerHelper :
@@ -1035,7 +1031,7 @@ void LngSvcMgr::GetAvailableSpellSvcs_Impl()
                 if (xSvc.is())
                 {
                     OUString            aImplName;
-                    uno::Sequence< sal_Int16 >    aLanguages;
+                    std::vector< LanguageType >   aLanguages;
                     uno::Reference< XServiceInfo > xInfo( xSvc, uno::UNO_QUERY );
                     if (xInfo.is())
                         aImplName = xInfo->getImplementationName();
@@ -1044,7 +1040,7 @@ void LngSvcMgr::GetAvailableSpellSvcs_Impl()
                     SAL_WARN_IF( !xSuppLoc.is(), "linguistic", "interfaces not supported" );
                     if (xSuppLoc.is()) {
                         uno::Sequence<lang::Locale> aLocaleSequence(xSuppLoc->getLocales());
-                        aLanguages = LocaleSeqToLangSeq( aLocaleSequence );
+                        aLanguages = LocaleSeqToLangVec( aLocaleSequence );
                     }
 
                     pAvailSpellSvcs->push_back( o3tl::make_unique<SvcInfo>( aImplName, aLanguages ) );
@@ -1097,7 +1093,7 @@ void LngSvcMgr::GetAvailableGrammarSvcs_Impl()
                 if (xSvc.is() && pAvailGrammarSvcs)
                 {
                     OUString            aImplName;
-                    uno::Sequence< sal_Int16 >   aLanguages;
+                    std::vector< LanguageType >    aLanguages;
                     uno::Reference< XServiceInfo > xInfo( xSvc, uno::UNO_QUERY );
                     if (xInfo.is())
                         aImplName = xInfo->getImplementationName();
@@ -1107,7 +1103,7 @@ void LngSvcMgr::GetAvailableGrammarSvcs_Impl()
                     if (xSuppLoc.is())
                     {
                         uno::Sequence<lang::Locale> aLocaleSequence(xSuppLoc->getLocales());
-                        aLanguages = LocaleSeqToLangSeq( aLocaleSequence );
+                        aLanguages = LocaleSeqToLangVec( aLocaleSequence );
                     }
 
                     pAvailGrammarSvcs->push_back( o3tl::make_unique<SvcInfo>( aImplName, aLanguages ) );
@@ -1158,7 +1154,7 @@ void LngSvcMgr::GetAvailableHyphSvcs_Impl()
                 if (xSvc.is())
                 {
                     OUString            aImplName;
-                    uno::Sequence< sal_Int16 >    aLanguages;
+                    std::vector< LanguageType >    aLanguages;
                     uno::Reference< XServiceInfo > xInfo( xSvc, uno::UNO_QUERY );
                     if (xInfo.is())
                         aImplName = xInfo->getImplementationName();
@@ -1168,7 +1164,7 @@ void LngSvcMgr::GetAvailableHyphSvcs_Impl()
                     if (xSuppLoc.is())
                     {
                         uno::Sequence<lang::Locale> aLocaleSequence(xSuppLoc->getLocales());
-                        aLanguages = LocaleSeqToLangSeq( aLocaleSequence );
+                        aLanguages = LocaleSeqToLangVec( aLocaleSequence );
                     }
                     pAvailHyphSvcs->push_back( o3tl::make_unique<SvcInfo>( aImplName, aLanguages ) );
                 }
@@ -1219,7 +1215,7 @@ void LngSvcMgr::GetAvailableThesSvcs_Impl()
                 if (xSvc.is())
                 {
                     OUString            aImplName;
-                    uno::Sequence< sal_Int16 >    aLanguages;
+                    std::vector< LanguageType >    aLanguages;
                     uno::Reference< XServiceInfo > xInfo( xSvc, uno::UNO_QUERY );
                     if (xInfo.is())
                         aImplName = xInfo->getImplementationName();
@@ -1229,7 +1225,7 @@ void LngSvcMgr::GetAvailableThesSvcs_Impl()
                     if (xSuppLoc.is())
                     {
                         uno::Sequence<lang::Locale> aLocaleSequence(xSuppLoc->getLocales());
-                        aLanguages = LocaleSeqToLangSeq( aLocaleSequence );
+                        aLanguages = LocaleSeqToLangVec( aLocaleSequence );
                     }
 
                     pAvailThesSvcs->push_back( o3tl::make_unique<SvcInfo>( aImplName, aLanguages ) );
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index bacff91c643e..3ea5bf57c242 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -93,14 +93,10 @@ css::lang::Locale LinguLanguageToLocale( LanguageType nLanguage )
 
 bool LinguIsUnspecified( LanguageType nLanguage )
 {
-    switch (nLanguage)
-    {
-        case LANGUAGE_NONE:
-        case LANGUAGE_UNDETERMINED:
-        case LANGUAGE_MULTIPLE:
-            return true;
-    }
-    return false;
+    return nLanguage.anyOf(
+         LANGUAGE_NONE,
+         LANGUAGE_UNDETERMINED,
+         LANGUAGE_MULTIPLE);
 }
 
 // When adding anything keep both LinguIsUnspecified() methods in sync!
@@ -264,7 +260,7 @@ static bool lcl_HasHyphInfo( const uno::Reference<XDictionaryEntry> &xEntry )
 
 uno::Reference< XDictionaryEntry > SearchDicList(
         const uno::Reference< XSearchableDictionaryList > &xDicList,
-        const OUString &rWord, sal_Int16 nLanguage,
+        const OUString &rWord, LanguageType nLanguage,
         bool bSearchPosDics, bool bSearchSpellEntry )
 {
     MutexGuard  aGuard( GetLinguMutex() );
@@ -286,7 +282,7 @@ uno::Reference< XDictionaryEntry > SearchDicList(
         uno::Reference< XDictionary > axDic( pDic[i], UNO_QUERY );
 
         DictionaryType  eType = axDic->getDictionaryType();
-        sal_Int16           nLang = LinguLocaleToLanguage( axDic->getLocale() );
+        LanguageType    nLang = LinguLocaleToLanguage( axDic->getLocale() );
 
         if ( axDic.is() && axDic->isActive()
             && (nLang == nLanguage  ||  LinguIsUnspecified( nLang)) )
@@ -343,7 +339,7 @@ bool SaveDictionaries( const uno::Reference< XSearchableDictionaryList > &xDicLi
 DictionaryError AddEntryToDic(
         uno::Reference< XDictionary >  &rxDic,
         const OUString &rWord, bool bIsNeg,
-        const OUString &rRplcTxt, sal_Int16 /* nRplcLang */,
+        const OUString &rRplcTxt,
         bool bStripDot )
 {
     if (!rxDic.is())
@@ -380,8 +376,23 @@ DictionaryError AddEntryToDic(
     return nRes;
 }
 
+std::vector< LanguageType >
+    LocaleSeqToLangVec( uno::Sequence< Locale > &rLocaleSeq )
+{
+    const Locale *pLocale = rLocaleSeq.getConstArray();
+    sal_Int32 nCount = rLocaleSeq.getLength();
+
+    std::vector< LanguageType >   aLangs;
+    for (sal_Int32 i = 0;  i < nCount;  ++i)
+    {
+        aLangs.push_back( LinguLocaleToLanguage( pLocale[i] ) );
+    }
+
+    return aLangs;
+}
+
 uno::Sequence< sal_Int16 >
-    LocaleSeqToLangSeq( uno::Sequence< Locale > &rLocaleSeq )
+     LocaleSeqToLangSeq( uno::Sequence< Locale > &rLocaleSeq )
 {
     const Locale *pLocale = rLocaleSeq.getConstArray();
     sal_Int32 nCount = rLocaleSeq.getLength();
@@ -390,12 +401,11 @@ uno::Sequence< sal_Int16 >
     sal_Int16 *pLang = aLangs.getArray();
     for (sal_Int32 i = 0;  i < nCount;  ++i)
     {
-        pLang[i] = LinguLocaleToLanguage( pLocale[i] );
+        pLang[i] = (sal_uInt16)LinguLocaleToLanguage( pLocale[i] );
     }
 
     return aLangs;
 }
-
 bool    IsReadOnly( const OUString &rURL, bool *pbExist )
 {
     bool bRes = false;
@@ -562,7 +572,7 @@ uno::Reference< XHyphenatedWord > RebuildHyphensAndControlChars(
         }
         else
         {
-            sal_Int16 nLang = LinguLocaleToLanguage( rxHyphWord->getLocale() );
+            LanguageType nLang = LinguLocaleToLanguage( rxHyphWord->getLocale() );
             xRes = new HyphenatedWord(
                         rOrigWord, nLang, nOrigHyphenationPos,
                         aOrigHyphenatedWord, nOrigHyphenPos );
@@ -584,7 +594,7 @@ osl::Mutex & lcl_GetCharClassMutex()
     return aMutex;
 }
 
-bool IsUpper( const OUString &rText, sal_Int32 nPos, sal_Int32 nLen, sal_Int16 nLanguage )
+bool IsUpper( const OUString &rText, sal_Int32 nPos, sal_Int32 nLen, LanguageType nLanguage )
 {
     MutexGuard  aGuard( lcl_GetCharClassMutex() );
 
@@ -620,7 +630,7 @@ CapType SAL_CALL capitalType(const OUString& aTerm, CharClass * pCC)
         return CapType::UNKNOWN;
 }
 
-OUString ToLower( const OUString &rText, sal_Int16 nLanguage )
+OUString ToLower( const OUString &rText, LanguageType nLanguage )
 {
     MutexGuard  aGuard( lcl_GetCharClassMutex() );
 
diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index 848b45aa8e69..d26993cabb5f 100644
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -756,7 +756,7 @@ sal_Bool SAL_CALL SpellCheckerDispatcher::hasLanguage(
     sal_Int16 nLanguage )
 {
     MutexGuard  aGuard( GetLinguMutex() );
-    return hasLocale( LanguageTag::convertToLocale( nLanguage) );
+    return hasLocale( LanguageTag::convertToLocale( LanguageType(nLanguage)) );
 }
 
 
@@ -766,7 +766,7 @@ sal_Bool SAL_CALL SpellCheckerDispatcher::isValid(
     const uno::Sequence< beans::PropertyValue >& rProperties )
 {
     MutexGuard  aGuard( GetLinguMutex() );
-    return isValid( rWord, LanguageTag::convertToLocale( nLanguage ), rProperties);
+    return isValid( rWord, LanguageTag::convertToLocale( LanguageType(nLanguage) ), rProperties);
 }
 
 
@@ -776,7 +776,7 @@ uno::Reference< linguistic2::XSpellAlternatives > SAL_CALL SpellCheckerDispatche
     const uno::Sequence< beans::PropertyValue >& rProperties )
 {
     MutexGuard  aGuard( GetLinguMutex() );
-    return spell( rWord, LanguageTag::convertToLocale( nLanguage), rProperties);
+    return spell( rWord, LanguageTag::convertToLocale( LanguageType(nLanguage) ), rProperties);
 }
 
 
@@ -788,7 +788,7 @@ void SpellCheckerDispatcher::SetServiceList( const Locale &rLocale,
     if (m_pCache)
         m_pCache->Flush();    // new services may spell differently...
 
-    sal_Int16 nLanguage = LinguLocaleToLanguage( rLocale );
+    LanguageType nLanguage = LinguLocaleToLanguage( rLocale );
 
     sal_Int32 nLen = rSvcImplNames.getLength();
     if (0 == nLen)
@@ -822,7 +822,7 @@ Sequence< OUString >
     Sequence< OUString > aRes;
 
     // search for entry with that language and use data from that
-    sal_Int16 nLanguage = LinguLocaleToLanguage( rLocale );
+    LanguageType nLanguage = LinguLocaleToLanguage( rLocale );
     const SpellSvcByLangMap_t::const_iterator aIt( m_aSvcMap.find( nLanguage ) );
     const LangSvcEntries_Spell      *pEntry = aIt != m_aSvcMap.end() ? aIt->second.get() : nullptr;
     if (pEntry)
diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx
index 9b22be11b472..ae025f364dad 100644
--- a/linguistic/source/spelldta.cxx
+++ b/linguistic/source/spelldta.cxx
@@ -60,7 +60,7 @@ bool SeqHasEntry(
 }
 
 
-void SearchSimilarText( const OUString &rText, sal_Int16 nLanguage,
+void SearchSimilarText( const OUString &rText, LanguageType nLanguage,
         Reference< XSearchableDictionaryList > &xDicList,
         std::vector< OUString > & rDicListProps )
 {
@@ -77,7 +77,7 @@ void SearchSimilarText( const OUString &rText, sal_Int16 nLanguage,
     {
         Reference< XDictionary > xDic( pDic[i], UNO_QUERY );
 
-        sal_Int16           nLang = LinguLocaleToLanguage( xDic->getLocale() );
+        LanguageType nLang = LinguLocaleToLanguage( xDic->getLocale() );
 
         if ( xDic.is() && xDic->isActive()
             && (nLang == nLanguage  ||  LinguIsUnspecified( nLang)) )
@@ -108,7 +108,7 @@ void SearchSimilarText( const OUString &rText, sal_Int16 nLanguage,
 
 void SeqRemoveNegEntries( std::vector< OUString > &rSeq,
         Reference< XSearchableDictionaryList > &rxDicList,
-        sal_Int16 nLanguage )
+        LanguageType nLanguage )
 {
     bool bSthRemoved = false;
     sal_Int32 nLen = rSeq.size();
@@ -179,7 +179,7 @@ SpellAlternatives::SpellAlternatives()
 
 
 SpellAlternatives::SpellAlternatives(
-        const OUString &rWord, sal_Int16 nLang,
+        const OUString &rWord, LanguageType nLang,
         const Sequence< OUString > &rAlternatives ) :
     aAlt        (rAlternatives),
     aWord       (rWord),
@@ -243,7 +243,7 @@ void SAL_CALL SpellAlternatives::setFailureType( sal_Int16 nFailureType )
 }
 
 
-void SpellAlternatives::SetWordLanguage(const OUString &rWord, sal_Int16 nLang)
+void SpellAlternatives::SetWordLanguage(const OUString &rWord, LanguageType nLang)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     aWord = rWord;
@@ -266,7 +266,7 @@ void SpellAlternatives::SetAlternatives( const Sequence< OUString > &rAlt )
 
 
 css::uno::Reference < css::linguistic2::XSpellAlternatives > SpellAlternatives::CreateSpellAlternatives(
-        const OUString &rWord, sal_Int16 nLang, sal_Int16 nTypeP, const css::uno::Sequence< OUString > &rAlt )
+        const OUString &rWord, LanguageType nLang, sal_Int16 nTypeP, const css::uno::Sequence< OUString > &rAlt )
 {
     SpellAlternatives* pAlt = new SpellAlternatives;
     pAlt->SetWordLanguage( rWord, nLang );
diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx
index a967745bc938..2c40d196759b 100644
--- a/linguistic/source/thesdsp.cxx
+++ b/linguistic/source/thesdsp.cxx
@@ -110,7 +110,7 @@ Sequence< Reference< XMeaning > > SAL_CALL
 
     Sequence< Reference< XMeaning > >   aMeanings;
 
-    sal_Int16 nLanguage = LinguLocaleToLanguage( rLocale );
+    LanguageType nLanguage = LinguLocaleToLanguage( rLocale );
     if (LinguIsUnspecified( nLanguage) || rTerm.isEmpty())
         return aMeanings;
 
@@ -202,7 +202,7 @@ void ThesaurusDispatcher::SetServiceList( const Locale &rLocale,
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    sal_Int16 nLanguage = LinguLocaleToLanguage( rLocale );
+    LanguageType nLanguage = LinguLocaleToLanguage( rLocale );
 
     sal_Int32 nLen = rSvcImplNames.getLength();
     if (0 == nLen)
@@ -236,7 +236,7 @@ Sequence< OUString >
     Sequence< OUString > aRes;
 
     // search for entry with that language and use data from that
-    sal_Int16 nLanguage = LinguLocaleToLanguage( rLocale );
+    LanguageType nLanguage = LinguLocaleToLanguage( rLocale );
     const ThesSvcByLangMap_t::const_iterator  aIt( aSvcMap.find( nLanguage ) );
     const LangSvcEntries_Thes       *pEntry = aIt != aSvcMap.end() ? aIt->second.get() : nullptr;
     if (pEntry)