--- a/i18nutil/source/utility/unicode.cxx +++ a/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; } --- a/include/svx/ucsubset.hrc +++ a/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) --- a/svx/source/dialog/charmap.cxx +++ a/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 --- a/svx/source/dialog/ucsubset.src +++ a/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: */ --