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

10 files changed, 327 insertions, 354 deletions

diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 45f12bc3bc54..1c620a67c697 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -21,7 +21,7 @@
 #define INCLUDED_SVX_DIALOGS_HRC
 
 #include <svx/svxids.hrc>
-#include <sfx2/dialogs.hrc>
+#include <sfx2/sfxsids.hrc>
 
 // factory IDs of tabpages implemented in CUI
 #define RID_SVXPAGE_CHAR_TWOLINES           (RID_SVX_START + 242)
@@ -75,6 +75,7 @@
 #define RID_SW_TP_OPTPRINT_PAGE         (RID_OFA_START + 209)
 #define RID_SW_TP_OPTTABLE_PAGE         (RID_OFA_START + 210)
 #define RID_SW_TP_REDLINE_OPT           (RID_OFA_START + 212)
+#define RID_SW_TP_DOC_STAT              (RID_OFA_START + 252)
 #define RID_SW_TP_OPTCOMPATIBILITY_PAGE (RID_OFA_START + 255)
 #define RID_SW_TP_COMPARISON_OPT        (RID_OFA_START + 257)
 #define RID_SW_TP_HTML_CONTENT_OPT      (RID_OFA_START + 240)
diff --git a/include/svx/exthelpid.hrc b/include/svx/exthelpid.hrc
deleted file mode 100644
index bcd17303b868..000000000000
--- a/include/svx/exthelpid.hrc
+++ /dev/null
@@ -1,34 +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_EXTHELPID_HRC
-#define INCLUDED_SVX_EXTHELPID_HRC
-
-// these HIDs are used in SVX and also in other modules, mainly CUI
-// the reason is that different controls have the same help texts assigned
-// but are implemented in different libraries
-// to avoid "exporting" the whole HID list only those few ones that are shared
-// are moved to this exported (delivered) hrc file
-
-// Help-Ids --------------------------------------------------------------
-#define HID_GALLERY_ACTUALIZE                     "SVX_HID_GALLERY_ACTUALIZE"
-#define HID_GALLERY_TITLE                         "SVX_HID_GALLERY_TITLE"
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index 31892bc8ef85..694677b0614d 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -33,6 +33,29 @@
 #include <svx/dlgctrl.hxx>
 #include <svx/svdmodel.hxx>
 
+// 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
+
 enum class ViewType3D
 {
     Geo = 1,
diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx
index e328ab8b1e78..e23754b657b0 100644
--- a/include/svx/imapdlg.hxx
+++ b/include/svx/imapdlg.hxx
@@ -32,6 +32,28 @@
 #include <svx/svxdllapi.h>
 #include <vector>
 
+#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
+
 class ImageMap;
 
 /*************************************************************************
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index a3ec0eedc488..6416454d1160 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1256,6 +1256,281 @@
 // String for saving modified image (instead of original)
 #define RID_SVXSTR_SAVE_MODIFIED_IMAGE                      NC_("RID_SVXSTR_SAVE_MODIFIED_IMAGE", "The image has been modified. By default the original image will be saved.\nDo you want to save the modified version instead ?")
 
+#define RID_SUBSETSTR_BASIC_LATIN                           NC_("RID_SUBSETMAP", "Basic Latin")
+#define RID_SUBSETSTR_LATIN_1                               NC_("RID_SUBSETMAP", "Latin-1")
+#define RID_SUBSETSTR_LATIN_EXTENDED_A                      NC_("RID_SUBSETMAP", "Latin Extended-A")
+#define RID_SUBSETSTR_LATIN_EXTENDED_B                      NC_("RID_SUBSETMAP", "Latin Extended-B")
+#define RID_SUBSETSTR_IPA_EXTENSIONS                        NC_("RID_SUBSETMAP", "IPA Extensions")
+#define RID_SUBSETSTR_SPACING_MODIFIERS                     NC_("RID_SUBSETMAP", "Spacing Modifier Letters")
+#define RID_SUBSETSTR_COMB_DIACRITICAL                      NC_("RID_SUBSETMAP", "Combining Diacritical Marks")
+#define RID_SUBSETSTR_BASIC_GREEK                           NC_("RID_SUBSETMAP", "Basic Greek")
+#define RID_SUBSETSTR_GREEK_SYMS_COPTIC                     NC_("RID_SUBSETMAP", "Greek Symbols And Coptic")
+#define RID_SUBSETSTR_CYRILLIC                              NC_("RID_SUBSETMAP", "Cyrillic")
+#define RID_SUBSETSTR_ARMENIAN                              NC_("RID_SUBSETMAP", "Armenian")
+#define RID_SUBSETSTR_BASIC_HEBREW                          NC_("RID_SUBSETMAP", "Basic Hebrew")
+#define RID_SUBSETSTR_HEBREW_EXTENDED                       NC_("RID_SUBSETMAP", "Hebrew Extended")
+#define RID_SUBSETSTR_BASIC_ARABIC                          NC_("RID_SUBSETMAP", "Basic Arabic")
+#define RID_SUBSETSTR_ARABIC_EXTENDED                       NC_("RID_SUBSETMAP", "Arabic Extended")
+#define RID_SUBSETSTR_DEVANAGARI                            NC_("RID_SUBSETMAP", "Devanagari")
+#define RID_SUBSETSTR_BENGALI                               NC_("RID_SUBSETMAP", "Bengali")
+#define RID_SUBSETSTR_GURMUKHI                              NC_("RID_SUBSETMAP", "Gurmukhi")
+#define RID_SUBSETSTR_GUJARATI                              NC_("RID_SUBSETMAP", "Gujarati")
+#define RID_SUBSETSTR_ODIA                                  NC_("RID_SUBSETMAP", "Odia")
+#define RID_SUBSETSTR_TAMIL                                 NC_("RID_SUBSETMAP", "Tamil")
+#define RID_SUBSETSTR_TELUGU                                NC_("RID_SUBSETMAP", "Telugu")
+#define RID_SUBSETSTR_KANNADA                               NC_("RID_SUBSETMAP", "Kannada")
+#define RID_SUBSETSTR_MALAYALAM                             NC_("RID_SUBSETMAP", "Malayalam")
+#define RID_SUBSETSTR_THAI                                  NC_("RID_SUBSETMAP", "Thai")
+#define RID_SUBSETSTR_LAO                                   NC_("RID_SUBSETMAP", "Lao")
+#define RID_SUBSETSTR_BASIC_GEORGIAN                        NC_("RID_SUBSETMAP", "Basic Georgian")
+#define RID_SUBSETSTR_GEORGIAN_EXTENDED                     NC_("RID_SUBSETMAP", "Georgian Extended")
+#define RID_SUBSETSTR_HANGUL_JAMO                           NC_("RID_SUBSETMAP", "Hangul Jamo")
+#define RID_SUBSETSTR_LATIN_EXTENDED_ADDS                   NC_("RID_SUBSETMAP", "Latin Extended Additionals")
+#define RID_SUBSETSTR_GREEK_EXTENDED                        NC_("RID_SUBSETMAP", "Greek Extended")
+#define RID_SUBSETSTR_GENERAL_PUNCTUATION                   NC_("RID_SUBSETMAP", "General punctuation")
+#define RID_SUBSETSTR_SUB_SUPER_SCRIPTS                     NC_("RID_SUBSETMAP", "Superscripts and Subscripts")
+#define RID_SUBSETSTR_CURRENCY_SYMBOLS                      NC_("RID_SUBSETMAP", "Currency Symbols")
+#define RID_SUBSETSTR_COMB_DIACRITIC_SYMS                   NC_("RID_SUBSETMAP", "Combining Diacritical Symbols")
+#define RID_SUBSETSTR_LETTERLIKE_SYMBOLS                    NC_("RID_SUBSETMAP", "Letterlike Symbols")
+#define RID_SUBSETSTR_NUMBER_FORMS                          NC_("RID_SUBSETMAP", "Number Forms")
+#define RID_SUBSETSTR_ARROWS                                NC_("RID_SUBSETMAP", "Arrows")
+#define RID_SUBSETSTR_MATH_OPERATORS                        NC_("RID_SUBSETMAP", "Mathematical Operators")
+#define RID_SUBSETSTR_MISC_TECHNICAL                        NC_("RID_SUBSETMAP", "Miscellaneous Technical")
+#define RID_SUBSETSTR_CONTROL_PICTURES                      NC_("RID_SUBSETMAP", "Control Pictures")
+#define RID_SUBSETSTR_OPTICAL_CHAR_REC                      NC_("RID_SUBSETMAP", "Optical Character Recognition")
+#define RID_SUBSETSTR_ENCLOSED_ALPHANUM                     NC_("RID_SUBSETMAP", "Enclosed Alphanumerics")
+#define RID_SUBSETSTR_BOX_DRAWING                           NC_("RID_SUBSETMAP", "Box Drawing")
+#define RID_SUBSETSTR_BLOCK_ELEMENTS                        NC_("RID_SUBSETMAP", "Block Elements")
+#define RID_SUBSETSTR_GEOMETRIC_SHAPES                      NC_("RID_SUBSETMAP", "Geometric Shapes")
+#define RID_SUBSETSTR_MISC_DINGBATS                         NC_("RID_SUBSETMAP", "Miscellaneous Symbols")
+#define RID_SUBSETSTR_DINGBATS                              NC_("RID_SUBSETMAP", "Dingbats")
+#define RID_SUBSETSTR_CJK_SYMS_PUNCTUATION                  NC_("RID_SUBSETMAP", "CJK Symbols And Punctuation")
+#define RID_SUBSETSTR_HIRAGANA                              NC_("RID_SUBSETMAP", "Hiragana")
+#define RID_SUBSETSTR_KATAKANA                              NC_("RID_SUBSETMAP", "Katakana")
+#define RID_SUBSETSTR_BOPOMOFO                              NC_("RID_SUBSETMAP", "Bopomofo")
+#define RID_SUBSETSTR_HANGUL_COMPAT_JAMO                    NC_("RID_SUBSETMAP", "Hangul Compatibility Jamo")
+#define RID_SUBSETSTR_CJK_MISC                              NC_("RID_SUBSETMAP", "CJK Miscellaneous")
+#define RID_SUBSETSTR_ENCLOSED_CJK_LETTERS                  NC_("RID_SUBSETMAP", "Enclosed CJK Letters And Months")
+#define RID_SUBSETSTR_CJK_COMPATIBILITY                     NC_("RID_SUBSETMAP", "CJK Compatibility")
+#define RID_SUBSETSTR_HANGUL                                NC_("RID_SUBSETMAP", "Hangul")
+#define RID_SUBSETSTR_CJK_UNIFIED_IDGRAPH                   NC_("RID_SUBSETMAP", "CJK Unified Ideographs")
+#define RID_SUBSETSTR_CJK_EXT_A_UNIFIED_IDGRAPH             NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension A")
+#define RID_SUBSETSTR_PRIVATE_USE_AREA                      NC_("RID_SUBSETMAP", "Private Use Area")
+#define RID_SUBSETSTR_CJK_COMPAT_IDGRAPHS                   NC_("RID_SUBSETMAP", "CJK Compatibility Ideographs")
+#define RID_SUBSETSTR_ALPHA_PRESENTATION                    NC_("RID_SUBSETMAP", "Alphabetic Presentation Forms")
+#define RID_SUBSETSTR_ARABIC_PRESENT_A                      NC_("RID_SUBSETMAP", "Arabic Presentation Forms-A")
+#define RID_SUBSETSTR_COMBINING_HALF_MARKS                  NC_("RID_SUBSETMAP", "Combining Half Marks")
+#define RID_SUBSETSTR_CJK_COMPAT_FORMS                      NC_("RID_SUBSETMAP", "CJK Compatibility Forms")
+#define RID_SUBSETSTR_SMALL_FORM_VARIANTS                   NC_("RID_SUBSETMAP", "Small Form Variants")
+#define RID_SUBSETSTR_ARABIC_PRESENT_B                      NC_("RID_SUBSETMAP", "Arabic Presentation Forms-B")
+#define RID_SUBSETSTR_HALFW_FULLW_FORMS                     NC_("RID_SUBSETMAP", "Half-width and Full-width Forms")
+#define RID_SUBSETSTR_SPECIALS                              NC_("RID_SUBSETMAP", "Specials")
+#define RID_SUBSETSTR_YI_SYLLABLES                          NC_("RID_SUBSETMAP", "Yi Syllables")
+#define RID_SUBSETSTR_YI_RADICALS                           NC_("RID_SUBSETMAP", "Yi Radicals")
+#define RID_SUBSETSTR_OLD_ITALIC                            NC_("RID_SUBSETMAP", "Old Italic")
+#define RID_SUBSETSTR_GOTHIC                                NC_("RID_SUBSETMAP", "Gothic")
+#define RID_SUBSETSTR_DESERET                               NC_("RID_SUBSETMAP", "Deseret")
+#define RID_SUBSETSTR_BYZANTINE_MUSICAL_SYMBOLS             NC_("RID_SUBSETMAP", "Byzantine Musical Symbols")
+#define RID_SUBSETSTR_MUSICAL_SYMBOLS                       NC_("RID_SUBSETMAP", "Musical Symbols")
+#define RID_SUBSETSTR_MATHEMATICAL_ALPHANUMERIC_SYMBOLS     NC_("RID_SUBSETMAP", "Mathematical Alphanumeric Symbols")
+#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B    NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension B")
+#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C    NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension C")
+#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D    NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension D")
+#define RID_SUBSETSTR_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT   NC_("RID_SUBSETMAP", "CJK Compatibility Ideographs Supplement")
+#define RID_SUBSETSTR_TAGS                                  NC_("RID_SUBSETMAP", "Tags")
+#define RID_SUBSETSTR_CYRILLIC_SUPPLEMENTARY                NC_("RID_SUBSETMAP", "Cyrillic Supplement")
+#define RID_SUBSETSTR_VARIATION_SELECTORS                   NC_("RID_SUBSETMAP", "Variation Selectors")
+#define RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_A      NC_("RID_SUBSETMAP", "Supplementary Private Use Area-A")
+#define RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_B      NC_("RID_SUBSETMAP", "Supplementary Private Use Area-B")
+#define RID_SUBSETSTR_LIMBU                                 NC_("RID_SUBSETMAP", "Limbu")
+#define RID_SUBSETSTR_TAI_LE                                NC_("RID_SUBSETMAP", "Tai Le")
+#define RID_SUBSETSTR_KHMER_SYMBOLS                         NC_("RID_SUBSETMAP", "Khmer Symbols")
+#define RID_SUBSETSTR_PHONETIC_EXTENSIONS                   NC_("RID_SUBSETMAP", "Phonetic Extensions")
+#define RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_ARROWS      NC_("RID_SUBSETMAP", "Miscellaneous Symbols And Arrows")
+#define RID_SUBSETSTR_YIJING_HEXAGRAM_SYMBOLS               NC_("RID_SUBSETMAP", "Yijing Hexagram Symbols")
+#define RID_SUBSETSTR_LINEAR_B_SYLLABARY                    NC_("RID_SUBSETMAP", "Linear B Syllabary")
+#define RID_SUBSETSTR_LINEAR_B_IDEOGRAMS                    NC_("RID_SUBSETMAP", "Linear B Ideograms")
+#define RID_SUBSETSTR_AEGEAN_NUMBERS                        NC_("RID_SUBSETMAP", "Aegean Numbers")
+#define RID_SUBSETSTR_UGARITIC                              NC_("RID_SUBSETMAP", "Ugaritic")
+#define RID_SUBSETSTR_SHAVIAN                               NC_("RID_SUBSETMAP", "Shavian")
+#define RID_SUBSETSTR_OSMANYA                               NC_("RID_SUBSETMAP", "Osmanya")
+#define RID_SUBSETSTR_SINHALA                               NC_("RID_SUBSETMAP", "Sinhala")
+#define RID_SUBSETSTR_TIBETAN                               NC_("RID_SUBSETMAP", "Tibetan")
+#define RID_SUBSETSTR_MYANMAR                               NC_("RID_SUBSETMAP", "Myanmar")
+#define RID_SUBSETSTR_KHMER                                 NC_("RID_SUBSETMAP", "Khmer")
+#define RID_SUBSETSTR_OGHAM                                 NC_("RID_SUBSETMAP", "Ogham")
+#define RID_SUBSETSTR_RUNIC                                 NC_("RID_SUBSETMAP", "Runic")
+#define RID_SUBSETSTR_SYRIAC                                NC_("RID_SUBSETMAP", "Syriac")
+#define RID_SUBSETSTR_THAANA                                NC_("RID_SUBSETMAP", "Thaana")
+#define RID_SUBSETSTR_ETHIOPIC                              NC_("RID_SUBSETMAP", "Ethiopic")
+#define RID_SUBSETSTR_CHEROKEE                              NC_("RID_SUBSETMAP", "Cherokee")
+#define RID_SUBSETSTR_CANADIAN_ABORIGINAL                   NC_("RID_SUBSETMAP", "Canadian Aboriginal Syllables")
+#define RID_SUBSETSTR_MONGOLIAN                             NC_("RID_SUBSETMAP", "Mongolian")
+#define RID_SUBSETSTR_MISC_MATH_SYMS_A                      NC_("RID_SUBSETMAP", "Miscellaneous Mathematical Symbols-A")
+#define RID_SUBSETSTR_SUPPL_ARROWS_A                        NC_("RID_SUBSETMAP", "Supplemental Arrows-A")
+#define RID_SUBSETSTR_BRAILLE_PATTERNS                      NC_("RID_SUBSETMAP", "Braille Patterns")
+#define RID_SUBSETSTR_SUPPL_ARROWS_B                        NC_("RID_SUBSETMAP", "Supplemental Arrows-B")
+#define RID_SUBSETSTR_MISC_MATH_SYMS_B                      NC_("RID_SUBSETMAP", "Miscellaneous Mathematical Symbols-B")
+#define RID_SUBSETSTR_CJK_RADICAL_SUPPL                     NC_("RID_SUBSETMAP", "CJK Radical Supplement")
+#define RID_SUBSETSTR_KANGXI_RADICALS                       NC_("RID_SUBSETMAP", "Kangxi Radicals")
+#define RID_SUBSETSTR_IDEO_DESC_CHARS                       NC_("RID_SUBSETMAP", "Ideographic Description Characters")
+#define RID_SUBSETSTR_TAGALOG                               NC_("RID_SUBSETMAP", "Tagalog")
+#define RID_SUBSETSTR_HANUNOO                               NC_("RID_SUBSETMAP", "Hanunoo")
+#define RID_SUBSETSTR_TAGBANWA                              NC_("RID_SUBSETMAP", "Tagbanwa")
+#define RID_SUBSETSTR_BUHID                                 NC_("RID_SUBSETMAP", "Buhid")
+#define RID_SUBSETSTR_KANBUN                                NC_("RID_SUBSETMAP", "Kanbun")
+#define RID_SUBSETSTR_BOPOMOFO_EXTENDED                     NC_("RID_SUBSETMAP", "Bopomofo Extended")
+#define RID_SUBSETSTR_KATAKANA_PHONETIC                     NC_("RID_SUBSETMAP", "Katakana Phonetics")
+#define RID_SUBSETSTR_CJK_STROKES                           NC_("RID_SUBSETMAP", "CJK Strokes")
+#define RID_SUBSETSTR_CYPRIOT_SYLLABARY                     NC_("RID_SUBSETMAP", "Cypriot Syllabary")
+#define RID_SUBSETSTR_TAI_XUAN_JING_SYMBOLS                 NC_("RID_SUBSETMAP", "Tai Xuan Jing Symbols")
+#define RID_SUBSETSTR_VARIATION_SELECTORS_SUPPLEMENT        NC_("RID_SUBSETMAP", "Variation Selectors Supplement")
+#define RID_SUBSETSTR_ANCIENT_GREEK_MUSICAL_NOTATION        NC_("RID_SUBSETMAP", "Ancient Greek Musical Notation")
+#define RID_SUBSETSTR_ANCIENT_GREEK_NUMBERS                 NC_("RID_SUBSETMAP", "Ancient Greek Numbers")
+#define RID_SUBSETSTR_ARABIC_SUPPLEMENT                     NC_("RID_SUBSETMAP", "Arabic Supplement")
+#define RID_SUBSETSTR_BUGINESE                              NC_("RID_SUBSETMAP", "Buginese")
+#define RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_SUPPLEMENT    NC_("RID_SUBSETMAP", "Combining Diacritical Marks Supplement")
+#define RID_SUBSETSTR_COPTIC                                NC_("RID_SUBSETMAP", "Coptic")
+#define RID_SUBSETSTR_ETHIOPIC_EXTENDED                     NC_("RID_SUBSETMAP", "Ethiopic Extended")
+#define RID_SUBSETSTR_ETHIOPIC_SUPPLEMENT                   NC_("RID_SUBSETMAP", "Ethiopic Supplement")
+#define RID_SUBSETSTR_GEORGIAN_SUPPLEMENT                   NC_("RID_SUBSETMAP", "Georgian Supplement")
+#define RID_SUBSETSTR_GLAGOLITIC                            NC_("RID_SUBSETMAP", "Glagolitic")
+#define RID_SUBSETSTR_KHAROSHTHI                            NC_("RID_SUBSETMAP", "Kharoshthi")
+#define RID_SUBSETSTR_MODIFIER_TONE_LETTERS                 NC_("RID_SUBSETMAP", "Modifier Tone Letters")
+#define RID_SUBSETSTR_NEW_TAI_LUE                           NC_("RID_SUBSETMAP", "New Tai Lue")
+#define RID_SUBSETSTR_OLD_PERSIAN                           NC_("RID_SUBSETMAP", "Old Persian")
+#define RID_SUBSETSTR_PHONETIC_EXTENSIONS_SUPPLEMENT        NC_("RID_SUBSETMAP", "Phonetic Extensions Supplement")
+#define RID_SUBSETSTR_SUPPLEMENTAL_PUNCTUATION              NC_("RID_SUBSETMAP", "Supplemental Punctuation")
+#define RID_SUBSETSTR_SYLOTI_NAGRI                          NC_("RID_SUBSETMAP", "Syloti Nagri")
+#define RID_SUBSETSTR_TIFINAGH                              NC_("RID_SUBSETMAP", "Tifinagh")
+#define RID_SUBSETSTR_VERTICAL_FORMS                        NC_("RID_SUBSETMAP", "Vertical Forms")
+#define RID_SUBSETSTR_NKO                                   NC_("RID_SUBSETMAP", "Nko")
+#define RID_SUBSETSTR_BALINESE                              NC_("RID_SUBSETMAP", "Balinese")
+#define RID_SUBSETSTR_LATIN_EXTENDED_C                      NC_("RID_SUBSETMAP", "Latin Extended-C")
+#define RID_SUBSETSTR_LATIN_EXTENDED_D                      NC_("RID_SUBSETMAP", "Latin Extended-D")
+#define RID_SUBSETSTR_PHAGS_PA                              NC_("RID_SUBSETMAP", "Phags-Pa")
+#define RID_SUBSETSTR_PHOENICIAN                            NC_("RID_SUBSETMAP", "Phoenician")
+#define RID_SUBSETSTR_CUNEIFORM                             NC_("RID_SUBSETMAP", "Cuneiform")
+#define RID_SUBSETSTR_CUNEIFORM_NUMBERS_AND_PUNCTUATION     NC_("RID_SUBSETMAP", "Cuneiform Numbers And Punctuation")
+#define RID_SUBSETSTR_COUNTING_ROD_NUMERALS                 NC_("RID_SUBSETMAP", "Counting Rod Numerals")
+#define RID_SUBSETSTR_SUNDANESE                             NC_("RID_SUBSETMAP", "Sundanese")
+#define RID_SUBSETSTR_LEPCHA                                NC_("RID_SUBSETMAP", "Lepcha")
+#define RID_SUBSETSTR_OL_CHIKI                              NC_("RID_SUBSETMAP", "Ol Chiki")
+#define RID_SUBSETSTR_CYRILLIC_EXTENDED_A                   NC_("RID_SUBSETMAP", "Cyrillic Extended-A")
+#define RID_SUBSETSTR_VAI                                   NC_("RID_SUBSETMAP", "Vai")
+#define RID_SUBSETSTR_CYRILLIC_EXTENDED_B                   NC_("RID_SUBSETMAP", "Cyrillic Extended-B")
+#define RID_SUBSETSTR_SAURASHTRA                            NC_("RID_SUBSETMAP", "Saurashtra")
+#define RID_SUBSETSTR_KAYAH_LI                              NC_("RID_SUBSETMAP", "Kayah Li")
+#define RID_SUBSETSTR_REJANG                                NC_("RID_SUBSETMAP", "Rejang")
+#define RID_SUBSETSTR_CHAM                                  NC_("RID_SUBSETMAP", "Cham")
+#define RID_SUBSETSTR_ANCIENT_SYMBOLS                       NC_("RID_SUBSETMAP", "Ancient Symbols")
+#define RID_SUBSETSTR_PHAISTOS_DISC                         NC_("RID_SUBSETMAP", "Phaistos Disc")
+#define RID_SUBSETSTR_LYCIAN                                NC_("RID_SUBSETMAP", "Lycian")
+#define RID_SUBSETSTR_CARIAN                                NC_("RID_SUBSETMAP", "Carian")
+#define RID_SUBSETSTR_LYDIAN                                NC_("RID_SUBSETMAP", "Lydian")
+#define RID_SUBSETSTR_MAHJONG_TILES                         NC_("RID_SUBSETMAP", "Mahjong Tiles")
+#define RID_SUBSETSTR_DOMINO_TILES                          NC_("RID_SUBSETMAP", "Domino Tiles")
+#define RID_SUBSETSTR_SAMARITAN                             NC_("RID_SUBSETMAP", "Samaritan")
+#define RID_SUBSETSTR_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED    NC_("RID_SUBSETMAP", "Canadian Aboriginal Syllabics Extended")
+#define RID_SUBSETSTR_TAI_THAM                              NC_("RID_SUBSETMAP", "Tai Tham")
+#define RID_SUBSETSTR_VEDIC_EXTENSIONS                      NC_("RID_SUBSETMAP", "Vedic Extensions")
+#define RID_SUBSETSTR_LISU                                  NC_("RID_SUBSETMAP", "Lisu")
+#define RID_SUBSETSTR_BAMUM                                 NC_("RID_SUBSETMAP", "Bamum")
+#define RID_SUBSETSTR_COMMON_INDIC_NUMBER_FORMS             NC_("RID_SUBSETMAP", "Common Indic Number Forms")
+#define RID_SUBSETSTR_DEVANAGARI_EXTENDED                   NC_("RID_SUBSETMAP", "Devanagari Extended")
+#define RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_A                NC_("RID_SUBSETMAP", "Hangul Jamo Extended-A")
+#define RID_SUBSETSTR_JAVANESE                              NC_("RID_SUBSETMAP", "Javanese")
+#define RID_SUBSETSTR_MYANMAR_EXTENDED_A                    NC_("RID_SUBSETMAP", "Myanmar Extended-A")
+#define RID_SUBSETSTR_TAI_VIET                              NC_("RID_SUBSETMAP", "Tai Viet")
+#define RID_SUBSETSTR_MEETEI_MAYEK                          NC_("RID_SUBSETMAP", "Meetei Mayek")
+#define RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_B                NC_("RID_SUBSETMAP", "Hangul Jamo Extended-B")
+#define RID_SUBSETSTR_IMPERIAL_ARAMAIC                      NC_("RID_SUBSETMAP", "Imperial Aramaic")
+#define RID_SUBSETSTR_OLD_SOUTH_ARABIAN                     NC_("RID_SUBSETMAP", "Old South Arabian")
+#define RID_SUBSETSTR_AVESTAN                               NC_("RID_SUBSETMAP", "Avestan")
+#define RID_SUBSETSTR_INSCRIPTIONAL_PARTHIAN                NC_("RID_SUBSETMAP", "Inscriptional Parthian")
+#define RID_SUBSETSTR_INSCRIPTIONAL_PAHLAVI                 NC_("RID_SUBSETMAP", "Inscriptional Pahlavi")
+#define RID_SUBSETSTR_OLD_TURKIC                            NC_("RID_SUBSETMAP", "Old Turkic")
+#define RID_SUBSETSTR_RUMI_NUMERAL_SYMBOLS                  NC_("RID_SUBSETMAP", "Rumi Numeral Symbols")
+#define RID_SUBSETSTR_KAITHI                                NC_("RID_SUBSETMAP", "Kaithi")
+#define RID_SUBSETSTR_EGYPTIAN_HIEROGLYPHS                  NC_("RID_SUBSETMAP", "Egyptian Hieroglyphs")
+#define RID_SUBSETSTR_ENCLOSED_ALPHANUMERIC_SUPPLEMENT      NC_("RID_SUBSETMAP", "Enclosed Alphanumeric Supplement")
+#define RID_SUBSETSTR_ENCLOSED_IDEOGRAPHIC_SUPPLEMENT       NC_("RID_SUBSETMAP", "Enclosed Ideographic Supplement")
+#define RID_SUBSETSTR_MANDAIC                               NC_("RID_SUBSETMAP", "Mandaic")
+#define RID_SUBSETSTR_BATAK                                 NC_("RID_SUBSETMAP", "Batak")
+#define RID_SUBSETSTR_ETHIOPIC_EXTENDED_A                   NC_("RID_SUBSETMAP", "Ethiopic Extended-A")
+#define RID_SUBSETSTR_BRAHMI                                NC_("RID_SUBSETMAP", "Brahmi")
+#define RID_SUBSETSTR_BAMUM_SUPPLEMENT                      NC_("RID_SUBSETMAP", "Bamum Supplement")
+#define RID_SUBSETSTR_KANA_SUPPLEMENT                       NC_("RID_SUBSETMAP", "Kana Supplement")
+#define RID_SUBSETSTR_PLAYING_CARDS                         NC_("RID_SUBSETMAP", "Playing Cards")
+#define RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS NC_("RID_SUBSETMAP", "Miscellaneous Symbols And Pictographs")
+#define RID_SUBSETSTR_EMOTICONS                             NC_("RID_SUBSETMAP", "Emoticons")
+#define RID_SUBSETSTR_TRANSPORT_AND_MAP_SYMBOLS             NC_("RID_SUBSETMAP", "Transport And Map Symbols")
+#define RID_SUBSETSTR_ALCHEMICAL_SYMBOLS                    NC_("RID_SUBSETMAP", "Alchemical Symbols")
+#define RID_SUBSETSTR_ARABIC_EXTENDED_A                     NC_("RID_SUBSETMAP", "Arabic Extended-A")
+#define RID_SUBSETSTR_ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS    NC_("RID_SUBSETMAP", "Arabic Mathematical Alphabetic Symbols")
+#define RID_SUBSETSTR_CHAKMA                                NC_("RID_SUBSETMAP", "Chakma")
+#define RID_SUBSETSTR_MEETEI_MAYEK_EXTENSIONS               NC_("RID_SUBSETMAP", "Meetei Mayek Extensions")
+#define RID_SUBSETSTR_MEROITIC_CURSIVE                      NC_("RID_SUBSETMAP", "Meroitic Cursive")
+#define RID_SUBSETSTR_MEROITIC_HIEROGLYPHS                  NC_("RID_SUBSETMAP", "Meroitic Hieroglyphs")
+#define RID_SUBSETSTR_MIAO                                  NC_("RID_SUBSETMAP", "Miao")
+#define RID_SUBSETSTR_SHARADA                               NC_("RID_SUBSETMAP", "Sharada")
+#define RID_SUBSETSTR_SORA_SOMPENG                          NC_("RID_SUBSETMAP", "Sora Sompeng")
+#define RID_SUBSETSTR_SUNDANESE_SUPPLEMENT                  NC_("RID_SUBSETMAP", "Sundanese Supplement")
+#define RID_SUBSETSTR_TAKRI                                 NC_("RID_SUBSETMAP", "Takri")
+#define RID_SUBSETSTR_BASSA_VAH                             NC_("RID_SUBSETMAP", "Bassa Vah")
+#define RID_SUBSETSTR_CAUCASIAN_ALBANIAN                    NC_("RID_SUBSETMAP", "Caucasian Albanian")
+#define RID_SUBSETSTR_COPTIC_EPACT_NUMBERS                  NC_("RID_SUBSETMAP", "Coptic Epact Numbers")
+#define RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_EXTENDED  NC_("RID_SUBSETMAP", "Combining Diacritical Marks Extended")
+#define RID_SUBSETSTR_DUPLOYAN                              NC_("RID_SUBSETMAP", "Duployan")
+#define RID_SUBSETSTR_ELBASAN                               NC_("RID_SUBSETMAP", "Elbasan")
+#define RID_SUBSETSTR_GEOMETRIC_SHAPES_EXTENDED             NC_("RID_SUBSETMAP", "Geometric Shapes Extended")
+#define RID_SUBSETSTR_GRANTHA                               NC_("RID_SUBSETMAP", "Grantha")
+#define RID_SUBSETSTR_KHOJKI                                NC_("RID_SUBSETMAP", "Khojki")
+#define RID_SUBSETSTR_KHUDAWADI                             NC_("RID_SUBSETMAP", "Khudawadi")
+#define RID_SUBSETSTR_LATIN_EXTENDED_E                      NC_("RID_SUBSETMAP", "Latin Extended-E")
+#define RID_SUBSETSTR_LINEAR_A                              NC_("RID_SUBSETMAP", "Linear A")
+#define RID_SUBSETSTR_MAHAJANI                              NC_("RID_SUBSETMAP", "Mahajani")
+#define RID_SUBSETSTR_MANICHAEAN                            NC_("RID_SUBSETMAP", "Manichaean")
+#define RID_SUBSETSTR_MENDE_KIKAKUI                         NC_("RID_SUBSETMAP", "Mende Kikakui")
+#define RID_SUBSETSTR_MODI                                  NC_("RID_SUBSETMAP", "Modi")
+#define RID_SUBSETSTR_MRO                                   NC_("RID_SUBSETMAP", "Mro")
+#define RID_SUBSETSTR_MYANMAR_EXTENDED_B                    NC_("RID_SUBSETMAP", "Myanmar Extended-B")
+#define RID_SUBSETSTR_NABATAEAN                             NC_("RID_SUBSETMAP", "Nabataean")
+#define RID_SUBSETSTR_OLD_NORTH_ARABIAN                     NC_("RID_SUBSETMAP", "Old North Arabian")
+#define RID_SUBSETSTR_OLD_PERMIC                            NC_("RID_SUBSETMAP", "Old Permic")
+#define RID_SUBSETSTR_ORNAMENTAL_DINGBATS                   NC_("RID_SUBSETMAP", "Ornamental Dingbats")
+#define RID_SUBSETSTR_PAHAWH_HMONG                          NC_("RID_SUBSETMAP", "Pahawh Hmong")
+#define RID_SUBSETSTR_PALMYRENE                             NC_("RID_SUBSETMAP", "Palmyrene")
+#define RID_SUBSETSTR_PAU_CIN_HAU                           NC_("RID_SUBSETMAP", "Pau Cin Hau")
+#define RID_SUBSETSTR_PSALTER_PAHLAVI                       NC_("RID_SUBSETMAP", "Psalter Pahlavi")
+#define RID_SUBSETSTR_SHORTHAND_FORMAT_CONTROLS             NC_("RID_SUBSETMAP", "Shorthand Format Controls")
+#define RID_SUBSETSTR_SIDDHAM                               NC_("RID_SUBSETMAP", "Siddham")
+#define RID_SUBSETSTR_SINHALA_ARCHAIC_NUMBERS               NC_("RID_SUBSETMAP", "Sinhala Archaic Numbers")
+#define RID_SUBSETSTR_SUPPLEMENTAL_ARROWS_C                 NC_("RID_SUBSETMAP", "Supplemental Arrows-C")
+#define RID_SUBSETSTR_TIRHUTA                               NC_("RID_SUBSETMAP", "Tirhuta")
+#define RID_SUBSETSTR_WARANG_CITI                           NC_("RID_SUBSETMAP", "Warang Citi")
+#define RID_SUBSETSTR_AHOM                                  NC_("RID_SUBSETMAP", "Ahom")
+#define RID_SUBSETSTR_ANATOLIAN_HIEROGLYPHS                 NC_("RID_SUBSETMAP", "Anatolian Hieroglyphs")
+#define RID_SUBSETSTR_CHEROKEE_SUPPLEMENT                   NC_("RID_SUBSETMAP", "Cherokee Supplement")
+#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E    NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension E")
+#define RID_SUBSETSTR_EARLY_DYNASTIC_CUNEIFORM              NC_("RID_SUBSETMAP", "Early Dynastic Cuneiform")
+#define RID_SUBSETSTR_HATRAN                                NC_("RID_SUBSETMAP", "Hatran")
+#define RID_SUBSETSTR_MULTANI                               NC_("RID_SUBSETMAP", "Multani")
+#define RID_SUBSETSTR_OLD_HUNGARIAN                         NC_("RID_SUBSETMAP", "Old Hungarian")
+#define RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS  NC_("RID_SUBSETMAP", "Supplemental Symbols And Pictographs")
+#define RID_SUBSETSTR_SUTTON_SIGNWRITING                    NC_("RID_SUBSETMAP", "Sutton Signwriting")
+#define RID_SUBSETSTR_ADLAM                                 NC_("RID_SUBSETMAP", "Adlam")
+#define RID_SUBSETSTR_BHAIKSUKI                             NC_("RID_SUBSETMAP", "Bhaiksuki")
+#define RID_SUBSETSTR_CYRILLIC_EXTENDED_C                   NC_("RID_SUBSETMAP", "Cyrillic Extended-C")
+#define RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT                 NC_("RID_SUBSETMAP", "Glagolitic Supplement")
+#define RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION   NC_("RID_SUBSETMAP", "Ideographic Symbols and Punctuation")
+#define RID_SUBSETSTR_MARCHEN                               NC_("RID_SUBSETMAP", "Marchen")
+#define RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT                  NC_("RID_SUBSETMAP", "Mongolian Supplement")
+#define RID_SUBSETSTR_NEWA                                  NC_("RID_SUBSETMAP", "Newa")
+#define RID_SUBSETSTR_OSAGE                                 NC_("RID_SUBSETMAP", "Osage")
+#define RID_SUBSETSTR_TANGUT                                NC_("RID_SUBSETMAP", "Tangut")
+#define RID_SUBSETSTR_TANGUT_COMPONENTS                     NC_("RID_SUBSETMAP", "Tangut Components")
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svxerr.hxx b/include/svx/svxerr.hxx
index 8ea7fce5b612..ef20f13ada09 100644
--- a/include/svx/svxerr.hxx
+++ b/include/svx/svxerr.hxx
@@ -76,8 +76,6 @@
 
 // class SvxErrorHandler -------------------------------------------------
 
-#ifndef __RSC
-
 #include <svtools/ehdl.hxx>
 #include <svx/svxdllapi.h>
 
@@ -93,6 +91,4 @@ SVX_DLLPUBLIC const ErrMsgCode* getRID_SVXERRCTX();
 
 #endif
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 6df863bbdf00..4ed5b3ff69e9 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -19,9 +19,8 @@
 #ifndef INCLUDED_SVX_SVXIDS_HRC
 #define INCLUDED_SVX_SVXIDS_HRC
 
-#include <svl/memberid.hrc>
+#include <svl/memberid.h>
 #include <svl/solar.hrc>
-#include <sfx2/sfx.hrc>
 #include <sfx2/sfxsids.hrc>
 #include <editeng/editids.hrc>
 #include <svx/unomid.hxx>
@@ -112,7 +111,6 @@
 #define SID_BASICIDE_ARG_LIBNAME            ( SID_BASICIDE_START + 34 )
 #define SID_BASICIDE_ARG_MODULENAME         ( SID_BASICIDE_START + 35 )
 #define SID_BASICIDE_BRKPNTSCHANGED         ( SID_BASICIDE_START + 36 )
-#define SID_BASICIDE_STATUSBAR              ( SID_BASICIDE_START + 37 )
 #define SID_BASICIDE_STAT_POS               ( SID_BASICIDE_START + 38 )
 #define SID_BASICIDE_STAT_DATE              ( SID_BASICIDE_START + 39 )
 #define SID_BASICIDE_STAT_TITLE             ( SID_BASICIDE_START + 40 )
diff --git a/include/svx/svxitems.hrc b/include/svx/svxitems.hrc
index deb55860d82b..01c1fa7465b3 100644
--- a/include/svx/svxitems.hrc
+++ b/include/svx/svxitems.hrc
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_SVX_INC_SVX_ITEMS_HRC
 #define INCLUDED_SVX_INC_SVX_ITEMS_HRC
 
-#include <utility>
-
-#include "svx/svxitems.hrc"
-#include "svx/svxids.hrc"
+#include <sal/types.h>
+#include <svx/svxitems.hrc>
+#include <svx/svxids.hrc>
 #include <editeng/editids.hrc>
+#include <utility>
 
 #define NC_(Context, String) (Context "\004" u8##String)
 
diff --git a/include/svx/ucsubset.hrc b/include/svx/ucsubset.hrc
deleted file mode 100644
index e826a84d83bb..000000000000
--- a/include/svx/ucsubset.hrc
+++ /dev/null
@@ -1,307 +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>
-
-// strings for unicode range descriptions (used e.g. by Charmap dialog)
-// (see the Unicode spec and TrueType::OS2.ulUnicodeRange description)
-#define RID_SUBSET_START                (RID_SVX_START + 901)
-
-#define RID_SUBSETSTR_BASIC_LATIN               (RID_SUBSET_START + 0)
-#define RID_SUBSETSTR_LATIN_1                   (RID_SUBSET_START + 1)
-#define RID_SUBSETSTR_LATIN_EXTENDED_A          (RID_SUBSET_START + 2)
-#define RID_SUBSETSTR_LATIN_EXTENDED_B          (RID_SUBSET_START + 3)
-#define RID_SUBSETSTR_IPA_EXTENSIONS            (RID_SUBSET_START + 4)
-#define RID_SUBSETSTR_SPACING_MODIFIERS         (RID_SUBSET_START + 5)
-#define RID_SUBSETSTR_COMB_DIACRITICAL          (RID_SUBSET_START + 6)
-#define RID_SUBSETSTR_BASIC_GREEK               (RID_SUBSET_START + 7)
-#define RID_SUBSETSTR_GREEK_SYMS_COPTIC         (RID_SUBSET_START + 8)
-#define RID_SUBSETSTR_CYRILLIC                  (RID_SUBSET_START + 9)
-#define RID_SUBSETSTR_ARMENIAN                  (RID_SUBSET_START + 10)
-#define RID_SUBSETSTR_HEBREW_EXTENDED           (RID_SUBSET_START + 11)
-#define RID_SUBSETSTR_BASIC_HEBREW              (RID_SUBSET_START + 12)
-#define RID_SUBSETSTR_BASIC_ARABIC              (RID_SUBSET_START + 13)
-#define RID_SUBSETSTR_ARABIC_EXTENDED           (RID_SUBSET_START + 14)
-#define RID_SUBSETSTR_DEVANAGARI                (RID_SUBSET_START + 15)
-#define RID_SUBSETSTR_BENGALI                   (RID_SUBSET_START + 16)
-#define RID_SUBSETSTR_GURMUKHI                  (RID_SUBSET_START + 17)
-#define RID_SUBSETSTR_GUJARATI                  (RID_SUBSET_START + 18)
-#define RID_SUBSETSTR_ODIA                      (RID_SUBSET_START + 19)
-#define RID_SUBSETSTR_TAMIL                     (RID_SUBSET_START + 20)
-#define RID_SUBSETSTR_TELUGU                    (RID_SUBSET_START + 21)
-#define RID_SUBSETSTR_KANNADA                   (RID_SUBSET_START + 22)
-#define RID_SUBSETSTR_MALAYALAM                 (RID_SUBSET_START + 23)
-#define RID_SUBSETSTR_THAI                      (RID_SUBSET_START + 24)
-#define RID_SUBSETSTR_LAO                       (RID_SUBSET_START + 25)
-#define RID_SUBSETSTR_BASIC_GEORGIAN            (RID_SUBSET_START + 26)
-#define RID_SUBSETSTR_GEORGIAN_EXTENDED         (RID_SUBSET_START + 27)
-#define RID_SUBSETSTR_HANGUL_JAMO               (RID_SUBSET_START + 28)
-#define RID_SUBSETSTR_LATIN_EXTENDED_ADDS       (RID_SUBSET_START + 29)
-#define RID_SUBSETSTR_GREEK_EXTENDED            (RID_SUBSET_START + 30)
-#define RID_SUBSETSTR_GENERAL_PUNCTUATION       (RID_SUBSET_START + 31)
-#define RID_SUBSETSTR_SUB_SUPER_SCRIPTS         (RID_SUBSET_START + 32)
-#define RID_SUBSETSTR_CURRENCY_SYMBOLS          (RID_SUBSET_START + 33)
-#define RID_SUBSETSTR_COMB_DIACRITIC_SYMS       (RID_SUBSET_START + 34)
-#define RID_SUBSETSTR_LETTERLIKE_SYMBOLS        (RID_SUBSET_START + 35)
-#define RID_SUBSETSTR_NUMBER_FORMS              (RID_SUBSET_START + 36)
-#define RID_SUBSETSTR_ARROWS                    (RID_SUBSET_START + 37)
-#define RID_SUBSETSTR_MATH_OPERATORS            (RID_SUBSET_START + 38)
-#define RID_SUBSETSTR_MISC_TECHNICAL            (RID_SUBSET_START + 39)
-#define RID_SUBSETSTR_CONTROL_PICTURES          (RID_SUBSET_START + 40)
-#define RID_SUBSETSTR_OPTICAL_CHAR_REC          (RID_SUBSET_START + 41)
-#define RID_SUBSETSTR_ENCLOSED_ALPHANUM         (RID_SUBSET_START + 42)
-#define RID_SUBSETSTR_BOX_DRAWING               (RID_SUBSET_START + 43)
-#define RID_SUBSETSTR_BLOCK_ELEMENTS            (RID_SUBSET_START + 44)
-#define RID_SUBSETSTR_GEOMETRIC_SHAPES          (RID_SUBSET_START + 45)
-#define RID_SUBSETSTR_MISC_DINGBATS             (RID_SUBSET_START + 46)
-#define RID_SUBSETSTR_DINGBATS                  (RID_SUBSET_START + 47)
-#define RID_SUBSETSTR_CJK_SYMS_PUNCTUATION      (RID_SUBSET_START + 48)
-#define RID_SUBSETSTR_HIRAGANA                  (RID_SUBSET_START + 49)
-#define RID_SUBSETSTR_KATAKANA                  (RID_SUBSET_START + 50)
-#define RID_SUBSETSTR_BOPOMOFO                  (RID_SUBSET_START + 51)
-#define RID_SUBSETSTR_HANGUL_COMPAT_JAMO        (RID_SUBSET_START + 52)
-#define RID_SUBSETSTR_CJK_MISC                  (RID_SUBSET_START + 53)
-#define RID_SUBSETSTR_ENCLOSED_CJK_LETTERS      (RID_SUBSET_START + 54)
-#define RID_SUBSETSTR_CJK_COMPATIBILITY         (RID_SUBSET_START + 55)
-#define RID_SUBSETSTR_HANGUL                    (RID_SUBSET_START + 56)
-
-#define RID_SUBSETSTR_CJK_UNIFIED_IDGRAPH       (RID_SUBSET_START + 59)
-#define RID_SUBSETSTR_PRIVATE_USE_AREA          (RID_SUBSET_START + 60)
-#define RID_SUBSETSTR_CJK_COMPAT_IDGRAPHS       (RID_SUBSET_START + 61)
-#define RID_SUBSETSTR_ALPHA_PRESENTATION        (RID_SUBSET_START + 62)
-#define RID_SUBSETSTR_ARABIC_PRESENT_A          (RID_SUBSET_START + 63)
-#define RID_SUBSETSTR_COMBINING_HALF_MARKS      (RID_SUBSET_START + 64)
-#define RID_SUBSETSTR_CJK_COMPAT_FORMS          (RID_SUBSET_START + 65)
-#define RID_SUBSETSTR_SMALL_FORM_VARIANTS       (RID_SUBSET_START + 66)
-#define RID_SUBSETSTR_ARABIC_PRESENT_B          (RID_SUBSET_START + 67)
-#define RID_SUBSETSTR_HALFW_FULLW_FORMS         (RID_SUBSET_START + 68)
-#define RID_SUBSETSTR_SPECIALS                  (RID_SUBSET_START + 69)
-
-#define RID_SUBSETSTR_YI_SYLLABLES              (RID_SUBSET_START + 70)
-#define RID_SUBSETSTR_YI_RADICALS               (RID_SUBSET_START + 71)
-#define RID_SUBSETSTR_OLD_ITALIC                (RID_SUBSET_START + 72)
-#define RID_SUBSETSTR_GOTHIC                    (RID_SUBSET_START + 73)
-#define RID_SUBSETSTR_DESERET                   (RID_SUBSET_START + 74)
-#define RID_SUBSETSTR_BYZANTINE_MUSICAL_SYMBOLS (RID_SUBSET_START + 75)
-#define RID_SUBSETSTR_MUSICAL_SYMBOLS           (RID_SUBSET_START + 76)
-#define RID_SUBSETSTR_MATHEMATICAL_ALPHANUMERIC_SYMBOLS (RID_SUBSET_START + 77)
-#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B (RID_SUBSET_START + 78)
-#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C (RID_SUBSET_START + 79)
-#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D (RID_SUBSET_START + 80)
-#define RID_SUBSETSTR_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT (RID_SUBSET_START + 81)
-#define RID_SUBSETSTR_TAGS                      (RID_SUBSET_START + 82)
-#define RID_SUBSETSTR_CYRILLIC_SUPPLEMENTARY    (RID_SUBSET_START + 83)
-#define RID_SUBSETSTR_VARIATION_SELECTORS       (RID_SUBSET_START + 84)
-#define RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_A (RID_SUBSET_START + 85)
-#define RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_B (RID_SUBSET_START + 86)
-#define RID_SUBSETSTR_LIMBU                     (RID_SUBSET_START + 87)
-#define RID_SUBSETSTR_TAI_LE                    (RID_SUBSET_START + 88)
-#define RID_SUBSETSTR_KHMER_SYMBOLS             (RID_SUBSET_START + 89)
-#define RID_SUBSETSTR_PHONETIC_EXTENSIONS       (RID_SUBSET_START + 90)
-#define RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_ARROWS (RID_SUBSET_START + 91)
-#define RID_SUBSETSTR_YIJING_HEXAGRAM_SYMBOLS   (RID_SUBSET_START + 92)
-#define RID_SUBSETSTR_LINEAR_B_SYLLABARY        (RID_SUBSET_START + 93)
-#define RID_SUBSETSTR_LINEAR_B_IDEOGRAMS        (RID_SUBSET_START + 94)
-#define RID_SUBSETSTR_AEGEAN_NUMBERS            (RID_SUBSET_START + 95)
-#define RID_SUBSETSTR_UGARITIC                  (RID_SUBSET_START + 96)
-#define RID_SUBSETSTR_SHAVIAN                   (RID_SUBSET_START + 97)
-#define RID_SUBSETSTR_OSMANYA                   (RID_SUBSET_START + 98)
-#define RID_SUBSETSTR_CYPRIOT_SYLLABARY         (RID_SUBSET_START + 99)
-#define RID_SUBSETSTR_TAI_XUAN_JING_SYMBOLS     (RID_SUBSET_START + 100)
-#define RID_SUBSETSTR_VARIATION_SELECTORS_SUPPLEMENT (RID_SUBSET_START + 101)
-#define RID_SUBSETSTR_ANCIENT_GREEK_MUSICAL_NOTATION (RID_SUBSET_START + 102)
-#define RID_SUBSETSTR_ANCIENT_GREEK_NUMBERS     (RID_SUBSET_START + 103)
-#define RID_SUBSETSTR_ARABIC_SUPPLEMENT         (RID_SUBSET_START + 104)
-#define RID_SUBSETSTR_BUGINESE                  (RID_SUBSET_START + 105)
-#define RID_SUBSETSTR_CJK_STROKES               (RID_SUBSET_START + 106)
-#define RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_SUPPLEMENT (RID_SUBSET_START + 107)
-#define RID_SUBSETSTR_COPTIC                    (RID_SUBSET_START + 108)
-#define RID_SUBSETSTR_ETHIOPIC_EXTENDED         (RID_SUBSET_START + 109)
-#define RID_SUBSETSTR_ETHIOPIC_SUPPLEMENT       (RID_SUBSET_START + 110)
-#define RID_SUBSETSTR_GEORGIAN_SUPPLEMENT       (RID_SUBSET_START + 111)
-#define RID_SUBSETSTR_GLAGOLITIC                (RID_SUBSET_START + 112)
-#define RID_SUBSETSTR_KHAROSHTHI                (RID_SUBSET_START + 113)
-#define RID_SUBSETSTR_MODIFIER_TONE_LETTERS     (RID_SUBSET_START + 114)
-#define RID_SUBSETSTR_NEW_TAI_LUE               (RID_SUBSET_START + 115)
-#define RID_SUBSETSTR_OLD_PERSIAN               (RID_SUBSET_START + 116)
-#define RID_SUBSETSTR_PHONETIC_EXTENSIONS_SUPPLEMENT (RID_SUBSET_START + 117)
-#define RID_SUBSETSTR_SUPPLEMENTAL_PUNCTUATION  (RID_SUBSET_START + 118)
-#define RID_SUBSETSTR_SYLOTI_NAGRI              (RID_SUBSET_START + 119)
-#define RID_SUBSETSTR_TIFINAGH                  (RID_SUBSET_START + 120)
-#define RID_SUBSETSTR_VERTICAL_FORMS            (RID_SUBSET_START + 121)
-#define RID_SUBSETSTR_NKO                       (RID_SUBSET_START + 122)
-#define RID_SUBSETSTR_BALINESE                  (RID_SUBSET_START + 123)
-#define RID_SUBSETSTR_LATIN_EXTENDED_C          (RID_SUBSET_START + 124)
-#define RID_SUBSETSTR_LATIN_EXTENDED_D          (RID_SUBSET_START + 125)
-#define RID_SUBSETSTR_PHAGS_PA                  (RID_SUBSET_START + 126)
-#define RID_SUBSETSTR_PHOENICIAN                (RID_SUBSET_START + 127)
-#define RID_SUBSETSTR_CUNEIFORM                 (RID_SUBSET_START + 128)
-#define RID_SUBSETSTR_CUNEIFORM_NUMBERS_AND_PUNCTUATION (RID_SUBSET_START + 129)
-#define RID_SUBSETSTR_COUNTING_ROD_NUMERALS     (RID_SUBSET_START + 130)
-#define RID_SUBSETSTR_SUNDANESE                 (RID_SUBSET_START + 131)
-#define RID_SUBSETSTR_LEPCHA                    (RID_SUBSET_START + 132)
-#define RID_SUBSETSTR_OL_CHIKI                  (RID_SUBSET_START + 133)
-#define RID_SUBSETSTR_CYRILLIC_EXTENDED_A       (RID_SUBSET_START + 134)
-#define RID_SUBSETSTR_VAI                       (RID_SUBSET_START + 135)
-#define RID_SUBSETSTR_CYRILLIC_EXTENDED_B       (RID_SUBSET_START + 136)
-#define RID_SUBSETSTR_SAURASHTRA                (RID_SUBSET_START + 137)
-#define RID_SUBSETSTR_KAYAH_LI                  (RID_SUBSET_START + 138)
-#define RID_SUBSETSTR_REJANG                    (RID_SUBSET_START + 139)
-#define RID_SUBSETSTR_CHAM                      (RID_SUBSET_START + 140)
-#define RID_SUBSETSTR_ANCIENT_SYMBOLS           (RID_SUBSET_START + 141)
-#define RID_SUBSETSTR_PHAISTOS_DISC             (RID_SUBSET_START + 142)
-#define RID_SUBSETSTR_LYCIAN                    (RID_SUBSET_START + 143)
-#define RID_SUBSETSTR_CARIAN                    (RID_SUBSET_START + 144)
-#define RID_SUBSETSTR_LYDIAN                    (RID_SUBSET_START + 145)
-#define RID_SUBSETSTR_MAHJONG_TILES             (RID_SUBSET_START + 146)
-#define RID_SUBSETSTR_DOMINO_TILES              (RID_SUBSET_START + 147)
-#define RID_SUBSETSTR_SAMARITAN                 (RID_SUBSET_START + 148)
-#define RID_SUBSETSTR_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED (RID_SUBSET_START + 149)
-#define RID_SUBSETSTR_TAI_THAM                  (RID_SUBSET_START + 150)
-#define RID_SUBSETSTR_VEDIC_EXTENSIONS          (RID_SUBSET_START + 151)
-#define RID_SUBSETSTR_LISU                      (RID_SUBSET_START + 152)
-#define RID_SUBSETSTR_BAMUM                     (RID_SUBSET_START + 153)
-#define RID_SUBSETSTR_COMMON_INDIC_NUMBER_FORMS (RID_SUBSET_START + 154)
-#define RID_SUBSETSTR_DEVANAGARI_EXTENDED       (RID_SUBSET_START + 155)
-#define RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_A    (RID_SUBSET_START + 156)
-#define RID_SUBSETSTR_JAVANESE                  (RID_SUBSET_START + 157)
-#define RID_SUBSETSTR_MYANMAR_EXTENDED_A        (RID_SUBSET_START + 158)
-#define RID_SUBSETSTR_TAI_VIET                  (RID_SUBSET_START + 159)
-#define RID_SUBSETSTR_MEETEI_MAYEK              (RID_SUBSET_START + 160)
-#define RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_B    (RID_SUBSET_START + 161)
-#define RID_SUBSETSTR_IMPERIAL_ARAMAIC          (RID_SUBSET_START + 162)
-#define RID_SUBSETSTR_OLD_SOUTH_ARABIAN         (RID_SUBSET_START + 163)
-#define RID_SUBSETSTR_AVESTAN                   (RID_SUBSET_START + 164)
-#define RID_SUBSETSTR_INSCRIPTIONAL_PARTHIAN    (RID_SUBSET_START + 165)
-#define RID_SUBSETSTR_INSCRIPTIONAL_PAHLAVI     (RID_SUBSET_START + 166)
-#define RID_SUBSETSTR_OLD_TURKIC                (RID_SUBSET_START + 167)
-#define RID_SUBSETSTR_RUMI_NUMERAL_SYMBOLS      (RID_SUBSET_START + 168)
-#define RID_SUBSETSTR_KAITHI                    (RID_SUBSET_START + 169)
-#define RID_SUBSETSTR_EGYPTIAN_HIEROGLYPHS      (RID_SUBSET_START + 170)
-#define RID_SUBSETSTR_ENCLOSED_ALPHANUMERIC_SUPPLEMENT (RID_SUBSET_START + 171)
-#define RID_SUBSETSTR_ENCLOSED_IDEOGRAPHIC_SUPPLEMENT (RID_SUBSET_START + 172)
-#define RID_SUBSETSTR_MANDAIC                   (RID_SUBSET_START + 174)
-#define RID_SUBSETSTR_BATAK                     (RID_SUBSET_START + 175)
-#define RID_SUBSETSTR_ETHIOPIC_EXTENDED_A       (RID_SUBSET_START + 176)
-#define RID_SUBSETSTR_BRAHMI                    (RID_SUBSET_START + 177)
-#define RID_SUBSETSTR_BAMUM_SUPPLEMENT          (RID_SUBSET_START + 178)
-#define RID_SUBSETSTR_KANA_SUPPLEMENT           (RID_SUBSET_START + 179)
-#define RID_SUBSETSTR_PLAYING_CARDS             (RID_SUBSET_START + 180)
-#define RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS (RID_SUBSET_START + 181)
-#define RID_SUBSETSTR_EMOTICONS                 (RID_SUBSET_START + 182)
-#define RID_SUBSETSTR_TRANSPORT_AND_MAP_SYMBOLS (RID_SUBSET_START + 183)
-#define RID_SUBSETSTR_ALCHEMICAL_SYMBOLS        (RID_SUBSET_START + 184)
-#define RID_SUBSETSTR_CJK_EXT_A_UNIFIED_IDGRAPH (RID_SUBSET_START + 185)
-#define RID_SUBSETSTR_ARABIC_EXTENDED_A         (RID_SUBSET_START + 186)
-#define RID_SUBSETSTR_ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS (RID_SUBSET_START + 187)
-#define RID_SUBSETSTR_CHAKMA                    (RID_SUBSET_START + 188)
-#define RID_SUBSETSTR_MEETEI_MAYEK_EXTENSIONS   (RID_SUBSET_START + 189)
-#define RID_SUBSETSTR_MEROITIC_CURSIVE          (RID_SUBSET_START + 190)
-#define RID_SUBSETSTR_MEROITIC_HIEROGLYPHS      (RID_SUBSET_START + 191)
-#define RID_SUBSETSTR_MIAO                      (RID_SUBSET_START + 192)
-#define RID_SUBSETSTR_SHARADA                   (RID_SUBSET_START + 193)
-#define RID_SUBSETSTR_SORA_SOMPENG              (RID_SUBSET_START + 194)
-#define RID_SUBSETSTR_SUNDANESE_SUPPLEMENT      (RID_SUBSET_START + 195)
-#define RID_SUBSETSTR_TAKRI                     (RID_SUBSET_START + 196)
-#define RID_SUBSETSTR_SINHALA                   (RID_SUBSET_START + 197)
-#define RID_SUBSETSTR_TIBETAN                   (RID_SUBSET_START + 198)
-#define RID_SUBSETSTR_MYANMAR                   (RID_SUBSET_START + 199)
-#define RID_SUBSETSTR_KHMER                     (RID_SUBSET_START + 200)
-#define RID_SUBSETSTR_OGHAM                     (RID_SUBSET_START + 201)
-#define RID_SUBSETSTR_THAANA                    (RID_SUBSET_START + 202)
-#define RID_SUBSETSTR_CANADIAN_ABORIGINAL       (RID_SUBSET_START + 203)
-
-#define RID_SUBSETSTR_BRAILLE_PATTERNS          (RID_SUBSET_START + 204)
-#define RID_SUBSETSTR_CJK_RADICAL_SUPPL         (RID_SUBSET_START + 205)
-
-#define RID_SUBSETSTR_TAGBANWA                  (RID_SUBSET_START + 206)
-#define RID_SUBSETSTR_BOPOMOFO_EXTENDED         (RID_SUBSET_START + 207)
-#define RID_SUBSETSTR_KATAKANA_PHONETIC         (RID_SUBSET_START + 208)
-#define RID_SUBSETSTR_RUNIC                     (RID_SUBSET_START + 209)
-#define RID_SUBSETSTR_SYRIAC                    (RID_SUBSET_START + 210)
-#define RID_SUBSETSTR_ETHIOPIC                  (RID_SUBSET_START + 211)
-#define RID_SUBSETSTR_CHEROKEE                  (RID_SUBSET_START + 212)
-#define RID_SUBSETSTR_MONGOLIAN                 (RID_SUBSET_START + 213)
-#define RID_SUBSETSTR_MISC_MATH_SYMS_A          (RID_SUBSET_START + 214)
-#define RID_SUBSETSTR_SUPPL_ARROWS_A            (RID_SUBSET_START + 215)
-#define RID_SUBSETSTR_SUPPL_ARROWS_B            (RID_SUBSET_START + 216)
-#define RID_SUBSETSTR_MISC_MATH_SYMS_B          (RID_SUBSET_START + 217)
-#define RID_SUBSETSTR_KANGXI_RADICALS           (RID_SUBSET_START + 218)
-#define RID_SUBSETSTR_IDEO_DESC_CHARS           (RID_SUBSET_START + 219)
-#define RID_SUBSETSTR_TAGALOG                   (RID_SUBSET_START + 220)
-#define RID_SUBSETSTR_HANUNOO                   (RID_SUBSET_START + 221)
-#define RID_SUBSETSTR_KANBUN                    (RID_SUBSET_START + 222)
-#define RID_SUBSETSTR_BUHID                     (RID_SUBSET_START + 223)
-#define RID_SUBSETSTR_BASSA_VAH                 (RID_SUBSET_START + 224)
-#define RID_SUBSETSTR_CAUCASIAN_ALBANIAN        (RID_SUBSET_START + 225)
-#define RID_SUBSETSTR_COPTIC_EPACT_NUMBERS      (RID_SUBSET_START + 226)
-#define RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_EXTENDED  (RID_SUBSET_START + 227)
-#define RID_SUBSETSTR_DUPLOYAN                  (RID_SUBSET_START + 228)
-#define RID_SUBSETSTR_ELBASAN                   (RID_SUBSET_START + 229)
-#define RID_SUBSETSTR_GEOMETRIC_SHAPES_EXTENDED (RID_SUBSET_START + 230)
-#define RID_SUBSETSTR_GRANTHA                   (RID_SUBSET_START + 231)
-#define RID_SUBSETSTR_KHOJKI                    (RID_SUBSET_START + 232)
-#define RID_SUBSETSTR_KHUDAWADI                 (RID_SUBSET_START + 233)
-#define RID_SUBSETSTR_LATIN_EXTENDED_E          (RID_SUBSET_START + 234)
-#define RID_SUBSETSTR_LINEAR_A                  (RID_SUBSET_START + 235)
-#define RID_SUBSETSTR_MAHAJANI                  (RID_SUBSET_START + 236)
-#define RID_SUBSETSTR_MANICHAEAN                (RID_SUBSET_START + 237)
-#define RID_SUBSETSTR_MENDE_KIKAKUI             (RID_SUBSET_START + 238)
-#define RID_SUBSETSTR_MODI                      (RID_SUBSET_START + 239)
-#define RID_SUBSETSTR_MRO                       (RID_SUBSET_START + 240)
-#define RID_SUBSETSTR_MYANMAR_EXTENDED_B        (RID_SUBSET_START + 241)
-#define RID_SUBSETSTR_NABATAEAN                 (RID_SUBSET_START + 242)
-#define RID_SUBSETSTR_OLD_NORTH_ARABIAN         (RID_SUBSET_START + 243)
-#define RID_SUBSETSTR_OLD_PERMIC                (RID_SUBSET_START + 244)
-#define RID_SUBSETSTR_ORNAMENTAL_DINGBATS       (RID_SUBSET_START + 245)
-#define RID_SUBSETSTR_PAHAWH_HMONG              (RID_SUBSET_START + 246)
-#define RID_SUBSETSTR_PALMYRENE                 (RID_SUBSET_START + 247)
-#define RID_SUBSETSTR_PAU_CIN_HAU               (RID_SUBSET_START + 248)
-#define RID_SUBSETSTR_PSALTER_PAHLAVI           (RID_SUBSET_START + 249)
-#define RID_SUBSETSTR_SHORTHAND_FORMAT_CONTROLS (RID_SUBSET_START + 250)
-#define RID_SUBSETSTR_SIDDHAM                   (RID_SUBSET_START + 251)
-#define RID_SUBSETSTR_SINHALA_ARCHAIC_NUMBERS   (RID_SUBSET_START + 252)
-#define RID_SUBSETSTR_SUPPLEMENTAL_ARROWS_C     (RID_SUBSET_START + 253)
-#define RID_SUBSETSTR_TIRHUTA                   (RID_SUBSET_START + 254)
-#define RID_SUBSETSTR_WARANG_CITI               (RID_SUBSET_START + 255)
-#define RID_SUBSETSTR_AHOM                      (RID_SUBSET_START + 256)
-#define RID_SUBSETSTR_ANATOLIAN_HIEROGLYPHS     (RID_SUBSET_START + 257)
-#define RID_SUBSETSTR_CHEROKEE_SUPPLEMENT       (RID_SUBSET_START + 258)
-#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E    (RID_SUBSET_START + 259)
-#define RID_SUBSETSTR_EARLY_DYNASTIC_CUNEIFORM  (RID_SUBSET_START + 260)
-#define RID_SUBSETSTR_HATRAN                    (RID_SUBSET_START + 261)
-#define RID_SUBSETSTR_MULTANI                   (RID_SUBSET_START + 262)
-#define RID_SUBSETSTR_OLD_HUNGARIAN             (RID_SUBSET_START + 263)
-#define RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS  (RID_SUBSET_START + 264)
-#define RID_SUBSETSTR_SUTTON_SIGNWRITING        (RID_SUBSET_START + 265)
-#define RID_SUBSETSTR_ADLAM                     (RID_SUBSET_START + 266)
-#define RID_SUBSETSTR_BHAIKSUKI                 (RID_SUBSET_START + 267)
-#define RID_SUBSETSTR_CYRILLIC_EXTENDED_C       (RID_SUBSET_START + 268)
-#define RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT     (RID_SUBSET_START + 269)
-#define RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION   (RID_SUBSET_START + 270)
-#define RID_SUBSETSTR_MARCHEN                   (RID_SUBSET_START + 271)
-#define RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT      (RID_SUBSET_START + 272)
-#define RID_SUBSETSTR_NEWA                      (RID_SUBSET_START + 273)
-#define RID_SUBSETSTR_OSAGE                     (RID_SUBSET_START + 274)
-#define RID_SUBSETSTR_TANGUT                    (RID_SUBSET_START + 275)
-#define RID_SUBSETSTR_TANGUT_COMPONENTS         (RID_SUBSET_START + 276)
-
-//      RID_SUBSET_END                          (RID_SUBSET_START + 299)
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/ucsubset.hxx b/include/svx/ucsubset.hxx
index f71a454fa469..570913f3bd18 100644
--- a/include/svx/ucsubset.hxx
+++ b/include/svx/ucsubset.hxx
@@ -22,7 +22,6 @@
 
 #include <svx/svxdllapi.h>
 
-#include <svx/ucsubset.hrc>
 #include <vcl/metric.hxx>
 
 #include <list>