diff options
| author | Eike Rathke <erack@redhat.com> | 2021-12-28 18:24:50 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2021-12-30 01:49:06 +0100 |
| commit | 9749cabf7222dfcc74fa951e88a74dd4b301d97a (patch) | |
| tree | 3b2aaa2ced86f87a5430f04530fe2c7510f31e18 /i18nlangtag | |
| parent | eef42ef32b651a9fd47edd0d8fcb650a2a058831 (diff) | |
Use primary().anyOf() instead of yet another equalsPrimary()
... where for each or'ed expression the same nLang was masked again.
Change-Id: I61d572be6f72c70d24dc56e67b950af2d2b5f767
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127642
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
Diffstat (limited to 'i18nlangtag')
| -rw-r--r-- | i18nlangtag/source/isolang/mslangid.cxx | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/i18nlangtag/source/isolang/mslangid.cxx b/i18nlangtag/source/isolang/mslangid.cxx index 758a6e7aef3f..71f6b7b49e66 100644 --- a/i18nlangtag/source/isolang/mslangid.cxx +++ b/i18nlangtag/source/isolang/mslangid.cxx @@ -210,25 +210,20 @@ css::lang::Locale MsLangId::getFallbackLocale( return Conversion::lookupFallbackLocale( rLocale); } -static constexpr bool equalsPrimary(LanguageType lhs, LanguageType rhs) -{ - return (sal_uInt16(lhs) & LANGUAGE_MASK_PRIMARY ) - == (sal_uInt16(rhs) & LANGUAGE_MASK_PRIMARY ); -} - // static bool MsLangId::isRightToLeft( LanguageType nLang ) { - if( equalsPrimary(nLang, LANGUAGE_ARABIC_SAUDI_ARABIA) - || equalsPrimary(nLang, LANGUAGE_HEBREW) - || equalsPrimary(nLang, LANGUAGE_YIDDISH) - || equalsPrimary(nLang, LANGUAGE_URDU_PAKISTAN) - || equalsPrimary(nLang, LANGUAGE_FARSI) - || equalsPrimary(nLang, LANGUAGE_KASHMIRI) - || equalsPrimary(nLang, LANGUAGE_SINDHI) - || equalsPrimary(nLang, LANGUAGE_UIGHUR_CHINA) - || equalsPrimary(nLang, LANGUAGE_USER_KYRGYZ_CHINA) - || equalsPrimary(nLang, LANGUAGE_USER_NKO) ) + if (primary(nLang).anyOf( + primary(LANGUAGE_ARABIC_SAUDI_ARABIA), + primary(LANGUAGE_HEBREW), + primary(LANGUAGE_YIDDISH), + primary(LANGUAGE_URDU_PAKISTAN), + primary(LANGUAGE_FARSI), + primary(LANGUAGE_KASHMIRI), + primary(LANGUAGE_SINDHI), + primary(LANGUAGE_UIGHUR_CHINA), + primary(LANGUAGE_USER_KYRGYZ_CHINA), + primary(LANGUAGE_USER_NKO))) { return true; } |