diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2017-04-17 21:35:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-26 08:50:54 +0200 |
| commit | c70d49c7c888da8cfd73db8585e7be1f37fc398a (patch) | |
| tree | c0e540401850018464ca76300536faf9aa7e27d2 /writerfilter | |
| parent | cd4344d3bdef631b3e64ac12a9e64bc9670c1b7c (diff) | |
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>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/ThemeTable.cxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdispatchvalue.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/writerfilter/source/dmapper/ThemeTable.cxx b/writerfilter/source/dmapper/ThemeTable.cxx index 657753c7a59d..9c162c4d5489 100644 --- a/writerfilter/source/dmapper/ThemeTable.cxx +++ b/writerfilter/source/dmapper/ThemeTable.cxx @@ -263,7 +263,7 @@ OUString ThemeTable::fromLCIDToScriptTag(LanguageType lang) { // conversion list from: // http://blogs.msdn.com/b/officeinteroperability/archive/2013/04/22/office-open-xml-themes-schemes-and-fonts.aspx - switch (lang) + switch ((sal_uInt16)lang) { case 0x429 : // lidFarsi case 0x401 : // lidArabic diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx b/writerfilter/source/rtftok/rtfdispatchvalue.cxx index 6e4724d3ab07..bba6d4d29c83 100644 --- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx +++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx @@ -215,7 +215,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) } if (nSprm > 0) { - LanguageTag aTag((LanguageType)nParam); + LanguageTag aTag((LanguageType(nParam))); auto pValue = std::make_shared<RTFValue>(aTag.getBcp47()); putNestedAttribute(m_aStates.top().aCharacterSprms, NS_ooxml::LN_EG_RPrBase_lang, nSprm, pValue); // Language is a character property, but we should store it at a paragraph level as well for fields. @@ -473,7 +473,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) case RTF_DEFLANG: case RTF_ADEFLANG: { - LanguageTag aTag((LanguageType)nParam); + LanguageTag aTag((LanguageType(nParam))); auto pValue = std::make_shared<RTFValue>(aTag.getBcp47()); putNestedAttribute(m_aStates.top().aCharacterSprms, (nKeyword == RTF_DEFLANG ? NS_ooxml::LN_EG_RPrBase_lang : NS_ooxml::LN_CT_Language_bidi), nSprm, pValue); } |