[Libreoffice-commits] core.git: configure.ac download.lst external/icu i18nutil/source include/svx svx/source
Caolán McNamara
caolanm at redhat.com
Fri Dec 19 05:03:18 PST 2014
configure.ac | 2
download.lst | 2
external/icu/UnpackedTarball_icu.mk | 3
external/icu/icu-ubsan.patch.0 | 20 ----
external/icu/icu4c-aix.patch | 9 --
external/icu/icu4c-buffer-overflow.patch | 30 -------
external/icu/icu4c-build.patch | 43 +++++-----
external/icu/icu4c-icu11054.patch.1 | 44 ----------
external/icu/icu4c-icu11100.patch.1 | 2
external/icu/icu4c-icu11131.patch.1 | 68 ----------------
external/icu/icu4c-mkdir.patch | 9 --
i18nutil/source/utility/unicode.cxx | 20 ++++
include/svx/ucsubset.hrc | 32 +++++++
svx/source/dialog/charmap.cxx | 99 +++++++++++++++++++++++
svx/source/dialog/ucsubset.src | 128 +++++++++++++++++++++++++++++++
15 files changed, 311 insertions(+), 200 deletions(-)
New commits:
commit f9d3e0f57c173494d250aadd0022abb738634f43
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Dec 19 11:04:49 2014 +0000
upgrade to icu 54
Change-Id: I4d32ac386ff8b69bee4319e673769917045d9450
Reviewed-on: https://gerrit.libreoffice.org/13547
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/configure.ac b/configure.ac
index 021c7de..276fe1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8781,7 +8781,7 @@ SYSTEM_GENBRK=
SYSTEM_GENCCODE=
SYSTEM_GENCMN=
-ICU_MAJOR=53
+ICU_MAJOR=54
ICU_MINOR=1
ICU_RECLASSIFIED_CLOSE_PARENTHESIS="TRUE"
ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
diff --git a/download.lst b/download.lst
index c2e5949..2bb91ca 100644
--- a/download.lst
+++ b/download.lst
@@ -65,7 +65,7 @@ export HARFBUZZ_TARBALL := harfbuzz-0.9.23.tar.bz2
export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
export HUNSPELL_TARBALL := 4967da60b23413604c9e563beacc63b4-hunspell-1.3.3.tar.gz
export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-export ICU_TARBALL := b73baa6fbdfef197608d1f69300919b9-icu4c-53_1-src.tgz
+export ICU_TARBALL := e844caed8f2ca24c088505b0d6271bc0-icu4c-54_1-src.tgz
export JFREEREPORT_FLOW_ENGINE_TARBALL := ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
export JFREEREPORT_FLUTE_TARBALL := d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
export JFREEREPORT_LIBBASE_TARBALL := eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk
index af9c751..e0d18b5 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -19,12 +19,9 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-macosx.patch \
external/icu/icu4c-solarisgcc.patch \
external/icu/icu4c-mkdir.patch \
- external/icu/icu4c-buffer-overflow.patch \
external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch \
external/icu/icu-ubsan.patch.0 \
- external/icu/icu4c-icu11054.patch.1 \
external/icu/icu4c-icu11100.patch.1 \
- external/icu/icu4c-icu11131.patch.1 \
external/icu/icu4c-scriptrun.patch \
external/icu/icu4c-icu11451.patch.1 \
))
diff --git a/external/icu/icu-ubsan.patch.0 b/external/icu/icu-ubsan.patch.0
index 479007b..c6baaed 100644
--- a/external/icu/icu-ubsan.patch.0
+++ b/external/icu/icu-ubsan.patch.0
@@ -138,23 +138,3 @@
}
/* INTERNAL: compares two entries */
---- source/common/ustring.cpp
-+++ source/common/ustring.cpp
-@@ -1486,7 +1486,7 @@
- */
-
- #define STRING_HASH(TYPE, STR, STRLEN, DEREF) \
-- int32_t hash = 0; \
-+ uint32_t hash = 0; \
- const TYPE *p = (const TYPE*) STR; \
- if (p != NULL) { \
- int32_t len = (int32_t)(STRLEN); \
-@@ -1497,7 +1497,7 @@
- p += inc; \
- } \
- } \
-- return hash
-+ return static_cast<int32_t>(hash)
-
- /* Used by UnicodeString to compute its hashcode - Not public API. */
- U_CAPI int32_t U_EXPORT2
diff --git a/external/icu/icu4c-aix.patch b/external/icu/icu4c-aix.patch
index 580a8fc..f4a449f 100644
--- a/external/icu/icu4c-aix.patch
+++ b/external/icu/icu4c-aix.patch
@@ -114,16 +114,16 @@
## BIR - bind with internal references [so app data and icu data doesn't collide]
--- misc/icu/source/tools/pkgdata/pkgdata.cpp 2013-04-06 20:56:00.935656635 +0100
+++ misc/build/icu/source/tools/pkgdata/pkgdata.cpp 2013-10-31 20:38:10.623984554 +0700
-@@ -888,7 +888,7 @@
+@@ -902,7 +902,7 @@
uprv_strcat(pkgDataFlags[SO_EXT], ".");
uprv_strcat(pkgDataFlags[SO_EXT], pkgDataFlags[A_EXT]);
-#elif U_PLATFORM == U_PF_OS400 || defined(_AIX)
+#elif U_PLATFORM == U_PF_OS400
- sprintf(libFileNames[LIB_FILE_VERSION_TMP], "%s.%s",
+ sprintf(libFileNames[LIB_FILE_VERSION_TMP], "%s%s%s",
libFileNames[LIB_FILE],
- pkgDataFlags[SOBJ_EXT]);
-@@ -1302,15 +1302,6 @@
+ FILE_EXTENSION_SEP,
+@@ -1375,15 +1375,6 @@
pkgDataFlags[LDICUDTFLAGS],
targetDir,
libFileNames[LIB_FILE_CYGWIN_VERSION],
@@ -139,4 +139,3 @@
#else
sprintf(cmd, "%s %s -o %s%s %s %s%s %s %s",
pkgDataFlags[GENLIB],
-
diff --git a/external/icu/icu4c-buffer-overflow.patch b/external/icu/icu4c-buffer-overflow.patch
deleted file mode 100644
index fb5f8ab..0000000
--- a/external/icu/icu4c-buffer-overflow.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-I: Statement might be overflowing a buffer in strncat. Common mistake:
- BAD: strncat(buffer,charptr,sizeof(buffer)) is wrong, it takes the left over size as 3rd argument
- GOOD: strncat(buffer,charptr,sizeof(buffer)-strlen(buffer)-1)
-E: icu bufferoverflowstrncat pkgdata.cpp:299:87
-
----
- source/tools/pkgdata/pkgdata.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-Index: icu/source/tools/pkgdata/pkgdata.cpp
-===================================================================
---- build/icu.orig/source/tools/pkgdata/pkgdata.cpp
-+++ build/icu/source/tools/pkgdata/pkgdata.cpp
-@@ -2060,12 +2060,12 @@
- const char cmd[] = "icu-config --incpkgdatafile";
-
- /* #1 try the same path where pkgdata was called from. */
-- findDirname(progname, cmdBuf, 1024, &status);
-+ findDirname(progname, cmdBuf, sizeof(cmdBuf), &status);
- if(U_SUCCESS(status)) {
- if (cmdBuf[0] != 0) {
-- uprv_strncat(cmdBuf, U_FILE_SEP_STRING, 1024);
-+ uprv_strncat(cmdBuf, U_FILE_SEP_STRING, sizeof(cmdBuf)-1-strlen(cmdBuf));
- }
-- uprv_strncat(cmdBuf, cmd, 1023);
-+ uprv_strncat(cmdBuf, cmd, sizeof(cmdBuf)-1-strlen(cmdBuf));
-
- if(verbose) {
- fprintf(stdout, "# Calling icu-config: %s\n", cmdBuf);
-
diff --git a/external/icu/icu4c-build.patch b/external/icu/icu4c-build.patch
index 8f4a7ee..1f6010b 100644
--- a/external/icu/icu4c-build.patch
+++ b/external/icu/icu4c-build.patch
@@ -16,31 +16,30 @@
".long ","",HEX_0X
},
+ {"gcc-android-arm",
-+ "\t.arch armv5te\n"
-+ "\t.fpu softvfp\n"
-+ "\t.eabi_attribute 20, 1\n"
-+ "\t.eabi_attribute 21, 1\n"
-+ "\t.eabi_attribute 23, 3\n"
-+ "\t.eabi_attribute 24, 1\n"
-+ "\t.eabi_attribute 25, 1\n"
-+ "\t.eabi_attribute 26, 2\n"
-+ "\t.eabi_attribute 30, 6\n"
-+ "\t.eabi_attribute 18, 4\n"
-+ "\t.file \"%s.s\"\n"
-+ "\t.global %s\n"
-+ "\t.section .rodata\n"
-+ "\t.align 2\n"
-+ "\t.type %s, %%object\n"
-+ "%s:\n",
++ "\t.arch armv5te\n"
++ "\t.fpu softvfp\n"
++ "\t.eabi_attribute 20, 1\n"
++ "\t.eabi_attribute 21, 1\n"
++ "\t.eabi_attribute 23, 3\n"
++ "\t.eabi_attribute 24, 1\n"
++ "\t.eabi_attribute 25, 1\n"
++ "\t.eabi_attribute 26, 2\n"
++ "\t.eabi_attribute 30, 6\n"
++ "\t.eabi_attribute 18, 4\n"
++ "\t.file \"%s.s\"\n"
++ "\t.global %s\n"
++ "\t.section .rodata\n"
++ "\t.align 2\n"
++ "\t.type %s, %%object\n"
++ "%s:\n",
+
-+ "\t.word ",
-+ "\t.section .note.GNU-stack,\"\",%%progbits\n",
-+ HEX_0X
++ "\t.word ",
++ "\t.section .note.GNU-stack,\"\",%%progbits\n",
++ HEX_0X
+ },
- // 16 bytes alignment.
- // http://docs.oracle.com/cd/E19641-01/802-1947/802-1947.pdf
+ /* 16 bytes alignment. */
+ /* http://docs.oracle.com/cd/E19641-01/802-1947/802-1947.pdf */
{"sun",
-
--- misc/icu/source/config/mh-darwin 2010-09-29 20:37:36.000000000 +0200
+++ misc/build/icu/source/config/mh-darwin 2011-03-15 10:56:26.653056004 +0100
@@ -28,11 +28,7 @@
diff --git a/external/icu/icu4c-icu11054.patch.1 b/external/icu/icu4c-icu11054.patch.1
deleted file mode 100644
index 48d21f5..0000000
--- a/external/icu/icu4c-icu11054.patch.1
+++ /dev/null
@@ -1,44 +0,0 @@
---- icu/source/common/ubidi.c.orig 2014-08-09 20:54:39.338833533 +0100
-+++ icu/source/common/ubidi.c 2014-08-09 20:55:48.625469055 +0100
-@@ -679,10 +679,10 @@
- bd->isoRuns[0].contextPos=0;
- if(pBiDi->openingsMemory) {
- bd->openings=pBiDi->openingsMemory;
-- bd->openingsSize=pBiDi->openingsSize;
-+ bd->openingsCount=pBiDi->openingsSize / sizeof(Opening);
- } else {
- bd->openings=bd->simpleOpenings;
-- bd->openingsSize=SIMPLE_OPENINGS_SIZE;
-+ bd->openingsCount=SIMPLE_OPENINGS_SIZE;
- }
- bd->isNumbersSpecial=bd->pBiDi->reorderingMode==UBIDI_REORDER_NUMBERS_SPECIAL ||
- bd->pBiDi->reorderingMode==UBIDI_REORDER_INVERSE_FOR_NUMBERS_SPECIAL;
-@@ -743,7 +743,7 @@
- bracketAddOpening(BracketData *bd, UChar match, int32_t position) {
- IsoRun *pLastIsoRun=&bd->isoRuns[bd->isoRunLast];
- Opening *pOpening;
-- if(pLastIsoRun->limit>=bd->openingsSize) { /* no available new entry */
-+ if(pLastIsoRun->limit>=bd->openingsCount) { /* no available new entry */
- UBiDi *pBiDi=bd->pBiDi;
- if(!getInitialOpeningsMemory(pBiDi, pLastIsoRun->limit * 2))
- return FALSE;
-@@ -751,7 +751,7 @@
- uprv_memcpy(pBiDi->openingsMemory, bd->simpleOpenings,
- SIMPLE_OPENINGS_SIZE * sizeof(Opening));
- bd->openings=pBiDi->openingsMemory; /* may have changed */
-- bd->openingsSize=pBiDi->openingsSize;
-+ bd->openingsCount=pBiDi->openingsSize / sizeof(Opening);
- }
- pOpening=&bd->openings[pLastIsoRun->limit];
- pOpening->position=position;
---- icu/source/common/ubidiimp.h.orig 2014-08-09 20:55:15.053161192 +0100
-+++ icu/source/common/ubidiimp.h 2014-08-09 20:56:07.028637725 +0100
-@@ -173,7 +173,7 @@
- /* array of opening entries which should be enough in most cases; no malloc() */
- Opening simpleOpenings[SIMPLE_OPENINGS_SIZE];
- Opening *openings; /* pointer to current array of entries */
-- int32_t openingsSize; /* number of allocated entries */
-+ int32_t openingsCount; /* number of allocated entries */
- int32_t isoRunLast; /* index of last used entry */
- /* array of nested isolated sequence entries; can never excess UBIDI_MAX_EXPLICIT_LEVEL
- + 1 for index 0, + 1 for before the first isolated sequence */
diff --git a/external/icu/icu4c-icu11100.patch.1 b/external/icu/icu4c-icu11100.patch.1
index f63a79f..18bfe4f 100644
--- a/external/icu/icu4c-icu11100.patch.1
+++ b/external/icu/icu4c-icu11100.patch.1
@@ -7,7 +7,7 @@
+static int
+isolatesavailable(UBiDi *pBiDi) {
+ if (pBiDi->isolates == pBiDi->simpleIsolates) {
-+ return pBiDi->isolateCount < SIMPLE_ISOLATES_SIZE-1;
++ return pBiDi->isolateCount < SIMPLE_ISOLATES_COUNT-1;
+ }
+ return pBiDi->isolateCount < pBiDi->isolatesSize/sizeof(Isolate)-1;
+}
diff --git a/external/icu/icu4c-icu11131.patch.1 b/external/icu/icu4c-icu11131.patch.1
deleted file mode 100644
index e9978ab..0000000
--- a/external/icu/icu4c-icu11131.patch.1
+++ /dev/null
@@ -1,68 +0,0 @@
---- icu/source/i18n/smpdtfmt.cpp.orig 2014-08-27 10:29:29.849821672 +0530
-+++ icu/source/i18n/smpdtfmt.cpp 2014-08-27 10:29:49.323821401 +0530
-@@ -1082,6 +1082,7 @@
- }
- } else {
- status = U_MEMORY_ALLOCATION_ERROR;
-+ return;
- }
- }
- umtx_unlock(&LOCK);
---- icu/source/common/usprep.cpp.orig 2014-08-27 10:38:24.360821077 +0530
-+++ icu/source/common/usprep.cpp 2014-08-27 10:38:38.696821312 +0530
-@@ -796,16 +796,23 @@ usprep_prepare( const UStringPrepProfi
- }
-
- CLEANUP:
-- if(b1!=b1Stack){
-- uprv_free(b1);
-- b1=NULL;
-- }
--
-- if(b2!=b1Stack && b2!=b2Stack && b2!=b1 /* b1 should not be freed twice */){
-- uprv_free(b2);
-- b2=NULL;
-- }
-- return u_terminateUChars(dest, destCapacity, b2Len, status);
-+ if(b2==b1 && b1!=b1Stack){
-+ uprv_free(b1);
-+ b1=NULL;
-+ b2=NULL;
-+ }
-+ else
-+ {
-+ if(b1!=b1Stack){
-+ uprv_free(b1);
-+ b1=NULL;
-+ }
-+ if(b2!=b1Stack && b2!=b2Stack && b2!=b1 /* b1 should not be freed twice */){
-+ uprv_free(b2);
-+ b2=NULL;
-+ }
-+ }
-+ return u_terminateUChars(dest, destCapacity, b2Len, status);
- }
-
-
---- icu/source/common/ubidi.c.orig 2014-08-29 14:32:24.007259924 +0100
-+++ icu/source/common/ubidi.c 2014-08-29 14:33:21.555833532 +0100
-@@ -2521,11 +2521,18 @@
- pBiDi->trailingWSStart=saveTrailingWSStart;
- /* free memory for mapping table and visual text */
- uprv_free(runsOnlyMemory);
-+ runsOnlyMemory=NULL;
- if(pBiDi->runCount>1) {
- pBiDi->direction=UBIDI_MIXED;
- }
- cleanup3:
-- pBiDi->reorderingMode=UBIDI_REORDER_RUNS_ONLY;
-+ if(runsOnlyMemory != NULL)
-+ {
-+ pBiDi->reorderingMode=UBIDI_REORDER_RUNS_ONLY;
-+ uprv_free(runsOnlyMemory);
-+ }
-+ else
-+ pBiDi->reorderingMode=UBIDI_REORDER_RUNS_ONLY;
- }
-
- /* ubidi_setPara ------------------------------------------------------------ */
diff --git a/external/icu/icu4c-mkdir.patch b/external/icu/icu4c-mkdir.patch
index c9758a3..094ddd5 100644
--- a/external/icu/icu4c-mkdir.patch
+++ b/external/icu/icu4c-mkdir.patch
@@ -1,11 +1,10 @@
--- misc/icu/source/dataMakefile.in.sav 2012-04-05 22:49:20.000000000 +0200
+++ build/icu/source/data/Makefile.in 2012-12-04 14:24:40.548026700 +0100
-@@ -350,6 +350,7 @@
+@@ -363,6 +363,7 @@
ifeq ($(PKGDATA_MODE),dll)
SO_VERSION_DATA = $(OUTTMPDIR)/icudata.res
$(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc
+ mkdir -p $(OUTTMPDIR)
- rc.exe /i$(srcdir)/../common /i$(top_builddir)/common /fo$@ $(CPPFLAGS) $(SOURCE_FILE)
- endif
- endif
-
+ ifeq ($(MSYS_RC_MODE),1)
+ rc.exe -i$(srcdir)/../common -i$(top_builddir)/common -fo$@ $(CPPFLAGS) $<
+ else
diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
index edea198..a3c953c 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -934,6 +934,26 @@ OString SAL_CALL unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript)
sRet = "mwr";
break;
#endif
+#if (U_ICU_VERSION_MAJOR_NUM >= 54)
+ case USCRIPT_AHOM:
+ sRet = "aho";
+ break;
+ case USCRIPT_HATRAN:
+ sRet = "qly-Hatr";
+ break;
+ case USCRIPT_MODI:
+ sRet = "mr-Modi";
+ break;
+ case USCRIPT_MULTANI:
+ sRet = "skr-Mutl";
+ break;
+ case USCRIPT_PAU_CIN_HAU:
+ sRet = "ctd-Pauc";
+ break;
+ case USCRIPT_SIDDHAM:
+ sRet = "sa-Sidd";
+ break;
+#endif
}
return sRet;
}
diff --git a/include/svx/ucsubset.hrc b/include/svx/ucsubset.hrc
index 5b1fb0e..cff30f1 100644
--- a/include/svx/ucsubset.hrc
+++ b/include/svx/ucsubset.hrc
@@ -249,6 +249,38 @@
#define RID_SUBSETSTR_HANUNOO (RID_SUBSET_START + 221)
#define RID_SUBSETSTR_KANBUN (RID_SUBSET_START + 222)
#define RID_SUBSETSTR_BUHID (RID_SUBSET_START + 223)
+#define RID_SUBSETSTR_BASSA_VAH (RID_SUBSET_START + 224)
+#define RID_SUBSETSTR_CAUCASIAN_ALBANIAN (RID_SUBSET_START + 225)
+#define RID_SUBSETSTR_COPTIC_EPACT_NUMBERS (RID_SUBSET_START + 226)
+#define RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_EXTENDED (RID_SUBSET_START + 227)
+#define RID_SUBSETSTR_DUPLOYAN (RID_SUBSET_START + 228)
+#define RID_SUBSETSTR_ELBASAN (RID_SUBSET_START + 229)
+#define RID_SUBSETSTR_GEOMETRIC_SHAPES_EXTENDED (RID_SUBSET_START + 230)
+#define RID_SUBSETSTR_GRANTHA (RID_SUBSET_START + 231)
+#define RID_SUBSETSTR_KHOJKI (RID_SUBSET_START + 232)
+#define RID_SUBSETSTR_KHUDAWADI (RID_SUBSET_START + 233)
+#define RID_SUBSETSTR_LATIN_EXTENDED_E (RID_SUBSET_START + 234)
+#define RID_SUBSETSTR_LINEAR_A (RID_SUBSET_START + 235)
+#define RID_SUBSETSTR_MAHAJANI (RID_SUBSET_START + 236)
+#define RID_SUBSETSTR_MANICHAEAN (RID_SUBSET_START + 237)
+#define RID_SUBSETSTR_MENDE_KIKAKUI (RID_SUBSET_START + 238)
+#define RID_SUBSETSTR_MODI (RID_SUBSET_START + 239)
+#define RID_SUBSETSTR_MRO (RID_SUBSET_START + 240)
+#define RID_SUBSETSTR_MYANMAR_EXTENDED_B (RID_SUBSET_START + 241)
+#define RID_SUBSETSTR_NABATAEAN (RID_SUBSET_START + 242)
+#define RID_SUBSETSTR_OLD_NORTH_ARABIAN (RID_SUBSET_START + 243)
+#define RID_SUBSETSTR_OLD_PERMIC (RID_SUBSET_START + 244)
+#define RID_SUBSETSTR_ORNAMENTAL_DINGBATS (RID_SUBSET_START + 245)
+#define RID_SUBSETSTR_PAHAWH_HMONG (RID_SUBSET_START + 246)
+#define RID_SUBSETSTR_PALMYRENE (RID_SUBSET_START + 247)
+#define RID_SUBSETSTR_PAU_CIN_HAU (RID_SUBSET_START + 248)
+#define RID_SUBSETSTR_PSALTER_PAHLAVI (RID_SUBSET_START + 249)
+#define RID_SUBSETSTR_SHORTHAND_FORMAT_CONTROLS (RID_SUBSET_START + 250)
+#define RID_SUBSETSTR_SIDDHAM (RID_SUBSET_START + 251)
+#define RID_SUBSETSTR_SINHALA_ARCHAIC_NUMBERS (RID_SUBSET_START + 252)
+#define RID_SUBSETSTR_SUPPLEMENTAL_ARROWS_C (RID_SUBSET_START + 253)
+#define RID_SUBSETSTR_TIRHUTA (RID_SUBSET_START + 254)
+#define RID_SUBSETSTR_WARANG_CITI (RID_SUBSET_START + 255)
// RID_SUBSET_END (RID_SUBSET_START + 299)
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 16b5992..d50bc44 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -1448,6 +1448,105 @@ void SubsetMap::InitList()
aAllSubsets.push_back( Subset( 0x11680, 0x116CF, RID_SUBSETSTR_TAKRI ) );
break;
#endif
+#if U_ICU_VERSION_MAJOR_NUM >= 53
+ case UBLOCK_BASSA_VAH:
+ aAllSubsets.push_back( Subset( 0x16AD0, 0x16AFF, RID_SUBSETSTR_BASSA_VAH ) );
+ break;
+ case UBLOCK_CAUCASIAN_ALBANIAN:
+ aAllSubsets.push_back( Subset( 0x10530, 0x1056F, RID_SUBSETSTR_CAUCASIAN_ALBANIAN) );
+ break;
+ case UBLOCK_COPTIC_EPACT_NUMBERS:
+ aAllSubsets.push_back( Subset( 0x102E0, 0x102FF, RID_SUBSETSTR_COPTIC_EPACT_NUMBERS ) );
+ break;
+ case UBLOCK_COMBINING_DIACRITICAL_MARKS_EXTENDED:
+ aAllSubsets.push_back( Subset( 0x1AB0, 0x1AFF, RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_EXTENDED ) );
+ break;
+ case UBLOCK_DUPLOYAN:
+ aAllSubsets.push_back( Subset( 0x1BC00, 0x1BC9F, RID_SUBSETSTR_DUPLOYAN ) );
+ break;
+ case UBLOCK_ELBASAN:
+ aAllSubsets.push_back( Subset( 0x10500, 0x1052F, RID_SUBSETSTR_ELBASAN ) );
+ break;
+ case UBLOCK_GEOMETRIC_SHAPES_EXTENDED:
+ aAllSubsets.push_back( Subset( 0x1F780, 0x1F7FF, RID_SUBSETSTR_GEOMETRIC_SHAPES_EXTENDED ) );
+ break;
+ case UBLOCK_GRANTHA:
+ aAllSubsets.push_back( Subset( 0x11300, 0x1137F, RID_SUBSETSTR_GRANTHA ) );
+ break;
+ case UBLOCK_KHOJKI:
+ aAllSubsets.push_back( Subset( 0x11200, 0x1124F, RID_SUBSETSTR_KHOJKI ) );
+ break;
+ case UBLOCK_KHUDAWADI:
+ aAllSubsets.push_back( Subset( 0x112B0, 0x112FF, RID_SUBSETSTR_KHUDAWADI ) );
+ break;
+ case UBLOCK_LATIN_EXTENDED_E:
+ aAllSubsets.push_back( Subset( 0xAB30, 0xAB6F, RID_SUBSETSTR_LATIN_EXTENDED_E ) );
+ break;
+ case UBLOCK_LINEAR_A:
+ aAllSubsets.push_back( Subset( 0x10600, 0x1077F, RID_SUBSETSTR_LINEAR_A ) );
+ break;
+ case UBLOCK_MAHAJANI:
+ aAllSubsets.push_back( Subset( 0x11150, 0x1117F, RID_SUBSETSTR_MAHAJANI ) );
+ break;
+ case UBLOCK_MANICHAEAN:
+ aAllSubsets.push_back( Subset( 0x10AC0, 0x10AFF, RID_SUBSETSTR_MANICHAEAN ) );
+ break;
+ case UBLOCK_MENDE_KIKAKUI:
+ aAllSubsets.push_back( Subset( 0x1E800, 0x1E8DF, RID_SUBSETSTR_MENDE_KIKAKUI ) );
+ break;
+ case UBLOCK_MODI:
+ aAllSubsets.push_back( Subset( 0x11600, 0x1165F, RID_SUBSETSTR_MODI ) );
+ break;
+ case UBLOCK_MRO:
+ aAllSubsets.push_back( Subset( 0x16A40, 0x16A6F, RID_SUBSETSTR_MRO ) );
+ break;
+ case UBLOCK_MYANMAR_EXTENDED_B:
+ aAllSubsets.push_back( Subset( 0xA9E0, 0xA9FF, RID_SUBSETSTR_MYANMAR_EXTENDED_B ) );
+ break;
+ case UBLOCK_NABATAEAN:
+ aAllSubsets.push_back( Subset( 0x10880, 0x108AF, RID_SUBSETSTR_NABATAEAN ) );
+ break;
+ case UBLOCK_OLD_NORTH_ARABIAN:
+ aAllSubsets.push_back( Subset( 0x10A80, 0x10A9F, RID_SUBSETSTR_OLD_NORTH_ARABIAN ) );
+ break;
+ case UBLOCK_OLD_PERMIC:
+ aAllSubsets.push_back( Subset( 0x10350, 0x1037F, RID_SUBSETSTR_OLD_PERMIC ) );
+ break;
+ case UBLOCK_ORNAMENTAL_DINGBATS:
+ aAllSubsets.push_back( Subset( 0x1F650, 0x1F67F, RID_SUBSETSTR_ORNAMENTAL_DINGBATS ) );
+ break;
+ case UBLOCK_PAHAWH_HMONG:
+ aAllSubsets.push_back( Subset( 0x16B00, 0x16B8F, RID_SUBSETSTR_PAHAWH_HMONG ) );
+ break;
+ case UBLOCK_PALMYRENE:
+ aAllSubsets.push_back( Subset( 0x10860, 0x1087F, RID_SUBSETSTR_PALMYRENE ) );
+ break;
+ case UBLOCK_PAU_CIN_HAU:
+ aAllSubsets.push_back( Subset( 0x11AC0, 0x11AFF, RID_SUBSETSTR_PAU_CIN_HAU ) );
+ break;
+ case UBLOCK_PSALTER_PAHLAVI:
+ aAllSubsets.push_back( Subset( 0x10B80, 0x10BAF, RID_SUBSETSTR_PSALTER_PAHLAVI ) );
+ break;
+ case UBLOCK_SHORTHAND_FORMAT_CONTROLS:
+ aAllSubsets.push_back( Subset( 0x1BCA0, 0x1BCAF, RID_SUBSETSTR_SHORTHAND_FORMAT_CONTROLS ) );
+ break;
+ case UBLOCK_SIDDHAM:
+ aAllSubsets.push_back( Subset( 0x11580, 0x115FF, RID_SUBSETSTR_SIDDHAM ) );
+ break;
+ case UBLOCK_SINHALA_ARCHAIC_NUMBERS:
+ aAllSubsets.push_back( Subset( 0x111E0, 0x111FF, RID_SUBSETSTR_SINHALA_ARCHAIC_NUMBERS ) );
+ break;
+ case UBLOCK_SUPPLEMENTAL_ARROWS_C:
+ aAllSubsets.push_back( Subset( 0x1F800, 0x1F8FF, RID_SUBSETSTR_SUPPLEMENTAL_ARROWS_C ) );
+ break;
+ case UBLOCK_TIRHUTA:
+ aAllSubsets.push_back( Subset( 0x11480, 0x114DF, RID_SUBSETSTR_TIRHUTA ) );
+ break;
+ case UBLOCK_WARANG_CITI:
+ aAllSubsets.push_back( Subset( 0x118A0, 0x118FF, RID_SUBSETSTR_WARANG_CITI ) );
+ break;
+#endif
+
}
#if OSL_DEBUG_LEVEL > 0
diff --git a/svx/source/dialog/ucsubset.src b/svx/source/dialog/ucsubset.src
index a658396..eadec3c 100644
--- a/svx/source/dialog/ucsubset.src
+++ b/svx/source/dialog/ucsubset.src
@@ -911,6 +911,134 @@ Resource RID_SUBSETMAP
{
Text [ en-US ] = "Takri";
};
+ String RID_SUBSETSTR_BASSA_VAH
+ {
+ Text [ en-US ] = "Bassa Vah";
+ };
+ String RID_SUBSETSTR_CAUCASIAN_ALBANIAN
+ {
+ Text [ en-US ] = "Caucasian Albanian";
+ };
+ String RID_SUBSETSTR_COPTIC_EPACT_NUMBERS
+ {
+ Text [ en-US ] = "Coptic Epact Numbers";
+ };
+ String RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_EXTENDED
+ {
+ Text [ en-US ] = "Combining Diacritical Marks Extended";
+ };
+ String RID_SUBSETSTR_DUPLOYAN
+ {
+ Text [ en-US ] = "Duployan";
+ };
+ String RID_SUBSETSTR_ELBASAN
+ {
+ Text [ en-US ] = "Elbasan";
+ };
+ String RID_SUBSETSTR_GEOMETRIC_SHAPES_EXTENDED
+ {
+ Text [ en-US ] = "Geometric Shapes Extended";
+ };
+ String RID_SUBSETSTR_GRANTHA
+ {
+ Text [ en-US ] = "Grantha";
+ };
+ String RID_SUBSETSTR_KHOJKI
+ {
+ Text [ en-US ] = "Khojki";
+ };
+ String RID_SUBSETSTR_KHUDAWADI
+ {
+ Text [ en-US ] = "Khudawadi";
+ };
+ String RID_SUBSETSTR_LATIN_EXTENDED_E
+ {
+ Text [ en-US ] = "Latin Extended-E";
+ };
+ String RID_SUBSETSTR_LINEAR_A
+ {
+ Text [ en-US ] = "Linear A";
+ };
+ String RID_SUBSETSTR_MAHAJANI
+ {
+ Text [ en-US ] = "Mahajani";
+ };
+ String RID_SUBSETSTR_MANICHAEAN
+ {
+ Text [ en-US ] = "Manichaean";
+ };
+ String RID_SUBSETSTR_MENDE_KIKAKUI
+ {
+ Text [ en-US ] = "Mende Kikakui";
+ };
+ String RID_SUBSETSTR_MODI
+ {
+ Text [ en-US ] = "Modi";
+ };
+ String RID_SUBSETSTR_MRO
+ {
+ Text [ en-US ] = "Mro";
+ };
+ String RID_SUBSETSTR_MYANMAR_EXTENDED_B
+ {
+ Text [ en-US ] = "Myanmar Extended-B";
+ };
+ String RID_SUBSETSTR_NABATAEAN
+ {
+ Text [ en-US ] = "Nabataean";
+ };
+ String RID_SUBSETSTR_OLD_NORTH_ARABIAN
+ {
+ Text [ en-US ] = "Old North Arabian";
+ };
+ String RID_SUBSETSTR_OLD_PERMIC
+ {
+ Text [ en-US ] = "Old Permic";
+ };
+ String RID_SUBSETSTR_ORNAMENTAL_DINGBATS
+ {
+ Text [ en-US ] = "Ornamental Dingbats";
+ };
+ String RID_SUBSETSTR_PAHAWH_HMONG
+ {
+ Text [ en-US ] = "Pahawh Hmong";
+ };
+ String RID_SUBSETSTR_PALMYRENE
+ {
+ Text [ en-US ] = "Palmyrene";
+ };
+ String RID_SUBSETSTR_PAU_CIN_HAU
+ {
+ Text [ en-US ] = "Pau Cin Hau";
+ };
+ String RID_SUBSETSTR_PSALTER_PAHLAVI
+ {
+ Text [ en-US ] = "Psalter Pahlavi";
+ };
+ String RID_SUBSETSTR_SHORTHAND_FORMAT_CONTROLS
+ {
+ Text [ en-US ] = "Shorthand Format Controls";
+ };
+ String RID_SUBSETSTR_SIDDHAM
+ {
+ Text [ en-US ] = "Siddham";
+ };
+ String RID_SUBSETSTR_SINHALA_ARCHAIC_NUMBERS
+ {
+ Text [ en-US ] = "Sinhala Archaic Numbers";
+ };
+ String RID_SUBSETSTR_SUPPLEMENTAL_ARROWS_C
+ {
+ Text [ en-US ] = "Supplemental Arrows-C";
+ };
+ String RID_SUBSETSTR_TIRHUTA
+ {
+ Text [ en-US ] = "Tirhuta";
+ };
+ String RID_SUBSETSTR_WARANG_CITI
+ {
+ Text [ en-US ] = "Warang Citi";
+ };
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list