[Libreoffice-commits] core.git: i18nutil/source include/svx svx/source

[Eike Rathke (via logerrit)]

 i18nutil/source/utility/unicode.cxx |   14 ++++++++++++++
 include/svx/strings.hrc             |    8 ++++++++
 svx/source/dialog/charmap.cxx       |   26 ++++++++++++++++++++++++++
 3 files changed, 48 insertions(+)

New commits:
commit b4f398db743213e80ecceab97a2dcb01b465b3b9
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Mon May 11 18:07:11 2020 +0200
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Mon May 11 19:43:35 2020 +0200

    Adapt to be able to build against ICU 66
    
    In case building against system ICU 66 is wanted.
    Otherwise an interim step on the way to ICU 67.
    
    Change-Id: I8c559ee3206afd4f61af4fd3af7dd85911198f3b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93985
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins

diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
index 382df4db89fd..f944d69c40e2 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -766,6 +766,20 @@ OString unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript)
         case USCRIPT_WANCHO:
             sRet = "nnp-Wcho";
             break;
+#endif
+#if (U_ICU_VERSION_MAJOR_NUM >= 66)
+        case USCRIPT_CHORASMIAN:
+            sRet = "xco-Chrs";
+            break;
+        case USCRIPT_DIVES_AKURU:
+            sRet = "dv-Diak";
+            break;
+        case USCRIPT_KHITAN_SMALL_SCRIPT:
+            sRet = "zkt-Kits";
+            break;
+        case USCRIPT_YEZIDI:
+            sRet = "kmr-Yezi";
+            break;
 #endif
     }
     return sRet;
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 5fbb88d75df3..33d90b6180f1 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1696,6 +1696,14 @@
 #define RID_SUBSETSTR_SYMBOLS_AND_PICTOGRAPHS_EXTENDED_A    NC_("RID_SUBSETMAP", "Symbols and Pictographs Extended-A")
 #define RID_SUBSETSTR_TAMIL_SUPPLEMENT                      NC_("RID_SUBSETMAP", "Tamil Supplement")
 #define RID_SUBSETSTR_WANCHO                                NC_("RID_SUBSETMAP", "Wancho")
+#define RID_SUBSETSTR_CHORASMIAN                            NC_("RID_SUBSETMAP", "Chorasmian")
+#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_G    NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension G")
+#define RID_SUBSETSTR_DIVES_AKURU                           NC_("RID_SUBSETMAP", "Dhives Akuru")
+#define RID_SUBSETSTR_KHITAN_SMALL_SCRIPT                   NC_("RID_SUBSETMAP", "Khitan small script")
+#define RID_SUBSETSTR_LISU_SUPPLEMENT                       NC_("RID_SUBSETMAP", "Lisu Supplement")
+#define RID_SUBSETSTR_SYMBOLS_FOR_LEGACY_COMPUTING          NC_("RID_SUBSETMAP", "Symbols for Legacy Computing")
+#define RID_SUBSETSTR_TANGUT_SUPPLEMENT                     NC_("RID_SUBSETMAP", "Tangut Supplement")
+#define RID_SUBSETSTR_YEZIDI                                NC_("RID_SUBSETMAP", "Yezidi")
 
 #define RID_SVXSTR_FRAMEDIR_LTR                             NC_("RID_SVXSTR_FRAMEDIR_LTR", "Left-to-right (LTR)")
 #define RID_SVXSTR_FRAMEDIR_RTL                             NC_("RID_SVXSTR_FRAMEDIR_RTL", "Right-to-left (RTL)")
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index b2e5b4159d56..c43cafb9eb55 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -1801,6 +1801,32 @@ void SubsetMap::InitList()
                     aAllSubsets.emplace_back( 0x1E2C0, 0x1E2FF, SvxResId(RID_SUBSETSTR_WANCHO) );
                     break;
 #endif
+#if (U_ICU_VERSION_MAJOR_NUM >= 66)
+                case UBLOCK_CHORASMIAN:
+                    aAllSubsets.emplace_back( 0x10FB0, 0x10FDF, SvxResId(RID_SUBSETSTR_CHORASMIAN) );
+                    break;
+                case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_G:
+                    aAllSubsets.emplace_back( 0x30000, 0x3134F, SvxResId(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_G) );
+                    break;
+                case UBLOCK_DIVES_AKURU:
+                    aAllSubsets.emplace_back( 0x11900, 0x1195F, SvxResId(RID_SUBSETSTR_DIVES_AKURU) );
+                    break;
+                case UBLOCK_KHITAN_SMALL_SCRIPT:
+                    aAllSubsets.emplace_back( 0x18B00, 0x18CFF, SvxResId(RID_SUBSETSTR_KHITAN_SMALL_SCRIPT) );
+                    break;
+                case UBLOCK_LISU_SUPPLEMENT:
+                    aAllSubsets.emplace_back( 0x11FB0, 0x11FBF, SvxResId(RID_SUBSETSTR_LISU_SUPPLEMENT) );
+                    break;
+                case UBLOCK_SYMBOLS_FOR_LEGACY_COMPUTING:
+                    aAllSubsets.emplace_back( 0x1FB00, 0x1FBFF, SvxResId(RID_SUBSETSTR_SYMBOLS_FOR_LEGACY_COMPUTING) );
+                    break;
+                case UBLOCK_TANGUT_SUPPLEMENT:
+                    aAllSubsets.emplace_back( 0x18D00, 0x18D8F, SvxResId(RID_SUBSETSTR_TANGUT_SUPPLEMENT) );
+                    break;
+                case UBLOCK_YEZIDI:
+                    aAllSubsets.emplace_back( 0x10E80, 0x10EBF, SvxResId(RID_SUBSETSTR_YEZIDI) );
+                    break;
+#endif
 
             }