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 /sw/source/core/doc/DocumentStylePoolManager.cxx | |
| 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 'sw/source/core/doc/DocumentStylePoolManager.cxx')
| -rw-r--r-- | sw/source/core/doc/DocumentStylePoolManager.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx index 5dab3be1472d..cb7f4dd0848f 100644 --- a/sw/source/core/doc/DocumentStylePoolManager.cxx +++ b/sw/source/core/doc/DocumentStylePoolManager.cxx @@ -121,7 +121,7 @@ namespace }; for(const auto & n : aArr) { - sal_uInt16 nLng = static_cast<const SvxLanguageItem&>(rSet.GetPool()->GetDefaultItem( + LanguageType nLng = static_cast<const SvxLanguageItem&>(rSet.GetPool()->GetDefaultItem( n.nResLngId )).GetLanguage(); vcl::Font aFnt( OutputDevice::GetDefaultFont( nFntType, nLng, GetDefaultFontFlags::OnlyOne ) ); @@ -150,7 +150,7 @@ namespace for(const auto & n : aArr) { - sal_uInt16 nLng = static_cast<const SvxLanguageItem&>(rSet.GetPool()->GetDefaultItem( + LanguageType nLng = static_cast<const SvxLanguageItem&>(rSet.GetPool()->GetDefaultItem( n.nResLngId )).GetLanguage(); vcl::Font aFnt( OutputDevice::GetDefaultFont( n.nFntType, nLng, GetDefaultFontFlags::OnlyOne ) ); @@ -354,7 +354,7 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId, /* koreans do not like SvxScriptItem(TRUE) */ if (bRegardLanguage) { - sal_uLong nAppLanguage = GetAppLanguage(); + LanguageType nAppLanguage = GetAppLanguage(); if (GetDefaultFrameDirection(nAppLanguage) == SvxFrameDirection::Horizontal_RL_TB) { @@ -440,7 +440,7 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId, RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CTL_LANGUAGE }; - static const sal_uInt16 aLangs[] = + static const LanguageType aLangs[] = { LANGUAGE_ENGLISH_US, LANGUAGE_ENGLISH_US, @@ -455,7 +455,7 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId, for( int i = 0; i < 3; ++i ) { - sal_uInt16 nLng = static_cast<const SvxLanguageItem&>(m_rDoc.GetDefault( aLangTypes[i] )).GetLanguage(); + LanguageType nLng = static_cast<const SvxLanguageItem&>(m_rDoc.GetDefault( aLangTypes[i] )).GetLanguage(); if( LANGUAGE_DONTKNOW == nLng ) nLng = aLangs[i]; |