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, 35 insertions, 32 deletions

diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx
index cc0466b85da4..7822215057d7 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -23,6 +23,7 @@
 #include <tools/solar.h>
 #include <rtl/ref.hxx>
 #include <fldupde.hxx>
+#include <i18nlangtag/lang.h>
 
 class SvxForbiddenCharactersTable;
 namespace com { namespace sun { namespace star { namespace i18n { struct ForbiddenCharacters; } } } }
@@ -136,7 +137,7 @@ enum class DocumentSettingId
        a list of forbidden characters.
     */
     virtual const css::i18n::ForbiddenCharacters*
-        getForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ bool bLocaleData ) const = 0;
+        getForbiddenCharacters(/*[in]*/ LanguageType nLang, /*[in]*/ bool bLocaleData ) const = 0;
 
     /** Set the forbidden characters.
 
@@ -146,7 +147,7 @@ enum class DocumentSettingId
        @param rForbiddenCharacters
        [in] the new list of forbidden characters for language lang.
     */
-    virtual void setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang,
+    virtual void setForbiddenCharacters(/*[in]*/ LanguageType nLang,
                                         /*[in]*/ const css::i18n::ForbiddenCharacters& rForbiddenCharacters ) = 0;
 
     /** Get the forbidden character table and creates one if necessary.
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 3cf00ef249a9..6d3357333864 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -21,6 +21,7 @@
 
 #include <rtl/ustring.hxx>
 #include <tools/link.hxx>
+#include <i18nlangtag/lang.h>
 #include <com/sun/star/util/Date.hpp>
 #include "swdllapi.h"
 #include <swdbdata.hxx>
@@ -329,13 +330,13 @@ public:
                             css::uno::Reference< css::sdbc::XConnection> const & xConnection,
                             css::uno::Reference< css::beans::XPropertySet> const & xColumn,
                             SvNumberFormatter* pNFormatr,
-                            long nLanguage );
+                            LanguageType nLanguage );
 
     sal_uLong GetColumnFormat( const OUString& rDBName,
                             const OUString& rTableName,
                             const OUString& rColNm,
                             SvNumberFormatter* pNFormatr,
-                            long nLanguage );
+                            LanguageType nLanguage );
     sal_Int32 GetColumnType( const OUString& rDBName,
                           const OUString& rTableName,
                           const OUString& rColNm );
@@ -356,7 +357,7 @@ public:
     bool            OpenDataSource(const OUString& rDataSource, const OUString& rTableOrQuery);
     sal_uInt32      GetSelectedRecordId(const OUString& rDataSource, const OUString& rTableOrQuery, sal_Int32 nCommandType = -1);
     bool            GetColumnCnt(const OUString& rSourceName, const OUString& rTableName,
-                            const OUString& rColumnName, sal_uInt32 nAbsRecordId, long nLanguage,
+                            const OUString& rColumnName, sal_uInt32 nAbsRecordId, LanguageType nLanguage,
                             OUString& rResult, double* pNumber);
     /** create and store or find an already stored connection to a data source for use
     in SwFieldMgr and SwDBTreeList */
@@ -370,10 +371,10 @@ public:
     /// close all data sources - after fields were updated
     void            CloseAll(bool bIncludingMerge = true);
 
-    bool            GetMergeColumnCnt(const OUString& rColumnName, sal_uInt16 nLanguage,
+    bool            GetMergeColumnCnt(const OUString& rColumnName, LanguageType nLanguage,
                                       OUString &rResult, double *pNumber);
     bool            FillCalcWithMergeData(SvNumberFormatter *pDocFormatter,
-                                          sal_uInt16 nLanguage, SwCalc &aCalc);
+                                          LanguageType nLanguage, SwCalc &aCalc);
     bool            ToNextRecord(const OUString& rDataSource, const OUString& rTableOrQuery);
 
     sal_uInt32      GetSelectedRecordId();
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index d1ad7ecbf232..5cdeb3ff9030 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -496,7 +496,7 @@ class SwDocInfoFieldType : public SwValueFieldType
 public:
     SwDocInfoFieldType(SwDoc* pDc);
 
-    OUString                Expand(sal_uInt16 nSubType, sal_uInt32 nFormat, sal_uInt16 nLang, const OUString& rName) const;
+    OUString                Expand(sal_uInt16 nSubType, sal_uInt32 nFormat, LanguageType nLang, const OUString& rName) const;
     virtual SwFieldType*    Copy() const override;
 };
 
@@ -515,7 +515,7 @@ public:
 
     virtual void            SetSubType(sal_uInt16) override;
     virtual sal_uInt16      GetSubType() const override;
-    virtual void            SetLanguage(sal_uInt16 nLng) override;
+    virtual void            SetLanguage(LanguageType nLng) override;
     virtual OUString        GetFieldName() const override;
     const OUString&         GetName() const { return aName; }
     void                    SetName( const OUString& rName ) { aName = rName; }
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index d706e823c607..7ffcf379365a 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -288,7 +288,7 @@ public:
     SvtScriptType GetScriptType() const;
 
     /// @return the language at current cursor position.
-    sal_uInt16 GetCurLang() const;
+    LanguageType GetCurLang() const;
 
     /// TABLE
     size_t GetTableFrameFormatCount( bool bUsed = false ) const;
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index 9c5e00dc3f25..a74734191cb5 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -99,7 +99,7 @@ public:
                    sal_uInt16 nSubType, sal_uLong nFormat = 0);
 
     virtual void                SetValue( const double& rVal ) override;
-    virtual void                SetLanguage(sal_uInt16 nLng) override;
+    virtual void                SetLanguage(LanguageType nLng) override;
 
     inline void                 ChgExpStr(const OUString& rExpand);
 
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 59bd4b00b05b..91aa97657955 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -275,7 +275,7 @@ class SW_DLLPUBLIC SwField
 private:
     mutable OUString    m_Cache;                ///< Cached expansion (for clipboard).
     bool                m_bUseFieldValueCache;  /// control the usage of the cached field value
-    sal_uInt16          m_nLang;                ///< Always change via SetLanguage!
+    LanguageType        m_nLang;                ///< Always change via SetLanguage!
     bool                m_bIsAutomaticLanguage;
     sal_uInt32          m_nFormat;              /// this can be either SvxNumType or SwChapterFormat depending on the subtype
     SwFieldType*        m_pType;
@@ -290,7 +290,7 @@ protected:
 
     SwField( SwFieldType* pTyp,
              sal_uInt32 nFormat = 0,
-             sal_uInt16 nLang = LANGUAGE_SYSTEM,
+             LanguageType nLang = LANGUAGE_SYSTEM,
              bool m_bUseFieldValueCache = true );
 
 public:
@@ -332,8 +332,8 @@ public:
     virtual void        SetSubType(sal_uInt16);
 
     /// Language at field position.
-    inline sal_uInt16       GetLanguage() const;
-    virtual void        SetLanguage(sal_uInt16 nLng);
+    inline LanguageType GetLanguage() const;
+    virtual void        SetLanguage(LanguageType nLng);
 
     /// Query parameters for dialog and for BASIC.
     inline sal_uInt32   GetFormat() const;
@@ -376,7 +376,7 @@ inline sal_uInt32 SwField::GetFormat() const
     return m_nFormat;
 }
 
-inline sal_uInt16 SwField::GetLanguage() const
+inline LanguageType SwField::GetLanguage() const
 {
     return m_nLang;
 }
@@ -407,7 +407,7 @@ public:
         m_bUseFormat = bFormat;
     }
 
-    OUString        ExpandValue(const double& rVal, sal_uInt32 nFormat, sal_uInt16 nLng) const;
+    OUString        ExpandValue(const double& rVal, sal_uInt32 nFormat, LanguageType nLng) const;
     OUString        DoubleToString(const double &rVal, LanguageType eLng) const;
     OUString        DoubleToString(const double &rVal, sal_uInt32 nFormat) const;
 };
@@ -418,14 +418,14 @@ private:
     double m_fValue;
 
 protected:
-    SwValueField( SwValueFieldType* pFieldType, sal_uInt32 nFormat, sal_uInt16 nLang = LANGUAGE_SYSTEM, const double fVal = 0.0 );
+    SwValueField( SwValueFieldType* pFieldType, sal_uInt32 nFormat, LanguageType nLang = LANGUAGE_SYSTEM, const double fVal = 0.0 );
     SwValueField( const SwValueField& rField );
 
 public:
     virtual                 ~SwValueField() override;
 
     virtual SwFieldType*    ChgTyp( SwFieldType* ) override;
-    virtual void            SetLanguage(sal_uInt16 nLng) override;
+    virtual void            SetLanguage(LanguageType nLng) override;
 
     SwDoc*           GetDoc() const          {
         return static_cast<const SwValueFieldType*>(GetTyp())->GetDoc();
@@ -434,7 +434,7 @@ public:
     virtual double          GetValue() const;
     virtual void            SetValue( const double& rVal );
 
-    OUString ExpandValue(const double& rVal, sal_uInt32 nFormat, sal_uInt16 nLng) const {
+    OUString ExpandValue(const double& rVal, sal_uInt32 nFormat, LanguageType nLng) const {
         return static_cast<SwValueFieldType*>(GetTyp())->ExpandValue(rVal, nFormat, nLng);
     }
 
diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx
index 825f08b7ab89..dc5d2d6ee0db 100644
--- a/sw/inc/flddat.hxx
+++ b/sw/inc/flddat.hxx
@@ -50,7 +50,7 @@ class SW_DLLPUBLIC SwDateTimeField : public SwValueField
 
 public:
         SwDateTimeField(SwDateTimeFieldType* pType, sal_uInt16 nSubType = DATEFLD,
-                    sal_uLong nFormat = 0, sal_uInt16 nLng = 0);
+                    sal_uLong nFormat = 0, LanguageType nLng = LANGUAGE_SYSTEM);
 
         virtual sal_uInt16      GetSubType() const override;
         virtual void            SetSubType(sal_uInt16 nSub) override;
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 0f1dc5225a6a..6a4b563a519c 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -658,7 +658,7 @@ public:
 
     void fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const;
 
-    sal_uInt16 GetLang( const sal_Int32 nBegin, const sal_Int32 nLen = 0,
+    LanguageType GetLang( const sal_Int32 nBegin, const sal_Int32 nLen = 0,
                     sal_uInt16 nScript = 0 ) const;
 
     /// in ndcopy.cxx
diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx
index 4c8958aac9a9..6830faeee1ac 100644
--- a/sw/inc/poolfmt.hxx
+++ b/sw/inc/poolfmt.hxx
@@ -22,6 +22,7 @@
 #include <limits.h>
 #include <tools/solar.h>
 #include <editeng/frmdir.hxx>
+#include <i18nlangtag/lang.h>
 
 /** POOLCOLL-IDs:
 // +----+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
@@ -431,7 +432,7 @@ RES_POOLCOLL_HTML_END
             the parent in all other cases. */
 sal_uInt16 GetPoolParent( sal_uInt16 nId );
 
-SvxFrameDirection GetDefaultFrameDirection(sal_uLong nLanguage);
+SvxFrameDirection GetDefaultFrameDirection(LanguageType nLanguage);
 
 bool IsConditionalByPoolId(sal_uInt16 nId);
 
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 92b47eb19e93..7410fe5307ed 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -63,7 +63,7 @@ class SW_DLLPUBLIC SwAsciiOptions
 {
     OUString sFont;
     rtl_TextEncoding eCharSet;
-    sal_uInt16 nLanguage;
+    LanguageType nLanguage;
     LineEnd eCRLF_Flag;
 
 public:
@@ -74,8 +74,8 @@ public:
     rtl_TextEncoding GetCharSet() const { return eCharSet; }
     void SetCharSet( rtl_TextEncoding nVal ) { eCharSet = nVal; }
 
-    sal_uInt16 GetLanguage() const { return nLanguage; }
-    void SetLanguage( sal_uInt16 nVal ) { nLanguage = nVal; }
+    LanguageType GetLanguage() const { return nLanguage; }
+    void SetLanguage( LanguageType nVal ) { nLanguage = nVal; }
 
     LineEnd GetParaFlags() const { return eCRLF_Flag; }
     void SetParaFlags( LineEnd eVal ) { eCRLF_Flag = eVal; }
@@ -85,7 +85,7 @@ public:
         sFont.clear();
         eCRLF_Flag = GetSystemLineEnd();
         eCharSet = ::osl_getThreadTextEncoding();
-        nLanguage = 0;
+        nLanguage = LANGUAGE_SYSTEM;
     }
     // for the automatic conversion (mail/news/...)
     void ReadUserData( const OUString& );
diff --git a/sw/inc/sortopt.hxx b/sw/inc/sortopt.hxx
index 3871b6b09fa1..964f55c3dd5b 100644
--- a/sw/inc/sortopt.hxx
+++ b/sw/inc/sortopt.hxx
@@ -47,7 +47,7 @@ struct SW_DLLPUBLIC SwSortOptions
     std::vector<SwSortKey*> aKeys;
     SwSortDirection         eDirection;
     sal_Unicode             cDeli;
-    sal_uInt16              nLanguage;
+    LanguageType            nLanguage;
     bool                    bTable;
     bool                    bIgnoreCase;
 };
diff --git a/sw/inc/swcalwrp.hxx b/sw/inc/swcalwrp.hxx
index e8ed1cb4e5bc..24bfeec16b63 100644
--- a/sw/inc/swcalwrp.hxx
+++ b/sw/inc/swcalwrp.hxx
@@ -28,14 +28,14 @@
 class SwCalendarWrapper : public CalendarWrapper
 {
     OUString sUniqueId;
-    sal_uInt16 nLang;
+    LanguageType nLang;
 
 public:
     SwCalendarWrapper( const css::uno::Reference< css::uno::XComponentContext > & rxContext = ::comphelper::getProcessComponentContext() )
         : CalendarWrapper( rxContext ), nLang( LANGUAGE_SYSTEM )
     {}
 
-    void LoadDefaultCalendar( sal_uInt16 nLang );
+    void LoadDefaultCalendar( LanguageType nLang );
 };
 
 salhelper::SingletonRef<SwCalendarWrapper>* s_getCalendarWrapper();
diff --git a/sw/inc/txatritr.hxx b/sw/inc/txatritr.hxx
index 178bf94cf4f6..4e82794a4c8d 100644
--- a/sw/inc/txatritr.hxx
+++ b/sw/inc/txatritr.hxx
@@ -67,7 +67,7 @@ public:
 
     bool               Next();
     sal_Int32          GetChgPos() const        { return nChgPos; }
-    sal_uInt16         GetLanguage() const
+    LanguageType       GetLanguage() const
         { return static_cast<const SvxLanguageItem&>(*pCurItem).GetValue(); }
 };
 
diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx
index e2490f9990cd..9d241df8a118 100644
--- a/sw/inc/usrfld.hxx
+++ b/sw/inc/usrfld.hxx
@@ -41,7 +41,7 @@ public:
     virtual OUString        GetName() const override;
     virtual SwFieldType*    Copy() const override;
 
-    OUString                Expand(sal_uInt32 nFormat, sal_uInt16 nSubType, sal_uInt16 nLng);
+    OUString                Expand(sal_uInt32 nFormat, sal_uInt16 nSubType, LanguageType nLng);
 
     OUString                GetContent( sal_uInt32 nFormat = 0 );
            void             SetContent( const OUString& rStr, sal_uInt32 nFormat = 0 );