[Libreoffice-commits] core.git: i18nlangtag/source

[Eike Rathke (via logerrit)]

 i18nlangtag/source/isolang/mslangid.cxx |   27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

New commits:
commit 9749cabf7222dfcc74fa951e88a74dd4b301d97a
Author:     Eike Rathke <er...@redhat.com>
AuthorDate: Tue Dec 28 18:24:50 2021 +0100
Commit:     Eike Rathke <er...@redhat.com>
CommitDate: Thu Dec 30 01:49:06 2021 +0100

    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 <er...@redhat.com>
    Tested-by: Jenkins

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;
     }