diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-07-16 15:05:04 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-07-21 08:20:51 +0100 |
| commit | 182a74d937088f0f08850014a7b918719e106b7d (patch) | |
| tree | 0a286f4a6a5adcd32fd32a26b61b247d247c93d2 /svx | |
| parent | 00657aef09d854c74fb426a935a3e8b1fc390bb0 (diff) | |
de-hrc various things
e.g. helpid[s].hrc -> helpids.h
and insert include guards where missing
move "ordinary" defines into .hxx files
remove .hrc entries that are used as arguments to dialog factory
when a dedicated method can be added instead
Change-Id: I792fb8eb0adfaa63cf354e6e57401fc943e9196e
Diffstat (limited to 'svx')
68 files changed, 361 insertions, 827 deletions
diff --git a/svx/inc/float3d.hrc b/svx/inc/float3d.hrc deleted file mode 100644 index 7d13a16189d8..000000000000 --- a/svx/inc/float3d.hrc +++ /dev/null @@ -1,44 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include <svx/dialogs.hrc> - -// Lower part -#define CTL_PREVIEW 12 -#define CTL_LIGHT_PREVIEW 13 - -// Geometry - -// Depiction/Appearance -#define FT_DISTANCE 51 - -// Lighting -#define BTN_LIGHT_1 60 -#define BTN_LIGHT_2 61 -#define BTN_LIGHT_3 62 -#define BTN_LIGHT_4 63 -#define BTN_LIGHT_5 64 -#define BTN_LIGHT_6 65 -#define BTN_LIGHT_7 66 -#define BTN_LIGHT_8 67 -#define FT_LIGHTSOURCE 77 -#define LB_AMBIENTLIGHT 78 -#define BTN_AMBIENT_COLOR 79 -#define FT_AMBIENTLIGHT 80 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc deleted file mode 100644 index c470e7876970..000000000000 --- a/svx/inc/fmhelp.hrc +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_SVX_INC_FMHELP_HRC -#define INCLUDED_SVX_INC_FMHELP_HRC - -#define HID_FORM_NAVIGATOR "SVX_HID_FORM_NAVIGATOR" -#define HID_FORM_NAVIGATOR_WIN "SVX_HID_FORM_NAVIGATOR_WIN" -#define HID_FIELD_SEL "SVX_HID_FIELD_SEL" -#define HID_FIELD_SEL_WIN "SVX_HID_FIELD_SEL_WIN" -#define HID_FILTER_NAVIGATOR "SVX_HID_FILTER_NAVIGATOR" -#define HID_FILTER_NAVIGATOR_WIN "SVX_HID_FILTER_NAVIGATOR_WIN" -#define HID_GRID_TRAVEL_FIRST "SVX_HID_GRID_TRAVEL_FIRST" -#define HID_GRID_TRAVEL_PREV "SVX_HID_GRID_TRAVEL_PREV" -#define HID_GRID_TRAVEL_NEXT "SVX_HID_GRID_TRAVEL_NEXT" -#define HID_GRID_TRAVEL_LAST "SVX_HID_GRID_TRAVEL_LAST" -#define HID_GRID_TRAVEL_NEW "SVX_HID_GRID_TRAVEL_NEW" -#define HID_GRID_TRAVEL_ABSOLUTE "SVX_HID_GRID_TRAVEL_ABSOLUTE" -#define HID_GRID_NUMBEROFRECORDS "SVX_HID_GRID_NUMBEROFRECORDS" - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/helpid.hrc b/svx/inc/helpids.h index d5f4e91c59df..ea53d4d31b3f 100644 --- a/svx/inc/helpid.hrc +++ b/svx/inc/helpids.h @@ -16,10 +16,9 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_INC_HELPID_HRC -#define INCLUDED_SVX_INC_HELPID_HRC +#ifndef INCLUDED_SVX_INC_HELPIDS_H +#define INCLUDED_SVX_INC_HELPIDS_H -#include <svx/exthelpid.hrc> #include <svx/svxcommands.h> #define HID_BMPMASK_CTL_QCOL_1 "SVX_HID_BMPMASK_CTL_QCOL_1" @@ -48,6 +47,24 @@ #define HID_POPUP_LINEEND_CTRL "SVX_HID_POPUP_LINEEND_CTRL" #define HID_STYLE_LISTBOX "SVX_HID_STYLE_LISTBOX" #define HID_VALUESET_EXTRUSION_LIGHTING "SVX_HID_VALUESET_EXTRUSION_LIGHTING" +#define HID_GALLERY_ACTUALIZE "SVX_HID_GALLERY_ACTUALIZE" +#define HID_GALLERY_TITLE "SVX_HID_GALLERY_TITLE" +#define HID_UNDERLINE_BTN "SVX_HID_UNDERLINE_BTN" +#define HID_SPACING_MB_KERN "SVX_HID_SPACING_MB_KERN" + +#define HID_FORM_NAVIGATOR "SVX_HID_FORM_NAVIGATOR" +#define HID_FORM_NAVIGATOR_WIN "SVX_HID_FORM_NAVIGATOR_WIN" +#define HID_FIELD_SEL "SVX_HID_FIELD_SEL" +#define HID_FIELD_SEL_WIN "SVX_HID_FIELD_SEL_WIN" +#define HID_FILTER_NAVIGATOR "SVX_HID_FILTER_NAVIGATOR" +#define HID_FILTER_NAVIGATOR_WIN "SVX_HID_FILTER_NAVIGATOR_WIN" +#define HID_GRID_TRAVEL_FIRST "SVX_HID_GRID_TRAVEL_FIRST" +#define HID_GRID_TRAVEL_PREV "SVX_HID_GRID_TRAVEL_PREV" +#define HID_GRID_TRAVEL_NEXT "SVX_HID_GRID_TRAVEL_NEXT" +#define HID_GRID_TRAVEL_LAST "SVX_HID_GRID_TRAVEL_LAST" +#define HID_GRID_TRAVEL_NEW "SVX_HID_GRID_TRAVEL_NEW" +#define HID_GRID_TRAVEL_ABSOLUTE "SVX_HID_GRID_TRAVEL_ABSOLUTE" +#define HID_GRID_NUMBEROFRECORDS "SVX_HID_GRID_NUMBEROFRECORDS" #endif diff --git a/svx/inc/ucsubsetstruct.hrc b/svx/inc/ucsubsetstruct.hrc deleted file mode 100644 index 8bbc19ddfbce..000000000000 --- a/svx/inc/ucsubsetstruct.hrc +++ /dev/null @@ -1,312 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_SVX_INC_UCSUBSETSTRUCT_HRC -#define INCLUDED_SVX_INC_UCSUBSETSTRUCT_HRC - -#include <svx/ucsubset.hrc> -#include <utility> - -#define NC_(Context, String) (Context "\004" u8##String) - -/* - * strings for unicode range descriptions (used e.g. by charmap) - * (see the Unicode Standard & TrueType::OS2.ulUnicodeRange description) - */ -const std::pair<const char*, sal_uInt16> RID_SUBSETMAP[] = -{ - { NC_("RID_SUBSETMAP", "Basic Latin"), RID_SUBSETSTR_BASIC_LATIN }, - { NC_("RID_SUBSETMAP", "Latin-1"), RID_SUBSETSTR_LATIN_1 }, - { NC_("RID_SUBSETMAP", "Latin Extended-A"), RID_SUBSETSTR_LATIN_EXTENDED_A }, - { NC_("RID_SUBSETMAP", "Latin Extended-B"), RID_SUBSETSTR_LATIN_EXTENDED_B }, - { NC_("RID_SUBSETMAP", "IPA Extensions"), RID_SUBSETSTR_IPA_EXTENSIONS }, - { NC_("RID_SUBSETMAP", "Spacing Modifier Letters"), RID_SUBSETSTR_SPACING_MODIFIERS }, - { NC_("RID_SUBSETMAP", "Combining Diacritical Marks"), RID_SUBSETSTR_COMB_DIACRITICAL }, - { NC_("RID_SUBSETMAP", "Basic Greek"), RID_SUBSETSTR_BASIC_GREEK }, - { NC_("RID_SUBSETMAP", "Greek Symbols And Coptic"), RID_SUBSETSTR_GREEK_SYMS_COPTIC }, - { NC_("RID_SUBSETMAP", "Cyrillic"), RID_SUBSETSTR_CYRILLIC }, - { NC_("RID_SUBSETMAP", "Armenian"), RID_SUBSETSTR_ARMENIAN }, - { NC_("RID_SUBSETMAP", "Basic Hebrew"), RID_SUBSETSTR_BASIC_HEBREW }, - { NC_("RID_SUBSETMAP", "Hebrew Extended"), RID_SUBSETSTR_HEBREW_EXTENDED }, - { NC_("RID_SUBSETMAP", "Basic Arabic"), RID_SUBSETSTR_BASIC_ARABIC }, - { NC_("RID_SUBSETMAP", "Arabic Extended"), RID_SUBSETSTR_ARABIC_EXTENDED }, - { NC_("RID_SUBSETMAP", "Devanagari"), RID_SUBSETSTR_DEVANAGARI }, - { NC_("RID_SUBSETMAP", "Bengali"), RID_SUBSETSTR_BENGALI }, - { NC_("RID_SUBSETMAP", "Gurmukhi"), RID_SUBSETSTR_GURMUKHI }, - { NC_("RID_SUBSETMAP", "Gujarati"), RID_SUBSETSTR_GUJARATI }, - { NC_("RID_SUBSETMAP", "Odia"), RID_SUBSETSTR_ODIA }, - { NC_("RID_SUBSETMAP", "Tamil"), RID_SUBSETSTR_TAMIL }, - { NC_("RID_SUBSETMAP", "Telugu"), RID_SUBSETSTR_TELUGU }, - { NC_("RID_SUBSETMAP", "Kannada"), RID_SUBSETSTR_KANNADA }, - { NC_("RID_SUBSETMAP", "Malayalam"), RID_SUBSETSTR_MALAYALAM }, - { NC_("RID_SUBSETMAP", "Thai"), RID_SUBSETSTR_THAI }, - { NC_("RID_SUBSETMAP", "Lao"), RID_SUBSETSTR_LAO }, - { NC_("RID_SUBSETMAP", "Basic Georgian"), RID_SUBSETSTR_BASIC_GEORGIAN }, - { NC_("RID_SUBSETMAP", "Georgian Extended"), RID_SUBSETSTR_GEORGIAN_EXTENDED }, - { NC_("RID_SUBSETMAP", "Hangul Jamo"), RID_SUBSETSTR_HANGUL_JAMO }, - { NC_("RID_SUBSETMAP", "Latin Extended Additionals"), RID_SUBSETSTR_LATIN_EXTENDED_ADDS }, - { NC_("RID_SUBSETMAP", "Greek Extended"), RID_SUBSETSTR_GREEK_EXTENDED }, - { NC_("RID_SUBSETMAP", "General punctuation"), RID_SUBSETSTR_GENERAL_PUNCTUATION }, - { NC_("RID_SUBSETMAP", "Superscripts and Subscripts"), RID_SUBSETSTR_SUB_SUPER_SCRIPTS }, - { NC_("RID_SUBSETMAP", "Currency Symbols"), RID_SUBSETSTR_CURRENCY_SYMBOLS }, - { NC_("RID_SUBSETMAP", "Combining Diacritical Symbols"), RID_SUBSETSTR_COMB_DIACRITIC_SYMS }, - { NC_("RID_SUBSETMAP", "Letterlike Symbols"), RID_SUBSETSTR_LETTERLIKE_SYMBOLS }, - { NC_("RID_SUBSETMAP", "Number Forms"), RID_SUBSETSTR_NUMBER_FORMS }, - { NC_("RID_SUBSETMAP", "Arrows"), RID_SUBSETSTR_ARROWS }, - { NC_("RID_SUBSETMAP", "Mathematical Operators"), RID_SUBSETSTR_MATH_OPERATORS }, - { NC_("RID_SUBSETMAP", "Miscellaneous Technical"), RID_SUBSETSTR_MISC_TECHNICAL }, - { NC_("RID_SUBSETMAP", "Control Pictures"), RID_SUBSETSTR_CONTROL_PICTURES }, - { NC_("RID_SUBSETMAP", "Optical Character Recognition"), RID_SUBSETSTR_OPTICAL_CHAR_REC }, - { NC_("RID_SUBSETMAP", "Enclosed Alphanumerics"), RID_SUBSETSTR_ENCLOSED_ALPHANUM }, - { NC_("RID_SUBSETMAP", "Box Drawing"), RID_SUBSETSTR_BOX_DRAWING }, - { NC_("RID_SUBSETMAP", "Block Elements"), RID_SUBSETSTR_BLOCK_ELEMENTS }, - { NC_("RID_SUBSETMAP", "Geometric Shapes"), RID_SUBSETSTR_GEOMETRIC_SHAPES }, - { NC_("RID_SUBSETMAP", "Miscellaneous Symbols"), RID_SUBSETSTR_MISC_DINGBATS }, - { NC_("RID_SUBSETMAP", "Dingbats"), RID_SUBSETSTR_DINGBATS }, - { NC_("RID_SUBSETMAP", "CJK Symbols And Punctuation"), RID_SUBSETSTR_CJK_SYMS_PUNCTUATION }, - { NC_("RID_SUBSETMAP", "Hiragana"), RID_SUBSETSTR_HIRAGANA }, - { NC_("RID_SUBSETMAP", "Katakana"), RID_SUBSETSTR_KATAKANA }, - { NC_("RID_SUBSETMAP", "Bopomofo"), RID_SUBSETSTR_BOPOMOFO }, - { NC_("RID_SUBSETMAP", "Hangul Compatibility Jamo"), RID_SUBSETSTR_HANGUL_COMPAT_JAMO }, - { NC_("RID_SUBSETMAP", "CJK Miscellaneous"), RID_SUBSETSTR_CJK_MISC }, - { NC_("RID_SUBSETMAP", "Enclosed CJK Letters And Months"), RID_SUBSETSTR_ENCLOSED_CJK_LETTERS }, - { NC_("RID_SUBSETMAP", "CJK Compatibility"), RID_SUBSETSTR_CJK_COMPATIBILITY }, - { NC_("RID_SUBSETMAP", "Hangul"), RID_SUBSETSTR_HANGUL }, - { NC_("RID_SUBSETMAP", "CJK Unified Ideographs"), RID_SUBSETSTR_CJK_UNIFIED_IDGRAPH }, - { NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension A"), RID_SUBSETSTR_CJK_EXT_A_UNIFIED_IDGRAPH }, - { NC_("RID_SUBSETMAP", "Private Use Area"), RID_SUBSETSTR_PRIVATE_USE_AREA }, - { NC_("RID_SUBSETMAP", "CJK Compatibility Ideographs"), RID_SUBSETSTR_CJK_COMPAT_IDGRAPHS }, - { NC_("RID_SUBSETMAP", "Alphabetic Presentation Forms"), RID_SUBSETSTR_ALPHA_PRESENTATION }, - { NC_("RID_SUBSETMAP", "Arabic Presentation Forms-A"), RID_SUBSETSTR_ARABIC_PRESENT_A }, - { NC_("RID_SUBSETMAP", "Combining Half Marks"), RID_SUBSETSTR_COMBINING_HALF_MARKS }, - { NC_("RID_SUBSETMAP", "CJK Compatibility Forms"), RID_SUBSETSTR_CJK_COMPAT_FORMS }, - { NC_("RID_SUBSETMAP", "Small Form Variants"), RID_SUBSETSTR_SMALL_FORM_VARIANTS }, - { NC_("RID_SUBSETMAP", "Arabic Presentation Forms-B"), RID_SUBSETSTR_ARABIC_PRESENT_B }, - { NC_("RID_SUBSETMAP", "Half-width and Full-width Forms"), RID_SUBSETSTR_HALFW_FULLW_FORMS }, - { NC_("RID_SUBSETMAP", "Specials"), RID_SUBSETSTR_SPECIALS }, - { NC_("RID_SUBSETMAP", "Yi Syllables"), RID_SUBSETSTR_YI_SYLLABLES }, - { NC_("RID_SUBSETMAP", "Yi Radicals"), RID_SUBSETSTR_YI_RADICALS }, - { NC_("RID_SUBSETMAP", "Old Italic"), RID_SUBSETSTR_OLD_ITALIC }, - { NC_("RID_SUBSETMAP", "Gothic"), RID_SUBSETSTR_GOTHIC }, - { NC_("RID_SUBSETMAP", "Deseret"), RID_SUBSETSTR_DESERET }, - { NC_("RID_SUBSETMAP", "Byzantine Musical Symbols"), RID_SUBSETSTR_BYZANTINE_MUSICAL_SYMBOLS }, - { NC_("RID_SUBSETMAP", "Musical Symbols"), RID_SUBSETSTR_MUSICAL_SYMBOLS }, - { NC_("RID_SUBSETMAP", "Mathematical Alphanumeric Symbols"), RID_SUBSETSTR_MATHEMATICAL_ALPHANUMERIC_SYMBOLS }, - { NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension B"), RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B }, - { NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension C"), RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C }, - { NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension D"), RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D }, - { NC_("RID_SUBSETMAP", "CJK Compatibility Ideographs Supplement"), RID_SUBSETSTR_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT }, - { NC_("RID_SUBSETMAP", "Tags"), RID_SUBSETSTR_TAGS }, - { NC_("RID_SUBSETMAP", "Cyrillic Supplement"), RID_SUBSETSTR_CYRILLIC_SUPPLEMENTARY }, - { NC_("RID_SUBSETMAP", "Variation Selectors"), RID_SUBSETSTR_VARIATION_SELECTORS }, - { NC_("RID_SUBSETMAP", "Supplementary Private Use Area-A"), RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_A }, - { NC_("RID_SUBSETMAP", "Supplementary Private Use Area-B"), RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_B }, - { NC_("RID_SUBSETMAP", "Limbu"), RID_SUBSETSTR_LIMBU }, - { NC_("RID_SUBSETMAP", "Tai Le"), RID_SUBSETSTR_TAI_LE }, - { NC_("RID_SUBSETMAP", "Khmer Symbols"), RID_SUBSETSTR_KHMER_SYMBOLS }, - { NC_("RID_SUBSETMAP", "Phonetic Extensions"), RID_SUBSETSTR_PHONETIC_EXTENSIONS }, - { NC_("RID_SUBSETMAP", "Miscellaneous Symbols And Arrows"), RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_ARROWS }, - { NC_("RID_SUBSETMAP", "Yijing Hexagram Symbols"), RID_SUBSETSTR_YIJING_HEXAGRAM_SYMBOLS }, - { NC_("RID_SUBSETMAP", "Linear B Syllabary"), RID_SUBSETSTR_LINEAR_B_SYLLABARY }, - { NC_("RID_SUBSETMAP", "Linear B Ideograms"), RID_SUBSETSTR_LINEAR_B_IDEOGRAMS }, - { NC_("RID_SUBSETMAP", "Aegean Numbers"), RID_SUBSETSTR_AEGEAN_NUMBERS }, - { NC_("RID_SUBSETMAP", "Ugaritic"), RID_SUBSETSTR_UGARITIC }, - { NC_("RID_SUBSETMAP", "Shavian"), RID_SUBSETSTR_SHAVIAN }, - { NC_("RID_SUBSETMAP", "Osmanya"), RID_SUBSETSTR_OSMANYA }, - { NC_("RID_SUBSETMAP", "Sinhala"), RID_SUBSETSTR_SINHALA }, - { NC_("RID_SUBSETMAP", "Tibetan"), RID_SUBSETSTR_TIBETAN }, - { NC_("RID_SUBSETMAP", "Myanmar"), RID_SUBSETSTR_MYANMAR }, - { NC_("RID_SUBSETMAP", "Khmer"), RID_SUBSETSTR_KHMER }, - { NC_("RID_SUBSETMAP", "Ogham"), RID_SUBSETSTR_OGHAM }, - { NC_("RID_SUBSETMAP", "Runic"), RID_SUBSETSTR_RUNIC }, - { NC_("RID_SUBSETMAP", "Syriac"), RID_SUBSETSTR_SYRIAC }, - { NC_("RID_SUBSETMAP", "Thaana"), RID_SUBSETSTR_THAANA }, - { NC_("RID_SUBSETMAP", "Ethiopic"), RID_SUBSETSTR_ETHIOPIC }, - { NC_("RID_SUBSETMAP", "Cherokee"), RID_SUBSETSTR_CHEROKEE }, - { NC_("RID_SUBSETMAP", "Canadian Aboriginal Syllables"), RID_SUBSETSTR_CANADIAN_ABORIGINAL }, - { NC_("RID_SUBSETMAP", "Mongolian"), RID_SUBSETSTR_MONGOLIAN }, - { NC_("RID_SUBSETMAP", "Miscellaneous Mathematical Symbols-A"), RID_SUBSETSTR_MISC_MATH_SYMS_A }, - { NC_("RID_SUBSETMAP", "Supplemental Arrows-A"), RID_SUBSETSTR_SUPPL_ARROWS_A }, - { NC_("RID_SUBSETMAP", "Braille Patterns"), RID_SUBSETSTR_BRAILLE_PATTERNS }, - { NC_("RID_SUBSETMAP", "Supplemental Arrows-B"), RID_SUBSETSTR_SUPPL_ARROWS_B }, - { NC_("RID_SUBSETMAP", "Miscellaneous Mathematical Symbols-B"), RID_SUBSETSTR_MISC_MATH_SYMS_B }, - { NC_("RID_SUBSETMAP", "CJK Radical Supplement"), RID_SUBSETSTR_CJK_RADICAL_SUPPL }, - { NC_("RID_SUBSETMAP", "Kangxi Radicals"), RID_SUBSETSTR_KANGXI_RADICALS }, - { NC_("RID_SUBSETMAP", "Ideographic Description Characters"), RID_SUBSETSTR_IDEO_DESC_CHARS }, - { NC_("RID_SUBSETMAP", "Tagalog"), RID_SUBSETSTR_TAGALOG }, - { NC_("RID_SUBSETMAP", "Hanunoo"), RID_SUBSETSTR_HANUNOO }, - { NC_("RID_SUBSETMAP", "Tagbanwa"), RID_SUBSETSTR_TAGBANWA }, - { NC_("RID_SUBSETMAP", "Buhid"), RID_SUBSETSTR_BUHID }, - { NC_("RID_SUBSETMAP", "Kanbun"), RID_SUBSETSTR_KANBUN }, - { NC_("RID_SUBSETMAP", "Bopomofo Extended"), RID_SUBSETSTR_BOPOMOFO_EXTENDED }, - { NC_("RID_SUBSETMAP", "Katakana Phonetics"), RID_SUBSETSTR_KATAKANA_PHONETIC }, - { NC_("RID_SUBSETMAP", "CJK Strokes"), RID_SUBSETSTR_CJK_STROKES }, - { NC_("RID_SUBSETMAP", "Cypriot Syllabary"), RID_SUBSETSTR_CYPRIOT_SYLLABARY }, - { NC_("RID_SUBSETMAP", "Tai Xuan Jing Symbols"), RID_SUBSETSTR_TAI_XUAN_JING_SYMBOLS }, - { NC_("RID_SUBSETMAP", "Variation Selectors Supplement"), RID_SUBSETSTR_VARIATION_SELECTORS_SUPPLEMENT }, - { NC_("RID_SUBSETMAP", "Ancient Greek Musical Notation"), RID_SUBSETSTR_ANCIENT_GREEK_MUSICAL_NOTATION }, - { NC_("RID_SUBSETMAP", "Ancient Greek Numbers"), RID_SUBSETSTR_ANCIENT_GREEK_NUMBERS }, - { NC_("RID_SUBSETMAP", "Arabic Supplement"), RID_SUBSETSTR_ARABIC_SUPPLEMENT }, - { NC_("RID_SUBSETMAP", "Buginese"), RID_SUBSETSTR_BUGINESE }, - { NC_("RID_SUBSETMAP", "Combining Diacritical Marks Supplement"), RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_SUPPLEMENT }, - { NC_("RID_SUBSETMAP", "Coptic"), RID_SUBSETSTR_COPTIC }, - { NC_("RID_SUBSETMAP", "Ethiopic Extended"), RID_SUBSETSTR_ETHIOPIC_EXTENDED }, - { NC_("RID_SUBSETMAP", "Ethiopic Supplement"), RID_SUBSETSTR_ETHIOPIC_SUPPLEMENT }, - { NC_("RID_SUBSETMAP", "Georgian Supplement"), RID_SUBSETSTR_GEORGIAN_SUPPLEMENT }, - { NC_("RID_SUBSETMAP", "Glagolitic"), RID_SUBSETSTR_GLAGOLITIC }, - { NC_("RID_SUBSETMAP", "Kharoshthi"), RID_SUBSETSTR_KHAROSHTHI }, - { NC_("RID_SUBSETMAP", "Modifier Tone Letters"), RID_SUBSETSTR_MODIFIER_TONE_LETTERS }, - { NC_("RID_SUBSETMAP", "New Tai Lue"), RID_SUBSETSTR_NEW_TAI_LUE }, - { NC_("RID_SUBSETMAP", "Old Persian"), RID_SUBSETSTR_OLD_PERSIAN }, - { NC_("RID_SUBSETMAP", "Phonetic Extensions Supplement"), RID_SUBSETSTR_PHONETIC_EXTENSIONS_SUPPLEMENT }, - { NC_("RID_SUBSETMAP", "Supplemental Punctuation"), RID_SUBSETSTR_SUPPLEMENTAL_PUNCTUATION }, - { NC_("RID_SUBSETMAP", "Syloti Nagri"), RID_SUBSETSTR_SYLOTI_NAGRI }, - { NC_("RID_SUBSETMAP", "Tifinagh"), RID_SUBSETSTR_TIFINAGH }, - { NC_("RID_SUBSETMAP", "Vertical Forms"), RID_SUBSETSTR_VERTICAL_FORMS }, - { NC_("RID_SUBSETMAP", "Nko"), RID_SUBSETSTR_NKO }, - { NC_("RID_SUBSETMAP", "Balinese"), RID_SUBSETSTR_BALINESE }, - { NC_("RID_SUBSETMAP", "Latin Extended-C"), RID_SUBSETSTR_LATIN_EXTENDED_C }, - { NC_("RID_SUBSETMAP", "Latin Extended-D"), RID_SUBSETSTR_LATIN_EXTENDED_D }, - { NC_("RID_SUBSETMAP", "Phags-Pa"), RID_SUBSETSTR_PHAGS_PA }, - { NC_("RID_SUBSETMAP", "Phoenician"), RID_SUBSETSTR_PHOENICIAN }, - { NC_("RID_SUBSETMAP", "Cuneiform"), RID_SUBSETSTR_CUNEIFORM }, - { NC_("RID_SUBSETMAP", "Cuneiform Numbers And Punctuation"), RID_SUBSETSTR_CUNEIFORM_NUMBERS_AND_PUNCTUATION }, - { NC_("RID_SUBSETMAP", "Counting Rod Numerals"), RID_SUBSETSTR_COUNTING_ROD_NUMERALS }, - { NC_("RID_SUBSETMAP", "Sundanese"), RID_SUBSETSTR_SUNDANESE }, - { NC_("RID_SUBSETMAP", "Lepcha"), RID_SUBSETSTR_LEPCHA }, - { NC_("RID_SUBSETMAP", "Ol Chiki"), RID_SUBSETSTR_OL_CHIKI }, - { NC_("RID_SUBSETMAP", "Cyrillic Extended-A"), RID_SUBSETSTR_CYRILLIC_EXTENDED_A }, - { NC_("RID_SUBSETMAP", "Vai"), RID_SUBSETSTR_VAI }, - { NC_("RID_SUBSETMAP", "Cyrillic Extended-B"), RID_SUBSETSTR_CYRILLIC_EXTENDED_B }, - { NC_("RID_SUBSETMAP", "Saurashtra"), RID_SUBSETSTR_SAURASHTRA }, - { NC_("RID_SUBSETMAP", "Kayah Li"), RID_SUBSETSTR_KAYAH_LI }, - { NC_("RID_SUBSETMAP", "Rejang"), RID_SUBSETSTR_REJANG }, - { NC_("RID_SUBSETMAP", "Cham"), RID_SUBSETSTR_CHAM }, - { NC_("RID_SUBSETMAP", "Ancient Symbols"), RID_SUBSETSTR_ANCIENT_SYMBOLS }, - { NC_("RID_SUBSETMAP", "Phaistos Disc"), RID_SUBSETSTR_PHAISTOS_DISC }, - { NC_("RID_SUBSETMAP", "Lycian"), RID_SUBSETSTR_LYCIAN }, - { NC_("RID_SUBSETMAP", "Carian"), RID_SUBSETSTR_CARIAN }, - { NC_("RID_SUBSETMAP", "Lydian"), RID_SUBSETSTR_LYDIAN }, - { NC_("RID_SUBSETMAP", "Mahjong Tiles"), RID_SUBSETSTR_MAHJONG_TILES }, - { NC_("RID_SUBSETMAP", "Domino Tiles"), RID_SUBSETSTR_DOMINO_TILES }, - { NC_("RID_SUBSETMAP", "Samaritan"), RID_SUBSETSTR_SAMARITAN }, - { NC_("RID_SUBSETMAP", "Canadian Aboriginal Syllabics Extended"), RID_SUBSETSTR_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED }, - { NC_("RID_SUBSETMAP", "Tai Tham"), RID_SUBSETSTR_TAI_THAM }, - { NC_("RID_SUBSETMAP", "Vedic Extensions"), RID_SUBSETSTR_VEDIC_EXTENSIONS }, - { NC_("RID_SUBSETMAP", "Lisu"), RID_SUBSETSTR_LISU }, - { NC_("RID_SUBSETMAP", "Bamum"), RID_SUBSETSTR_BAMUM }, - { NC_("RID_SUBSETMAP", "Common Indic Number Forms"), RID_SUBSETSTR_COMMON_INDIC_NUMBER_FORMS }, - { NC_("RID_SUBSETMAP", "Devanagari Extended"), RID_SUBSETSTR_DEVANAGARI_EXTENDED }, - { NC_("RID_SUBSETMAP", "Hangul Jamo Extended-A"), RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_A }, - { NC_("RID_SUBSETMAP", "Javanese"), RID_SUBSETSTR_JAVANESE }, - { NC_("RID_SUBSETMAP", "Myanmar Extended-A"), RID_SUBSETSTR_MYANMAR_EXTENDED_A }, - { NC_("RID_SUBSETMAP", "Tai Viet"), RID_SUBSETSTR_TAI_VIET }, - { NC_("RID_SUBSETMAP", "Meetei Mayek"), RID_SUBSETSTR_MEETEI_MAYEK }, - { NC_("RID_SUBSETMAP", "Hangul Jamo Extended-B"), RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_B }, - { NC_("RID_SUBSETMAP", "Imperial Aramaic"), RID_SUBSETSTR_IMPERIAL_ARAMAIC }, - { NC_("RID_SUBSETMAP", "Old South Arabian"), RID_SUBSETSTR_OLD_SOUTH_ARABIAN }, - { NC_("RID_SUBSETMAP", "Avestan"), RID_SUBSETSTR_AVESTAN }, - { NC_("RID_SUBSETMAP", "Inscriptional Parthian"), RID_SUBSETSTR_INSCRIPTIONAL_PARTHIAN }, - { NC_("RID_SUBSETMAP", "Inscriptional Pahlavi"), RID_SUBSETSTR_INSCRIPTIONAL_PAHLAVI }, - { NC_("RID_SUBSETMAP", "Old Turkic"), RID_SUBSETSTR_OLD_TURKIC }, - { NC_("RID_SUBSETMAP", "Rumi Numeral Symbols"), RID_SUBSETSTR_RUMI_NUMERAL_SYMBOLS }, - { NC_("RID_SUBSETMAP", "Kaithi"), RID_SUBSETSTR_KAITHI }, - { NC_("RID_SUBSETMAP", "Egyptian Hieroglyphs"), RID_SUBSETSTR_EGYPTIAN_HIEROGLYPHS }, - { NC_("RID_SUBSETMAP", "Enclosed Alphanumeric Supplement"), RID_SUBSETSTR_ENCLOSED_ALPHANUMERIC_SUPPLEMENT }, - { NC_("RID_SUBSETMAP", "Enclosed Ideographic Supplement"), RID_SUBSETSTR_ENCLOSED_IDEOGRAPHIC_SUPPLEMENT }, - { NC_("RID_SUBSETMAP", "Mandaic"), RID_SUBSETSTR_MANDAIC }, - { NC_("RID_SUBSETMAP", "Batak"), RID_SUBSETSTR_BATAK }, - { NC_("RID_SUBSETMAP", "Ethiopic Extended-A"), RID_SUBSETSTR_ETHIOPIC_EXTENDED_A }, - { NC_("RID_SUBSETMAP", "Brahmi"), RID_SUBSETSTR_BRAHMI }, - { NC_("RID_SUBSETMAP", "Bamum Supplement"), RID_SUBSETSTR_BAMUM_SUPPLEMENT }, - { NC_("RID_SUBSETMAP", "Kana Supplement"), RID_SUBSETSTR_KANA_SUPPLEMENT }, - { NC_("RID_SUBSETMAP", "Playing Cards"), RID_SUBSETSTR_PLAYING_CARDS }, - { NC_("RID_SUBSETMAP", "Miscellaneous Symbols And Pictographs"), RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS }, - { NC_("RID_SUBSETMAP", "Emoticons"), RID_SUBSETSTR_EMOTICONS }, - { NC_("RID_SUBSETMAP", "Transport And Map Symbols"), RID_SUBSETSTR_TRANSPORT_AND_MAP_SYMBOLS }, - { NC_("RID_SUBSETMAP", "Alchemical Symbols"), RID_SUBSETSTR_ALCHEMICAL_SYMBOLS }, - { NC_("RID_SUBSETMAP", "Arabic Extended-A"), RID_SUBSETSTR_ARABIC_EXTENDED_A }, - { NC_("RID_SUBSETMAP", "Arabic Mathematical Alphabetic Symbols"), RID_SUBSETSTR_ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS }, - { NC_("RID_SUBSETMAP", "Chakma"), RID_SUBSETSTR_CHAKMA }, - { NC_("RID_SUBSETMAP", "Meetei Mayek Extensions"), RID_SUBSETSTR_MEETEI_MAYEK_EXTENSIONS }, - { NC_("RID_SUBSETMAP", "Meroitic Cursive"), RID_SUBSETSTR_MEROITIC_CURSIVE }, - { NC_("RID_SUBSETMAP", "Meroitic Hieroglyphs"), RID_SUBSETSTR_MEROITIC_HIEROGLYPHS }, - { NC_("RID_SUBSETMAP", "Miao"), RID_SUBSETSTR_MIAO }, - { NC_("RID_SUBSETMAP", "Sharada"), RID_SUBSETSTR_SHARADA }, - { NC_("RID_SUBSETMAP", "Sora Sompeng"), RID_SUBSETSTR_SORA_SOMPENG }, - { NC_("RID_SUBSETMAP", "Sundanese Supplement"), RID_SUBSETSTR_SUNDANESE_SUPPLEMENT }, - { NC_("RID_SUBSETMAP", "Takri"), RID_SUBSETSTR_TAKRI }, - { NC_("RID_SUBSETMAP", "Bassa Vah"), RID_SUBSETSTR_BASSA_VAH }, - { NC_("RID_SUBSETMAP", "Caucasian Albanian"), RID_SUBSETSTR_CAUCASIAN_ALBANIAN }, - { NC_("RID_SUBSETMAP", "Coptic Epact Numbers"), RID_SUBSETSTR_COPTIC_EPACT_NUMBERS }, - { NC_("RID_SUBSETMAP", "Combining Diacritical Marks Extended"), RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_EXTENDED }, - { NC_("RID_SUBSETMAP", "Duployan"), RID_SUBSETSTR_DUPLOYAN }, - { NC_("RID_SUBSETMAP", "Elbasan"), RID_SUBSETSTR_ELBASAN }, - { NC_("RID_SUBSETMAP", "Geometric Shapes Extended"), RID_SUBSETSTR_GEOMETRIC_SHAPES_EXTENDED }, - { NC_("RID_SUBSETMAP", "Grantha"), RID_SUBSETSTR_GRANTHA }, - { NC_("RID_SUBSETMAP", "Khojki"), RID_SUBSETSTR_KHOJKI }, - { NC_("RID_SUBSETMAP", "Khudawadi"), RID_SUBSETSTR_KHUDAWADI }, - { NC_("RID_SUBSETMAP", "Latin Extended-E"), RID_SUBSETSTR_LATIN_EXTENDED_E }, - { NC_("RID_SUBSETMAP", "Linear A"), RID_SUBSETSTR_LINEAR_A }, - { NC_("RID_SUBSETMAP", "Mahajani"), RID_SUBSETSTR_MAHAJANI }, - { NC_("RID_SUBSETMAP", "Manichaean"), RID_SUBSETSTR_MANICHAEAN }, - { NC_("RID_SUBSETMAP", "Mende Kikakui"), RID_SUBSETSTR_MENDE_KIKAKUI }, - { NC_("RID_SUBSETMAP", "Modi"), RID_SUBSETSTR_MODI }, - { NC_("RID_SUBSETMAP", "Mro"), RID_SUBSETSTR_MRO }, - { NC_("RID_SUBSETMAP", "Myanmar Extended-B"), RID_SUBSETSTR_MYANMAR_EXTENDED_B }, - { NC_("RID_SUBSETMAP", "Nabataean"), RID_SUBSETSTR_NABATAEAN }, - { NC_("RID_SUBSETMAP", "Old North Arabian"), RID_SUBSETSTR_OLD_NORTH_ARABIAN }, - { NC_("RID_SUBSETMAP", "Old Permic"), RID_SUBSETSTR_OLD_PERMIC }, - { NC_("RID_SUBSETMAP", "Ornamental Dingbats"), RID_SUBSETSTR_ORNAMENTAL_DINGBATS }, - { NC_("RID_SUBSETMAP", "Pahawh Hmong"), RID_SUBSETSTR_PAHAWH_HMONG }, - { NC_("RID_SUBSETMAP", "Palmyrene"), RID_SUBSETSTR_PALMYRENE }, - { NC_("RID_SUBSETMAP", "Pau Cin Hau"), RID_SUBSETSTR_PAU_CIN_HAU }, - { NC_("RID_SUBSETMAP", "Psalter Pahlavi"), RID_SUBSETSTR_PSALTER_PAHLAVI }, - { NC_("RID_SUBSETMAP", "Shorthand Format Controls"), RID_SUBSETSTR_SHORTHAND_FORMAT_CONTROLS }, - { NC_("RID_SUBSETMAP", "Siddham"), RID_SUBSETSTR_SIDDHAM }, - { NC_("RID_SUBSETMAP", "Sinhala Archaic Numbers"), RID_SUBSETSTR_SINHALA_ARCHAIC_NUMBERS }, - { NC_("RID_SUBSETMAP", "Supplemental Arrows-C"), RID_SUBSETSTR_SUPPLEMENTAL_ARROWS_C }, - { NC_("RID_SUBSETMAP", "Tirhuta"), RID_SUBSETSTR_TIRHUTA }, - { NC_("RID_SUBSETMAP", "Warang Citi"), RID_SUBSETSTR_WARANG_CITI }, - { NC_("RID_SUBSETMAP", "Ahom"), RID_SUBSETSTR_AHOM }, - { NC_("RID_SUBSETMAP", "Anatolian Hieroglyphs"), RID_SUBSETSTR_ANATOLIAN_HIEROGLYPHS }, - { NC_("RID_SUBSETMAP", "Cherokee Supplement"), RID_SUBSETSTR_CHEROKEE_SUPPLEMENT }, - { NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension E"), RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E }, - { NC_("RID_SUBSETMAP", "Early Dynastic Cuneiform"), RID_SUBSETSTR_EARLY_DYNASTIC_CUNEIFORM }, - { NC_("RID_SUBSETMAP", "Hatran"), RID_SUBSETSTR_HATRAN }, - { NC_("RID_SUBSETMAP", "Multani"), RID_SUBSETSTR_MULTANI }, - { NC_("RID_SUBSETMAP", "Old Hungarian"), RID_SUBSETSTR_OLD_HUNGARIAN }, - { NC_("RID_SUBSETMAP", "Supplemental Symbols And Pictographs"), RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS }, - { NC_("RID_SUBSETMAP", "Sutton Signwriting"), RID_SUBSETSTR_SUTTON_SIGNWRITING }, - { NC_("RID_SUBSETMAP", "Adlam"), RID_SUBSETSTR_ADLAM }, - { NC_("RID_SUBSETMAP", "Bhaiksuki"), RID_SUBSETSTR_BHAIKSUKI }, - { NC_("RID_SUBSETMAP", "Cyrillic Extended-C"), RID_SUBSETSTR_CYRILLIC_EXTENDED_C }, - { NC_("RID_SUBSETMAP", "Glagolitic Supplement"), RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT }, - { NC_("RID_SUBSETMAP", "Ideographic Symbols and Punctuation"), RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION }, - { NC_("RID_SUBSETMAP", "Marchen"), RID_SUBSETSTR_MARCHEN }, - { NC_("RID_SUBSETMAP", "Mongolian Supplement"), RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT }, - { NC_("RID_SUBSETMAP", "Newa"), RID_SUBSETSTR_NEWA }, - { NC_("RID_SUBSETMAP", "Osage"), RID_SUBSETSTR_OSAGE }, - { NC_("RID_SUBSETMAP", "Tangut"), RID_SUBSETSTR_TANGUT }, - { NC_("RID_SUBSETMAP", "Tangut Components"), RID_SUBSETSTR_TANGUT_COMPONENTS } -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/sdi/svxslots.hrc b/svx/sdi/svxslots.hrc index f31acc0c0fed..28bc5655c4fc 100644 --- a/svx/sdi/svxslots.hrc +++ b/svx/sdi/svxslots.hrc @@ -16,9 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sfx2/sfx.hrc> #include <sfx2/sfxsids.hrc> -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <editeng/editids.hrc> #include <svx/svxids.hrc> #include <svx/unomid.hxx> diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 7940e92eec9f..3f69bb61eb6f 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -34,7 +34,7 @@ #include <svx/strings.hrc> #include <svx/svxids.hrc> #include <memory> -#include "helpid.hrc" +#include "helpids.h" #define OWN_CALLMODE SfxCallMode::ASYNCHRON | SfxCallMode::RECORD diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index e2e8fe43cba7..0faa2153475f 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -42,7 +42,6 @@ #include <svl/itemset.hxx> #include <unicode/uchar.h> #include "rtl/ustrbuf.hxx" -#include "ucsubsetstruct.hrc" using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; @@ -784,19 +783,6 @@ inline Subset::Subset(sal_UCS4 nMin, sal_UCS4 nMax, const OUString& rName) : mnRangeMin(nMin), mnRangeMax(nMax), maRangeName(rName) {} -namespace -{ - OUString FindIndex(sal_uInt16 nRID) - { - for (size_t i = 0; i < SAL_N_ELEMENTS(RID_SUBSETMAP); ++i) - { - if (nRID == RID_SUBSETMAP[i].second) - return SvxResId(RID_SUBSETMAP[i].first); - } - return OUString(); - } -} - void SubsetMap::InitList() { static SubsetList aAllSubsets; @@ -819,826 +805,826 @@ void SubsetMap::InitList() case UBLOCK_LOW_SURROGATES: break; case UBLOCK_BASIC_LATIN: - aAllSubsets.push_back( Subset( 0x0000, 0x007F, FindIndex(RID_SUBSETSTR_BASIC_LATIN) ) ); + aAllSubsets.push_back( Subset( 0x0000, 0x007F, RID_SUBSETSTR_BASIC_LATIN ) ); break; case UBLOCK_LATIN_1_SUPPLEMENT: - aAllSubsets.push_back( Subset( 0x0080, 0x00FF, FindIndex(RID_SUBSETSTR_LATIN_1) ) ); + aAllSubsets.push_back( Subset( 0x0080, 0x00FF, RID_SUBSETSTR_LATIN_1 ) ); break; case UBLOCK_LATIN_EXTENDED_A: - aAllSubsets.push_back( Subset( 0x0100, 0x017F, FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_A) ) ); + aAllSubsets.push_back( Subset( 0x0100, 0x017F, RID_SUBSETSTR_LATIN_EXTENDED_A ) ); break; case UBLOCK_LATIN_EXTENDED_B: - aAllSubsets.push_back( Subset( 0x0180, 0x024F, FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_B) ) ); + aAllSubsets.push_back( Subset( 0x0180, 0x024F, RID_SUBSETSTR_LATIN_EXTENDED_B ) ); break; case UBLOCK_IPA_EXTENSIONS: - aAllSubsets.push_back( Subset( 0x0250, 0x02AF, FindIndex(RID_SUBSETSTR_IPA_EXTENSIONS) ) ); + aAllSubsets.push_back( Subset( 0x0250, 0x02AF, RID_SUBSETSTR_IPA_EXTENSIONS ) ); break; case UBLOCK_SPACING_MODIFIER_LETTERS: - aAllSubsets.push_back( Subset( 0x02B0, 0x02FF, FindIndex(RID_SUBSETSTR_SPACING_MODIFIERS) ) ); + aAllSubsets.push_back( Subset( 0x02B0, 0x02FF, RID_SUBSETSTR_SPACING_MODIFIERS ) ); break; case UBLOCK_COMBINING_DIACRITICAL_MARKS: - aAllSubsets.push_back( Subset( 0x0300, 0x036F, FindIndex(RID_SUBSETSTR_COMB_DIACRITICAL) ) ); + aAllSubsets.push_back( Subset( 0x0300, 0x036F, RID_SUBSETSTR_COMB_DIACRITICAL ) ); break; case UBLOCK_GREEK: - aAllSubsets.push_back( Subset( 0x0370, 0x03FF, FindIndex(RID_SUBSETSTR_BASIC_GREEK) ) ); + aAllSubsets.push_back( Subset( 0x0370, 0x03FF, RID_SUBSETSTR_BASIC_GREEK ) ); break; case UBLOCK_CYRILLIC: - aAllSubsets.push_back( Subset( 0x0400, 0x04FF, FindIndex(RID_SUBSETSTR_CYRILLIC) ) ); + aAllSubsets.push_back( Subset( 0x0400, 0x04FF, RID_SUBSETSTR_CYRILLIC ) ); break; case UBLOCK_ARMENIAN: - aAllSubsets.push_back( Subset( 0x0530, 0x058F, FindIndex(RID_SUBSETSTR_ARMENIAN) ) ); + aAllSubsets.push_back( Subset( 0x0530, 0x058F, RID_SUBSETSTR_ARMENIAN ) ); break; case UBLOCK_HEBREW: - aAllSubsets.push_back( Subset( 0x0590, 0x05FF, FindIndex(RID_SUBSETSTR_BASIC_HEBREW) ) ); + aAllSubsets.push_back( Subset( 0x0590, 0x05FF, RID_SUBSETSTR_BASIC_HEBREW ) ); break; case UBLOCK_ARABIC: - aAllSubsets.push_back( Subset( 0x0600, 0x065F, FindIndex(RID_SUBSETSTR_BASIC_ARABIC) ) ); + aAllSubsets.push_back( Subset( 0x0600, 0x065F, RID_SUBSETSTR_BASIC_ARABIC ) ); break; case UBLOCK_SYRIAC: - aAllSubsets.push_back( Subset( 0x0700, 0x074F, FindIndex(RID_SUBSETSTR_SYRIAC) ) ); + aAllSubsets.push_back( Subset( 0x0700, 0x074F, RID_SUBSETSTR_SYRIAC ) ); break; case UBLOCK_THAANA: - aAllSubsets.push_back( Subset( 0x0780, 0x07BF, FindIndex(RID_SUBSETSTR_THAANA) ) ); + aAllSubsets.push_back( Subset( 0x0780, 0x07BF, RID_SUBSETSTR_THAANA ) ); break; case UBLOCK_DEVANAGARI: - aAllSubsets.push_back( Subset( 0x0900, 0x097F, FindIndex(RID_SUBSETSTR_DEVANAGARI) ) ); + aAllSubsets.push_back( Subset( 0x0900, 0x097F, RID_SUBSETSTR_DEVANAGARI ) ); break; case UBLOCK_BENGALI: - aAllSubsets.push_back( Subset( 0x0980, 0x09FF, FindIndex(RID_SUBSETSTR_BENGALI) ) ); + aAllSubsets.push_back( Subset( 0x0980, 0x09FF, RID_SUBSETSTR_BENGALI ) ); break; case UBLOCK_GURMUKHI: - aAllSubsets.push_back( Subset( 0x0A00, 0x0A7F, FindIndex(RID_SUBSETSTR_GURMUKHI) ) ); + aAllSubsets.push_back( Subset( 0x0A00, 0x0A7F, RID_SUBSETSTR_GURMUKHI ) ); break; case UBLOCK_GUJARATI: - aAllSubsets.push_back( Subset( 0x0A80, 0x0AFF, FindIndex(RID_SUBSETSTR_GUJARATI) ) ); + aAllSubsets.push_back( Subset( 0x0A80, 0x0AFF, RID_SUBSETSTR_GUJARATI ) ); break; case UBLOCK_ORIYA: - aAllSubsets.push_back( Subset( 0x0B00, 0x0B7F, FindIndex(RID_SUBSETSTR_ODIA) ) ); + aAllSubsets.push_back( Subset( 0x0B00, 0x0B7F, RID_SUBSETSTR_ODIA ) ); break; case UBLOCK_TAMIL: - aAllSubsets.push_back( Subset( 0x0B80, 0x0BFF, FindIndex(RID_SUBSETSTR_TAMIL) ) ); + aAllSubsets.push_back( Subset( 0x0B80, 0x0BFF, RID_SUBSETSTR_TAMIL ) ); break; case UBLOCK_TELUGU: - aAllSubsets.push_back( Subset( 0x0C00, 0x0C7F, FindIndex(RID_SUBSETSTR_TELUGU) ) ); + aAllSubsets.push_back( Subset( 0x0C00, 0x0C7F, RID_SUBSETSTR_TELUGU ) ); break; case UBLOCK_KANNADA: - aAllSubsets.push_back( Subset( 0x0C80, 0x0CFF, FindIndex(RID_SUBSETSTR_KANNADA) ) ); + aAllSubsets.push_back( Subset( 0x0C80, 0x0CFF, RID_SUBSETSTR_KANNADA ) ); break; case UBLOCK_MALAYALAM: - aAllSubsets.push_back( Subset( 0x0D00, 0x0D7F, FindIndex(RID_SUBSETSTR_MALAYALAM) ) ); + aAllSubsets.push_back( Subset( 0x0D00, 0x0D7F, RID_SUBSETSTR_MALAYALAM ) ); break; case UBLOCK_SINHALA: - aAllSubsets.push_back( Subset( 0x0D80, 0x0DFF, FindIndex(RID_SUBSETSTR_SINHALA) ) ); + aAllSubsets.push_back( Subset( 0x0D80, 0x0DFF, RID_SUBSETSTR_SINHALA ) ); break; case UBLOCK_THAI: - aAllSubsets.push_back( Subset( 0x0E00, 0x0E7F, FindIndex(RID_SUBSETSTR_THAI) ) ); + aAllSubsets.push_back( Subset( 0x0E00, 0x0E7F, RID_SUBSETSTR_THAI ) ); break; case UBLOCK_LAO: - aAllSubsets.push_back( Subset( 0x0E80, 0x0EFF, FindIndex(RID_SUBSETSTR_LAO) ) ); + aAllSubsets.push_back( Subset( 0x0E80, 0x0EFF, RID_SUBSETSTR_LAO ) ); break; case UBLOCK_TIBETAN: - aAllSubsets.push_back( Subset( 0x0F00, 0x0FBF, FindIndex(RID_SUBSETSTR_TIBETAN) ) ); + aAllSubsets.push_back( Subset( 0x0F00, 0x0FBF, RID_SUBSETSTR_TIBETAN ) ); break; case UBLOCK_MYANMAR: - aAllSubsets.push_back( Subset( 0x1000, 0x109F, FindIndex(RID_SUBSETSTR_MYANMAR) ) ); + aAllSubsets.push_back( Subset( 0x1000, 0x109F, RID_SUBSETSTR_MYANMAR ) ); break; case UBLOCK_GEORGIAN: - aAllSubsets.push_back( Subset( 0x10A0, 0x10FF, FindIndex(RID_SUBSETSTR_BASIC_GEORGIAN) ) ); + aAllSubsets.push_back( Subset( 0x10A0, 0x10FF, RID_SUBSETSTR_BASIC_GEORGIAN ) ); break; case UBLOCK_HANGUL_JAMO: - aAllSubsets.push_back( Subset( 0x1100, 0x11FF, FindIndex(RID_SUBSETSTR_HANGUL_JAMO) ) ); + aAllSubsets.push_back( Subset( 0x1100, 0x11FF, RID_SUBSETSTR_HANGUL_JAMO ) ); break; case UBLOCK_ETHIOPIC: - aAllSubsets.push_back( Subset( 0x1200, 0x137F, FindIndex(RID_SUBSETSTR_ETHIOPIC) ) ); + aAllSubsets.push_back( Subset( 0x1200, 0x137F, RID_SUBSETSTR_ETHIOPIC ) ); break; case UBLOCK_CHEROKEE: - aAllSubsets.push_back( Subset( 0x13A0, 0x13FF, FindIndex(RID_SUBSETSTR_CHEROKEE) ) ); + aAllSubsets.push_back( Subset( 0x13A0, 0x13FF, RID_SUBSETSTR_CHEROKEE ) ); break; case UBLOCK_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS: - aAllSubsets.push_back( Subset( 0x1400, 0x167F, FindIndex(RID_SUBSETSTR_CANADIAN_ABORIGINAL) ) ); + aAllSubsets.push_back( Subset( 0x1400, 0x167F, RID_SUBSETSTR_CANADIAN_ABORIGINAL ) ); break; case UBLOCK_OGHAM: - aAllSubsets.push_back( Subset( 0x1680, 0x169F, FindIndex(RID_SUBSETSTR_OGHAM) ) ); + aAllSubsets.push_back( Subset( 0x1680, 0x169F, RID_SUBSETSTR_OGHAM ) ); break; case UBLOCK_RUNIC: - aAllSubsets.push_back( Subset( 0x16A0, 0x16F0, FindIndex(RID_SUBSETSTR_RUNIC) ) ); + aAllSubsets.push_back( Subset( 0x16A0, 0x16F0, RID_SUBSETSTR_RUNIC ) ); break; case UBLOCK_KHMER: - aAllSubsets.push_back( Subset( 0x1780, 0x17FF, FindIndex(RID_SUBSETSTR_KHMER) ) ); + aAllSubsets.push_back( Subset( 0x1780, 0x17FF, RID_SUBSETSTR_KHMER ) ); break; case UBLOCK_MONGOLIAN: - aAllSubsets.push_back( Subset( 0x1800, 0x18AF, FindIndex(RID_SUBSETSTR_MONGOLIAN) ) ); + aAllSubsets.push_back( Subset( 0x1800, 0x18AF, RID_SUBSETSTR_MONGOLIAN ) ); break; case UBLOCK_LATIN_EXTENDED_ADDITIONAL: - aAllSubsets.push_back( Subset( 0x1E00, 0x1EFF, FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_ADDS) ) ); + aAllSubsets.push_back( Subset( 0x1E00, 0x1EFF, RID_SUBSETSTR_LATIN_EXTENDED_ADDS ) ); break; case UBLOCK_GREEK_EXTENDED: - aAllSubsets.push_back( Subset( 0x1F00, 0x1FFF, FindIndex(RID_SUBSETSTR_GREEK_EXTENDED) ) ); + aAllSubsets.push_back( Subset( 0x1F00, 0x1FFF, RID_SUBSETSTR_GREEK_EXTENDED ) ); break; case UBLOCK_GENERAL_PUNCTUATION: - aAllSubsets.push_back( Subset( 0x2000, 0x206F, FindIndex(RID_SUBSETSTR_GENERAL_PUNCTUATION) ) ); + aAllSubsets.push_back( Subset( 0x2000, 0x206F, RID_SUBSETSTR_GENERAL_PUNCTUATION ) ); break; case UBLOCK_SUPERSCRIPTS_AND_SUBSCRIPTS: - aAllSubsets.push_back( Subset( 0x2070, 0x209F, FindIndex(RID_SUBSETSTR_SUB_SUPER_SCRIPTS) ) ); + aAllSubsets.push_back( Subset( 0x2070, 0x209F, RID_SUBSETSTR_SUB_SUPER_SCRIPTS ) ); break; case UBLOCK_CURRENCY_SYMBOLS: - aAllSubsets.push_back( Subset( 0x20A0, 0x20CF, FindIndex(RID_SUBSETSTR_CURRENCY_SYMBOLS) ) ); + aAllSubsets.push_back( Subset( 0x20A0, 0x20CF, RID_SUBSETSTR_CURRENCY_SYMBOLS ) ); break; case UBLOCK_COMBINING_MARKS_FOR_SYMBOLS: - aAllSubsets.push_back( Subset( 0x20D0, 0x20FF, FindIndex(RID_SUBSETSTR_COMB_DIACRITIC_SYMS) ) ); + aAllSubsets.push_back( Subset( 0x20D0, 0x20FF, RID_SUBSETSTR_COMB_DIACRITIC_SYMS ) ); break; case UBLOCK_LETTERLIKE_SYMBOLS: - aAllSubsets.push_back( Subset( 0x2100, 0x214F, FindIndex(RID_SUBSETSTR_LETTERLIKE_SYMBOLS) ) ); + aAllSubsets.push_back( Subset( 0x2100, 0x214F, RID_SUBSETSTR_LETTERLIKE_SYMBOLS ) ); break; case UBLOCK_NUMBER_FORMS: - aAllSubsets.push_back( Subset( 0x2150, 0x218F, FindIndex(RID_SUBSETSTR_NUMBER_FORMS) ) ); + aAllSubsets.push_back( Subset( 0x2150, 0x218F, RID_SUBSETSTR_NUMBER_FORMS ) ); break; case UBLOCK_ARROWS: - aAllSubsets.push_back( Subset( 0x2190, 0x21FF, FindIndex(RID_SUBSETSTR_ARROWS) ) ); + aAllSubsets.push_back( Subset( 0x2190, 0x21FF, RID_SUBSETSTR_ARROWS ) ); break; case UBLOCK_MATHEMATICAL_OPERATORS: - aAllSubsets.push_back( Subset( 0x2200, 0x22FF, FindIndex(RID_SUBSETSTR_MATH_OPERATORS) ) ); + aAllSubsets.push_back( Subset( 0x2200, 0x22FF, RID_SUBSETSTR_MATH_OPERATORS ) ); break; case UBLOCK_MISCELLANEOUS_TECHNICAL: - aAllSubsets.push_back( Subset( 0x2300, 0x23FF, FindIndex(RID_SUBSETSTR_MISC_TECHNICAL) ) ); + aAllSubsets.push_back( Subset( 0x2300, 0x23FF, RID_SUBSETSTR_MISC_TECHNICAL ) ); break; case UBLOCK_CONTROL_PICTURES: - aAllSubsets.push_back( Subset( 0x2400, 0x243F, FindIndex(RID_SUBSETSTR_CONTROL_PICTURES) ) ); + aAllSubsets.push_back( Subset( 0x2400, 0x243F, RID_SUBSETSTR_CONTROL_PICTURES ) ); break; case UBLOCK_OPTICAL_CHARACTER_RECOGNITION: - aAllSubsets.push_back( Subset( 0x2440, 0x245F, FindIndex(RID_SUBSETSTR_OPTICAL_CHAR_REC) ) ); + aAllSubsets.push_back( Subset( 0x2440, 0x245F, RID_SUBSETSTR_OPTICAL_CHAR_REC ) ); break; case UBLOCK_ENCLOSED_ALPHANUMERICS: - aAllSubsets.push_back( Subset( 0x2460, 0x24FF, FindIndex(RID_SUBSETSTR_ENCLOSED_ALPHANUM) ) ); + aAllSubsets.push_back( Subset( 0x2460, 0x24FF, RID_SUBSETSTR_ENCLOSED_ALPHANUM ) ); break; case UBLOCK_BOX_DRAWING: - aAllSubsets.push_back( Subset( 0x2500, 0x257F, FindIndex(RID_SUBSETSTR_BOX_DRAWING) ) ); + aAllSubsets.push_back( Subset( 0x2500, 0x257F, RID_SUBSETSTR_BOX_DRAWING ) ); break; case UBLOCK_BLOCK_ELEMENTS: - aAllSubsets.push_back( Subset( 0x2580, 0x259F, FindIndex(RID_SUBSETSTR_BLOCK_ELEMENTS) ) ); + aAllSubsets.push_back( Subset( 0x2580, 0x259F, RID_SUBSETSTR_BLOCK_ELEMENTS ) ); break; case UBLOCK_GEOMETRIC_SHAPES: - aAllSubsets.push_back( Subset( 0x25A0, 0x25FF, FindIndex(RID_SUBSETSTR_GEOMETRIC_SHAPES) ) ); + aAllSubsets.push_back( Subset( 0x25A0, 0x25FF, RID_SUBSETSTR_GEOMETRIC_SHAPES ) ); break; case UBLOCK_MISCELLANEOUS_SYMBOLS: - aAllSubsets.push_back( Subset( 0x2600, 0x26FF, FindIndex(RID_SUBSETSTR_MISC_DINGBATS) ) ); + aAllSubsets.push_back( Subset( 0x2600, 0x26FF, RID_SUBSETSTR_MISC_DINGBATS ) ); break; case UBLOCK_DINGBATS: - aAllSubsets.push_back( Subset( 0x2700, 0x27BF, FindIndex(RID_SUBSETSTR_DINGBATS) ) ); + aAllSubsets.push_back( Subset( 0x2700, 0x27BF, RID_SUBSETSTR_DINGBATS ) ); break; case UBLOCK_BRAILLE_PATTERNS: - aAllSubsets.push_back( Subset( 0x2800, 0x28FF, FindIndex(RID_SUBSETSTR_BRAILLE_PATTERNS) ) ); + aAllSubsets.push_back( Subset( 0x2800, 0x28FF, RID_SUBSETSTR_BRAILLE_PATTERNS ) ); break; case UBLOCK_CJK_RADICALS_SUPPLEMENT: - aAllSubsets.push_back( Subset( 0x2E80, 0x2EFF, FindIndex(RID_SUBSETSTR_CJK_RADICAL_SUPPL) ) ); + aAllSubsets.push_back( Subset( 0x2E80, 0x2EFF, RID_SUBSETSTR_CJK_RADICAL_SUPPL ) ); break; case UBLOCK_KANGXI_RADICALS: - aAllSubsets.push_back( Subset( 0x2F00, 0x2FDF, FindIndex(RID_SUBSETSTR_KANGXI_RADICALS) ) ); + aAllSubsets.push_back( Subset( 0x2F00, 0x2FDF, RID_SUBSETSTR_KANGXI_RADICALS ) ); break; case UBLOCK_IDEOGRAPHIC_DESCRIPTION_CHARACTERS: - aAllSubsets.push_back( Subset( 0x2FF0, 0x2FFF, FindIndex(RID_SUBSETSTR_IDEO_DESC_CHARS) ) ); + aAllSubsets.push_back( Subset( 0x2FF0, 0x2FFF, RID_SUBSETSTR_IDEO_DESC_CHARS ) ); break; case UBLOCK_CJK_SYMBOLS_AND_PUNCTUATION: - aAllSubsets.push_back( Subset( 0x3000, 0x303F, FindIndex(RID_SUBSETSTR_CJK_SYMS_PUNCTUATION) ) ); + aAllSubsets.push_back( Subset( 0x3000, 0x303F, RID_SUBSETSTR_CJK_SYMS_PUNCTUATION ) ); break; case UBLOCK_HIRAGANA: - aAllSubsets.push_back( Subset( 0x3040, 0x309F, FindIndex(RID_SUBSETSTR_HIRAGANA) ) ); + aAllSubsets.push_back( Subset( 0x3040, 0x309F, RID_SUBSETSTR_HIRAGANA ) ); break; case UBLOCK_KATAKANA: - aAllSubsets.push_back( Subset( 0x30A0, 0x30FF, FindIndex(RID_SUBSETSTR_KATAKANA) ) ); + aAllSubsets.push_back( Subset( 0x30A0, 0x30FF, RID_SUBSETSTR_KATAKANA ) ); break; case UBLOCK_BOPOMOFO: - aAllSubsets.push_back( Subset( 0x3100, 0x312F, FindIndex(RID_SUBSETSTR_BOPOMOFO) ) ); + aAllSubsets.push_back( Subset( 0x3100, 0x312F, RID_SUBSETSTR_BOPOMOFO ) ); break; case UBLOCK_HANGUL_COMPATIBILITY_JAMO: - aAllSubsets.push_back( Subset( 0x3130, 0x318F, FindIndex(RID_SUBSETSTR_HANGUL_COMPAT_JAMO) ) ); + aAllSubsets.push_back( Subset( 0x3130, 0x318F, RID_SUBSETSTR_HANGUL_COMPAT_JAMO ) ); break; case UBLOCK_KANBUN: - aAllSubsets.push_back( Subset( 0x3190, 0x319F, FindIndex(RID_SUBSETSTR_KANBUN) ) ); + aAllSubsets.push_back( Subset( 0x3190, 0x319F, RID_SUBSETSTR_KANBUN ) ); break; case UBLOCK_BOPOMOFO_EXTENDED: - aAllSubsets.push_back( Subset( 0x31A0, 0x31BF, FindIndex(RID_SUBSETSTR_BOPOMOFO_EXTENDED) ) ); + aAllSubsets.push_back( Subset( 0x31A0, 0x31BF, RID_SUBSETSTR_BOPOMOFO_EXTENDED ) ); break; case UBLOCK_ENCLOSED_CJK_LETTERS_AND_MONTHS: - aAllSubsets.push_back( Subset( 0x3200, 0x32FF, FindIndex(RID_SUBSETSTR_ENCLOSED_CJK_LETTERS) ) ); + aAllSubsets.push_back( Subset( 0x3200, 0x32FF, RID_SUBSETSTR_ENCLOSED_CJK_LETTERS ) ); break; case UBLOCK_CJK_COMPATIBILITY: - aAllSubsets.push_back( Subset( 0x3300, 0x33FF, FindIndex(RID_SUBSETSTR_CJK_COMPATIBILITY) ) ); + aAllSubsets.push_back( Subset( 0x3300, 0x33FF, RID_SUBSETSTR_CJK_COMPATIBILITY ) ); break; case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A: - aAllSubsets.push_back( Subset( 0x3400, 0x4DBF, FindIndex(RID_SUBSETSTR_CJK_EXT_A_UNIFIED_IDGRAPH) ) ); + aAllSubsets.push_back( Subset( 0x3400, 0x4DBF, RID_SUBSETSTR_CJK_EXT_A_UNIFIED_IDGRAPH ) ); break; case UBLOCK_CJK_UNIFIED_IDEOGRAPHS: - aAllSubsets.push_back( Subset( 0x4E00, 0x9FA5, FindIndex(RID_SUBSETSTR_CJK_UNIFIED_IDGRAPH) ) ); + aAllSubsets.push_back( Subset( 0x4E00, 0x9FA5, RID_SUBSETSTR_CJK_UNIFIED_IDGRAPH ) ); break; case UBLOCK_YI_SYLLABLES: - aAllSubsets.push_back( Subset( 0xA000, 0xA48F, FindIndex(RID_SUBSETSTR_YI_SYLLABLES) ) ); + aAllSubsets.push_back( Subset( 0xA000, 0xA48F, RID_SUBSETSTR_YI_SYLLABLES ) ); break; case UBLOCK_YI_RADICALS: - aAllSubsets.push_back( Subset( 0xA490, 0xA4CF, FindIndex(RID_SUBSETSTR_YI_RADICALS) ) ); + aAllSubsets.push_back( Subset( 0xA490, 0xA4CF, RID_SUBSETSTR_YI_RADICALS ) ); break; case UBLOCK_HANGUL_SYLLABLES: - aAllSubsets.push_back( Subset( 0xAC00, 0xD7AF, FindIndex(RID_SUBSETSTR_HANGUL) ) ); + aAllSubsets.push_back( Subset( 0xAC00, 0xD7AF, RID_SUBSETSTR_HANGUL ) ); break; case UBLOCK_PRIVATE_USE_AREA: - aAllSubsets.push_back( Subset( 0xE000, 0xF8FF, FindIndex(RID_SUBSETSTR_PRIVATE_USE_AREA) ) ); + aAllSubsets.push_back( Subset( 0xE000, 0xF8FF, RID_SUBSETSTR_PRIVATE_USE_AREA ) ); break; case UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS: - aAllSubsets.push_back( Subset( 0xF900, 0xFAFF, FindIndex(RID_SUBSETSTR_CJK_COMPAT_IDGRAPHS) ) ); + aAllSubsets.push_back( Subset( 0xF900, 0xFAFF, RID_SUBSETSTR_CJK_COMPAT_IDGRAPHS ) ); break; case UBLOCK_ALPHABETIC_PRESENTATION_FORMS: - aAllSubsets.push_back( Subset( 0xFB00, 0xFB4F, FindIndex(RID_SUBSETSTR_ALPHA_PRESENTATION) ) ); + aAllSubsets.push_back( Subset( 0xFB00, 0xFB4F, RID_SUBSETSTR_ALPHA_PRESENTATION ) ); break; case UBLOCK_ARABIC_PRESENTATION_FORMS_A: - aAllSubsets.push_back( Subset( 0xFB50, 0xFDFF, FindIndex(RID_SUBSETSTR_ARABIC_PRESENT_A) ) ); + aAllSubsets.push_back( Subset( 0xFB50, 0xFDFF, RID_SUBSETSTR_ARABIC_PRESENT_A ) ); break; case UBLOCK_COMBINING_HALF_MARKS: - aAllSubsets.push_back( Subset( 0xFE20, 0xFE2F, FindIndex(RID_SUBSETSTR_COMBINING_HALF_MARKS) ) ); + aAllSubsets.push_back( Subset( 0xFE20, 0xFE2F, RID_SUBSETSTR_COMBINING_HALF_MARKS ) ); break; case UBLOCK_CJK_COMPATIBILITY_FORMS: - aAllSubsets.push_back( Subset( 0xFE30, 0xFE4F, FindIndex(RID_SUBSETSTR_CJK_COMPAT_FORMS) ) ); + aAllSubsets.push_back( Subset( 0xFE30, 0xFE4F, RID_SUBSETSTR_CJK_COMPAT_FORMS ) ); break; case UBLOCK_SMALL_FORM_VARIANTS: - aAllSubsets.push_back( Subset( 0xFE50, 0xFE6F, FindIndex(RID_SUBSETSTR_SMALL_FORM_VARIANTS) ) ); + aAllSubsets.push_back( Subset( 0xFE50, 0xFE6F, RID_SUBSETSTR_SMALL_FORM_VARIANTS ) ); break; case UBLOCK_ARABIC_PRESENTATION_FORMS_B: - aAllSubsets.push_back( Subset( 0xFE70, 0xFEFF, FindIndex(RID_SUBSETSTR_ARABIC_PRESENT_B) ) ); + aAllSubsets.push_back( Subset( 0xFE70, 0xFEFF, RID_SUBSETSTR_ARABIC_PRESENT_B ) ); break; case UBLOCK_SPECIALS: - aAllSubsets.push_back( Subset( 0xFFF0, 0xFFFF, FindIndex(RID_SUBSETSTR_SPECIALS) ) ); + aAllSubsets.push_back( Subset( 0xFFF0, 0xFFFF, RID_SUBSETSTR_SPECIALS ) ); break; case UBLOCK_HALFWIDTH_AND_FULLWIDTH_FORMS: - aAllSubsets.push_back( Subset( 0xFF00, 0xFFEF, FindIndex(RID_SUBSETSTR_HALFW_FULLW_FORMS) ) ); + aAllSubsets.push_back( Subset( 0xFF00, 0xFFEF, RID_SUBSETSTR_HALFW_FULLW_FORMS ) ); break; case UBLOCK_OLD_ITALIC: - aAllSubsets.push_back( Subset( 0x10300, 0x1032F, FindIndex(RID_SUBSETSTR_OLD_ITALIC) ) ); + aAllSubsets.push_back( Subset( 0x10300, 0x1032F, RID_SUBSETSTR_OLD_ITALIC ) ); break; case UBLOCK_GOTHIC: - aAllSubsets.push_back( Subset( 0x10330, 0x1034F, FindIndex(RID_SUBSETSTR_GOTHIC) ) ); + aAllSubsets.push_back( Subset( 0x10330, 0x1034F, RID_SUBSETSTR_GOTHIC ) ); break; case UBLOCK_DESERET: - aAllSubsets.push_back( Subset( 0x10400, 0x1044F, FindIndex(RID_SUBSETSTR_DESERET) ) ); + aAllSubsets.push_back( Subset( 0x10400, 0x1044F, RID_SUBSETSTR_DESERET ) ); break; case UBLOCK_BYZANTINE_MUSICAL_SYMBOLS: - aAllSubsets.push_back( Subset( 0x1D000, 0x1D0FF, FindIndex(RID_SUBSETSTR_BYZANTINE_MUSICAL_SYMBOLS) ) ); + aAllSubsets.push_back( Subset( 0x1D000, 0x1D0FF, RID_SUBSETSTR_BYZANTINE_MUSICAL_SYMBOLS ) ); break; case UBLOCK_MUSICAL_SYMBOLS: - aAllSubsets.push_back( Subset( 0x1D100, 0x1D1FF, FindIndex(RID_SUBSETSTR_MUSICAL_SYMBOLS) ) ); + aAllSubsets.push_back( Subset( 0x1D100, 0x1D1FF, RID_SUBSETSTR_MUSICAL_SYMBOLS ) ); break; case UBLOCK_MATHEMATICAL_ALPHANUMERIC_SYMBOLS: - aAllSubsets.push_back( Subset( 0x1D400, 0x1D7FF, FindIndex(RID_SUBSETSTR_MATHEMATICAL_ALPHANUMERIC_SYMBOLS) ) ); + aAllSubsets.push_back( Subset( 0x1D400, 0x1D7FF, RID_SUBSETSTR_MATHEMATICAL_ALPHANUMERIC_SYMBOLS ) ); break; case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B: - aAllSubsets.push_back( Subset( 0x20000, 0x2A6DF, FindIndex(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B) ) ); + aAllSubsets.push_back( Subset( 0x20000, 0x2A6DF, RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B ) ); break; case UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT: - aAllSubsets.push_back( Subset( 0x2F800, 0x2FA1F, FindIndex(RID_SUBSETSTR_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT) ) ); + aAllSubsets.push_back( Subset( 0x2F800, 0x2FA1F, RID_SUBSETSTR_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT ) ); break; case UBLOCK_TAGS: - aAllSubsets.push_back( Subset( 0xE0000, 0xE007F, FindIndex(RID_SUBSETSTR_TAGS) ) ); + aAllSubsets.push_back( Subset( 0xE0000, 0xE007F, RID_SUBSETSTR_TAGS ) ); break; case UBLOCK_CYRILLIC_SUPPLEMENTARY: - aAllSubsets.push_back( Subset( 0x0500, 0x052F, FindIndex(RID_SUBSETSTR_CYRILLIC_SUPPLEMENTARY) ) ); + aAllSubsets.push_back( Subset( 0x0500, 0x052F, RID_SUBSETSTR_CYRILLIC_SUPPLEMENTARY ) ); break; case UBLOCK_TAGALOG: - aAllSubsets.push_back( Subset( 0x1700, 0x171F, FindIndex(RID_SUBSETSTR_TAGALOG) ) ); + aAllSubsets.push_back( Subset( 0x1700, 0x171F, RID_SUBSETSTR_TAGALOG ) ); break; case UBLOCK_HANUNOO: - aAllSubsets.push_back( Subset( 0x1720, 0x173F, FindIndex(RID_SUBSETSTR_HANUNOO) ) ); + aAllSubsets.push_back( Subset( 0x1720, 0x173F, RID_SUBSETSTR_HANUNOO ) ); break; case UBLOCK_BUHID: - aAllSubsets.push_back( Subset( 0x1740, 0x175F, FindIndex(RID_SUBSETSTR_BUHID) ) ); + aAllSubsets.push_back( Subset( 0x1740, 0x175F, RID_SUBSETSTR_BUHID ) ); break; case UBLOCK_TAGBANWA: - aAllSubsets.push_back( Subset( 0x1760, 0x177F, FindIndex(RID_SUBSETSTR_TAGBANWA) ) ); + aAllSubsets.push_back( Subset( 0x1760, 0x177F, RID_SUBSETSTR_TAGBANWA ) ); break; case UBLOCK_MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A: - aAllSubsets.push_back( Subset( 0x27C0, 0x27EF, FindIndex(RID_SUBSETSTR_MISC_MATH_SYMS_A) ) ); + aAllSubsets.push_back( Subset( 0x27C0, 0x27EF, RID_SUBSETSTR_MISC_MATH_SYMS_A ) ); break; case UBLOCK_SUPPLEMENTAL_ARROWS_A: - aAllSubsets.push_back( Subset( 0x27F0, 0x27FF, FindIndex(RID_SUBSETSTR_SUPPL_ARROWS_A) ) ); + aAllSubsets.push_back( Subset( 0x27F0, 0x27FF, RID_SUBSETSTR_SUPPL_ARROWS_A ) ); break; case UBLOCK_SUPPLEMENTAL_ARROWS_B: - aAllSubsets.push_back( Subset( 0x2900, 0x297F, FindIndex(RID_SUBSETSTR_SUPPL_ARROWS_B) ) ); + aAllSubsets.push_back( Subset( 0x2900, 0x297F, RID_SUBSETSTR_SUPPL_ARROWS_B ) ); break; case UBLOCK_MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B: - aAllSubsets.push_back( Subset( 0x2980, 0x29FF, FindIndex(RID_SUBSETSTR_MISC_MATH_SYMS_B) ) ); + aAllSubsets.push_back( Subset( 0x2980, 0x29FF, RID_SUBSETSTR_MISC_MATH_SYMS_B ) ); break; case UBLOCK_SUPPLEMENTAL_MATHEMATICAL_OPERATORS: - aAllSubsets.push_back( Subset( 0x2A00, 0x2AFF, FindIndex(RID_SUBSETSTR_MISC_MATH_SYMS_B) ) ); + aAllSubsets.push_back( Subset( 0x2A00, 0x2AFF, RID_SUBSETSTR_MISC_MATH_SYMS_B ) ); break; case UBLOCK_KATAKANA_PHONETIC_EXTENSIONS: - aAllSubsets.push_back( Subset( 0x31F0, 0x31FF, FindIndex(RID_SUBSETSTR_KATAKANA_PHONETIC) ) ); + aAllSubsets.push_back( Subset( 0x31F0, 0x31FF, RID_SUBSETSTR_KATAKANA_PHONETIC ) ); break; case UBLOCK_VARIATION_SELECTORS: - aAllSubsets.push_back( Subset( 0xFE00, 0xFE0F, FindIndex(RID_SUBSETSTR_VARIATION_SELECTORS) ) ); + aAllSubsets.push_back( Subset( 0xFE00, 0xFE0F, RID_SUBSETSTR_VARIATION_SELECTORS ) ); break; case UBLOCK_SUPPLEMENTARY_PRIVATE_USE_AREA_A: - aAllSubsets.push_back( Subset( 0xF0000, 0xFFFFF, FindIndex(RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_A) ) ); + aAllSubsets.push_back( Subset( 0xF0000, 0xFFFFF, RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_A ) ); break; case UBLOCK_SUPPLEMENTARY_PRIVATE_USE_AREA_B: - aAllSubsets.push_back( Subset( 0x100000, 0x10FFFF, FindIndex(RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_B) ) ); + aAllSubsets.push_back( Subset( 0x100000, 0x10FFFF, RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_B ) ); break; case UBLOCK_LIMBU: - aAllSubsets.push_back( Subset( 0x1900, 0x194F, FindIndex(RID_SUBSETSTR_LIMBU) ) ); + aAllSubsets.push_back( Subset( 0x1900, 0x194F, RID_SUBSETSTR_LIMBU ) ); break; case UBLOCK_TAI_LE: - aAllSubsets.push_back( Subset( 0x1950, 0x197F, FindIndex(RID_SUBSETSTR_TAI_LE) ) ); + aAllSubsets.push_back( Subset( 0x1950, 0x197F, RID_SUBSETSTR_TAI_LE ) ); break; case UBLOCK_KHMER_SYMBOLS: - aAllSubsets.push_back( Subset( 0x19E0, 0x19FF, FindIndex(RID_SUBSETSTR_KHMER_SYMBOLS) ) ); + aAllSubsets.push_back( Subset( 0x19E0, 0x19FF, RID_SUBSETSTR_KHMER_SYMBOLS ) ); break; case UBLOCK_PHONETIC_EXTENSIONS: - aAllSubsets.push_back( Subset( 0x1D00, 0x1D7F, FindIndex(RID_SUBSETSTR_PHONETIC_EXTENSIONS) ) ); + aAllSubsets.push_back( Subset( 0x1D00, 0x1D7F, RID_SUBSETSTR_PHONETIC_EXTENSIONS ) ); break; case UBLOCK_MISCELLANEOUS_SYMBOLS_AND_ARROWS: - aAllSubsets.push_back( Subset( 0x2B00, 0x2BFF, FindIndex(RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_ARROWS) ) ); + aAllSubsets.push_back( Subset( 0x2B00, 0x2BFF, RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_ARROWS ) ); break; case UBLOCK_YIJING_HEXAGRAM_SYMBOLS: - aAllSubsets.push_back( Subset( 0x4DC0, 0x4DFF, FindIndex(RID_SUBSETSTR_YIJING_HEXAGRAM_SYMBOLS) ) ); + aAllSubsets.push_back( Subset( 0x4DC0, 0x4DFF, RID_SUBSETSTR_YIJING_HEXAGRAM_SYMBOLS ) ); break; case UBLOCK_LINEAR_B_SYLLABARY: - aAllSubsets.push_back( Subset( 0x10000, 0x1007F, FindIndex(RID_SUBSETSTR_LINEAR_B_SYLLABARY) ) ); + aAllSubsets.push_back( Subset( 0x10000, 0x1007F, RID_SUBSETSTR_LINEAR_B_SYLLABARY ) ); break; case UBLOCK_LINEAR_B_IDEOGRAMS: - aAllSubsets.push_back( Subset( 0x10080, 0x100FF, FindIndex(RID_SUBSETSTR_LINEAR_B_IDEOGRAMS) ) ); + aAllSubsets.push_back( Subset( 0x10080, 0x100FF, RID_SUBSETSTR_LINEAR_B_IDEOGRAMS ) ); break; case UBLOCK_AEGEAN_NUMBERS: - aAllSubsets.push_back( Subset( 0x10100, 0x1013F, FindIndex(RID_SUBSETSTR_AEGEAN_NUMBERS) ) ); + aAllSubsets.push_back( Subset( 0x10100, 0x1013F, RID_SUBSETSTR_AEGEAN_NUMBERS ) ); break; case UBLOCK_UGARITIC: - aAllSubsets.push_back( Subset( 0x10380, 0x1039F, FindIndex(RID_SUBSETSTR_UGARITIC) ) ); + aAllSubsets.push_back( Subset( 0x10380, 0x1039F, RID_SUBSETSTR_UGARITIC ) ); break; case UBLOCK_SHAVIAN: - aAllSubsets.push_back( Subset( 0x10450, 0x1047F, FindIndex(RID_SUBSETSTR_SHAVIAN) ) ); + aAllSubsets.push_back( Subset( 0x10450, 0x1047F, RID_SUBSETSTR_SHAVIAN ) ); break; case UBLOCK_OSMANYA: - aAllSubsets.push_back( Subset( 0x10480, 0x104AF, FindIndex(RID_SUBSETSTR_OSMANYA) ) ); + aAllSubsets.push_back( Subset( 0x10480, 0x104AF, RID_SUBSETSTR_OSMANYA ) ); break; case UBLOCK_CYPRIOT_SYLLABARY: - aAllSubsets.push_back( Subset( 0x10800, 0x1083F, FindIndex(RID_SUBSETSTR_CYPRIOT_SYLLABARY) ) ); + aAllSubsets.push_back( Subset( 0x10800, 0x1083F, RID_SUBSETSTR_CYPRIOT_SYLLABARY ) ); break; case UBLOCK_TAI_XUAN_JING_SYMBOLS: - aAllSubsets.push_back( Subset( 0x1D300, 0x1D35F, FindIndex(RID_SUBSETSTR_TAI_XUAN_JING_SYMBOLS) ) ); + aAllSubsets.push_back( Subset( 0x1D300, 0x1D35F, RID_SUBSETSTR_TAI_XUAN_JING_SYMBOLS ) ); break; case UBLOCK_VARIATION_SELECTORS_SUPPLEMENT: - aAllSubsets.push_back( Subset( 0xE0100, 0xE01EF, FindIndex(RID_SUBSETSTR_VARIATION_SELECTORS_SUPPLEMENT) ) ); + aAllSubsets.push_back( Subset( 0xE0100, 0xE01EF, RID_SUBSETSTR_VARIATION_SELECTORS_SUPPLEMENT ) ); break; case UBLOCK_ANCIENT_GREEK_MUSICAL_NOTATION: - aAllSubsets.push_back( Subset(0x1D200, 0x1D24F, FindIndex(RID_SUBSETSTR_ANCIENT_GREEK_MUSICAL_NOTATION) ) ); + aAllSubsets.push_back( Subset(0x1D200, 0x1D24F, RID_SUBSETSTR_ANCIENT_GREEK_MUSICAL_NOTATION ) ); break; case UBLOCK_ANCIENT_GREEK_NUMBERS: - aAllSubsets.push_back( Subset(0x10140, 0x1018F , FindIndex(RID_SUBSETSTR_ANCIENT_GREEK_NUMBERS) ) ); + aAllSubsets.push_back( Subset(0x10140, 0x1018F , RID_SUBSETSTR_ANCIENT_GREEK_NUMBERS ) ); break; case UBLOCK_ARABIC_SUPPLEMENT: - aAllSubsets.push_back( Subset(0x0750, 0x077F , FindIndex(RID_SUBSETSTR_ARABIC_SUPPLEMENT) ) ); + aAllSubsets.push_back( Subset(0x0750, 0x077F , RID_SUBSETSTR_ARABIC_SUPPLEMENT ) ); break; case UBLOCK_BUGINESE: - aAllSubsets.push_back( Subset(0x1A00, 0x1A1F , FindIndex(RID_SUBSETSTR_BUGINESE) ) ); + aAllSubsets.push_back( Subset(0x1A00, 0x1A1F , RID_SUBSETSTR_BUGINESE ) ); break; case UBLOCK_CJK_STROKES: - aAllSubsets.push_back( Subset( 0x31C0, 0x31EF, FindIndex(RID_SUBSETSTR_CJK_STROKES) ) ); + aAllSubsets.push_back( Subset( 0x31C0, 0x31EF, RID_SUBSETSTR_CJK_STROKES ) ); break; case UBLOCK_COMBINING_DIACRITICAL_MARKS_SUPPLEMENT: - aAllSubsets.push_back( Subset( 0x1DC0, 0x1DFF , FindIndex(RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_SUPPLEMENT) ) ); + aAllSubsets.push_back( Subset( 0x1DC0, 0x1DFF , RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_SUPPLEMENT ) ); break; case UBLOCK_COPTIC: - aAllSubsets.push_back( Subset( 0x2C80, 0x2CFF , FindIndex(RID_SUBSETSTR_COPTIC) ) ); + aAllSubsets.push_back( Subset( 0x2C80, 0x2CFF , RID_SUBSETSTR_COPTIC ) ); break; case UBLOCK_ETHIOPIC_EXTENDED: - aAllSubsets.push_back( Subset( 0x2D80, 0x2DDF , FindIndex(RID_SUBSETSTR_ETHIOPIC_EXTENDED) ) ); + aAllSubsets.push_back( Subset( 0x2D80, 0x2DDF , RID_SUBSETSTR_ETHIOPIC_EXTENDED ) ); break; case UBLOCK_ETHIOPIC_SUPPLEMENT: - aAllSubsets.push_back( Subset( 0x1380, 0x139F, FindIndex(RID_SUBSETSTR_ETHIOPIC_SUPPLEMENT) ) ); + aAllSubsets.push_back( Subset( 0x1380, 0x139F, RID_SUBSETSTR_ETHIOPIC_SUPPLEMENT ) ); break; case UBLOCK_GEORGIAN_SUPPLEMENT: - aAllSubsets.push_back( Subset( 0x2D00, 0x2D2F, FindIndex(RID_SUBSETSTR_GEORGIAN_SUPPLEMENT) ) ); + aAllSubsets.push_back( Subset( 0x2D00, 0x2D2F, RID_SUBSETSTR_GEORGIAN_SUPPLEMENT ) ); break; case UBLOCK_GLAGOLITIC: - aAllSubsets.push_back( Subset( 0x2C00, 0x2C5F, FindIndex(RID_SUBSETSTR_GLAGOLITIC) ) ); + aAllSubsets.push_back( Subset( 0x2C00, 0x2C5F, RID_SUBSETSTR_GLAGOLITIC ) ); break; case UBLOCK_KHAROSHTHI: - aAllSubsets.push_back( Subset( 0x10A00, 0x10A5F, FindIndex(RID_SUBSETSTR_KHAROSHTHI) ) ); + aAllSubsets.push_back( Subset( 0x10A00, 0x10A5F, RID_SUBSETSTR_KHAROSHTHI ) ); break; case UBLOCK_MODIFIER_TONE_LETTERS: - aAllSubsets.push_back( Subset( 0xA700, 0xA71F, FindIndex(RID_SUBSETSTR_MODIFIER_TONE_LETTERS) ) ); + aAllSubsets.push_back( Subset( 0xA700, 0xA71F, RID_SUBSETSTR_MODIFIER_TONE_LETTERS ) ); break; case UBLOCK_NEW_TAI_LUE: - aAllSubsets.push_back( Subset( 0x1980, 0x19DF, FindIndex(RID_SUBSETSTR_NEW_TAI_LUE) ) ); + aAllSubsets.push_back( Subset( 0x1980, 0x19DF, RID_SUBSETSTR_NEW_TAI_LUE ) ); break; case UBLOCK_OLD_PERSIAN: - aAllSubsets.push_back( Subset( 0x103A0, 0x103DF, FindIndex(RID_SUBSETSTR_OLD_PERSIAN) ) ); + aAllSubsets.push_back( Subset( 0x103A0, 0x103DF, RID_SUBSETSTR_OLD_PERSIAN ) ); break; case UBLOCK_PHONETIC_EXTENSIONS_SUPPLEMENT: - aAllSubsets.push_back( Subset( 0x1D80, 0x1DBF, FindIndex(RID_SUBSETSTR_PHONETIC_EXTENSIONS_SUPPLEMENT) ) ); + aAllSubsets.push_back( Subset( 0x1D80, 0x1DBF, RID_SUBSETSTR_PHONETIC_EXTENSIONS_SUPPLEMENT ) ); break; case UBLOCK_SUPPLEMENTAL_PUNCTUATION: - aAllSubsets.push_back( Subset( 0x2E00, 0x2E7F, FindIndex(RID_SUBSETSTR_SUPPLEMENTAL_PUNCTUATION) ) ); + aAllSubsets.push_back( Subset( 0x2E00, 0x2E7F, RID_SUBSETSTR_SUPPLEMENTAL_PUNCTUATION ) ); break; case UBLOCK_SYLOTI_NAGRI: - aAllSubsets.push_back( Subset( 0xA800, 0xA82F, FindIndex(RID_SUBSETSTR_SYLOTI_NAGRI) ) ); + aAllSubsets.push_back( Subset( 0xA800, 0xA82F, RID_SUBSETSTR_SYLOTI_NAGRI ) ); break; case UBLOCK_TIFINAGH: - aAllSubsets.push_back( Subset( 0x2D30, 0x2D7F, FindIndex(RID_SUBSETSTR_TIFINAGH) ) ); + aAllSubsets.push_back( Subset( 0x2D30, 0x2D7F, RID_SUBSETSTR_TIFINAGH ) ); break; case UBLOCK_VERTICAL_FORMS: - aAllSubsets.push_back( Subset( 0xFE10, 0xFE1F, FindIndex(RID_SUBSETSTR_VERTICAL_FORMS) ) ); + aAllSubsets.push_back( Subset( 0xFE10, 0xFE1F, RID_SUBSETSTR_VERTICAL_FORMS ) ); break; case UBLOCK_NKO: - aAllSubsets.push_back( Subset( 0x07C0, 0x07FF, FindIndex(RID_SUBSETSTR_NKO) ) ); + aAllSubsets.push_back( Subset( 0x07C0, 0x07FF, RID_SUBSETSTR_NKO ) ); break; case UBLOCK_BALINESE: - aAllSubsets.push_back( Subset( 0x1B00, 0x1B7F, FindIndex(RID_SUBSETSTR_BALINESE) ) ); + aAllSubsets.push_back( Subset( 0x1B00, 0x1B7F, RID_SUBSETSTR_BALINESE ) ); break; case UBLOCK_LATIN_EXTENDED_C: - aAllSubsets.push_back( Subset( 0x2C60, 0x2C7F, FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_C) ) ); + aAllSubsets.push_back( Subset( 0x2C60, 0x2C7F, RID_SUBSETSTR_LATIN_EXTENDED_C ) ); break; case UBLOCK_LATIN_EXTENDED_D: - aAllSubsets.push_back( Subset( 0xA720, 0xA7FF, FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_D) ) ); + aAllSubsets.push_back( Subset( 0xA720, 0xA7FF, RID_SUBSETSTR_LATIN_EXTENDED_D ) ); break; case UBLOCK_PHAGS_PA: - aAllSubsets.push_back( Subset( 0xA840, 0xA87F, FindIndex(RID_SUBSETSTR_PHAGS_PA) ) ); + aAllSubsets.push_back( Subset( 0xA840, 0xA87F, RID_SUBSETSTR_PHAGS_PA ) ); break; case UBLOCK_PHOENICIAN: - aAllSubsets.push_back( Subset( 0x10900, 0x1091F, FindIndex(RID_SUBSETSTR_PHOENICIAN) ) ); + aAllSubsets.push_back( Subset( 0x10900, 0x1091F, RID_SUBSETSTR_PHOENICIAN ) ); break; case UBLOCK_CUNEIFORM: - aAllSubsets.push_back( Subset( 0x12000, 0x123FF, FindIndex(RID_SUBSETSTR_CUNEIFORM) ) ); + aAllSubsets.push_back( Subset( 0x12000, 0x123FF, RID_SUBSETSTR_CUNEIFORM ) ); break; case UBLOCK_CUNEIFORM_NUMBERS_AND_PUNCTUATION: - aAllSubsets.push_back( Subset( 0x12400, 0x1247F, FindIndex(RID_SUBSETSTR_CUNEIFORM_NUMBERS_AND_PUNCTUATION) ) ); + aAllSubsets.push_back( Subset( 0x12400, 0x1247F, RID_SUBSETSTR_CUNEIFORM_NUMBERS_AND_PUNCTUATION ) ); break; case UBLOCK_COUNTING_ROD_NUMERALS: - aAllSubsets.push_back( Subset( 0x1D360, 0x1D37F, FindIndex(RID_SUBSETSTR_COUNTING_ROD_NUMERALS) ) ); + aAllSubsets.push_back( Subset( 0x1D360, 0x1D37F, RID_SUBSETSTR_COUNTING_ROD_NUMERALS ) ); break; case UBLOCK_SUNDANESE: - aAllSubsets.push_back( Subset( 0x1B80, 0x1BBF, FindIndex(RID_SUBSETSTR_SUNDANESE) ) ); + aAllSubsets.push_back( Subset( 0x1B80, 0x1BBF, RID_SUBSETSTR_SUNDANESE ) ); break; case UBLOCK_LEPCHA: - aAllSubsets.push_back( Subset( 0x1C00, 0x1C4F, FindIndex(RID_SUBSETSTR_LEPCHA) ) ); + aAllSubsets.push_back( Subset( 0x1C00, 0x1C4F, RID_SUBSETSTR_LEPCHA ) ); break; case UBLOCK_OL_CHIKI: - aAllSubsets.push_back( Subset( 0x1C50, 0x1C7F, FindIndex(RID_SUBSETSTR_OL_CHIKI) ) ); + aAllSubsets.push_back( Subset( 0x1C50, 0x1C7F, RID_SUBSETSTR_OL_CHIKI ) ); break; case UBLOCK_CYRILLIC_EXTENDED_A: - aAllSubsets.push_back( Subset( 0x2DE0, 0x2DFF, FindIndex(RID_SUBSETSTR_CYRILLIC_EXTENDED_A) ) ); + aAllSubsets.push_back( Subset( 0x2DE0, 0x2DFF, RID_SUBSETSTR_CYRILLIC_EXTENDED_A ) ); break; case UBLOCK_VAI: - aAllSubsets.push_back( Subset( 0xA500, 0xA63F, FindIndex(RID_SUBSETSTR_VAI) ) ); + aAllSubsets.push_back( Subset( 0xA500, 0xA63F, RID_SUBSETSTR_VAI ) ); break; case UBLOCK_CYRILLIC_EXTENDED_B: - aAllSubsets.push_back( Subset( 0xA640, 0xA69F, FindIndex(RID_SUBSETSTR_CYRILLIC_EXTENDED_B) ) ); + aAllSubsets.push_back( Subset( 0xA640, 0xA69F, RID_SUBSETSTR_CYRILLIC_EXTENDED_B ) ); break; case UBLOCK_SAURASHTRA: - aAllSubsets.push_back( Subset( 0xA880, 0xA8DF, FindIndex(RID_SUBSETSTR_SAURASHTRA) ) ); + aAllSubsets.push_back( Subset( 0xA880, 0xA8DF, RID_SUBSETSTR_SAURASHTRA ) ); break; case UBLOCK_KAYAH_LI: - aAllSubsets.push_back( Subset( 0xA900, 0xA92F, FindIndex(RID_SUBSETSTR_KAYAH_LI) ) ); + aAllSubsets.push_back( Subset( 0xA900, 0xA92F, RID_SUBSETSTR_KAYAH_LI ) ); break; case UBLOCK_REJANG: - aAllSubsets.push_back( Subset( 0xA930, 0xA95F, FindIndex(RID_SUBSETSTR_REJANG) ) ); + aAllSubsets.push_back( Subset( 0xA930, 0xA95F, RID_SUBSETSTR_REJANG ) ); break; case UBLOCK_CHAM: - aAllSubsets.push_back( Subset( 0xAA00, 0xAA5F, FindIndex(RID_SUBSETSTR_CHAM) ) ); + aAllSubsets.push_back( Subset( 0xAA00, 0xAA5F, RID_SUBSETSTR_CHAM ) ); break; case UBLOCK_ANCIENT_SYMBOLS: - aAllSubsets.push_back( Subset( 0x10190, 0x101CF, FindIndex(RID_SUBSETSTR_ANCIENT_SYMBOLS) ) ); + aAllSubsets.push_back( Subset( 0x10190, 0x101CF, RID_SUBSETSTR_ANCIENT_SYMBOLS ) ); break; case UBLOCK_PHAISTOS_DISC: - aAllSubsets.push_back( Subset( 0x101D0, 0x101FF, FindIndex(RID_SUBSETSTR_PHAISTOS_DISC) ) ); + aAllSubsets.push_back( Subset( 0x101D0, 0x101FF, RID_SUBSETSTR_PHAISTOS_DISC ) ); break; case UBLOCK_LYCIAN: - aAllSubsets.push_back( Subset( 0x10280, 0x1029F, FindIndex(RID_SUBSETSTR_LYCIAN) ) ); + aAllSubsets.push_back( Subset( 0x10280, 0x1029F, RID_SUBSETSTR_LYCIAN ) ); break; case UBLOCK_CARIAN: - aAllSubsets.push_back( Subset( 0x102A0, 0x102DF, FindIndex(RID_SUBSETSTR_CARIAN) ) ); + aAllSubsets.push_back( Subset( 0x102A0, 0x102DF, RID_SUBSETSTR_CARIAN ) ); break; case UBLOCK_LYDIAN: - aAllSubsets.push_back( Subset( 0x10920, 0x1093F, FindIndex(RID_SUBSETSTR_LYDIAN) ) ); + aAllSubsets.push_back( Subset( 0x10920, 0x1093F, RID_SUBSETSTR_LYDIAN ) ); break; case UBLOCK_MAHJONG_TILES: - aAllSubsets.push_back( Subset( 0x1F000, 0x1F02F, FindIndex(RID_SUBSETSTR_MAHJONG_TILES) ) ); + aAllSubsets.push_back( Subset( 0x1F000, 0x1F02F, RID_SUBSETSTR_MAHJONG_TILES ) ); break; case UBLOCK_DOMINO_TILES: - aAllSubsets.push_back( Subset( 0x1F030, 0x1F09F, FindIndex(RID_SUBSETSTR_DOMINO_TILES) ) ); + aAllSubsets.push_back( Subset( 0x1F030, 0x1F09F, RID_SUBSETSTR_DOMINO_TILES ) ); break; #if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >= 4) case UBLOCK_SAMARITAN: - aAllSubsets.push_back( Subset( 0x0800, 0x083F, FindIndex(RID_SUBSETSTR_SAMARITAN) ) ); + aAllSubsets.push_back( Subset( 0x0800, 0x083F, RID_SUBSETSTR_SAMARITAN ) ); break; case UBLOCK_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED: - aAllSubsets.push_back( Subset( 0x18B0, 0x18FF, FindIndex(RID_SUBSETSTR_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED) ) ); + aAllSubsets.push_back( Subset( 0x18B0, 0x18FF, RID_SUBSETSTR_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED ) ); break; case UBLOCK_TAI_THAM: - aAllSubsets.push_back( Subset( 0x1A20, 0x1AAF, FindIndex(RID_SUBSETSTR_TAI_THAM) ) ); + aAllSubsets.push_back( Subset( 0x1A20, 0x1AAF, RID_SUBSETSTR_TAI_THAM ) ); break; case UBLOCK_VEDIC_EXTENSIONS: - aAllSubsets.push_back( Subset( 0x1CD0, 0x1CFF, FindIndex(RID_SUBSETSTR_VEDIC_EXTENSIONS) ) ); + aAllSubsets.push_back( Subset( 0x1CD0, 0x1CFF, RID_SUBSETSTR_VEDIC_EXTENSIONS ) ); break; case UBLOCK_LISU: - aAllSubsets.push_back( Subset( 0xA4D0, 0xA4FF, FindIndex(RID_SUBSETSTR_LISU) ) ); + aAllSubsets.push_back( Subset( 0xA4D0, 0xA4FF, RID_SUBSETSTR_LISU ) ); break; case UBLOCK_BAMUM: - aAllSubsets.push_back( Subset( 0xA6A0, 0xA6FF, FindIndex(RID_SUBSETSTR_BAMUM) ) ); + aAllSubsets.push_back( Subset( 0xA6A0, 0xA6FF, RID_SUBSETSTR_BAMUM ) ); break; case UBLOCK_COMMON_INDIC_NUMBER_FORMS: - aAllSubsets.push_back( Subset( 0xA830, 0xA83F, FindIndex(RID_SUBSETSTR_COMMON_INDIC_NUMBER_FORMS) ) ); + aAllSubsets.push_back( Subset( 0xA830, 0xA83F, RID_SUBSETSTR_COMMON_INDIC_NUMBER_FORMS ) ); break; case UBLOCK_DEVANAGARI_EXTENDED: - aAllSubsets.push_back( Subset( 0xA8E0, 0xA8FF, FindIndex(RID_SUBSETSTR_DEVANAGARI_EXTENDED) ) ); + aAllSubsets.push_back( Subset( 0xA8E0, 0xA8FF, RID_SUBSETSTR_DEVANAGARI_EXTENDED ) ); break; case UBLOCK_HANGUL_JAMO_EXTENDED_A: - aAllSubsets.push_back( Subset( 0xA960, 0xA97F, FindIndex(RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_A) ) ); + aAllSubsets.push_back( Subset( 0xA960, 0xA97F, RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_A ) ); break; case UBLOCK_JAVANESE: - aAllSubsets.push_back( Subset( 0xA980, 0xA9DF, FindIndex(RID_SUBSETSTR_JAVANESE) ) ); + aAllSubsets.push_back( Subset( 0xA980, 0xA9DF, RID_SUBSETSTR_JAVANESE ) ); break; case UBLOCK_MYANMAR_EXTENDED_A: - aAllSubsets.push_back( Subset( 0xAA60, 0xAA7F, FindIndex(RID_SUBSETSTR_MYANMAR_EXTENDED_A) ) ); + aAllSubsets.push_back( Subset( 0xAA60, 0xAA7F, RID_SUBSETSTR_MYANMAR_EXTENDED_A ) ); break; case UBLOCK_TAI_VIET: - aAllSubsets.push_back( Subset( 0xAA80, 0xAADF, FindIndex(RID_SUBSETSTR_TAI_VIET) ) ); + aAllSubsets.push_back( Subset( 0xAA80, 0xAADF, RID_SUBSETSTR_TAI_VIET ) ); break; case UBLOCK_MEETEI_MAYEK: - aAllSubsets.push_back( Subset( 0xABC0, 0xABFF, FindIndex(RID_SUBSETSTR_MEETEI_MAYEK) ) ); + aAllSubsets.push_back( Subset( 0xABC0, 0xABFF, RID_SUBSETSTR_MEETEI_MAYEK ) ); break; case UBLOCK_HANGUL_JAMO_EXTENDED_B: - aAllSubsets.push_back( Subset( 0xD7B0, 0xD7FF, FindIndex(RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_B) ) ); + aAllSubsets.push_back( Subset( 0xD7B0, 0xD7FF, RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_B ) ); break; case UBLOCK_IMPERIAL_ARAMAIC: - aAllSubsets.push_back( Subset( 0x10840, 0x1085F, FindIndex(RID_SUBSETSTR_IMPERIAL_ARAMAIC) ) ); + aAllSubsets.push_back( Subset( 0x10840, 0x1085F, RID_SUBSETSTR_IMPERIAL_ARAMAIC ) ); break; case UBLOCK_OLD_SOUTH_ARABIAN: - aAllSubsets.push_back( Subset( 0x10A60, 0x10A7F, FindIndex(RID_SUBSETSTR_OLD_SOUTH_ARABIAN) ) ); + aAllSubsets.push_back( Subset( 0x10A60, 0x10A7F, RID_SUBSETSTR_OLD_SOUTH_ARABIAN ) ); break; case UBLOCK_AVESTAN: - aAllSubsets.push_back( Subset( 0x10B00, 0x10B3F, FindIndex(RID_SUBSETSTR_AVESTAN) ) ); + aAllSubsets.push_back( Subset( 0x10B00, 0x10B3F, RID_SUBSETSTR_AVESTAN ) ); break; case UBLOCK_INSCRIPTIONAL_PARTHIAN: - aAllSubsets.push_back( Subset( 0x10B40, 0x10B5F, FindIndex(RID_SUBSETSTR_INSCRIPTIONAL_PARTHIAN) ) ); + aAllSubsets.push_back( Subset( 0x10B40, 0x10B5F, RID_SUBSETSTR_INSCRIPTIONAL_PARTHIAN ) ); break; case UBLOCK_INSCRIPTIONAL_PAHLAVI: - aAllSubsets.push_back( Subset( 0x10B60, 0x10B7F, FindIndex(RID_SUBSETSTR_INSCRIPTIONAL_PAHLAVI) ) ); + aAllSubsets.push_back( Subset( 0x10B60, 0x10B7F, RID_SUBSETSTR_INSCRIPTIONAL_PAHLAVI ) ); break; case UBLOCK_OLD_TURKIC: - aAllSubsets.push_back( Subset( 0x10C00, 0x10C4F, FindIndex(RID_SUBSETSTR_OLD_TURKIC) ) ); + aAllSubsets.push_back( Subset( 0x10C00, 0x10C4F, RID_SUBSETSTR_OLD_TURKIC ) ); break; case UBLOCK_RUMI_NUMERAL_SYMBOLS: - aAllSubsets.push_back( Subset( 0x10E60, 0x10E7F, FindIndex(RID_SUBSETSTR_RUMI_NUMERAL_SYMBOLS) ) ); + aAllSubsets.push_back( Subset( 0x10E60, 0x10E7F, RID_SUBSETSTR_RUMI_NUMERAL_SYMBOLS ) ); break; case UBLOCK_KAITHI: - aAllSubsets.push_back( Subset( 0x11080, 0x110CF, FindIndex(RID_SUBSETSTR_KAITHI) ) ); + aAllSubsets.push_back( Subset( 0x11080, 0x110CF, RID_SUBSETSTR_KAITHI ) ); break; case UBLOCK_EGYPTIAN_HIEROGLYPHS: - aAllSubsets.push_back( Subset( 0x13000, 0x1342F, FindIndex(RID_SUBSETSTR_EGYPTIAN_HIEROGLYPHS) ) ); + aAllSubsets.push_back( Subset( 0x13000, 0x1342F, RID_SUBSETSTR_EGYPTIAN_HIEROGLYPHS ) ); break; case UBLOCK_ENCLOSED_ALPHANUMERIC_SUPPLEMENT: - aAllSubsets.push_back( Subset( 0x1F100, 0x1F1FF, FindIndex(RID_SUBSETSTR_ENCLOSED_ALPHANUMERIC_SUPPLEMENT) ) ); + aAllSubsets.push_back( Subset( 0x1F100, 0x1F1FF, RID_SUBSETSTR_ENCLOSED_ALPHANUMERIC_SUPPLEMENT ) ); break; case UBLOCK_ENCLOSED_IDEOGRAPHIC_SUPPLEMENT: - aAllSubsets.push_back( Subset( 0x1F200, 0x1F2FF, FindIndex(RID_SUBSETSTR_ENCLOSED_IDEOGRAPHIC_SUPPLEMENT) ) ); + aAllSubsets.push_back( Subset( 0x1F200, 0x1F2FF, RID_SUBSETSTR_ENCLOSED_IDEOGRAPHIC_SUPPLEMENT ) ); break; case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C: - aAllSubsets.push_back( Subset( 0x2A700, 0x2B73F, FindIndex(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C) ) ); + aAllSubsets.push_back( Subset( 0x2A700, 0x2B73F, RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C ) ); break; #endif #if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >= 6) case UBLOCK_MANDAIC: - aAllSubsets.push_back( Subset( 0x0840, 0x085F, FindIndex(RID_SUBSETSTR_MANDAIC) ) ); + aAllSubsets.push_back( Subset( 0x0840, 0x085F, RID_SUBSETSTR_MANDAIC ) ); break; case UBLOCK_BATAK: - aAllSubsets.push_back( Subset( 0x1BC0, 0x1BFF, FindIndex(RID_SUBSETSTR_BATAK) ) ); + aAllSubsets.push_back( Subset( 0x1BC0, 0x1BFF, RID_SUBSETSTR_BATAK ) ); break; case UBLOCK_ETHIOPIC_EXTENDED_A: - aAllSubsets.push_back( Subset( 0xAB00, 0xAB2F, FindIndex(RID_SUBSETSTR_ETHIOPIC_EXTENDED_A) ) ); + aAllSubsets.push_back( Subset( 0xAB00, 0xAB2F, RID_SUBSETSTR_ETHIOPIC_EXTENDED_A ) ); break; case UBLOCK_BRAHMI: - aAllSubsets.push_back( Subset( 0x11000, 0x1107F, FindIndex(RID_SUBSETSTR_BRAHMI) ) ); + aAllSubsets.push_back( Subset( 0x11000, 0x1107F, RID_SUBSETSTR_BRAHMI ) ); break; case UBLOCK_BAMUM_SUPPLEMENT: - aAllSubsets.push_back( Subset( 0x16800, 0x16A3F, FindIndex(RID_SUBSETSTR_BAMUM_SUPPLEMENT) ) ); + aAllSubsets.push_back( Subset( 0x16800, 0x16A3F, RID_SUBSETSTR_BAMUM_SUPPLEMENT ) ); break; case UBLOCK_KANA_SUPPLEMENT: - aAllSubsets.push_back( Subset( 0x1B000, 0x1B0FF, FindIndex(RID_SUBSETSTR_KANA_SUPPLEMENT) ) ); + aAllSubsets.push_back( Subset( 0x1B000, 0x1B0FF, RID_SUBSETSTR_KANA_SUPPLEMENT ) ); break; case UBLOCK_PLAYING_CARDS: - aAllSubsets.push_back( Subset( 0x1F0A0, 0x1F0FF, FindIndex(RID_SUBSETSTR_PLAYING_CARDS) ) ); + aAllSubsets.push_back( Subset( 0x1F0A0, 0x1F0FF, RID_SUBSETSTR_PLAYING_CARDS ) ); break; case UBLOCK_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS: - aAllSubsets.push_back( Subset( 0x1F300, 0x1F5FF, FindIndex(RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS) ) ); + aAllSubsets.push_back( Subset( 0x1F300, 0x1F5FF, RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS ) ); break; case UBLOCK_EMOTICONS: - aAllSubsets.push_back( Subset( 0x1F600, 0x1F64F, FindIndex(RID_SUBSETSTR_EMOTICONS) ) ); + aAllSubsets.push_back( Subset( 0x1F600, 0x1F64F, RID_SUBSETSTR_EMOTICONS ) ); break; case UBLOCK_TRANSPORT_AND_MAP_SYMBOLS: - aAllSubsets.push_back( Subset( 0x1F680, 0x1F6FF, FindIndex(RID_SUBSETSTR_TRANSPORT_AND_MAP_SYMBOLS) ) ); + aAllSubsets.push_back( Subset( 0x1F680, 0x1F6FF, RID_SUBSETSTR_TRANSPORT_AND_MAP_SYMBOLS ) ); break; case UBLOCK_ALCHEMICAL_SYMBOLS: - aAllSubsets.push_back( Subset( 0x1F700, 0x1F77F, FindIndex(RID_SUBSETSTR_ALCHEMICAL_SYMBOLS) ) ); + aAllSubsets.push_back( Subset( 0x1F700, 0x1F77F, RID_SUBSETSTR_ALCHEMICAL_SYMBOLS ) ); break; case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D: - aAllSubsets.push_back( Subset( 0x2B740, 0x2B81F, FindIndex(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D) ) ); + aAllSubsets.push_back( Subset( 0x2B740, 0x2B81F, RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D ) ); break; #endif // Note ICU version 49 (NOT 4.9), so the MAJOR_NUM is two digits. #if U_ICU_VERSION_MAJOR_NUM >= 49 case UBLOCK_ARABIC_EXTENDED_A: - aAllSubsets.push_back( Subset( 0x08A0, 0x08FF, FindIndex(RID_SUBSETSTR_ARABIC_EXTENDED_A) ) ); + aAllSubsets.push_back( Subset( 0x08A0, 0x08FF, RID_SUBSETSTR_ARABIC_EXTENDED_A ) ); break; case UBLOCK_ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS: - aAllSubsets.push_back( Subset( 0x1EE00, 0x1EEFF, FindIndex(RID_SUBSETSTR_ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS) ) ); + aAllSubsets.push_back( Subset( 0x1EE00, 0x1EEFF, RID_SUBSETSTR_ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS ) ); break; case UBLOCK_CHAKMA: - aAllSubsets.push_back( Subset( 0x11100, 0x1114F, FindIndex(RID_SUBSETSTR_CHAKMA) ) ); + aAllSubsets.push_back( Subset( 0x11100, 0x1114F, RID_SUBSETSTR_CHAKMA ) ); break; case UBLOCK_MEETEI_MAYEK_EXTENSIONS: - aAllSubsets.push_back( Subset( 0xAAE0, 0xAAFF, FindIndex(RID_SUBSETSTR_MEETEI_MAYEK_EXTENSIONS) ) ); + aAllSubsets.push_back( Subset( 0xAAE0, 0xAAFF, RID_SUBSETSTR_MEETEI_MAYEK_EXTENSIONS ) ); break; case UBLOCK_MEROITIC_CURSIVE: - aAllSubsets.push_back( Subset( 0x109A0, 0x109FF, FindIndex(RID_SUBSETSTR_MEROITIC_CURSIVE) ) ); + aAllSubsets.push_back( Subset( 0x109A0, 0x109FF, RID_SUBSETSTR_MEROITIC_CURSIVE ) ); break; case UBLOCK_MEROITIC_HIEROGLYPHS: - aAllSubsets.push_back( Subset( 0x10980, 0x1099F, FindIndex(RID_SUBSETSTR_MEROITIC_HIEROGLYPHS) ) ); + aAllSubsets.push_back( Subset( 0x10980, 0x1099F, RID_SUBSETSTR_MEROITIC_HIEROGLYPHS ) ); break; case UBLOCK_MIAO: - aAllSubsets.push_back( Subset( 0x16F00, 0x16F9F, FindIndex(RID_SUBSETSTR_MIAO) ) ); + aAllSubsets.push_back( Subset( 0x16F00, 0x16F9F, RID_SUBSETSTR_MIAO ) ); break; case UBLOCK_SHARADA: - aAllSubsets.push_back( Subset( 0x11180, 0x111DF, FindIndex(RID_SUBSETSTR_SHARADA) ) ); + aAllSubsets.push_back( Subset( 0x11180, 0x111DF, RID_SUBSETSTR_SHARADA ) ); break; case UBLOCK_SORA_SOMPENG: - aAllSubsets.push_back( Subset( 0x110D0, 0x110FF, FindIndex(RID_SUBSETSTR_SORA_SOMPENG) ) ); + aAllSubsets.push_back( Subset( 0x110D0, 0x110FF, RID_SUBSETSTR_SORA_SOMPENG ) ); break; case UBLOCK_SUNDANESE_SUPPLEMENT: - aAllSubsets.push_back( Subset( 0x1CC0, 0x1CCF, FindIndex(RID_SUBSETSTR_SUNDANESE_SUPPLEMENT) ) ); + aAllSubsets.push_back( Subset( 0x1CC0, 0x1CCF, RID_SUBSETSTR_SUNDANESE_SUPPLEMENT ) ); break; case UBLOCK_TAKRI: - aAllSubsets.push_back( Subset( 0x11680, 0x116CF, FindIndex(RID_SUBSETSTR_TAKRI) ) ); + aAllSubsets.push_back( Subset( 0x11680, 0x116CF, RID_SUBSETSTR_TAKRI ) ); break; #endif #if U_ICU_VERSION_MAJOR_NUM >= 54 case UBLOCK_BASSA_VAH: - aAllSubsets.push_back( Subset( 0x16AD0, 0x16AFF, FindIndex(RID_SUBSETSTR_BASSA_VAH) ) ); + aAllSubsets.push_back( Subset( 0x16AD0, 0x16AFF, RID_SUBSETSTR_BASSA_VAH ) ); break; case UBLOCK_CAUCASIAN_ALBANIAN: - aAllSubsets.push_back( Subset( 0x10530, 0x1056F, FindIndex(RID_SUBSETSTR_CAUCASIAN_ALBANIAN) ) ); + aAllSubsets.push_back( Subset( 0x10530, 0x1056F, RID_SUBSETSTR_CAUCASIAN_ALBANIAN ) ); break; case UBLOCK_COPTIC_EPACT_NUMBERS: - aAllSubsets.push_back( Subset( 0x102E0, 0x102FF, FindIndex(RID_SUBSETSTR_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, FindIndex(RID_SUBSETSTR_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, FindIndex(RID_SUBSETSTR_DUPLOYAN) ) ); + aAllSubsets.push_back( Subset( 0x1BC00, 0x1BC9F, RID_SUBSETSTR_DUPLOYAN ) ); break; case UBLOCK_ELBASAN: - aAllSubsets.push_back( Subset( 0x10500, 0x1052F, FindIndex(RID_SUBSETSTR_ELBASAN) ) ); + aAllSubsets.push_back( Subset( 0x10500, 0x1052F, RID_SUBSETSTR_ELBASAN ) ); break; case UBLOCK_GEOMETRIC_SHAPES_EXTENDED: - aAllSubsets.push_back( Subset( 0x1F780, 0x1F7FF, FindIndex(RID_SUBSETSTR_GEOMETRIC_SHAPES_EXTENDED) ) ); + aAllSubsets.push_back( Subset( 0x1F780, 0x1F7FF, RID_SUBSETSTR_GEOMETRIC_SHAPES_EXTENDED ) ); break; case UBLOCK_GRANTHA: - aAllSubsets.push_back( Subset( 0x11300, 0x1137F, FindIndex(RID_SUBSETSTR_GRANTHA) ) ); + aAllSubsets.push_back( Subset( 0x11300, 0x1137F, RID_SUBSETSTR_GRANTHA ) ); break; case UBLOCK_KHOJKI: - aAllSubsets.push_back( Subset( 0x11200, 0x1124F, FindIndex(RID_SUBSETSTR_KHOJKI) ) ); + aAllSubsets.push_back( Subset( 0x11200, 0x1124F, RID_SUBSETSTR_KHOJKI ) ); break; case UBLOCK_KHUDAWADI: - aAllSubsets.push_back( Subset( 0x112B0, 0x112FF, FindIndex(RID_SUBSETSTR_KHUDAWADI) ) ); + aAllSubsets.push_back( Subset( 0x112B0, 0x112FF, RID_SUBSETSTR_KHUDAWADI ) ); break; case UBLOCK_LATIN_EXTENDED_E: - aAllSubsets.push_back( Subset( 0xAB30, 0xAB6F, FindIndex(RID_SUBSETSTR_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, FindIndex(RID_SUBSETSTR_LINEAR_A) ) ); + aAllSubsets.push_back( Subset( 0x10600, 0x1077F, RID_SUBSETSTR_LINEAR_A ) ); break; case UBLOCK_MAHAJANI: - aAllSubsets.push_back( Subset( 0x11150, 0x1117F, FindIndex(RID_SUBSETSTR_MAHAJANI) ) ); + aAllSubsets.push_back( Subset( 0x11150, 0x1117F, RID_SUBSETSTR_MAHAJANI ) ); break; case UBLOCK_MANICHAEAN: - aAllSubsets.push_back( Subset( 0x10AC0, 0x10AFF, FindIndex(RID_SUBSETSTR_MANICHAEAN) ) ); + aAllSubsets.push_back( Subset( 0x10AC0, 0x10AFF, RID_SUBSETSTR_MANICHAEAN ) ); break; case UBLOCK_MENDE_KIKAKUI: - aAllSubsets.push_back( Subset( 0x1E800, 0x1E8DF, FindIndex(RID_SUBSETSTR_MENDE_KIKAKUI) ) ); + aAllSubsets.push_back( Subset( 0x1E800, 0x1E8DF, RID_SUBSETSTR_MENDE_KIKAKUI ) ); break; case UBLOCK_MODI: - aAllSubsets.push_back( Subset( 0x11600, 0x1165F, FindIndex(RID_SUBSETSTR_MODI) ) ); + aAllSubsets.push_back( Subset( 0x11600, 0x1165F, RID_SUBSETSTR_MODI ) ); break; case UBLOCK_MRO: - aAllSubsets.push_back( Subset( 0x16A40, 0x16A6F, FindIndex(RID_SUBSETSTR_MRO) ) ); + aAllSubsets.push_back( Subset( 0x16A40, 0x16A6F, RID_SUBSETSTR_MRO ) ); break; case UBLOCK_MYANMAR_EXTENDED_B: - aAllSubsets.push_back( Subset( 0xA9E0, 0xA9FF, FindIndex(RID_SUBSETSTR_MYANMAR_EXTENDED_B) ) ); + aAllSubsets.push_back( Subset( 0xA9E0, 0xA9FF, RID_SUBSETSTR_MYANMAR_EXTENDED_B ) ); break; case UBLOCK_NABATAEAN: - aAllSubsets.push_back( Subset( 0x10880, 0x108AF, FindIndex(RID_SUBSETSTR_NABATAEAN) ) ); + aAllSubsets.push_back( Subset( 0x10880, 0x108AF, RID_SUBSETSTR_NABATAEAN ) ); break; case UBLOCK_OLD_NORTH_ARABIAN: - aAllSubsets.push_back( Subset( 0x10A80, 0x10A9F, FindIndex(RID_SUBSETSTR_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, FindIndex(RID_SUBSETSTR_OLD_PERMIC) ) ); + aAllSubsets.push_back( Subset( 0x10350, 0x1037F, RID_SUBSETSTR_OLD_PERMIC ) ); break; case UBLOCK_ORNAMENTAL_DINGBATS: - aAllSubsets.push_back( Subset( 0x1F650, 0x1F67F, FindIndex(RID_SUBSETSTR_ORNAMENTAL_DINGBATS) ) ); + aAllSubsets.push_back( Subset( 0x1F650, 0x1F67F, RID_SUBSETSTR_ORNAMENTAL_DINGBATS ) ); break; case UBLOCK_PAHAWH_HMONG: - aAllSubsets.push_back( Subset( 0x16B00, 0x16B8F, FindIndex(RID_SUBSETSTR_PAHAWH_HMONG) ) ); + aAllSubsets.push_back( Subset( 0x16B00, 0x16B8F, RID_SUBSETSTR_PAHAWH_HMONG ) ); break; case UBLOCK_PALMYRENE: - aAllSubsets.push_back( Subset( 0x10860, 0x1087F, FindIndex(RID_SUBSETSTR_PALMYRENE) ) ); + aAllSubsets.push_back( Subset( 0x10860, 0x1087F, RID_SUBSETSTR_PALMYRENE ) ); break; case UBLOCK_PAU_CIN_HAU: - aAllSubsets.push_back( Subset( 0x11AC0, 0x11AFF, FindIndex(RID_SUBSETSTR_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, FindIndex(RID_SUBSETSTR_PSALTER_PAHLAVI) ) ); + aAllSubsets.push_back( Subset( 0x10B80, 0x10BAF, RID_SUBSETSTR_PSALTER_PAHLAVI ) ); break; case UBLOCK_SHORTHAND_FORMAT_CONTROLS: - aAllSubsets.push_back( Subset( 0x1BCA0, 0x1BCAF, FindIndex(RID_SUBSETSTR_SHORTHAND_FORMAT_CONTROLS) ) ); + aAllSubsets.push_back( Subset( 0x1BCA0, 0x1BCAF, RID_SUBSETSTR_SHORTHAND_FORMAT_CONTROLS ) ); break; case UBLOCK_SIDDHAM: - aAllSubsets.push_back( Subset( 0x11580, 0x115FF, FindIndex(RID_SUBSETSTR_SIDDHAM) ) ); + aAllSubsets.push_back( Subset( 0x11580, 0x115FF, RID_SUBSETSTR_SIDDHAM ) ); break; case UBLOCK_SINHALA_ARCHAIC_NUMBERS: - aAllSubsets.push_back( Subset( 0x111E0, 0x111FF, FindIndex(RID_SUBSETSTR_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, FindIndex(RID_SUBSETSTR_SUPPLEMENTAL_ARROWS_C) ) ); + aAllSubsets.push_back( Subset( 0x1F800, 0x1F8FF, RID_SUBSETSTR_SUPPLEMENTAL_ARROWS_C ) ); break; case UBLOCK_TIRHUTA: - aAllSubsets.push_back( Subset( 0x11480, 0x114DF, FindIndex(RID_SUBSETSTR_TIRHUTA) ) ); + aAllSubsets.push_back( Subset( 0x11480, 0x114DF, RID_SUBSETSTR_TIRHUTA ) ); break; case UBLOCK_WARANG_CITI: - aAllSubsets.push_back( Subset( 0x118A0, 0x118FF, FindIndex(RID_SUBSETSTR_WARANG_CITI) ) ); + aAllSubsets.push_back( Subset( 0x118A0, 0x118FF, RID_SUBSETSTR_WARANG_CITI ) ); break; #endif #if U_ICU_VERSION_MAJOR_NUM >= 56 case UBLOCK_AHOM: - aAllSubsets.push_back( Subset( 0x11700, 0x1173F, FindIndex(RID_SUBSETSTR_AHOM) ) ); + aAllSubsets.push_back( Subset( 0x11700, 0x1173F, RID_SUBSETSTR_AHOM ) ); break; case UBLOCK_ANATOLIAN_HIEROGLYPHS: - aAllSubsets.push_back( Subset( 0x14400, 0x1467F, FindIndex(RID_SUBSETSTR_ANATOLIAN_HIEROGLYPHS) ) ); + aAllSubsets.push_back( Subset( 0x14400, 0x1467F, RID_SUBSETSTR_ANATOLIAN_HIEROGLYPHS ) ); break; case UBLOCK_CHEROKEE_SUPPLEMENT: - aAllSubsets.push_back( Subset( 0xAB70, 0xABBF, FindIndex(RID_SUBSETSTR_CHEROKEE_SUPPLEMENT) ) ); + aAllSubsets.push_back( Subset( 0xAB70, 0xABBF, RID_SUBSETSTR_CHEROKEE_SUPPLEMENT ) ); break; case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E: - aAllSubsets.push_back( Subset( 0x2B820, 0x2CEAF, FindIndex(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E) ) ); + aAllSubsets.push_back( Subset( 0x2B820, 0x2CEAF, RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E ) ); break; case UBLOCK_EARLY_DYNASTIC_CUNEIFORM: - aAllSubsets.push_back( Subset( 0x12480, 0x1254F, FindIndex(RID_SUBSETSTR_EARLY_DYNASTIC_CUNEIFORM) ) ); + aAllSubsets.push_back( Subset( 0x12480, 0x1254F, RID_SUBSETSTR_EARLY_DYNASTIC_CUNEIFORM ) ); break; case UBLOCK_HATRAN: - aAllSubsets.push_back( Subset( 0x108E0, 0x108FF, FindIndex(RID_SUBSETSTR_HATRAN) ) ); + aAllSubsets.push_back( Subset( 0x108E0, 0x108FF, RID_SUBSETSTR_HATRAN ) ); break; case UBLOCK_MULTANI: - aAllSubsets.push_back( Subset( 0x11280, 0x112AF, FindIndex(RID_SUBSETSTR_MULTANI) ) ); + aAllSubsets.push_back( Subset( 0x11280, 0x112AF, RID_SUBSETSTR_MULTANI ) ); break; case UBLOCK_OLD_HUNGARIAN: - aAllSubsets.push_back( Subset( 0x10C80, 0x10CFF, FindIndex(RID_SUBSETSTR_OLD_HUNGARIAN) ) ); + aAllSubsets.push_back( Subset( 0x10C80, 0x10CFF, RID_SUBSETSTR_OLD_HUNGARIAN ) ); break; case UBLOCK_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS: - aAllSubsets.push_back( Subset( 0x1F900, 0x1F9FF, FindIndex(RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS) ) ); + aAllSubsets.push_back( Subset( 0x1F900, 0x1F9FF, RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS ) ); break; case UBLOCK_SUTTON_SIGNWRITING: - aAllSubsets.push_back( Subset( 0x1D800, 0x1DAAF, FindIndex(RID_SUBSETSTR_SUTTON_SIGNWRITING) ) ); + aAllSubsets.push_back( Subset( 0x1D800, 0x1DAAF, RID_SUBSETSTR_SUTTON_SIGNWRITING ) ); break; #endif #if (U_ICU_VERSION_MAJOR_NUM >= 58) case UBLOCK_ADLAM: - aAllSubsets.push_back( Subset( 0x1E900, 0x1E95F, FindIndex(RID_SUBSETSTR_ADLAM) ) ); + aAllSubsets.push_back( Subset( 0x1E900, 0x1E95F, RID_SUBSETSTR_ADLAM ) ); break; case UBLOCK_BHAIKSUKI: - aAllSubsets.push_back( Subset( 0x11C00, 0x11C6F, FindIndex(RID_SUBSETSTR_BHAIKSUKI) ) ); + aAllSubsets.push_back( Subset( 0x11C00, 0x11C6F, RID_SUBSETSTR_BHAIKSUKI ) ); break; case UBLOCK_CYRILLIC_EXTENDED_C: - aAllSubsets.push_back( Subset( 0x1C80, 0x1C8F, FindIndex(RID_SUBSETSTR_CYRILLIC_EXTENDED_C) ) ); + aAllSubsets.push_back( Subset( 0x1C80, 0x1C8F, RID_SUBSETSTR_CYRILLIC_EXTENDED_C ) ); break; case UBLOCK_GLAGOLITIC_SUPPLEMENT: - aAllSubsets.push_back( Subset( 0x1E000, 0x1E02F, FindIndex(RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT) ) ); + aAllSubsets.push_back( Subset( 0x1E000, 0x1E02F, RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT ) ); break; case UBLOCK_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION: - aAllSubsets.push_back( Subset( 0x16FE0, 0x16FFF, FindIndex(RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION) ) ); + aAllSubsets.push_back( Subset( 0x16FE0, 0x16FFF, RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION ) ); break; case UBLOCK_MARCHEN: - aAllSubsets.push_back( Subset( 0x11C70, 0x11CBF, FindIndex(RID_SUBSETSTR_MARCHEN) ) ); + aAllSubsets.push_back( Subset( 0x11C70, 0x11CBF, RID_SUBSETSTR_MARCHEN ) ); break; case UBLOCK_MONGOLIAN_SUPPLEMENT: - aAllSubsets.push_back( Subset( 0x11660, 0x1167F, FindIndex(RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT) ) ); + aAllSubsets.push_back( Subset( 0x11660, 0x1167F, RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT ) ); break; case UBLOCK_NEWA: - aAllSubsets.push_back( Subset( 0x11400, 0x1147F, FindIndex(RID_SUBSETSTR_NEWA) ) ); + aAllSubsets.push_back( Subset( 0x11400, 0x1147F, RID_SUBSETSTR_NEWA ) ); break; case UBLOCK_OSAGE: - aAllSubsets.push_back( Subset( 0x104B0, 0x104FF, FindIndex(RID_SUBSETSTR_OSAGE) ) ); + aAllSubsets.push_back( Subset( 0x104B0, 0x104FF, RID_SUBSETSTR_OSAGE ) ); break; case UBLOCK_TANGUT: - aAllSubsets.push_back( Subset( 0x17000, 0x187FF, FindIndex(RID_SUBSETSTR_TANGUT) ) ); + aAllSubsets.push_back( Subset( 0x17000, 0x187FF, RID_SUBSETSTR_TANGUT ) ); break; case UBLOCK_TANGUT_COMPONENTS: - aAllSubsets.push_back( Subset( 0x18800, 0x18AFF, FindIndex(RID_SUBSETSTR_TANGUT_COMPONENTS) ) ); + aAllSubsets.push_back( Subset( 0x18800, 0x18AFF, RID_SUBSETSTR_TANGUT_COMPONENTS ) ); break; #endif diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 0928a31a4aed..253e3b43e32f 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -34,7 +34,7 @@ #include <svx/dialmgr.hxx> #include "svx/strings.hrc" #include <svx/ctredlin.hxx> -#include "helpid.hrc" +#include "helpids.h" #define WRITER_DATE 2 #define CALC_DATE 3 diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 0f9955db0d3b..fe8be73d884c 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -34,7 +34,7 @@ #include <svx/polygn3d.hxx> #include <svx/xlnclit.hxx> #include <svx/xlnwtit.hxx> -#include "helpid.hrc" +#include "helpids.h" #include <algorithm> #include <svx/dialmgr.hxx> #include <vcl/settings.hxx> diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 4e09745ffe97..5ee4d6b5dcd7 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -44,7 +44,6 @@ #include <svx/dialmgr.hxx> #include <svx/strings.hrc> #include <svx/svxids.hrc> -#include "imapdlg.hrc" #include "imapwnd.hxx" #include "imapimp.hxx" #include "svx/dlgutil.hxx" diff --git a/svx/source/dialog/imapdlg.hrc b/svx/source/dialog/imapdlg.hrc deleted file mode 100644 index 598ba711c545..000000000000 --- a/svx/source/dialog/imapdlg.hrc +++ /dev/null @@ -1,48 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include <svx/dialogs.hrc> - -// ImapDlg-Dialog -#define RID_SVX_IMAPDLG_START RID_SVX_IMAP_START - -/******************************************************************************/ - -#define TBI_APPLY 1 -#define TBI_OPEN 2 -#define TBI_SAVEAS 3 - -#define TBI_SELECT 4 -#define TBI_RECT 5 -#define TBI_CIRCLE 6 -#define TBI_POLY 7 -#define TBI_FREEPOLY 8 - -#define TBI_ACTIVE 16 -#define TBI_MACRO 18 -#define TBI_PROPERTY 19 - -#define TBI_POLYEDIT 30 -#define TBI_POLYMOVE 31 -#define TBI_POLYINSERT 32 -#define TBI_POLYDELETE 33 - -#define TBI_UNDO 40 -#define TBI_REDO 41 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 13698841f019..faa784d4b506 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -30,7 +30,6 @@ #include <svx/dialmgr.hxx> #include <svx/strings.hrc> #include <svx/svxids.hrc> -#include <imapdlg.hrc> #include <imapwnd.hxx> #include <svx/svdpage.hxx> #include <svx/svdorect.hxx> diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 1f166ec87a3d..7d73630c2925 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -22,7 +22,7 @@ #include <i18nlangtag/mslangid.hxx> #include <svtools/valueset.hxx> #include <svl/languageoptions.hxx> -#include <helpid.hrc> +#include <helpids.h> #include <editeng/numitem.hxx> #include <svl/eitem.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 359eb476b725..1ffa9081976e 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -54,7 +54,6 @@ #include <svl/whiter.hxx> #include <svx/float3d.hxx> -#include "float3d.hrc" #include "bitmaps.hlst" using namespace com::sun::star; diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index 3763af2683a1..1b36f332d18c 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -22,7 +22,7 @@ #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp> -#include "fmprop.hrc" +#include "fmprop.hxx" #include <comphelper/extract.hxx> #include <sot/formats.hxx> #include <sot/exchange.hxx> diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx index 63d18d266100..465f8a85f2fe 100644 --- a/svx/source/fmcomp/dbaobjectex.cxx +++ b/svx/source/fmcomp/dbaobjectex.cxx @@ -21,7 +21,7 @@ #include <osl/diagnose.h> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp> -#include "fmprop.hrc" +#include "fmprop.hxx" #include <comphelper/extract.hxx> #include <sot/formats.hxx> #include <sot/exchange.hxx> diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index a254f807dffc..224d0d3dcaf6 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -19,7 +19,7 @@ #include "svx/fmgridif.hxx" #include "fmitems.hxx" -#include "fmprop.hrc" +#include "fmprop.hxx" #include "svx/fmtools.hxx" #include "fmservs.hxx" #include "fmurl.hxx" diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index ada679becd45..42bf7d6ad49b 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -19,7 +19,7 @@ #include "svx/fmgridif.hxx" -#include "fmprop.hrc" +#include "fmprop.hxx" #include "fmservs.hxx" #include "svx/fmtools.hxx" #include "fmurl.hxx" diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 7581d8da9223..86c44d500897 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -20,7 +20,7 @@ #include <memory> #include <sal/macros.h> -#include "fmprop.hrc" +#include "fmprop.hxx" #include "svx/strings.hrc" #include "svx/fmtools.hxx" #include "gridcell.hxx" diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 795e329ed08f..79ffdeef4cbe 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -18,7 +18,7 @@ */ #include <sal/macros.h> -#include "fmhelp.hrc" +#include "helpids.h" #include <svx/gridctrl.hxx> #include "gridcell.hxx" #include "svx/fmtools.hxx" @@ -26,7 +26,7 @@ #include <connectivity/dbtools.hxx> #include <connectivity/dbconversion.hxx> -#include "fmprop.hrc" +#include "fmprop.hxx" #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/sdb/XResultSetAccess.hpp> diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 1efc8de7081a..341347147568 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -25,9 +25,9 @@ #include "datanavi.hxx" #include "fmservs.hxx" -#include "fmhelp.hrc" +#include "helpids.h" #include "bitmaps.hlst" -#include "fpicker/fpicker.hrc" +#include "fpicker/strings.hrc" #include <svx/svxids.hrc> #include <tools/diagnose_ex.h> #include <tools/resmgr.hxx> diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 3eb21268652d..33b8770b28d6 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -20,9 +20,9 @@ #include <memory> #include "filtnav.hxx" #include "fmexch.hxx" -#include "fmhelp.hrc" +#include "helpids.h" #include "fmitems.hxx" -#include "fmprop.hrc" +#include "fmprop.hxx" #include <svx/strings.hrc> #include <com/sun/star/awt/XControlModel.hpp> diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index c0611b084cd9..af805f82f681 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -20,8 +20,8 @@ #include <sal/macros.h> -#include "fmhelp.hrc" -#include "fmprop.hrc" +#include "helpids.h" +#include "fmprop.hxx" #include "fmPropBrw.hxx" #include "svx/strings.hrc" #include "fmservs.hxx" diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx index 9390ffb0dcfa..0b396c425264 100644 --- a/svx/source/form/fmcontrolbordermanager.cxx +++ b/svx/source/form/fmcontrolbordermanager.cxx @@ -20,7 +20,7 @@ #include "fmcontrolbordermanager.hxx" -#include "fmprop.hrc" +#include "fmprop.hxx" #include <com/sun/star/form/validation/XValidatableFormComponent.hpp> #include <com/sun/star/awt/XTextComponent.hpp> diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx index a1a8a5cfd720..55b6568779c5 100644 --- a/svx/source/form/fmcontrollayout.cxx +++ b/svx/source/form/fmcontrollayout.cxx @@ -19,7 +19,7 @@ #include "fmcontrollayout.hxx" -#include "fmprop.hrc" +#include "fmprop.hxx" #include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/awt/VisualEffect.hpp> diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index 5d0b439e6fd4..3f6182207b91 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -21,7 +21,7 @@ #include <svx/strings.hrc> #include "fmexpl.hxx" -#include "fmhelp.hrc" +#include "helpids.h" #include <svx/fmglob.hxx> #include "fmservs.hxx" #include <svx/fmmodel.hxx> @@ -31,7 +31,7 @@ #include <svx/svxids.hrc> -#include "fmprop.hrc" +#include "fmprop.hxx" #include "bitmaps.hlst" #include <svx/dialmgr.hxx> #include "svx/svditer.hxx" diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index a792f3919b53..d3aae131f909 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -18,7 +18,7 @@ */ #include "fmobj.hxx" -#include "fmprop.hrc" +#include "fmprop.hxx" #include "fmvwimp.hxx" #include "fmpgeimp.hxx" #include "svx/fmview.hxx" diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index 924010787f16..1b6a86649670 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -41,7 +41,7 @@ #include "fmexpl.hxx" #include "filtnav.hxx" -#include "fmprop.hrc" +#include "fmprop.hxx" #include "fmPropBrw.hxx" #include "datanavi.hxx" diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index ef2c1d7a0fd9..34e9670b7606 100644 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -38,7 +38,7 @@ #include <svx/fmglob.hxx> -#include "fmprop.hrc" +#include "fmprop.hxx" #include "fmundo.hxx" #include "svx/fmtools.hxx" using namespace ::svxform; diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index cd579f0fe24a..4468fa0751f9 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -22,7 +22,7 @@ #include "fmpgeimp.hxx" #include "fmundo.hxx" #include "svx/fmtools.hxx" -#include "fmprop.hrc" +#include "fmprop.hxx" #include "fmservs.hxx" #include "fmobj.hxx" #include "formcontrolfactory.hxx" diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 5d700e69a4d6..58c8e1abca9b 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -21,7 +21,7 @@ #include <svx/fmshell.hxx> #include "svx/fmtools.hxx" #include "fmservs.hxx" -#include "fmprop.hrc" +#include "fmprop.hxx" #include "fmpgeimp.hxx" #include "fmitems.hxx" #include "fmundo.hxx" diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index d463f66b8ffc..be74781a1508 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -23,7 +23,7 @@ #include "fmobj.hxx" #include "fmpgeimp.hxx" #include "svx/fmtools.hxx" -#include "fmprop.hrc" +#include "fmprop.hxx" #include "fmservs.hxx" #include "fmshimp.hxx" #include "fmtextcontrolshell.hxx" diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index cd5e94199c46..0db270f0660a 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -41,7 +41,7 @@ #include <com/sun/star/util/XNumberFormats.hpp> #include <comphelper/processfactory.hxx> -#include "fmprop.hrc" +#include "fmprop.hxx" #include "fmservs.hxx" #include "svx/fmsrcimp.hxx" #include <svx/fmsearch.hxx> diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 5d71b38977f6..4eded5beda73 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -18,7 +18,7 @@ */ -#include "fmprop.hrc" +#include "fmprop.hxx" #include "fmtextcontroldialogs.hxx" #include "fmtextcontrolfeature.hxx" #include "fmtextcontrolshell.hxx" diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index c482e46bba8a..7e8c759bec79 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -18,7 +18,7 @@ */ -#include "fmprop.hrc" +#include "fmprop.hxx" #include "fmservs.hxx" #include "svx/fmtools.hxx" #include "svx/fmglob.hxx" diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 7e3bd870fe77..652faa322f9a 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -26,7 +26,7 @@ #include "fmpgeimp.hxx" #include "svx/svditer.hxx" #include "fmobj.hxx" -#include "fmprop.hrc" +#include "fmprop.hxx" #include "svx/strings.hrc" #include "svx/fmglob.hxx" #include "svx/dialmgr.hxx" @@ -49,7 +49,6 @@ #include <sfx2/objsh.hxx> #include <sfx2/docfile.hxx> #include <sfx2/app.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/event.hxx> #include <osl/mutex.hxx> #include <comphelper/property.hxx> diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index e190402400df..1b4690350137 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -50,7 +50,7 @@ #include "svx/fmtools.hxx" #include "fmshimp.hxx" #include "fmservs.hxx" -#include "fmprop.hrc" +#include "fmprop.hxx" #include "fmundo.hxx" #include <svx/dataaccessdescriptor.hxx> #include <comphelper/processfactory.hxx> diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 029f2d6cc708..49afb8d00201 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -22,7 +22,7 @@ #include "fmdocumentclassification.hxx" #include "fmobj.hxx" #include "fmpgeimp.hxx" -#include "fmprop.hrc" +#include "fmprop.hxx" #include "svx/strings.hrc" #include "fmservs.hxx" #include "fmshimp.hxx" diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index 728166409e43..35eb98aaf7d5 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -20,7 +20,7 @@ #include "formcontrolfactory.hxx" #include "fmcontrollayout.hxx" -#include "fmprop.hrc" +#include "fmprop.hxx" #include "svx/strings.hrc" #include "fmservs.hxx" #include "svx/dialmgr.hxx" diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 1c8baa032b56..fb63de35bd96 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -24,7 +24,7 @@ #include "formfeaturedispatcher.hxx" #include "fmdocumentclassification.hxx" #include "formcontrolling.hxx" -#include "fmprop.hrc" +#include "fmprop.hxx" #include "svx/dialmgr.hxx" #include "svx/strings.hrc" #include "fmservs.hxx" diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx index 23459b2069e8..e0ad57f183dc 100644 --- a/svx/source/form/formcontrolling.cxx +++ b/svx/source/form/formcontrolling.cxx @@ -22,7 +22,7 @@ #include "formcontrolling.hxx" #include "fmurl.hxx" #include "svx/svxids.hrc" -#include "fmprop.hrc" +#include "fmprop.hxx" #include "svx/fmtools.hxx" #include <com/sun/star/form/runtime/FormOperations.hpp> diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index ef6d24af1eed..b8b88183d612 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -25,7 +25,7 @@ #include <svx/svdpagv.hxx> #include "svx/svditer.hxx" -#include "fmhelp.hrc" +#include "helpids.h" #include "fmexpl.hxx" #include "fmshimp.hxx" #include "fmservs.hxx" @@ -33,7 +33,7 @@ #include "fmpgeimp.hxx" #include "fmitems.hxx" #include "fmobj.hxx" -#include "fmprop.hrc" +#include "fmprop.hxx" #include <vcl/wrkwin.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/dispatch.hxx> diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index b176b61fd5bf..df2fb0f99626 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -26,10 +26,10 @@ #include <svx/svdogrp.hxx> #include <svx/svdpagv.hxx> -#include "fmprop.hrc" +#include "fmprop.hxx" #include "fmundo.hxx" -#include "fmhelp.hrc" +#include "helpids.h" #include "fmexpl.hxx" #include "svx/strings.hrc" #include "fmshimp.hxx" diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index df06fec08719..af2e399fff7f 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -33,14 +33,14 @@ #include <com/sun/star/util/XLocalizedAliases.hpp> #include <comphelper/processfactory.hxx> -#include "fmhelp.hrc" +#include "helpids.h" #include <svx/fmshell.hxx> #include "fmshimp.hxx" #include <svx/fmpage.hxx> #include "fmpgeimp.hxx" -#include "fmprop.hrc" +#include "fmprop.hxx" #include <svx/dialmgr.hxx> #include <svx/svdpagv.hxx> diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 90b4cae4aa74..b0993f984eef 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -34,7 +34,7 @@ #include <svx/strings.hrc> #include "svx/tbxctl.hxx" #include "tbxform.hxx" -#include "fmhelp.hrc" +#include "helpids.h" #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> diff --git a/svx/source/form/typemap.cxx b/svx/source/form/typemap.cxx index 2fd33ea736a1..70c94f5edf4b 100644 --- a/svx/source/form/typemap.cxx +++ b/svx/source/form/typemap.cxx @@ -47,7 +47,7 @@ #include <editeng/adjustitem.hxx> #include <editeng/emphasismarkitem.hxx> -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #define SFX_TYPEMAP #include "svxslots.hxx" diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index f690357da5d3..568be2aae542 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -26,7 +26,7 @@ #include <vcl/settings.hxx> #include <ucbhelper/content.hxx> #include <sfx2/app.hxx> -#include "helpid.hrc" +#include "helpids.h" #include "svx/gallery1.hxx" #include "svx/galtheme.hxx" #include "svx/galmisc.hxx" diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 6582b61d7e92..9f3e1f92a40f 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -32,7 +32,7 @@ #include <sfx2/sfxsids.hrc> #include <vcl/graphicfilter.hxx> #include <editeng/brushitem.hxx> -#include "helpid.hrc" +#include "helpids.h" #include "svx/gallery.hxx" #include "svx/svxids.hrc" #include "galobj.hxx" diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 4e1c02bcccf6..60b494366f3b 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -22,7 +22,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> #include <avmedia/mediaplayer.hxx> -#include "helpid.hrc" +#include "helpids.h" #include "galbrws2.hxx" #include "svx/dialmgr.hxx" #include "svx/galtheme.hxx" diff --git a/svx/source/inc/fmprop.hrc b/svx/source/inc/fmprop.hxx index 2c5733cbab92..0ea06e09f826 100644 --- a/svx/source/inc/fmprop.hrc +++ b/svx/source/inc/fmprop.hxx @@ -16,8 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SOURCE_INC_FMPROP_HRC -#define INCLUDED_SVX_SOURCE_INC_FMPROP_HRC +#ifndef INCLUDED_SVX_SOURCE_INC_FMPROP_HXX +#define INCLUDED_SVX_SOURCE_INC_FMPROP_HXX // PropertyIds, which have an assignment to a PropertyName, could continue // to be WhichIds in the future -> Itemset diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index cfac4a37e620..01f6c024fcf0 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -19,9 +19,9 @@ #include <svx/svxids.hrc> #include <tools/stream.hxx> -#include <svl/memberid.hrc> +#include <svl/memberid.h> #include <basic/sbxvar.hxx> - +#include <sfx2/event.hxx> #include "svx/hlnkitem.hxx" diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index 39c98404b0cc..31c20e00e10c 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -28,7 +28,7 @@ #include <svx/xtable.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> -#include <helpid.hrc> +#include <helpids.h> #include <svtools/valueset.hxx> #include <unotools/pathoptions.hxx> #include <svx/svxitems.hrc> diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index 186e0f9b6c48..806866c24c13 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -29,7 +29,7 @@ #include <svx/xtable.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> -#include <helpid.hrc> +#include <helpids.h> #include <svtools/valueset.hxx> #include <unotools/pathoptions.hxx> #include <svx/svxitems.hrc> diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx index e0bfe2d2fc43..f1b8ae5d45ff 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx @@ -18,10 +18,10 @@ */ #include <sfx2/bindings.hxx> #include "TextCharacterSpacingControl.hxx" -#include "TextPropertyPanel.hrc" #include <svx/strings.hrc> #include <svx/dialmgr.hxx> #include <unotools/viewoptions.hxx> +#include <editeng/editids.hrc> #include <editeng/kernitem.hxx> #include <editeng/fhgtitem.hxx> #include <sfx2/dispatch.hxx> @@ -29,6 +29,7 @@ #include <vcl/settings.hxx> #include <vcl/lstbox.hxx> #include <svl/itempool.hxx> +#include "helpids.h" #define SPACING_VERY_TIGHT -30 #define SPACING_TIGHT -15 diff --git a/svx/source/sidebar/text/TextPropertyPanel.hrc b/svx/source/sidebar/text/TextPropertyPanel.hrc deleted file mode 100644 index 07005543f753..000000000000 --- a/svx/source/sidebar/text/TextPropertyPanel.hrc +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include "svx/dialogs.hrc" - -//help ids -#define HID_UNDERLINE_BTN "SVX_HID_UNDERLINE_BTN" -#define HID_SPACING_MB_KERN "SVX_HID_SPACING_MB_KERN" - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx index ed8a51bf48d1..48c60644a71d 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.cxx +++ b/svx/source/sidebar/text/TextUnderlineControl.cxx @@ -17,13 +17,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include "TextUnderlineControl.hxx" -#include "TextPropertyPanel.hrc" #include <svx/strings.hrc> #include <svx/dialmgr.hxx> +#include <svx/svxids.hrc> #include <sfx2/dispatch.hxx> #include <sfx2/sidebar/Theme.hxx> +#include <editeng/editids.hrc> #include <editeng/udlnitem.hxx> #include <vcl/settings.hxx> +#include "helpids.h" namespace svx { diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 0829234d00a9..572e9fb5fbf3 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -38,7 +38,7 @@ #include <svx/xtable.hxx> #include <svx/dialmgr.hxx> #include "svx/xexch.hxx" -#include "helpid.hrc" +#include "helpids.h" #include <vcl/svapp.hxx> using namespace com::sun::star; diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 41501d8ea1d4..5f74831edcfe 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -37,7 +37,7 @@ #include <svx/dialmgr.hxx> #include "coreservices.hxx" -#include "helpid.hrc" +#include "helpids.h" #include "extrusioncontrols.hxx" #include "extrusiondepthdialog.hxx" diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 68729ff95567..0e3ebade9ff9 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -38,7 +38,7 @@ #include <svx/fillctrl.hxx> #include <svx/itemwin.hxx> #include <svx/dialmgr.hxx> -#include "helpid.hrc" +#include "helpids.h" #include <memory> #include <o3tl/make_unique.hxx> diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index ac3f2e5b4da5..7779058c18ff 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -53,7 +53,7 @@ #include <algorithm> #include <memory> -#include "helpid.hrc" +#include "helpids.h" #include "bitmaps.hlst" using ::svtools::ToolbarMenu; diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index f1efc65b123d..98c3132e3f7f 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -29,7 +29,7 @@ #include <svx/strings.hrc> #include <svx/svxids.hrc> -#include "helpid.hrc" +#include "helpids.h" #include "svx/drawitem.hxx" #include "svx/xattr.hxx" diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 79e9382b835a..ac780f01d60e 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -64,7 +64,7 @@ #include <svx/strings.hrc> #include <svx/svxitems.hrc> #include <svx/svxids.hrc> -#include "helpid.hrc" +#include "helpids.h" #include <sfx2/htmlmode.hxx> #include <sfx2/sidebar/Sidebar.hxx> #include <sfx2/sidebar/SidebarToolBox.hxx> diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 997a12d5a7c4..7b1900f49c42 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -37,7 +37,7 @@ #include <unotools/intlwrapper.hxx> #include <comphelper/processfactory.hxx> #include <vcl/svapp.hxx> -#include "helpid.hrc" +#include "helpids.h" namespace textconversiondlgs diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx index 4e4d62fe57ae..33e9278d8e7e 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx @@ -24,7 +24,7 @@ #include <vcl/msgbox.hxx> #include <unotools/lingucfg.hxx> #include <unotools/linguprops.hxx> -#include "helpid.hrc" +#include "helpids.h" namespace textconversiondlgs diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx index 5cb461772193..bd8ed0861b8f 100644 --- a/svx/source/unodraw/unobtabl.cxx +++ b/svx/source/unodraw/unobtabl.cxx @@ -30,7 +30,7 @@ #include <svx/unomid.hxx> #include <editeng/unoprnms.hxx> #include "svx/unofill.hxx" -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> using namespace ::com::sun::star; using namespace ::cppu; diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index f53b8c93ef8f..4aac08018752 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -35,10 +35,10 @@ #include <svx/unofill.hxx> #include <editeng/unonrule.hxx> #include <svtools/unoimap.hxx> +#include <sfx2/event.hxx> #include <svx/fmdpage.hxx> #include <svx/fmmodel.hxx> #include <svx/fmpage.hxx> -#include <sfx2/sfx.hrc> #include <svx/unoapi.hxx> #include <svx/svdmodel.hxx> diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 57c28add93c7..f8dfcc228ec2 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -35,7 +35,7 @@ #include <o3tl/any.hxx> #include <o3tl/make_unique.hxx> #include <svl/itempool.hxx> -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <tools/stream.hxx> #include <tools/mapunit.hxx> diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 9185378d5a24..c8de391e6fee 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -25,7 +25,7 @@ #include <vcl/bitmapex.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <svl/style.hxx> -#include <editeng/memberids.hrc> +#include <editeng/memberids.h> #include <svx/strings.hrc> #include "svx/xattr.hxx" #include <svx/xtable.hxx> |