1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
From ae182240328f20508c7a8936daf74a088627540b Mon Sep 17 00:00:00 2001
From: Taichi Haradaguchi <20001722@ymail.ne.jp>
Date: Tue, 31 Oct 2023 19:46:23 +0900
Subject: Update to ICU 74.1
https://icu.unicode.org/download/74
Unicode 15.1
https://blog.unicode.org/2023/09/announcing-unicode-standard-version-151.html
CLDR 44
https://cldr.unicode.org/index/downloads/cldr-44
New Unicode blocks:
UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_I
Change-Id: Ic9196e10138663d07235f5ebd9cc4bf3a9750824
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158749
Tested-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Eike Rathke <erack@redhat.com>
---
configure.ac | 4 ++--
download.lst | 8 ++++----
external/icu/icu4c-khmerbreakengine.patch.1 | 1 -
include/svx/strings.hrc | 1 +
svx/source/dialog/charmap.cxx | 5 +++++
5 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/external/icu/icu4c-khmerbreakengine.patch.1 b/external/icu/icu4c-khmerbreakengine.patch.1
index 605914014e96..db8ac50e6f75 100644
--- a/external/icu/icu4c-khmerbreakengine.patch.1
+++ b/external/icu/icu4c-khmerbreakengine.patch.1
@@ -796,7 +796,6 @@ diff -ur icu.org/source/common/dictionarydata.cpp icu/source/common/dictionaryda
if (wordCount < limit) {
if (values != nullptr) {
values[wordCount] = bt.getValue();
-
diff -ur icu.org/source/common/dictionarydata.h icu/source/common/dictionarydata.h
--- icu.org/source/common/dictionarydata.h 2023-06-14 06:23:55.000000000 +0900
+++ icu/source/common/dictionarydata.h 2023-06-26 17:43:53.097724900 +0900
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 13f896f04eeb..b8e69dc3dbe1 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1790,6 +1790,7 @@
#define RID_SUBSETSTR_KAKTOVIK_NUMERALS NC_("RID_SUBSETMAP", "Kaktovik Numerals")
#define RID_SUBSETSTR_KAWI NC_("RID_SUBSETMAP", "Kawi")
#define RID_SUBSETSTR_NAG_MUNDARI NC_("RID_SUBSETMAP", "Nag Mundari")
+#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_I NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension I")
#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 ed0c626b59c6..a73b0e263d60 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -1923,6 +1923,11 @@ void SubsetMap::InitList()
case UBLOCK_NAG_MUNDARI:
aAllSubsets.emplace_back( 0x1E4D0, 0x1E4FF, SvxResId(RID_SUBSETSTR_NAG_MUNDARI) );
break;
+#endif
+#if (U_ICU_VERSION_MAJOR_NUM >= 74)
+ case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_I:
+ aAllSubsets.emplace_back( 0x2EBF0, 0x2EE5F, SvxResId(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_I) );
+ break;
#endif
}
--
cgit v1.2.3
|
