LanguageType is unsigned int16

Change-Id: I5745fe2a54936e7a2585fe311522d71f08b97bfc

include/linguistic/hyphdta.hxx

@@ -35,14 +35,14 @@ class HyphenatedWord :
     OUString     aHyphenatedWord;
     sal_Int16    nHyphPos;
     sal_Int16    nHyphenationPos;
-    sal_Int16    nLanguage;
+    sal_uInt16   nLanguage;
     bool         bIsAltSpelling;
 
     HyphenatedWord(const HyphenatedWord &) = delete;
     HyphenatedWord & operator = (const HyphenatedWord &) = delete;
 
 public:
-    HyphenatedWord(const OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos,
+    HyphenatedWord(const OUString &rWord, sal_uInt16 nLang, sal_Int16 nHyphenationPos,
                    const OUString &rHyphenatedWord, sal_Int16 nHyphenPos );
     virtual ~HyphenatedWord();
 
@@ -81,13 +81,13 @@ class PossibleHyphens :
     OUString             aWord;
     OUString             aWordWithHyphens;
     css::uno::Sequence< sal_Int16 > aOrigHyphenPos;
-    sal_Int16                       nLanguage;
+    sal_uInt16           nLanguage;
 
     PossibleHyphens(const PossibleHyphens &) = delete;
     PossibleHyphens & operator = (const PossibleHyphens &) = delete;
 
 public:
-    PossibleHyphens(const OUString &rWord, sal_Int16 nLang,
+    PossibleHyphens(const OUString &rWord, sal_uInt16 nLang,
             const OUString &rHyphWord,
             const css::uno::Sequence< sal_Int16 > &rPositions);
     virtual ~PossibleHyphens();

include/linguistic/misc.hxx

@@ -80,7 +80,7 @@ enum class CapType
 
 LNG_DLLPUBLIC ::osl::Mutex& GetLinguMutex();
 
-LocaleDataWrapper & GetLocaleDataWrapper( sal_Int16 nLang );
+LocaleDataWrapper & GetLocaleDataWrapper( LanguageType nLang );
 
 sal_Int32 LevDistance( const OUString &rTxt1, const OUString &rTxt2 );
 

linguistic/source/hyphdsp.cxx

@@ -70,7 +70,7 @@ void HyphenatorDispatcher::ClearSvcList()
 Reference<XHyphenatedWord>  HyphenatorDispatcher::buildHyphWord(
             const OUString& rOrigWord,
             const Reference<XDictionaryEntry> &xEntry,
-            sal_Int16 nLang, sal_Int16 nMaxLeading )
+            LanguageType nLang, sal_Int16 nMaxLeading )
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -182,7 +182,7 @@ Reference<XHyphenatedWord>  HyphenatorDispatcher::buildHyphWord(
 
 
 Reference< XPossibleHyphens > HyphenatorDispatcher::buildPossHyphens(
-            const Reference< XDictionaryEntry > &xEntry, sal_Int16 nLanguage )
+            const Reference< XDictionaryEntry > &xEntry, LanguageType nLanguage )
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -281,7 +281,7 @@ Reference< XHyphenatedWord > SAL_CALL
     Reference< XHyphenatedWord >    xRes;
 
     sal_Int32 nWordLen = rWord.getLength();
-    sal_Int16 nLanguage = LinguLocaleToLanguage( rLocale );
+    LanguageType nLanguage = LinguLocaleToLanguage( rLocale );
     if (LinguIsUnspecified(nLanguage) || !nWordLen ||
         nMaxLeading == 0 || nMaxLeading == nWordLen)
         return xRes;
@@ -418,7 +418,7 @@ Reference< XHyphenatedWord > SAL_CALL
     Reference< XHyphenatedWord >    xRes;
 
     sal_Int32 nWordLen = rWord.getLength();
-    sal_Int16 nLanguage = LinguLocaleToLanguage( rLocale );
+    LanguageType nLanguage = LinguLocaleToLanguage( rLocale );
     if (LinguIsUnspecified(nLanguage) || !nWordLen)
         return xRes;
 
@@ -549,7 +549,7 @@ Reference< XPossibleHyphens > SAL_CALL
 
     Reference< XPossibleHyphens >   xRes;
 
-    sal_Int16 nLanguage = LinguLocaleToLanguage( rLocale );
+    LanguageType nLanguage = LinguLocaleToLanguage( rLocale );
     if (LinguIsUnspecified(nLanguage) || rWord.isEmpty())
         return xRes;
 
@@ -663,7 +663,7 @@ void HyphenatorDispatcher::SetServiceList( const Locale &rLocale,
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    sal_Int16 nLanguage = LinguLocaleToLanguage( rLocale );
+    LanguageType nLanguage = LinguLocaleToLanguage( rLocale );
 
     sal_Int32 nLen = rSvcImplNames.getLength();
     if (0 == nLen)
@@ -698,7 +698,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 HyphSvcByLangMap_t::const_iterator  aIt( aSvcMap.find( nLanguage ) );
     const LangSvcEntries_Hyph       *pEntry = aIt != aSvcMap.end() ? aIt->second.get() : nullptr;
     if (pEntry)

linguistic/source/hyphdsp.hxx

@@ -71,11 +71,11 @@ class HyphenatorDispatcher :
     static css::uno::Reference< css::linguistic2::XHyphenatedWord>
             buildHyphWord( const OUString& rOrigWord,
                 const css::uno::Reference< css::linguistic2::XDictionaryEntry> &xEntry,
-                sal_Int16 nLang, sal_Int16 nMaxLeading );
+                LanguageType nLang, sal_Int16 nMaxLeading );
 
     static css::uno::Reference< css::linguistic2::XPossibleHyphens >
             buildPossHyphens( const css::uno::Reference< css::linguistic2::XDictionaryEntry > &xEntry,
-                    sal_Int16 nLanguage );
+                    LanguageType nLanguage );
 
 public:
     explicit HyphenatorDispatcher( LngSvcMgr &rLngSvcMgr );

linguistic/source/hyphdta.cxx

@@ -40,7 +40,7 @@ namespace linguistic
 {
 
 
-HyphenatedWord::HyphenatedWord(const OUString &rWord, sal_Int16 nLang, sal_Int16 nHPos,
+HyphenatedWord::HyphenatedWord(const OUString &rWord, sal_uInt16 nLang, sal_Int16 nHPos,
                                const OUString &rHyphWord, sal_Int16 nPos ) :
     aWord           (rWord),
     aHyphenatedWord (rHyphWord),
@@ -119,7 +119,7 @@ sal_Bool SAL_CALL HyphenatedWord::isAlternativeSpelling()
 }
 
 
-PossibleHyphens::PossibleHyphens(const OUString &rWord, sal_Int16 nLang,
+PossibleHyphens::PossibleHyphens(const OUString &rWord, sal_uInt16 nLang,
             const OUString &rHyphWord,
             const Sequence< sal_Int16 > &rPositions) :
     aWord           (rWord),

linguistic/source/misc.cxx

@@ -68,7 +68,7 @@ osl::Mutex &    GetLinguMutex()
     return LinguMutex::get();
 }
 
-LocaleDataWrapper & GetLocaleDataWrapper( sal_Int16 nLang )
+LocaleDataWrapper & GetLocaleDataWrapper( LanguageType nLang )
 {
     static LocaleDataWrapper aLclDtaWrp( SvtSysLocale().GetLanguageTag() );