summaryrefslogtreecommitdiff
path: root/svx/source/dialog
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/dialog')
-rw-r--r--svx/source/dialog/SafeMode.src17
-rw-r--r--svx/source/dialog/SafeModeDialog.cxx2
-rw-r--r--svx/source/dialog/_bmpmask.cxx3
-rw-r--r--svx/source/dialog/_contdlg.cxx2
-rw-r--r--svx/source/dialog/bmpmask.hrc22
-rw-r--r--svx/source/dialog/bmpmask.src30
-rw-r--r--svx/source/dialog/charmap.cxx560
-rw-r--r--svx/source/dialog/checklbx.cxx2
-rw-r--r--svx/source/dialog/compressgraphicdialog.cxx3
-rw-r--r--svx/source/dialog/compressgraphicdialog.hrc34
-rw-r--r--svx/source/dialog/compressgraphicdialog.src87
-rw-r--r--svx/source/dialog/contwnd.cxx2
-rw-r--r--svx/source/dialog/ctredlin.cxx2
-rw-r--r--svx/source/dialog/databaseregistrationui.cxx1
-rw-r--r--svx/source/dialog/dialcontrol.cxx3
-rw-r--r--svx/source/dialog/dialmgr.cxx13
-rw-r--r--svx/source/dialog/dlgctl3d.cxx2
-rw-r--r--svx/source/dialog/dlgctrl.cxx3
-rw-r--r--svx/source/dialog/dlgctrl.src27
-rw-r--r--svx/source/dialog/docrecovery.cxx20
-rw-r--r--svx/source/dialog/docrecovery.src28
-rw-r--r--svx/source/dialog/fntctrl.cxx3
-rw-r--r--svx/source/dialog/fontwork.cxx3
-rw-r--r--svx/source/dialog/frmsel.cxx4
-rw-r--r--svx/source/dialog/frmsel.src54
-rw-r--r--svx/source/dialog/grfflt.cxx3
-rw-r--r--svx/source/dialog/hdft.cxx2
-rw-r--r--svx/source/dialog/imapdlg.cxx2
-rw-r--r--svx/source/dialog/imapwnd.cxx2
-rw-r--r--svx/source/dialog/langbox.cxx2
-rw-r--r--svx/source/dialog/language.src29
-rw-r--r--svx/source/dialog/numberingtype.src57
-rw-r--r--svx/source/dialog/optgrid.cxx2
-rw-r--r--svx/source/dialog/page.src99
-rw-r--r--svx/source/dialog/pagenumberlistbox.cxx13
-rw-r--r--svx/source/dialog/papersizelistbox.cxx16
-rw-r--r--svx/source/dialog/passwd.cxx2
-rw-r--r--svx/source/dialog/passwd.src32
-rw-r--r--svx/source/dialog/prtqry.cxx2
-rw-r--r--svx/source/dialog/prtqry.src39
-rw-r--r--svx/source/dialog/rlrcitem.cxx3
-rw-r--r--svx/source/dialog/rubydialog.cxx2
-rw-r--r--svx/source/dialog/ruler.src38
-rw-r--r--svx/source/dialog/rulritem.cxx3
-rw-r--r--svx/source/dialog/samecontent.src12
-rw-r--r--svx/source/dialog/samecontentlistbox.cxx13
-rw-r--r--svx/source/dialog/sdstring.src2288
-rw-r--r--svx/source/dialog/spacing.src16
-rw-r--r--svx/source/dialog/spacinglistbox.cxx13
-rw-r--r--svx/source/dialog/srchdlg.cxx11
-rw-r--r--svx/source/dialog/srchdlg.src61
-rw-r--r--svx/source/dialog/strarray.cxx88
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.cxx44
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.src121
-rw-r--r--svx/source/dialog/svxruler.cxx14
-rw-r--r--svx/source/dialog/swframeposstrings.cxx18
-rw-r--r--svx/source/dialog/swframeposstrings.src71
-rw-r--r--svx/source/dialog/txencbox.cxx21
-rw-r--r--svx/source/dialog/txenctab.cxx34
-rw-r--r--svx/source/dialog/txenctab.src110
-rw-r--r--svx/source/dialog/ucsubset.src308
61 files changed, 518 insertions, 4000 deletions
diff --git a/svx/source/dialog/SafeMode.src b/svx/source/dialog/SafeMode.src
deleted file mode 100644
index 2de389e72471..000000000000
--- a/svx/source/dialog/SafeMode.src
+++ /dev/null
@@ -1,17 +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/.
- */
-
-#include <svx/dialogs.hrc>
-
-String RID_SVXSTR_SAFEMODE_ZIP_FAILURE
-{
- Text[en-US] = "The zip file could not be created.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/svx/source/dialog/SafeModeDialog.cxx b/svx/source/dialog/SafeModeDialog.cxx
index 198b3d909302..4d3ff711e9ce 100644
--- a/svx/source/dialog/SafeModeDialog.cxx
+++ b/svx/source/dialog/SafeModeDialog.cxx
@@ -21,7 +21,7 @@
#include <cppuhelper/exc_hlp.hxx>
#include <unotools/configmgr.hxx>
#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <com/sun/star/task/OfficeRestartManager.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index c0bd9c222eb7..7940e92eec9f 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -31,8 +31,7 @@
#include <svx/dialmgr.hxx>
#include <svx/dlgctrl.hxx>
#include <svx/bmpmask.hxx>
-#include <svx/dialogs.hrc>
-#include <bmpmask.hrc>
+#include <svx/strings.hrc>
#include <svx/svxids.hrc>
#include <memory>
#include "helpid.hrc"
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 13726e6fb7db..c9738a0d9095 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -32,7 +32,7 @@
#include <svx/dialmgr.hxx>
#include "svx/xoutbmp.hxx"
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <svx/svxids.hrc>
#include <svx/contdlg.hxx>
#include "contimp.hxx"
diff --git a/svx/source/dialog/bmpmask.hrc b/svx/source/dialog/bmpmask.hrc
deleted file mode 100644
index bf054482824d..000000000000
--- a/svx/source/dialog/bmpmask.hrc
+++ /dev/null
@@ -1,22 +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 .
- */
-
-#define RID_SVXDLG_BMPMASK_STR_PALETTE (RID_SVX_BMPMASK_START + 3)
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src
deleted file mode 100644
index 16bf943d9f69..000000000000
--- a/svx/source/dialog/bmpmask.src
+++ /dev/null
@@ -1,30 +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/svxids.hrc>
-#include <svx/dialogs.hrc>
-#include "bmpmask.hrc"
-#include "helpid.hrc"
-
-String RID_SVXDLG_BMPMASK_STR_PALETTE
-{
- Text [ en-US ] = "Color Palette";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index e1b298df858d..e2e8fe43cba7 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -22,12 +22,11 @@
#include <vcl/builderfactory.hxx>
#include <vcl/fontcharmap.hxx>
#include <svtools/colorcfg.hxx>
-#include <tools/resary.hxx>
#include <rtl/textenc.h>
#include <svx/ucsubset.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <svx/charmap.hxx>
#include <svx/dialmgr.hxx>
@@ -42,8 +41,8 @@
#include <comphelper/types.hxx>
#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;
@@ -785,6 +784,19 @@ 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;
@@ -793,8 +805,6 @@ void SubsetMap::InitList()
{
bInit = false;
- ResStringArray aStringList(ResId(RID_SUBSETMAP, DIALOG_MGR()));
-
//I wish icu had a way to give me the block ranges
for (int i = UBLOCK_BASIC_LATIN; i < UBLOCK_COUNT; ++i)
{
@@ -809,826 +819,826 @@ void SubsetMap::InitList()
case UBLOCK_LOW_SURROGATES:
break;
case UBLOCK_BASIC_LATIN:
- aAllSubsets.push_back( Subset( 0x0000, 0x007F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BASIC_LATIN)) ) );
+ aAllSubsets.push_back( Subset( 0x0000, 0x007F, FindIndex(RID_SUBSETSTR_BASIC_LATIN) ) );
break;
case UBLOCK_LATIN_1_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x0080, 0x00FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LATIN_1)) ) );
+ aAllSubsets.push_back( Subset( 0x0080, 0x00FF, FindIndex(RID_SUBSETSTR_LATIN_1) ) );
break;
case UBLOCK_LATIN_EXTENDED_A:
- aAllSubsets.push_back( Subset( 0x0100, 0x017F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_A)) ) );
+ aAllSubsets.push_back( Subset( 0x0100, 0x017F, FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_A) ) );
break;
case UBLOCK_LATIN_EXTENDED_B:
- aAllSubsets.push_back( Subset( 0x0180, 0x024F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_B)) ) );
+ aAllSubsets.push_back( Subset( 0x0180, 0x024F, FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_B) ) );
break;
case UBLOCK_IPA_EXTENSIONS:
- aAllSubsets.push_back( Subset( 0x0250, 0x02AF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_IPA_EXTENSIONS)) ) );
+ aAllSubsets.push_back( Subset( 0x0250, 0x02AF, FindIndex(RID_SUBSETSTR_IPA_EXTENSIONS) ) );
break;
case UBLOCK_SPACING_MODIFIER_LETTERS:
- aAllSubsets.push_back( Subset( 0x02B0, 0x02FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SPACING_MODIFIERS)) ) );
+ aAllSubsets.push_back( Subset( 0x02B0, 0x02FF, FindIndex(RID_SUBSETSTR_SPACING_MODIFIERS) ) );
break;
case UBLOCK_COMBINING_DIACRITICAL_MARKS:
- aAllSubsets.push_back( Subset( 0x0300, 0x036F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_COMB_DIACRITICAL)) ) );
+ aAllSubsets.push_back( Subset( 0x0300, 0x036F, FindIndex(RID_SUBSETSTR_COMB_DIACRITICAL) ) );
break;
case UBLOCK_GREEK:
- aAllSubsets.push_back( Subset( 0x0370, 0x03FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BASIC_GREEK)) ) );
+ aAllSubsets.push_back( Subset( 0x0370, 0x03FF, FindIndex(RID_SUBSETSTR_BASIC_GREEK) ) );
break;
case UBLOCK_CYRILLIC:
- aAllSubsets.push_back( Subset( 0x0400, 0x04FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CYRILLIC)) ) );
+ aAllSubsets.push_back( Subset( 0x0400, 0x04FF, FindIndex(RID_SUBSETSTR_CYRILLIC) ) );
break;
case UBLOCK_ARMENIAN:
- aAllSubsets.push_back( Subset( 0x0530, 0x058F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ARMENIAN)) ) );
+ aAllSubsets.push_back( Subset( 0x0530, 0x058F, FindIndex(RID_SUBSETSTR_ARMENIAN) ) );
break;
case UBLOCK_HEBREW:
- aAllSubsets.push_back( Subset( 0x0590, 0x05FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BASIC_HEBREW)) ) );
+ aAllSubsets.push_back( Subset( 0x0590, 0x05FF, FindIndex(RID_SUBSETSTR_BASIC_HEBREW) ) );
break;
case UBLOCK_ARABIC:
- aAllSubsets.push_back( Subset( 0x0600, 0x065F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BASIC_ARABIC)) ) );
+ aAllSubsets.push_back( Subset( 0x0600, 0x065F, FindIndex(RID_SUBSETSTR_BASIC_ARABIC) ) );
break;
case UBLOCK_SYRIAC:
- aAllSubsets.push_back( Subset( 0x0700, 0x074F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SYRIAC)) ) );
+ aAllSubsets.push_back( Subset( 0x0700, 0x074F, FindIndex(RID_SUBSETSTR_SYRIAC) ) );
break;
case UBLOCK_THAANA:
- aAllSubsets.push_back( Subset( 0x0780, 0x07BF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_THAANA)) ) );
+ aAllSubsets.push_back( Subset( 0x0780, 0x07BF, FindIndex(RID_SUBSETSTR_THAANA) ) );
break;
case UBLOCK_DEVANAGARI:
- aAllSubsets.push_back( Subset( 0x0900, 0x097F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_DEVANAGARI)) ) );
+ aAllSubsets.push_back( Subset( 0x0900, 0x097F, FindIndex(RID_SUBSETSTR_DEVANAGARI) ) );
break;
case UBLOCK_BENGALI:
- aAllSubsets.push_back( Subset( 0x0980, 0x09FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BENGALI)) ) );
+ aAllSubsets.push_back( Subset( 0x0980, 0x09FF, FindIndex(RID_SUBSETSTR_BENGALI) ) );
break;
case UBLOCK_GURMUKHI:
- aAllSubsets.push_back( Subset( 0x0A00, 0x0A7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_GURMUKHI)) ) );
+ aAllSubsets.push_back( Subset( 0x0A00, 0x0A7F, FindIndex(RID_SUBSETSTR_GURMUKHI) ) );
break;
case UBLOCK_GUJARATI:
- aAllSubsets.push_back( Subset( 0x0A80, 0x0AFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_GUJARATI)) ) );
+ aAllSubsets.push_back( Subset( 0x0A80, 0x0AFF, FindIndex(RID_SUBSETSTR_GUJARATI) ) );
break;
case UBLOCK_ORIYA:
- aAllSubsets.push_back( Subset( 0x0B00, 0x0B7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ODIA)) ) );
+ aAllSubsets.push_back( Subset( 0x0B00, 0x0B7F, FindIndex(RID_SUBSETSTR_ODIA) ) );
break;
case UBLOCK_TAMIL:
- aAllSubsets.push_back( Subset( 0x0B80, 0x0BFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TAMIL)) ) );
+ aAllSubsets.push_back( Subset( 0x0B80, 0x0BFF, FindIndex(RID_SUBSETSTR_TAMIL) ) );
break;
case UBLOCK_TELUGU:
- aAllSubsets.push_back( Subset( 0x0C00, 0x0C7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TELUGU)) ) );
+ aAllSubsets.push_back( Subset( 0x0C00, 0x0C7F, FindIndex(RID_SUBSETSTR_TELUGU) ) );
break;
case UBLOCK_KANNADA:
- aAllSubsets.push_back( Subset( 0x0C80, 0x0CFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KANNADA)) ) );
+ aAllSubsets.push_back( Subset( 0x0C80, 0x0CFF, FindIndex(RID_SUBSETSTR_KANNADA) ) );
break;
case UBLOCK_MALAYALAM:
- aAllSubsets.push_back( Subset( 0x0D00, 0x0D7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MALAYALAM)) ) );
+ aAllSubsets.push_back( Subset( 0x0D00, 0x0D7F, FindIndex(RID_SUBSETSTR_MALAYALAM) ) );
break;
case UBLOCK_SINHALA:
- aAllSubsets.push_back( Subset( 0x0D80, 0x0DFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SINHALA)) ) );
+ aAllSubsets.push_back( Subset( 0x0D80, 0x0DFF, FindIndex(RID_SUBSETSTR_SINHALA) ) );
break;
case UBLOCK_THAI:
- aAllSubsets.push_back( Subset( 0x0E00, 0x0E7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_THAI)) ) );
+ aAllSubsets.push_back( Subset( 0x0E00, 0x0E7F, FindIndex(RID_SUBSETSTR_THAI) ) );
break;
case UBLOCK_LAO:
- aAllSubsets.push_back( Subset( 0x0E80, 0x0EFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LAO)) ) );
+ aAllSubsets.push_back( Subset( 0x0E80, 0x0EFF, FindIndex(RID_SUBSETSTR_LAO) ) );
break;
case UBLOCK_TIBETAN:
- aAllSubsets.push_back( Subset( 0x0F00, 0x0FBF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TIBETAN)) ) );
+ aAllSubsets.push_back( Subset( 0x0F00, 0x0FBF, FindIndex(RID_SUBSETSTR_TIBETAN) ) );
break;
case UBLOCK_MYANMAR:
- aAllSubsets.push_back( Subset( 0x1000, 0x109F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MYANMAR)) ) );
+ aAllSubsets.push_back( Subset( 0x1000, 0x109F, FindIndex(RID_SUBSETSTR_MYANMAR) ) );
break;
case UBLOCK_GEORGIAN:
- aAllSubsets.push_back( Subset( 0x10A0, 0x10FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BASIC_GEORGIAN)) ) );
+ aAllSubsets.push_back( Subset( 0x10A0, 0x10FF, FindIndex(RID_SUBSETSTR_BASIC_GEORGIAN) ) );
break;
case UBLOCK_HANGUL_JAMO:
- aAllSubsets.push_back( Subset( 0x1100, 0x11FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_HANGUL_JAMO)) ) );
+ aAllSubsets.push_back( Subset( 0x1100, 0x11FF, FindIndex(RID_SUBSETSTR_HANGUL_JAMO) ) );
break;
case UBLOCK_ETHIOPIC:
- aAllSubsets.push_back( Subset( 0x1200, 0x137F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ETHIOPIC)) ) );
+ aAllSubsets.push_back( Subset( 0x1200, 0x137F, FindIndex(RID_SUBSETSTR_ETHIOPIC) ) );
break;
case UBLOCK_CHEROKEE:
- aAllSubsets.push_back( Subset( 0x13A0, 0x13FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CHEROKEE)) ) );
+ aAllSubsets.push_back( Subset( 0x13A0, 0x13FF, FindIndex(RID_SUBSETSTR_CHEROKEE) ) );
break;
case UBLOCK_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS:
- aAllSubsets.push_back( Subset( 0x1400, 0x167F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CANADIAN_ABORIGINAL)) ) );
+ aAllSubsets.push_back( Subset( 0x1400, 0x167F, FindIndex(RID_SUBSETSTR_CANADIAN_ABORIGINAL) ) );
break;
case UBLOCK_OGHAM:
- aAllSubsets.push_back( Subset( 0x1680, 0x169F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_OGHAM)) ) );
+ aAllSubsets.push_back( Subset( 0x1680, 0x169F, FindIndex(RID_SUBSETSTR_OGHAM) ) );
break;
case UBLOCK_RUNIC:
- aAllSubsets.push_back( Subset( 0x16A0, 0x16F0, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_RUNIC)) ) );
+ aAllSubsets.push_back( Subset( 0x16A0, 0x16F0, FindIndex(RID_SUBSETSTR_RUNIC) ) );
break;
case UBLOCK_KHMER:
- aAllSubsets.push_back( Subset( 0x1780, 0x17FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KHMER)) ) );
+ aAllSubsets.push_back( Subset( 0x1780, 0x17FF, FindIndex(RID_SUBSETSTR_KHMER) ) );
break;
case UBLOCK_MONGOLIAN:
- aAllSubsets.push_back( Subset( 0x1800, 0x18AF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MONGOLIAN)) ) );
+ aAllSubsets.push_back( Subset( 0x1800, 0x18AF, FindIndex(RID_SUBSETSTR_MONGOLIAN) ) );
break;
case UBLOCK_LATIN_EXTENDED_ADDITIONAL:
- aAllSubsets.push_back( Subset( 0x1E00, 0x1EFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_ADDS)) ) );
+ aAllSubsets.push_back( Subset( 0x1E00, 0x1EFF, FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_ADDS) ) );
break;
case UBLOCK_GREEK_EXTENDED:
- aAllSubsets.push_back( Subset( 0x1F00, 0x1FFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_GREEK_EXTENDED)) ) );
+ aAllSubsets.push_back( Subset( 0x1F00, 0x1FFF, FindIndex(RID_SUBSETSTR_GREEK_EXTENDED) ) );
break;
case UBLOCK_GENERAL_PUNCTUATION:
- aAllSubsets.push_back( Subset( 0x2000, 0x206F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_GENERAL_PUNCTUATION)) ) );
+ aAllSubsets.push_back( Subset( 0x2000, 0x206F, FindIndex(RID_SUBSETSTR_GENERAL_PUNCTUATION) ) );
break;
case UBLOCK_SUPERSCRIPTS_AND_SUBSCRIPTS:
- aAllSubsets.push_back( Subset( 0x2070, 0x209F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SUB_SUPER_SCRIPTS)) ) );
+ aAllSubsets.push_back( Subset( 0x2070, 0x209F, FindIndex(RID_SUBSETSTR_SUB_SUPER_SCRIPTS) ) );
break;
case UBLOCK_CURRENCY_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x20A0, 0x20CF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CURRENCY_SYMBOLS)) ) );
+ aAllSubsets.push_back( Subset( 0x20A0, 0x20CF, FindIndex(RID_SUBSETSTR_CURRENCY_SYMBOLS) ) );
break;
case UBLOCK_COMBINING_MARKS_FOR_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x20D0, 0x20FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_COMB_DIACRITIC_SYMS)) ) );
+ aAllSubsets.push_back( Subset( 0x20D0, 0x20FF, FindIndex(RID_SUBSETSTR_COMB_DIACRITIC_SYMS) ) );
break;
case UBLOCK_LETTERLIKE_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x2100, 0x214F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LETTERLIKE_SYMBOLS)) ) );
+ aAllSubsets.push_back( Subset( 0x2100, 0x214F, FindIndex(RID_SUBSETSTR_LETTERLIKE_SYMBOLS) ) );
break;
case UBLOCK_NUMBER_FORMS:
- aAllSubsets.push_back( Subset( 0x2150, 0x218F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_NUMBER_FORMS)) ) );
+ aAllSubsets.push_back( Subset( 0x2150, 0x218F, FindIndex(RID_SUBSETSTR_NUMBER_FORMS) ) );
break;
case UBLOCK_ARROWS:
- aAllSubsets.push_back( Subset( 0x2190, 0x21FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ARROWS)) ) );
+ aAllSubsets.push_back( Subset( 0x2190, 0x21FF, FindIndex(RID_SUBSETSTR_ARROWS) ) );
break;
case UBLOCK_MATHEMATICAL_OPERATORS:
- aAllSubsets.push_back( Subset( 0x2200, 0x22FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MATH_OPERATORS)) ) );
+ aAllSubsets.push_back( Subset( 0x2200, 0x22FF, FindIndex(RID_SUBSETSTR_MATH_OPERATORS) ) );
break;
case UBLOCK_MISCELLANEOUS_TECHNICAL:
- aAllSubsets.push_back( Subset( 0x2300, 0x23FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MISC_TECHNICAL)) ) );
+ aAllSubsets.push_back( Subset( 0x2300, 0x23FF, FindIndex(RID_SUBSETSTR_MISC_TECHNICAL) ) );
break;
case UBLOCK_CONTROL_PICTURES:
- aAllSubsets.push_back( Subset( 0x2400, 0x243F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CONTROL_PICTURES)) ) );
+ aAllSubsets.push_back( Subset( 0x2400, 0x243F, FindIndex(RID_SUBSETSTR_CONTROL_PICTURES) ) );
break;
case UBLOCK_OPTICAL_CHARACTER_RECOGNITION:
- aAllSubsets.push_back( Subset( 0x2440, 0x245F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_OPTICAL_CHAR_REC)) ) );
+ aAllSubsets.push_back( Subset( 0x2440, 0x245F, FindIndex(RID_SUBSETSTR_OPTICAL_CHAR_REC) ) );
break;
case UBLOCK_ENCLOSED_ALPHANUMERICS:
- aAllSubsets.push_back( Subset( 0x2460, 0x24FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ENCLOSED_ALPHANUM)) ) );
+ aAllSubsets.push_back( Subset( 0x2460, 0x24FF, FindIndex(RID_SUBSETSTR_ENCLOSED_ALPHANUM) ) );
break;
case UBLOCK_BOX_DRAWING:
- aAllSubsets.push_back( Subset( 0x2500, 0x257F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BOX_DRAWING)) ) );
+ aAllSubsets.push_back( Subset( 0x2500, 0x257F, FindIndex(RID_SUBSETSTR_BOX_DRAWING) ) );
break;
case UBLOCK_BLOCK_ELEMENTS:
- aAllSubsets.push_back( Subset( 0x2580, 0x259F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BLOCK_ELEMENTS)) ) );
+ aAllSubsets.push_back( Subset( 0x2580, 0x259F, FindIndex(RID_SUBSETSTR_BLOCK_ELEMENTS) ) );
break;
case UBLOCK_GEOMETRIC_SHAPES:
- aAllSubsets.push_back( Subset( 0x25A0, 0x25FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_GEOMETRIC_SHAPES)) ) );
+ aAllSubsets.push_back( Subset( 0x25A0, 0x25FF, FindIndex(RID_SUBSETSTR_GEOMETRIC_SHAPES) ) );
break;
case UBLOCK_MISCELLANEOUS_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x2600, 0x26FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MISC_DINGBATS)) ) );
+ aAllSubsets.push_back( Subset( 0x2600, 0x26FF, FindIndex(RID_SUBSETSTR_MISC_DINGBATS) ) );
break;
case UBLOCK_DINGBATS:
- aAllSubsets.push_back( Subset( 0x2700, 0x27BF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_DINGBATS)) ) );
+ aAllSubsets.push_back( Subset( 0x2700, 0x27BF, FindIndex(RID_SUBSETSTR_DINGBATS) ) );
break;
case UBLOCK_BRAILLE_PATTERNS:
- aAllSubsets.push_back( Subset( 0x2800, 0x28FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BRAILLE_PATTERNS)) ) );
+ aAllSubsets.push_back( Subset( 0x2800, 0x28FF, FindIndex(RID_SUBSETSTR_BRAILLE_PATTERNS) ) );
break;
case UBLOCK_CJK_RADICALS_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x2E80, 0x2EFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_RADICAL_SUPPL)) ) );
+ aAllSubsets.push_back( Subset( 0x2E80, 0x2EFF, FindIndex(RID_SUBSETSTR_CJK_RADICAL_SUPPL) ) );
break;
case UBLOCK_KANGXI_RADICALS:
- aAllSubsets.push_back( Subset( 0x2F00, 0x2FDF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KANGXI_RADICALS)) ) );
+ aAllSubsets.push_back( Subset( 0x2F00, 0x2FDF, FindIndex(RID_SUBSETSTR_KANGXI_RADICALS) ) );
break;
case UBLOCK_IDEOGRAPHIC_DESCRIPTION_CHARACTERS:
- aAllSubsets.push_back( Subset( 0x2FF0, 0x2FFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_IDEO_DESC_CHARS)) ) );
+ aAllSubsets.push_back( Subset( 0x2FF0, 0x2FFF, FindIndex(RID_SUBSETSTR_IDEO_DESC_CHARS) ) );
break;
case UBLOCK_CJK_SYMBOLS_AND_PUNCTUATION:
- aAllSubsets.push_back( Subset( 0x3000, 0x303F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_SYMS_PUNCTUATION)) ) );
+ aAllSubsets.push_back( Subset( 0x3000, 0x303F, FindIndex(RID_SUBSETSTR_CJK_SYMS_PUNCTUATION) ) );
break;
case UBLOCK_HIRAGANA:
- aAllSubsets.push_back( Subset( 0x3040, 0x309F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_HIRAGANA)) ) );
+ aAllSubsets.push_back( Subset( 0x3040, 0x309F, FindIndex(RID_SUBSETSTR_HIRAGANA) ) );
break;
case UBLOCK_KATAKANA:
- aAllSubsets.push_back( Subset( 0x30A0, 0x30FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KATAKANA)) ) );
+ aAllSubsets.push_back( Subset( 0x30A0, 0x30FF, FindIndex(RID_SUBSETSTR_KATAKANA) ) );
break;
case UBLOCK_BOPOMOFO:
- aAllSubsets.push_back( Subset( 0x3100, 0x312F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BOPOMOFO)) ) );
+ aAllSubsets.push_back( Subset( 0x3100, 0x312F, FindIndex(RID_SUBSETSTR_BOPOMOFO) ) );
break;
case UBLOCK_HANGUL_COMPATIBILITY_JAMO:
- aAllSubsets.push_back( Subset( 0x3130, 0x318F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_HANGUL_COMPAT_JAMO)) ) );
+ aAllSubsets.push_back( Subset( 0x3130, 0x318F, FindIndex(RID_SUBSETSTR_HANGUL_COMPAT_JAMO) ) );
break;
case UBLOCK_KANBUN:
- aAllSubsets.push_back( Subset( 0x3190, 0x319F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KANBUN)) ) );
+ aAllSubsets.push_back( Subset( 0x3190, 0x319F, FindIndex(RID_SUBSETSTR_KANBUN) ) );
break;
case UBLOCK_BOPOMOFO_EXTENDED:
- aAllSubsets.push_back( Subset( 0x31A0, 0x31BF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BOPOMOFO_EXTENDED)) ) );
+ aAllSubsets.push_back( Subset( 0x31A0, 0x31BF, FindIndex(RID_SUBSETSTR_BOPOMOFO_EXTENDED) ) );
break;
case UBLOCK_ENCLOSED_CJK_LETTERS_AND_MONTHS:
- aAllSubsets.push_back( Subset( 0x3200, 0x32FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ENCLOSED_CJK_LETTERS)) ) );
+ aAllSubsets.push_back( Subset( 0x3200, 0x32FF, FindIndex(RID_SUBSETSTR_ENCLOSED_CJK_LETTERS) ) );
break;
case UBLOCK_CJK_COMPATIBILITY:
- aAllSubsets.push_back( Subset( 0x3300, 0x33FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_COMPATIBILITY)) ) );
+ aAllSubsets.push_back( Subset( 0x3300, 0x33FF, FindIndex(RID_SUBSETSTR_CJK_COMPATIBILITY) ) );
break;
case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A:
- aAllSubsets.push_back( Subset( 0x3400, 0x4DBF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_EXT_A_UNIFIED_IDGRAPH)) ) );
+ aAllSubsets.push_back( Subset( 0x3400, 0x4DBF, FindIndex(RID_SUBSETSTR_CJK_EXT_A_UNIFIED_IDGRAPH) ) );
break;
case UBLOCK_CJK_UNIFIED_IDEOGRAPHS:
- aAllSubsets.push_back( Subset( 0x4E00, 0x9FA5, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_UNIFIED_IDGRAPH)) ) );
+ aAllSubsets.push_back( Subset( 0x4E00, 0x9FA5, FindIndex(RID_SUBSETSTR_CJK_UNIFIED_IDGRAPH) ) );
break;
case UBLOCK_YI_SYLLABLES:
- aAllSubsets.push_back( Subset( 0xA000, 0xA48F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_YI_SYLLABLES)) ) );
+ aAllSubsets.push_back( Subset( 0xA000, 0xA48F, FindIndex(RID_SUBSETSTR_YI_SYLLABLES) ) );
break;
case UBLOCK_YI_RADICALS:
- aAllSubsets.push_back( Subset( 0xA490, 0xA4CF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_YI_RADICALS)) ) );
+ aAllSubsets.push_back( Subset( 0xA490, 0xA4CF, FindIndex(RID_SUBSETSTR_YI_RADICALS) ) );
break;
case UBLOCK_HANGUL_SYLLABLES:
- aAllSubsets.push_back( Subset( 0xAC00, 0xD7AF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_HANGUL)) ) );
+ aAllSubsets.push_back( Subset( 0xAC00, 0xD7AF, FindIndex(RID_SUBSETSTR_HANGUL) ) );
break;
case UBLOCK_PRIVATE_USE_AREA:
- aAllSubsets.push_back( Subset( 0xE000, 0xF8FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_PRIVATE_USE_AREA)) ) );
+ aAllSubsets.push_back( Subset( 0xE000, 0xF8FF, FindIndex(RID_SUBSETSTR_PRIVATE_USE_AREA) ) );
break;
case UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS:
- aAllSubsets.push_back( Subset( 0xF900, 0xFAFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_COMPAT_IDGRAPHS)) ) );
+ aAllSubsets.push_back( Subset( 0xF900, 0xFAFF, FindIndex(RID_SUBSETSTR_CJK_COMPAT_IDGRAPHS) ) );
break;
case UBLOCK_ALPHABETIC_PRESENTATION_FORMS:
- aAllSubsets.push_back( Subset( 0xFB00, 0xFB4F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ALPHA_PRESENTATION)) ) );
+ aAllSubsets.push_back( Subset( 0xFB00, 0xFB4F, FindIndex(RID_SUBSETSTR_ALPHA_PRESENTATION) ) );
break;
case UBLOCK_ARABIC_PRESENTATION_FORMS_A:
- aAllSubsets.push_back( Subset( 0xFB50, 0xFDFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ARABIC_PRESENT_A)) ) );
+ aAllSubsets.push_back( Subset( 0xFB50, 0xFDFF, FindIndex(RID_SUBSETSTR_ARABIC_PRESENT_A) ) );
break;
case UBLOCK_COMBINING_HALF_MARKS:
- aAllSubsets.push_back( Subset( 0xFE20, 0xFE2F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_COMBINING_HALF_MARKS)) ) );
+ aAllSubsets.push_back( Subset( 0xFE20, 0xFE2F, FindIndex(RID_SUBSETSTR_COMBINING_HALF_MARKS) ) );
break;
case UBLOCK_CJK_COMPATIBILITY_FORMS:
- aAllSubsets.push_back( Subset( 0xFE30, 0xFE4F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_COMPAT_FORMS)) ) );
+ aAllSubsets.push_back( Subset( 0xFE30, 0xFE4F, FindIndex(RID_SUBSETSTR_CJK_COMPAT_FORMS) ) );
break;
case UBLOCK_SMALL_FORM_VARIANTS:
- aAllSubsets.push_back( Subset( 0xFE50, 0xFE6F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SMALL_FORM_VARIANTS)) ) );
+ aAllSubsets.push_back( Subset( 0xFE50, 0xFE6F, FindIndex(RID_SUBSETSTR_SMALL_FORM_VARIANTS) ) );
break;
case UBLOCK_ARABIC_PRESENTATION_FORMS_B:
- aAllSubsets.push_back( Subset( 0xFE70, 0xFEFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ARABIC_PRESENT_B)) ) );
+ aAllSubsets.push_back( Subset( 0xFE70, 0xFEFF, FindIndex(RID_SUBSETSTR_ARABIC_PRESENT_B) ) );
break;
case UBLOCK_SPECIALS:
- aAllSubsets.push_back( Subset( 0xFFF0, 0xFFFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SPECIALS)) ) );
+ aAllSubsets.push_back( Subset( 0xFFF0, 0xFFFF, FindIndex(RID_SUBSETSTR_SPECIALS) ) );
break;
case UBLOCK_HALFWIDTH_AND_FULLWIDTH_FORMS:
- aAllSubsets.push_back( Subset( 0xFF00, 0xFFEF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_HALFW_FULLW_FORMS)) ) );
+ aAllSubsets.push_back( Subset( 0xFF00, 0xFFEF, FindIndex(RID_SUBSETSTR_HALFW_FULLW_FORMS) ) );
break;
case UBLOCK_OLD_ITALIC:
- aAllSubsets.push_back( Subset( 0x10300, 0x1032F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_OLD_ITALIC)) ) );
+ aAllSubsets.push_back( Subset( 0x10300, 0x1032F, FindIndex(RID_SUBSETSTR_OLD_ITALIC) ) );
break;
case UBLOCK_GOTHIC:
- aAllSubsets.push_back( Subset( 0x10330, 0x1034F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_GOTHIC)) ) );
+ aAllSubsets.push_back( Subset( 0x10330, 0x1034F, FindIndex(RID_SUBSETSTR_GOTHIC) ) );
break;
case UBLOCK_DESERET:
- aAllSubsets.push_back( Subset( 0x10400, 0x1044F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_DESERET)) ) );
+ aAllSubsets.push_back( Subset( 0x10400, 0x1044F, FindIndex(RID_SUBSETSTR_DESERET) ) );
break;
case UBLOCK_BYZANTINE_MUSICAL_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x1D000, 0x1D0FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BYZANTINE_MUSICAL_SYMBOLS)) ) );
+ aAllSubsets.push_back( Subset( 0x1D000, 0x1D0FF, FindIndex(RID_SUBSETSTR_BYZANTINE_MUSICAL_SYMBOLS) ) );
break;
case UBLOCK_MUSICAL_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x1D100, 0x1D1FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MUSICAL_SYMBOLS)) ) );
+ aAllSubsets.push_back( Subset( 0x1D100, 0x1D1FF, FindIndex(RID_SUBSETSTR_MUSICAL_SYMBOLS) ) );
break;
case UBLOCK_MATHEMATICAL_ALPHANUMERIC_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x1D400, 0x1D7FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MATHEMATICAL_ALPHANUMERIC_SYMBOLS)) ) );
+ aAllSubsets.push_back( Subset( 0x1D400, 0x1D7FF, FindIndex(RID_SUBSETSTR_MATHEMATICAL_ALPHANUMERIC_SYMBOLS) ) );
break;
case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B:
- aAllSubsets.push_back( Subset( 0x20000, 0x2A6DF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B)) ) );
+ aAllSubsets.push_back( Subset( 0x20000, 0x2A6DF, FindIndex(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B) ) );
break;
case UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x2F800, 0x2FA1F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT)) ) );
+ aAllSubsets.push_back( Subset( 0x2F800, 0x2FA1F, FindIndex(RID_SUBSETSTR_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT) ) );
break;
case UBLOCK_TAGS:
- aAllSubsets.push_back( Subset( 0xE0000, 0xE007F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TAGS)) ) );
+ aAllSubsets.push_back( Subset( 0xE0000, 0xE007F, FindIndex(RID_SUBSETSTR_TAGS) ) );
break;
case UBLOCK_CYRILLIC_SUPPLEMENTARY:
- aAllSubsets.push_back( Subset( 0x0500, 0x052F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CYRILLIC_SUPPLEMENTARY)) ) );
+ aAllSubsets.push_back( Subset( 0x0500, 0x052F, FindIndex(RID_SUBSETSTR_CYRILLIC_SUPPLEMENTARY) ) );
break;
case UBLOCK_TAGALOG:
- aAllSubsets.push_back( Subset( 0x1700, 0x171F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TAGALOG)) ) );
+ aAllSubsets.push_back( Subset( 0x1700, 0x171F, FindIndex(RID_SUBSETSTR_TAGALOG) ) );
break;
case UBLOCK_HANUNOO:
- aAllSubsets.push_back( Subset( 0x1720, 0x173F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_HANUNOO)) ) );
+ aAllSubsets.push_back( Subset( 0x1720, 0x173F, FindIndex(RID_SUBSETSTR_HANUNOO) ) );
break;
case UBLOCK_BUHID:
- aAllSubsets.push_back( Subset( 0x1740, 0x175F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BUHID)) ) );
+ aAllSubsets.push_back( Subset( 0x1740, 0x175F, FindIndex(RID_SUBSETSTR_BUHID) ) );
break;
case UBLOCK_TAGBANWA:
- aAllSubsets.push_back( Subset( 0x1760, 0x177F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TAGBANWA)) ) );
+ aAllSubsets.push_back( Subset( 0x1760, 0x177F, FindIndex(RID_SUBSETSTR_TAGBANWA) ) );
break;
case UBLOCK_MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A:
- aAllSubsets.push_back( Subset( 0x27C0, 0x27EF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MISC_MATH_SYMS_A)) ) );
+ aAllSubsets.push_back( Subset( 0x27C0, 0x27EF, FindIndex(RID_SUBSETSTR_MISC_MATH_SYMS_A) ) );
break;
case UBLOCK_SUPPLEMENTAL_ARROWS_A:
- aAllSubsets.push_back( Subset( 0x27F0, 0x27FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SUPPL_ARROWS_A)) ) );
+ aAllSubsets.push_back( Subset( 0x27F0, 0x27FF, FindIndex(RID_SUBSETSTR_SUPPL_ARROWS_A) ) );
break;
case UBLOCK_SUPPLEMENTAL_ARROWS_B:
- aAllSubsets.push_back( Subset( 0x2900, 0x297F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SUPPL_ARROWS_B)) ) );
+ aAllSubsets.push_back( Subset( 0x2900, 0x297F, FindIndex(RID_SUBSETSTR_SUPPL_ARROWS_B) ) );
break;
case UBLOCK_MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B:
- aAllSubsets.push_back( Subset( 0x2980, 0x29FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MISC_MATH_SYMS_B)) ) );
+ aAllSubsets.push_back( Subset( 0x2980, 0x29FF, FindIndex(RID_SUBSETSTR_MISC_MATH_SYMS_B) ) );
break;
case UBLOCK_SUPPLEMENTAL_MATHEMATICAL_OPERATORS:
- aAllSubsets.push_back( Subset( 0x2A00, 0x2AFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MISC_MATH_SYMS_B)) ) );
+ aAllSubsets.push_back( Subset( 0x2A00, 0x2AFF, FindIndex(RID_SUBSETSTR_MISC_MATH_SYMS_B) ) );
break;
case UBLOCK_KATAKANA_PHONETIC_EXTENSIONS:
- aAllSubsets.push_back( Subset( 0x31F0, 0x31FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KATAKANA_PHONETIC)) ) );
+ aAllSubsets.push_back( Subset( 0x31F0, 0x31FF, FindIndex(RID_SUBSETSTR_KATAKANA_PHONETIC) ) );
break;
case UBLOCK_VARIATION_SELECTORS:
- aAllSubsets.push_back( Subset( 0xFE00, 0xFE0F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_VARIATION_SELECTORS)) ) );
+ aAllSubsets.push_back( Subset( 0xFE00, 0xFE0F, FindIndex(RID_SUBSETSTR_VARIATION_SELECTORS) ) );
break;
case UBLOCK_SUPPLEMENTARY_PRIVATE_USE_AREA_A:
- aAllSubsets.push_back( Subset( 0xF0000, 0xFFFFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_A)) ) );
+ aAllSubsets.push_back( Subset( 0xF0000, 0xFFFFF, FindIndex(RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_A) ) );
break;
case UBLOCK_SUPPLEMENTARY_PRIVATE_USE_AREA_B:
- aAllSubsets.push_back( Subset( 0x100000, 0x10FFFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_B)) ) );
+ aAllSubsets.push_back( Subset( 0x100000, 0x10FFFF, FindIndex(RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_B) ) );
break;
case UBLOCK_LIMBU:
- aAllSubsets.push_back( Subset( 0x1900, 0x194F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LIMBU)) ) );
+ aAllSubsets.push_back( Subset( 0x1900, 0x194F, FindIndex(RID_SUBSETSTR_LIMBU) ) );
break;
case UBLOCK_TAI_LE:
- aAllSubsets.push_back( Subset( 0x1950, 0x197F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TAI_LE)) ) );
+ aAllSubsets.push_back( Subset( 0x1950, 0x197F, FindIndex(RID_SUBSETSTR_TAI_LE) ) );
break;
case UBLOCK_KHMER_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x19E0, 0x19FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KHMER_SYMBOLS)) ) );
+ aAllSubsets.push_back( Subset( 0x19E0, 0x19FF, FindIndex(RID_SUBSETSTR_KHMER_SYMBOLS) ) );
break;
case UBLOCK_PHONETIC_EXTENSIONS:
- aAllSubsets.push_back( Subset( 0x1D00, 0x1D7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_PHONETIC_EXTENSIONS)) ) );
+ aAllSubsets.push_back( Subset( 0x1D00, 0x1D7F, FindIndex(RID_SUBSETSTR_PHONETIC_EXTENSIONS) ) );
break;
case UBLOCK_MISCELLANEOUS_SYMBOLS_AND_ARROWS:
- aAllSubsets.push_back( Subset( 0x2B00, 0x2BFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_ARROWS)) ) );
+ aAllSubsets.push_back( Subset( 0x2B00, 0x2BFF, FindIndex(RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_ARROWS) ) );
break;
case UBLOCK_YIJING_HEXAGRAM_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x4DC0, 0x4DFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_YIJING_HEXAGRAM_SYMBOLS)) ) );
+ aAllSubsets.push_back( Subset( 0x4DC0, 0x4DFF, FindIndex(RID_SUBSETSTR_YIJING_HEXAGRAM_SYMBOLS) ) );
break;
case UBLOCK_LINEAR_B_SYLLABARY:
- aAllSubsets.push_back( Subset( 0x10000, 0x1007F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LINEAR_B_SYLLABARY)) ) );
+ aAllSubsets.push_back( Subset( 0x10000, 0x1007F, FindIndex(RID_SUBSETSTR_LINEAR_B_SYLLABARY) ) );
break;
case UBLOCK_LINEAR_B_IDEOGRAMS:
- aAllSubsets.push_back( Subset( 0x10080, 0x100FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LINEAR_B_IDEOGRAMS)) ) );
+ aAllSubsets.push_back( Subset( 0x10080, 0x100FF, FindIndex(RID_SUBSETSTR_LINEAR_B_IDEOGRAMS) ) );
break;
case UBLOCK_AEGEAN_NUMBERS:
- aAllSubsets.push_back( Subset( 0x10100, 0x1013F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_AEGEAN_NUMBERS)) ) );
+ aAllSubsets.push_back( Subset( 0x10100, 0x1013F, FindIndex(RID_SUBSETSTR_AEGEAN_NUMBERS) ) );
break;
case UBLOCK_UGARITIC:
- aAllSubsets.push_back( Subset( 0x10380, 0x1039F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_UGARITIC)) ) );
+ aAllSubsets.push_back( Subset( 0x10380, 0x1039F, FindIndex(RID_SUBSETSTR_UGARITIC) ) );
break;
case UBLOCK_SHAVIAN:
- aAllSubsets.push_back( Subset( 0x10450, 0x1047F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SHAVIAN)) ) );
+ aAllSubsets.push_back( Subset( 0x10450, 0x1047F, FindIndex(RID_SUBSETSTR_SHAVIAN) ) );
break;
case UBLOCK_OSMANYA:
- aAllSubsets.push_back( Subset( 0x10480, 0x104AF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_OSMANYA)) ) );
+ aAllSubsets.push_back( Subset( 0x10480, 0x104AF, FindIndex(RID_SUBSETSTR_OSMANYA) ) );
break;
case UBLOCK_CYPRIOT_SYLLABARY:
- aAllSubsets.push_back( Subset( 0x10800, 0x1083F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CYPRIOT_SYLLABARY)) ) );
+ aAllSubsets.push_back( Subset( 0x10800, 0x1083F, FindIndex(RID_SUBSETSTR_CYPRIOT_SYLLABARY) ) );
break;
case UBLOCK_TAI_XUAN_JING_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x1D300, 0x1D35F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TAI_XUAN_JING_SYMBOLS)) ) );
+ aAllSubsets.push_back( Subset( 0x1D300, 0x1D35F, FindIndex(RID_SUBSETSTR_TAI_XUAN_JING_SYMBOLS) ) );
break;
case UBLOCK_VARIATION_SELECTORS_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0xE0100, 0xE01EF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_VARIATION_SELECTORS_SUPPLEMENT)) ) );
+ aAllSubsets.push_back( Subset( 0xE0100, 0xE01EF, FindIndex(RID_SUBSETSTR_VARIATION_SELECTORS_SUPPLEMENT) ) );
break;
case UBLOCK_ANCIENT_GREEK_MUSICAL_NOTATION:
- aAllSubsets.push_back( Subset(0x1D200, 0x1D24F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ANCIENT_GREEK_MUSICAL_NOTATION)) ) );
+ aAllSubsets.push_back( Subset(0x1D200, 0x1D24F, FindIndex(RID_SUBSETSTR_ANCIENT_GREEK_MUSICAL_NOTATION) ) );
break;
case UBLOCK_ANCIENT_GREEK_NUMBERS:
- aAllSubsets.push_back( Subset(0x10140, 0x1018F , aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ANCIENT_GREEK_NUMBERS)) ) );
+ aAllSubsets.push_back( Subset(0x10140, 0x1018F , FindIndex(RID_SUBSETSTR_ANCIENT_GREEK_NUMBERS) ) );
break;
case UBLOCK_ARABIC_SUPPLEMENT:
- aAllSubsets.push_back( Subset(0x0750, 0x077F , aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ARABIC_SUPPLEMENT)) ) );
+ aAllSubsets.push_back( Subset(0x0750, 0x077F , FindIndex(RID_SUBSETSTR_ARABIC_SUPPLEMENT) ) );
break;
case UBLOCK_BUGINESE:
- aAllSubsets.push_back( Subset(0x1A00, 0x1A1F , aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BUGINESE)) ) );
+ aAllSubsets.push_back( Subset(0x1A00, 0x1A1F , FindIndex(RID_SUBSETSTR_BUGINESE) ) );
break;
case UBLOCK_CJK_STROKES:
- aAllSubsets.push_back( Subset( 0x31C0, 0x31EF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_STROKES)) ) );
+ aAllSubsets.push_back( Subset( 0x31C0, 0x31EF, FindIndex(RID_SUBSETSTR_CJK_STROKES) ) );
break;
case UBLOCK_COMBINING_DIACRITICAL_MARKS_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x1DC0, 0x1DFF , aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_SUPPLEMENT)) ) );
+ aAllSubsets.push_back( Subset( 0x1DC0, 0x1DFF , FindIndex(RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_SUPPLEMENT) ) );
break;
case UBLOCK_COPTIC:
- aAllSubsets.push_back( Subset( 0x2C80, 0x2CFF , aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_COPTIC)) ) );
+ aAllSubsets.push_back( Subset( 0x2C80, 0x2CFF , FindIndex(RID_SUBSETSTR_COPTIC) ) );
break;
case UBLOCK_ETHIOPIC_EXTENDED:
- aAllSubsets.push_back( Subset( 0x2D80, 0x2DDF , aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ETHIOPIC_EXTENDED)) ) );
+ aAllSubsets.push_back( Subset( 0x2D80, 0x2DDF , FindIndex(RID_SUBSETSTR_ETHIOPIC_EXTENDED) ) );
break;
case UBLOCK_ETHIOPIC_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x1380, 0x139F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ETHIOPIC_SUPPLEMENT)) ) );
+ aAllSubsets.push_back( Subset( 0x1380, 0x139F, FindIndex(RID_SUBSETSTR_ETHIOPIC_SUPPLEMENT) ) );
break;
case UBLOCK_GEORGIAN_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x2D00, 0x2D2F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_GEORGIAN_SUPPLEMENT)) ) );
+ aAllSubsets.push_back( Subset( 0x2D00, 0x2D2F, FindIndex(RID_SUBSETSTR_GEORGIAN_SUPPLEMENT) ) );
break;
case UBLOCK_GLAGOLITIC:
- aAllSubsets.push_back( Subset( 0x2C00, 0x2C5F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_GLAGOLITIC)) ) );
+ aAllSubsets.push_back( Subset( 0x2C00, 0x2C5F, FindIndex(RID_SUBSETSTR_GLAGOLITIC) ) );
break;
case UBLOCK_KHAROSHTHI:
- aAllSubsets.push_back( Subset( 0x10A00, 0x10A5F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KHAROSHTHI)) ) );
+ aAllSubsets.push_back( Subset( 0x10A00, 0x10A5F, FindIndex(RID_SUBSETSTR_KHAROSHTHI) ) );
break;
case UBLOCK_MODIFIER_TONE_LETTERS:
- aAllSubsets.push_back( Subset( 0xA700, 0xA71F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MODIFIER_TONE_LETTERS)) ) );
+ aAllSubsets.push_back( Subset( 0xA700, 0xA71F, FindIndex(RID_SUBSETSTR_MODIFIER_TONE_LETTERS) ) );
break;
case UBLOCK_NEW_TAI_LUE:
- aAllSubsets.push_back( Subset( 0x1980, 0x19DF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_NEW_TAI_LUE)) ) );
+ aAllSubsets.push_back( Subset( 0x1980, 0x19DF, FindIndex(RID_SUBSETSTR_NEW_TAI_LUE) ) );
break;
case UBLOCK_OLD_PERSIAN:
- aAllSubsets.push_back( Subset( 0x103A0, 0x103DF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_OLD_PERSIAN)) ) );
+ aAllSubsets.push_back( Subset( 0x103A0, 0x103DF, FindIndex(RID_SUBSETSTR_OLD_PERSIAN) ) );
break;
case UBLOCK_PHONETIC_EXTENSIONS_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x1D80, 0x1DBF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_PHONETIC_EXTENSIONS_SUPPLEMENT)) ) );
+ aAllSubsets.push_back( Subset( 0x1D80, 0x1DBF, FindIndex(RID_SUBSETSTR_PHONETIC_EXTENSIONS_SUPPLEMENT) ) );
break;
case UBLOCK_SUPPLEMENTAL_PUNCTUATION:
- aAllSubsets.push_back( Subset( 0x2E00, 0x2E7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SUPPLEMENTAL_PUNCTUATION)) ) );
+ aAllSubsets.push_back( Subset( 0x2E00, 0x2E7F, FindIndex(RID_SUBSETSTR_SUPPLEMENTAL_PUNCTUATION) ) );
break;
case UBLOCK_SYLOTI_NAGRI:
- aAllSubsets.push_back( Subset( 0xA800, 0xA82F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SYLOTI_NAGRI)) ) );
+ aAllSubsets.push_back( Subset( 0xA800, 0xA82F, FindIndex(RID_SUBSETSTR_SYLOTI_NAGRI) ) );
break;
case UBLOCK_TIFINAGH:
- aAllSubsets.push_back( Subset( 0x2D30, 0x2D7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TIFINAGH)) ) );
+ aAllSubsets.push_back( Subset( 0x2D30, 0x2D7F, FindIndex(RID_SUBSETSTR_TIFINAGH) ) );
break;
case UBLOCK_VERTICAL_FORMS:
- aAllSubsets.push_back( Subset( 0xFE10, 0xFE1F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_VERTICAL_FORMS)) ) );
+ aAllSubsets.push_back( Subset( 0xFE10, 0xFE1F, FindIndex(RID_SUBSETSTR_VERTICAL_FORMS) ) );
break;
case UBLOCK_NKO:
- aAllSubsets.push_back( Subset( 0x07C0, 0x07FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_NKO)) ) );
+ aAllSubsets.push_back( Subset( 0x07C0, 0x07FF, FindIndex(RID_SUBSETSTR_NKO) ) );
break;
case UBLOCK_BALINESE:
- aAllSubsets.push_back( Subset( 0x1B00, 0x1B7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BALINESE)) ) );
+ aAllSubsets.push_back( Subset( 0x1B00, 0x1B7F, FindIndex(RID_SUBSETSTR_BALINESE) ) );
break;
case UBLOCK_LATIN_EXTENDED_C:
- aAllSubsets.push_back( Subset( 0x2C60, 0x2C7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_C)) ) );
+ aAllSubsets.push_back( Subset( 0x2C60, 0x2C7F, FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_C) ) );
break;
case UBLOCK_LATIN_EXTENDED_D:
- aAllSubsets.push_back( Subset( 0xA720, 0xA7FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_D)) ) );
+ aAllSubsets.push_back( Subset( 0xA720, 0xA7FF, FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_D) ) );
break;
case UBLOCK_PHAGS_PA:
- aAllSubsets.push_back( Subset( 0xA840, 0xA87F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_PHAGS_PA)) ) );
+ aAllSubsets.push_back( Subset( 0xA840, 0xA87F, FindIndex(RID_SUBSETSTR_PHAGS_PA) ) );
break;
case UBLOCK_PHOENICIAN:
- aAllSubsets.push_back( Subset( 0x10900, 0x1091F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_PHOENICIAN)) ) );
+ aAllSubsets.push_back( Subset( 0x10900, 0x1091F, FindIndex(RID_SUBSETSTR_PHOENICIAN) ) );
break;
case UBLOCK_CUNEIFORM:
- aAllSubsets.push_back( Subset( 0x12000, 0x123FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CUNEIFORM)) ) );
+ aAllSubsets.push_back( Subset( 0x12000, 0x123FF, FindIndex(RID_SUBSETSTR_CUNEIFORM) ) );
break;
case UBLOCK_CUNEIFORM_NUMBERS_AND_PUNCTUATION:
- aAllSubsets.push_back( Subset( 0x12400, 0x1247F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CUNEIFORM_NUMBERS_AND_PUNCTUATION)) ) );
+ aAllSubsets.push_back( Subset( 0x12400, 0x1247F, FindIndex(RID_SUBSETSTR_CUNEIFORM_NUMBERS_AND_PUNCTUATION) ) );
break;
case UBLOCK_COUNTING_ROD_NUMERALS:
- aAllSubsets.push_back( Subset( 0x1D360, 0x1D37F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_COUNTING_ROD_NUMERALS)) ) );
+ aAllSubsets.push_back( Subset( 0x1D360, 0x1D37F, FindIndex(RID_SUBSETSTR_COUNTING_ROD_NUMERALS) ) );
break;
case UBLOCK_SUNDANESE:
- aAllSubsets.push_back( Subset( 0x1B80, 0x1BBF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SUNDANESE)) ) );
+ aAllSubsets.push_back( Subset( 0x1B80, 0x1BBF, FindIndex(RID_SUBSETSTR_SUNDANESE) ) );
break;
case UBLOCK_LEPCHA:
- aAllSubsets.push_back( Subset( 0x1C00, 0x1C4F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LEPCHA)) ) );
+ aAllSubsets.push_back( Subset( 0x1C00, 0x1C4F, FindIndex(RID_SUBSETSTR_LEPCHA) ) );
break;
case UBLOCK_OL_CHIKI:
- aAllSubsets.push_back( Subset( 0x1C50, 0x1C7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_OL_CHIKI)) ) );
+ aAllSubsets.push_back( Subset( 0x1C50, 0x1C7F, FindIndex(RID_SUBSETSTR_OL_CHIKI) ) );
break;
case UBLOCK_CYRILLIC_EXTENDED_A:
- aAllSubsets.push_back( Subset( 0x2DE0, 0x2DFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CYRILLIC_EXTENDED_A)) ) );
+ aAllSubsets.push_back( Subset( 0x2DE0, 0x2DFF, FindIndex(RID_SUBSETSTR_CYRILLIC_EXTENDED_A) ) );
break;
case UBLOCK_VAI:
- aAllSubsets.push_back( Subset( 0xA500, 0xA63F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_VAI)) ) );
+ aAllSubsets.push_back( Subset( 0xA500, 0xA63F, FindIndex(RID_SUBSETSTR_VAI) ) );
break;
case UBLOCK_CYRILLIC_EXTENDED_B:
- aAllSubsets.push_back( Subset( 0xA640, 0xA69F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CYRILLIC_EXTENDED_B)) ) );
+ aAllSubsets.push_back( Subset( 0xA640, 0xA69F, FindIndex(RID_SUBSETSTR_CYRILLIC_EXTENDED_B) ) );
break;
case UBLOCK_SAURASHTRA:
- aAllSubsets.push_back( Subset( 0xA880, 0xA8DF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SAURASHTRA)) ) );
+ aAllSubsets.push_back( Subset( 0xA880, 0xA8DF, FindIndex(RID_SUBSETSTR_SAURASHTRA) ) );
break;
case UBLOCK_KAYAH_LI:
- aAllSubsets.push_back( Subset( 0xA900, 0xA92F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KAYAH_LI)) ) );
+ aAllSubsets.push_back( Subset( 0xA900, 0xA92F, FindIndex(RID_SUBSETSTR_KAYAH_LI) ) );
break;
case UBLOCK_REJANG:
- aAllSubsets.push_back( Subset( 0xA930, 0xA95F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_REJANG)) ) );
+ aAllSubsets.push_back( Subset( 0xA930, 0xA95F, FindIndex(RID_SUBSETSTR_REJANG) ) );
break;
case UBLOCK_CHAM:
- aAllSubsets.push_back( Subset( 0xAA00, 0xAA5F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CHAM)) ) );
+ aAllSubsets.push_back( Subset( 0xAA00, 0xAA5F, FindIndex(RID_SUBSETSTR_CHAM) ) );
break;
case UBLOCK_ANCIENT_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x10190, 0x101CF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ANCIENT_SYMBOLS)) ) );
+ aAllSubsets.push_back( Subset( 0x10190, 0x101CF, FindIndex(RID_SUBSETSTR_ANCIENT_SYMBOLS) ) );
break;
case UBLOCK_PHAISTOS_DISC:
- aAllSubsets.push_back( Subset( 0x101D0, 0x101FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_PHAISTOS_DISC)) ) );
+ aAllSubsets.push_back( Subset( 0x101D0, 0x101FF, FindIndex(RID_SUBSETSTR_PHAISTOS_DISC) ) );
break;
case UBLOCK_LYCIAN:
- aAllSubsets.push_back( Subset( 0x10280, 0x1029F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LYCIAN)) ) );
+ aAllSubsets.push_back( Subset( 0x10280, 0x1029F, FindIndex(RID_SUBSETSTR_LYCIAN) ) );
break;
case UBLOCK_CARIAN:
- aAllSubsets.push_back( Subset( 0x102A0, 0x102DF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CARIAN)) ) );
+ aAllSubsets.push_back( Subset( 0x102A0, 0x102DF, FindIndex(RID_SUBSETSTR_CARIAN) ) );
break;
case UBLOCK_LYDIAN:
- aAllSubsets.push_back( Subset( 0x10920, 0x1093F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LYDIAN)) ) );
+ aAllSubsets.push_back( Subset( 0x10920, 0x1093F, FindIndex(RID_SUBSETSTR_LYDIAN) ) );
break;
case UBLOCK_MAHJONG_TILES:
- aAllSubsets.push_back( Subset( 0x1F000, 0x1F02F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MAHJONG_TILES)) ) );
+ aAllSubsets.push_back( Subset( 0x1F000, 0x1F02F, FindIndex(RID_SUBSETSTR_MAHJONG_TILES) ) );
break;
case UBLOCK_DOMINO_TILES:
- aAllSubsets.push_back( Subset( 0x1F030, 0x1F09F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_DOMINO_TILES)) ) );
+ aAllSubsets.push_back( Subset( 0x1F030, 0x1F09F, FindIndex(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, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SAMARITAN)) ) );
+ aAllSubsets.push_back( Subset( 0x0800, 0x083F, FindIndex(RID_SUBSETSTR_SAMARITAN) ) );
break;
case UBLOCK_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED:
- aAllSubsets.push_back( Subset( 0x18B0, 0x18FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED)) ) );
+ aAllSubsets.push_back( Subset( 0x18B0, 0x18FF, FindIndex(RID_SUBSETSTR_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED) ) );
break;
case UBLOCK_TAI_THAM:
- aAllSubsets.push_back( Subset( 0x1A20, 0x1AAF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TAI_THAM)) ) );
+ aAllSubsets.push_back( Subset( 0x1A20, 0x1AAF, FindIndex(RID_SUBSETSTR_TAI_THAM) ) );
break;
case UBLOCK_VEDIC_EXTENSIONS:
- aAllSubsets.push_back( Subset( 0x1CD0, 0x1CFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_VEDIC_EXTENSIONS)) ) );
+ aAllSubsets.push_back( Subset( 0x1CD0, 0x1CFF, FindIndex(RID_SUBSETSTR_VEDIC_EXTENSIONS) ) );
break;
case UBLOCK_LISU:
- aAllSubsets.push_back( Subset( 0xA4D0, 0xA4FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LISU)) ) );
+ aAllSubsets.push_back( Subset( 0xA4D0, 0xA4FF, FindIndex(RID_SUBSETSTR_LISU) ) );
break;
case UBLOCK_BAMUM:
- aAllSubsets.push_back( Subset( 0xA6A0, 0xA6FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BAMUM)) ) );
+ aAllSubsets.push_back( Subset( 0xA6A0, 0xA6FF, FindIndex(RID_SUBSETSTR_BAMUM) ) );
break;
case UBLOCK_COMMON_INDIC_NUMBER_FORMS:
- aAllSubsets.push_back( Subset( 0xA830, 0xA83F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_COMMON_INDIC_NUMBER_FORMS)) ) );
+ aAllSubsets.push_back( Subset( 0xA830, 0xA83F, FindIndex(RID_SUBSETSTR_COMMON_INDIC_NUMBER_FORMS) ) );
break;
case UBLOCK_DEVANAGARI_EXTENDED:
- aAllSubsets.push_back( Subset( 0xA8E0, 0xA8FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_DEVANAGARI_EXTENDED)) ) );
+ aAllSubsets.push_back( Subset( 0xA8E0, 0xA8FF, FindIndex(RID_SUBSETSTR_DEVANAGARI_EXTENDED) ) );
break;
case UBLOCK_HANGUL_JAMO_EXTENDED_A:
- aAllSubsets.push_back( Subset( 0xA960, 0xA97F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_A)) ) );
+ aAllSubsets.push_back( Subset( 0xA960, 0xA97F, FindIndex(RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_A) ) );
break;
case UBLOCK_JAVANESE:
- aAllSubsets.push_back( Subset( 0xA980, 0xA9DF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_JAVANESE)) ) );
+ aAllSubsets.push_back( Subset( 0xA980, 0xA9DF, FindIndex(RID_SUBSETSTR_JAVANESE) ) );
break;
case UBLOCK_MYANMAR_EXTENDED_A:
- aAllSubsets.push_back( Subset( 0xAA60, 0xAA7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MYANMAR_EXTENDED_A)) ) );
+ aAllSubsets.push_back( Subset( 0xAA60, 0xAA7F, FindIndex(RID_SUBSETSTR_MYANMAR_EXTENDED_A) ) );
break;
case UBLOCK_TAI_VIET:
- aAllSubsets.push_back( Subset( 0xAA80, 0xAADF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TAI_VIET)) ) );
+ aAllSubsets.push_back( Subset( 0xAA80, 0xAADF, FindIndex(RID_SUBSETSTR_TAI_VIET) ) );
break;
case UBLOCK_MEETEI_MAYEK:
- aAllSubsets.push_back( Subset( 0xABC0, 0xABFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MEETEI_MAYEK)) ) );
+ aAllSubsets.push_back( Subset( 0xABC0, 0xABFF, FindIndex(RID_SUBSETSTR_MEETEI_MAYEK) ) );
break;
case UBLOCK_HANGUL_JAMO_EXTENDED_B:
- aAllSubsets.push_back( Subset( 0xD7B0, 0xD7FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_B)) ) );
+ aAllSubsets.push_back( Subset( 0xD7B0, 0xD7FF, FindIndex(RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_B) ) );
break;
case UBLOCK_IMPERIAL_ARAMAIC:
- aAllSubsets.push_back( Subset( 0x10840, 0x1085F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_IMPERIAL_ARAMAIC)) ) );
+ aAllSubsets.push_back( Subset( 0x10840, 0x1085F, FindIndex(RID_SUBSETSTR_IMPERIAL_ARAMAIC) ) );
break;
case UBLOCK_OLD_SOUTH_ARABIAN:
- aAllSubsets.push_back( Subset( 0x10A60, 0x10A7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_OLD_SOUTH_ARABIAN)) ) );
+ aAllSubsets.push_back( Subset( 0x10A60, 0x10A7F, FindIndex(RID_SUBSETSTR_OLD_SOUTH_ARABIAN) ) );
break;
case UBLOCK_AVESTAN:
- aAllSubsets.push_back( Subset( 0x10B00, 0x10B3F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_AVESTAN)) ) );
+ aAllSubsets.push_back( Subset( 0x10B00, 0x10B3F, FindIndex(RID_SUBSETSTR_AVESTAN) ) );
break;
case UBLOCK_INSCRIPTIONAL_PARTHIAN:
- aAllSubsets.push_back( Subset( 0x10B40, 0x10B5F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_INSCRIPTIONAL_PARTHIAN)) ) );
+ aAllSubsets.push_back( Subset( 0x10B40, 0x10B5F, FindIndex(RID_SUBSETSTR_INSCRIPTIONAL_PARTHIAN) ) );
break;
case UBLOCK_INSCRIPTIONAL_PAHLAVI:
- aAllSubsets.push_back( Subset( 0x10B60, 0x10B7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_INSCRIPTIONAL_PAHLAVI)) ) );
+ aAllSubsets.push_back( Subset( 0x10B60, 0x10B7F, FindIndex(RID_SUBSETSTR_INSCRIPTIONAL_PAHLAVI) ) );
break;
case UBLOCK_OLD_TURKIC:
- aAllSubsets.push_back( Subset( 0x10C00, 0x10C4F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_OLD_TURKIC)) ) );
+ aAllSubsets.push_back( Subset( 0x10C00, 0x10C4F, FindIndex(RID_SUBSETSTR_OLD_TURKIC) ) );
break;
case UBLOCK_RUMI_NUMERAL_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x10E60, 0x10E7F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_RUMI_NUMERAL_SYMBOLS)) ) );
+ aAllSubsets.push_back( Subset( 0x10E60, 0x10E7F, FindIndex(RID_SUBSETSTR_RUMI_NUMERAL_SYMBOLS) ) );
break;
case UBLOCK_KAITHI:
- aAllSubsets.push_back( Subset( 0x11080, 0x110CF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KAITHI)) ) );
+ aAllSubsets.push_back( Subset( 0x11080, 0x110CF, FindIndex(RID_SUBSETSTR_KAITHI) ) );
break;
case UBLOCK_EGYPTIAN_HIEROGLYPHS:
- aAllSubsets.push_back( Subset( 0x13000, 0x1342F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_EGYPTIAN_HIEROGLYPHS)) ) );
+ aAllSubsets.push_back( Subset( 0x13000, 0x1342F, FindIndex(RID_SUBSETSTR_EGYPTIAN_HIEROGLYPHS) ) );
break;
case UBLOCK_ENCLOSED_ALPHANUMERIC_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x1F100, 0x1F1FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ENCLOSED_ALPHANUMERIC_SUPPLEMENT)) ) );
+ aAllSubsets.push_back( Subset( 0x1F100, 0x1F1FF, FindIndex(RID_SUBSETSTR_ENCLOSED_ALPHANUMERIC_SUPPLEMENT) ) );
break;
case UBLOCK_ENCLOSED_IDEOGRAPHIC_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x1F200, 0x1F2FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ENCLOSED_IDEOGRAPHIC_SUPPLEMENT)) ) );
+ aAllSubsets.push_back( Subset( 0x1F200, 0x1F2FF, FindIndex(RID_SUBSETSTR_ENCLOSED_IDEOGRAPHIC_SUPPLEMENT) ) );
break;
case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C:
- aAllSubsets.push_back( Subset( 0x2A700, 0x2B73F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C)) ) );
+ aAllSubsets.push_back( Subset( 0x2A700, 0x2B73F, FindIndex(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, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MANDAIC)) ) );
+ aAllSubsets.push_back( Subset( 0x0840, 0x085F, FindIndex(RID_SUBSETSTR_MANDAIC) ) );
break;
case UBLOCK_BATAK:
- aAllSubsets.push_back( Subset( 0x1BC0, 0x1BFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BATAK)) ) );
+ aAllSubsets.push_back( Subset( 0x1BC0, 0x1BFF, FindIndex(RID_SUBSETSTR_BATAK) ) );
break;
case UBLOCK_ETHIOPIC_EXTENDED_A:
- aAllSubsets.push_back( Subset( 0xAB00, 0xAB2F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ETHIOPIC_EXTENDED_A)) ) );
+ aAllSubsets.push_back( Subset( 0xAB00, 0xAB2F, FindIndex(RID_SUBSETSTR_ETHIOPIC_EXTENDED_A) ) );
break;
case UBLOCK_BRAHMI:
- aAllSubsets.push_back( Subset( 0x11000, 0x1107F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BRAHMI)) ) );
+ aAllSubsets.push_back( Subset( 0x11000, 0x1107F, FindIndex(RID_SUBSETSTR_BRAHMI) ) );
break;
case UBLOCK_BAMUM_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x16800, 0x16A3F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BAMUM_SUPPLEMENT)) ) );
+ aAllSubsets.push_back( Subset( 0x16800, 0x16A3F, FindIndex(RID_SUBSETSTR_BAMUM_SUPPLEMENT) ) );
break;
case UBLOCK_KANA_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x1B000, 0x1B0FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KANA_SUPPLEMENT)) ) );
+ aAllSubsets.push_back( Subset( 0x1B000, 0x1B0FF, FindIndex(RID_SUBSETSTR_KANA_SUPPLEMENT) ) );
break;
case UBLOCK_PLAYING_CARDS:
- aAllSubsets.push_back( Subset( 0x1F0A0, 0x1F0FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_PLAYING_CARDS)) ) );
+ aAllSubsets.push_back( Subset( 0x1F0A0, 0x1F0FF, FindIndex(RID_SUBSETSTR_PLAYING_CARDS) ) );
break;
case UBLOCK_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS:
- aAllSubsets.push_back( Subset( 0x1F300, 0x1F5FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS)) ) );
+ aAllSubsets.push_back( Subset( 0x1F300, 0x1F5FF, FindIndex(RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS) ) );
break;
case UBLOCK_EMOTICONS:
- aAllSubsets.push_back( Subset( 0x1F600, 0x1F64F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_EMOTICONS)) ) );
+ aAllSubsets.push_back( Subset( 0x1F600, 0x1F64F, FindIndex(RID_SUBSETSTR_EMOTICONS) ) );
break;
case UBLOCK_TRANSPORT_AND_MAP_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x1F680, 0x1F6FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TRANSPORT_AND_MAP_SYMBOLS)) ) );
+ aAllSubsets.push_back( Subset( 0x1F680, 0x1F6FF, FindIndex(RID_SUBSETSTR_TRANSPORT_AND_MAP_SYMBOLS) ) );
break;
case UBLOCK_ALCHEMICAL_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x1F700, 0x1F77F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ALCHEMICAL_SYMBOLS)) ) );
+ aAllSubsets.push_back( Subset( 0x1F700, 0x1F77F, FindIndex(RID_SUBSETSTR_ALCHEMICAL_SYMBOLS) ) );
break;
case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D:
- aAllSubsets.push_back( Subset( 0x2B740, 0x2B81F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D)) ) );
+ aAllSubsets.push_back( Subset( 0x2B740, 0x2B81F, FindIndex(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, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ARABIC_EXTENDED_A)) ) );
+ aAllSubsets.push_back( Subset( 0x08A0, 0x08FF, FindIndex(RID_SUBSETSTR_ARABIC_EXTENDED_A) ) );
break;
case UBLOCK_ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x1EE00, 0x1EEFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS)) ) );
+ aAllSubsets.push_back( Subset( 0x1EE00, 0x1EEFF, FindIndex(RID_SUBSETSTR_ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS) ) );
break;
case UBLOCK_CHAKMA:
- aAllSubsets.push_back( Subset( 0x11100, 0x1114F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CHAKMA)) ) );
+ aAllSubsets.push_back( Subset( 0x11100, 0x1114F, FindIndex(RID_SUBSETSTR_CHAKMA) ) );
break;
case UBLOCK_MEETEI_MAYEK_EXTENSIONS:
- aAllSubsets.push_back( Subset( 0xAAE0, 0xAAFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MEETEI_MAYEK_EXTENSIONS)) ) );
+ aAllSubsets.push_back( Subset( 0xAAE0, 0xAAFF, FindIndex(RID_SUBSETSTR_MEETEI_MAYEK_EXTENSIONS) ) );
break;
case UBLOCK_MEROITIC_CURSIVE:
- aAllSubsets.push_back( Subset( 0x109A0, 0x109FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MEROITIC_CURSIVE)) ) );
+ aAllSubsets.push_back( Subset( 0x109A0, 0x109FF, FindIndex(RID_SUBSETSTR_MEROITIC_CURSIVE) ) );
break;
case UBLOCK_MEROITIC_HIEROGLYPHS:
- aAllSubsets.push_back( Subset( 0x10980, 0x1099F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MEROITIC_HIEROGLYPHS)) ) );
+ aAllSubsets.push_back( Subset( 0x10980, 0x1099F, FindIndex(RID_SUBSETSTR_MEROITIC_HIEROGLYPHS) ) );
break;
case UBLOCK_MIAO:
- aAllSubsets.push_back( Subset( 0x16F00, 0x16F9F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MIAO)) ) );
+ aAllSubsets.push_back( Subset( 0x16F00, 0x16F9F, FindIndex(RID_SUBSETSTR_MIAO) ) );
break;
case UBLOCK_SHARADA:
- aAllSubsets.push_back( Subset( 0x11180, 0x111DF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SHARADA)) ) );
+ aAllSubsets.push_back( Subset( 0x11180, 0x111DF, FindIndex(RID_SUBSETSTR_SHARADA) ) );
break;
case UBLOCK_SORA_SOMPENG:
- aAllSubsets.push_back( Subset( 0x110D0, 0x110FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SORA_SOMPENG)) ) );
+ aAllSubsets.push_back( Subset( 0x110D0, 0x110FF, FindIndex(RID_SUBSETSTR_SORA_SOMPENG) ) );
break;
case UBLOCK_SUNDANESE_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x1CC0, 0x1CCF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SUNDANESE_SUPPLEMENT)) ) );
+ aAllSubsets.push_back( Subset( 0x1CC0, 0x1CCF, FindIndex(RID_SUBSETSTR_SUNDANESE_SUPPLEMENT) ) );
break;
case UBLOCK_TAKRI:
- aAllSubsets.push_back( Subset( 0x11680, 0x116CF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TAKRI)) ) );
+ aAllSubsets.push_back( Subset( 0x11680, 0x116CF, FindIndex(RID_SUBSETSTR_TAKRI) ) );
break;
#endif
#if U_ICU_VERSION_MAJOR_NUM >= 54
case UBLOCK_BASSA_VAH:
- aAllSubsets.push_back( Subset( 0x16AD0, 0x16AFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BASSA_VAH)) ) );
+ aAllSubsets.push_back( Subset( 0x16AD0, 0x16AFF, FindIndex(RID_SUBSETSTR_BASSA_VAH) ) );
break;
case UBLOCK_CAUCASIAN_ALBANIAN:
- aAllSubsets.push_back( Subset( 0x10530, 0x1056F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CAUCASIAN_ALBANIAN)) ) );
+ aAllSubsets.push_back( Subset( 0x10530, 0x1056F, FindIndex(RID_SUBSETSTR_CAUCASIAN_ALBANIAN) ) );
break;
case UBLOCK_COPTIC_EPACT_NUMBERS:
- aAllSubsets.push_back( Subset( 0x102E0, 0x102FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_COPTIC_EPACT_NUMBERS)) ) );
+ aAllSubsets.push_back( Subset( 0x102E0, 0x102FF, FindIndex(RID_SUBSETSTR_COPTIC_EPACT_NUMBERS) ) );
break;
case UBLOCK_COMBINING_DIACRITICAL_MARKS_EXTENDED:
- aAllSubsets.push_back( Subset( 0x1AB0, 0x1AFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_EXTENDED)) ) );
+ aAllSubsets.push_back( Subset( 0x1AB0, 0x1AFF, FindIndex(RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_EXTENDED) ) );
break;
case UBLOCK_DUPLOYAN:
- aAllSubsets.push_back( Subset( 0x1BC00, 0x1BC9F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_DUPLOYAN)) ) );
+ aAllSubsets.push_back( Subset( 0x1BC00, 0x1BC9F, FindIndex(RID_SUBSETSTR_DUPLOYAN) ) );
break;
case UBLOCK_ELBASAN:
- aAllSubsets.push_back( Subset( 0x10500, 0x1052F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ELBASAN)) ) );
+ aAllSubsets.push_back( Subset( 0x10500, 0x1052F, FindIndex(RID_SUBSETSTR_ELBASAN) ) );
break;
case UBLOCK_GEOMETRIC_SHAPES_EXTENDED:
- aAllSubsets.push_back( Subset( 0x1F780, 0x1F7FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_GEOMETRIC_SHAPES_EXTENDED)) ) );
+ aAllSubsets.push_back( Subset( 0x1F780, 0x1F7FF, FindIndex(RID_SUBSETSTR_GEOMETRIC_SHAPES_EXTENDED) ) );
break;
case UBLOCK_GRANTHA:
- aAllSubsets.push_back( Subset( 0x11300, 0x1137F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_GRANTHA)) ) );
+ aAllSubsets.push_back( Subset( 0x11300, 0x1137F, FindIndex(RID_SUBSETSTR_GRANTHA) ) );
break;
case UBLOCK_KHOJKI:
- aAllSubsets.push_back( Subset( 0x11200, 0x1124F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KHOJKI)) ) );
+ aAllSubsets.push_back( Subset( 0x11200, 0x1124F, FindIndex(RID_SUBSETSTR_KHOJKI) ) );
break;
case UBLOCK_KHUDAWADI:
- aAllSubsets.push_back( Subset( 0x112B0, 0x112FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_KHUDAWADI)) ) );
+ aAllSubsets.push_back( Subset( 0x112B0, 0x112FF, FindIndex(RID_SUBSETSTR_KHUDAWADI) ) );
break;
case UBLOCK_LATIN_EXTENDED_E:
- aAllSubsets.push_back( Subset( 0xAB30, 0xAB6F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_E)) ) );
+ aAllSubsets.push_back( Subset( 0xAB30, 0xAB6F, FindIndex(RID_SUBSETSTR_LATIN_EXTENDED_E) ) );
break;
case UBLOCK_LINEAR_A:
- aAllSubsets.push_back( Subset( 0x10600, 0x1077F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_LINEAR_A)) ) );
+ aAllSubsets.push_back( Subset( 0x10600, 0x1077F, FindIndex(RID_SUBSETSTR_LINEAR_A) ) );
break;
case UBLOCK_MAHAJANI:
- aAllSubsets.push_back( Subset( 0x11150, 0x1117F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MAHAJANI)) ) );
+ aAllSubsets.push_back( Subset( 0x11150, 0x1117F, FindIndex(RID_SUBSETSTR_MAHAJANI) ) );
break;
case UBLOCK_MANICHAEAN:
- aAllSubsets.push_back( Subset( 0x10AC0, 0x10AFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MANICHAEAN)) ) );
+ aAllSubsets.push_back( Subset( 0x10AC0, 0x10AFF, FindIndex(RID_SUBSETSTR_MANICHAEAN) ) );
break;
case UBLOCK_MENDE_KIKAKUI:
- aAllSubsets.push_back( Subset( 0x1E800, 0x1E8DF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MENDE_KIKAKUI)) ) );
+ aAllSubsets.push_back( Subset( 0x1E800, 0x1E8DF, FindIndex(RID_SUBSETSTR_MENDE_KIKAKUI) ) );
break;
case UBLOCK_MODI:
- aAllSubsets.push_back( Subset( 0x11600, 0x1165F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MODI)) ) );
+ aAllSubsets.push_back( Subset( 0x11600, 0x1165F, FindIndex(RID_SUBSETSTR_MODI) ) );
break;
case UBLOCK_MRO:
- aAllSubsets.push_back( Subset( 0x16A40, 0x16A6F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MRO)) ) );
+ aAllSubsets.push_back( Subset( 0x16A40, 0x16A6F, FindIndex(RID_SUBSETSTR_MRO) ) );
break;
case UBLOCK_MYANMAR_EXTENDED_B:
- aAllSubsets.push_back( Subset( 0xA9E0, 0xA9FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MYANMAR_EXTENDED_B)) ) );
+ aAllSubsets.push_back( Subset( 0xA9E0, 0xA9FF, FindIndex(RID_SUBSETSTR_MYANMAR_EXTENDED_B) ) );
break;
case UBLOCK_NABATAEAN:
- aAllSubsets.push_back( Subset( 0x10880, 0x108AF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_NABATAEAN)) ) );
+ aAllSubsets.push_back( Subset( 0x10880, 0x108AF, FindIndex(RID_SUBSETSTR_NABATAEAN) ) );
break;
case UBLOCK_OLD_NORTH_ARABIAN:
- aAllSubsets.push_back( Subset( 0x10A80, 0x10A9F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_OLD_NORTH_ARABIAN)) ) );
+ aAllSubsets.push_back( Subset( 0x10A80, 0x10A9F, FindIndex(RID_SUBSETSTR_OLD_NORTH_ARABIAN) ) );
break;
case UBLOCK_OLD_PERMIC:
- aAllSubsets.push_back( Subset( 0x10350, 0x1037F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_OLD_PERMIC)) ) );
+ aAllSubsets.push_back( Subset( 0x10350, 0x1037F, FindIndex(RID_SUBSETSTR_OLD_PERMIC) ) );
break;
case UBLOCK_ORNAMENTAL_DINGBATS:
- aAllSubsets.push_back( Subset( 0x1F650, 0x1F67F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ORNAMENTAL_DINGBATS)) ) );
+ aAllSubsets.push_back( Subset( 0x1F650, 0x1F67F, FindIndex(RID_SUBSETSTR_ORNAMENTAL_DINGBATS) ) );
break;
case UBLOCK_PAHAWH_HMONG:
- aAllSubsets.push_back( Subset( 0x16B00, 0x16B8F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_PAHAWH_HMONG)) ) );
+ aAllSubsets.push_back( Subset( 0x16B00, 0x16B8F, FindIndex(RID_SUBSETSTR_PAHAWH_HMONG) ) );
break;
case UBLOCK_PALMYRENE:
- aAllSubsets.push_back( Subset( 0x10860, 0x1087F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_PALMYRENE)) ) );
+ aAllSubsets.push_back( Subset( 0x10860, 0x1087F, FindIndex(RID_SUBSETSTR_PALMYRENE) ) );
break;
case UBLOCK_PAU_CIN_HAU:
- aAllSubsets.push_back( Subset( 0x11AC0, 0x11AFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_PAU_CIN_HAU)) ) );
+ aAllSubsets.push_back( Subset( 0x11AC0, 0x11AFF, FindIndex(RID_SUBSETSTR_PAU_CIN_HAU) ) );
break;
case UBLOCK_PSALTER_PAHLAVI:
- aAllSubsets.push_back( Subset( 0x10B80, 0x10BAF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_PSALTER_PAHLAVI)) ) );
+ aAllSubsets.push_back( Subset( 0x10B80, 0x10BAF, FindIndex(RID_SUBSETSTR_PSALTER_PAHLAVI) ) );
break;
case UBLOCK_SHORTHAND_FORMAT_CONTROLS:
- aAllSubsets.push_back( Subset( 0x1BCA0, 0x1BCAF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SHORTHAND_FORMAT_CONTROLS)) ) );
+ aAllSubsets.push_back( Subset( 0x1BCA0, 0x1BCAF, FindIndex(RID_SUBSETSTR_SHORTHAND_FORMAT_CONTROLS) ) );
break;
case UBLOCK_SIDDHAM:
- aAllSubsets.push_back( Subset( 0x11580, 0x115FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SIDDHAM)) ) );
+ aAllSubsets.push_back( Subset( 0x11580, 0x115FF, FindIndex(RID_SUBSETSTR_SIDDHAM) ) );
break;
case UBLOCK_SINHALA_ARCHAIC_NUMBERS:
- aAllSubsets.push_back( Subset( 0x111E0, 0x111FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SINHALA_ARCHAIC_NUMBERS)) ) );
+ aAllSubsets.push_back( Subset( 0x111E0, 0x111FF, FindIndex(RID_SUBSETSTR_SINHALA_ARCHAIC_NUMBERS) ) );
break;
case UBLOCK_SUPPLEMENTAL_ARROWS_C:
- aAllSubsets.push_back( Subset( 0x1F800, 0x1F8FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SUPPLEMENTAL_ARROWS_C)) ) );
+ aAllSubsets.push_back( Subset( 0x1F800, 0x1F8FF, FindIndex(RID_SUBSETSTR_SUPPLEMENTAL_ARROWS_C) ) );
break;
case UBLOCK_TIRHUTA:
- aAllSubsets.push_back( Subset( 0x11480, 0x114DF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TIRHUTA)) ) );
+ aAllSubsets.push_back( Subset( 0x11480, 0x114DF, FindIndex(RID_SUBSETSTR_TIRHUTA) ) );
break;
case UBLOCK_WARANG_CITI:
- aAllSubsets.push_back( Subset( 0x118A0, 0x118FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_WARANG_CITI)) ) );
+ aAllSubsets.push_back( Subset( 0x118A0, 0x118FF, FindIndex(RID_SUBSETSTR_WARANG_CITI) ) );
break;
#endif
#if U_ICU_VERSION_MAJOR_NUM >= 56
case UBLOCK_AHOM:
- aAllSubsets.push_back( Subset( 0x11700, 0x1173F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_AHOM)) ) );
+ aAllSubsets.push_back( Subset( 0x11700, 0x1173F, FindIndex(RID_SUBSETSTR_AHOM) ) );
break;
case UBLOCK_ANATOLIAN_HIEROGLYPHS:
- aAllSubsets.push_back( Subset( 0x14400, 0x1467F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ANATOLIAN_HIEROGLYPHS)) ) );
+ aAllSubsets.push_back( Subset( 0x14400, 0x1467F, FindIndex(RID_SUBSETSTR_ANATOLIAN_HIEROGLYPHS) ) );
break;
case UBLOCK_CHEROKEE_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0xAB70, 0xABBF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CHEROKEE_SUPPLEMENT)) ) );
+ aAllSubsets.push_back( Subset( 0xAB70, 0xABBF, FindIndex(RID_SUBSETSTR_CHEROKEE_SUPPLEMENT) ) );
break;
case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E:
- aAllSubsets.push_back( Subset( 0x2B820, 0x2CEAF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E)) ) );
+ aAllSubsets.push_back( Subset( 0x2B820, 0x2CEAF, FindIndex(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E) ) );
break;
case UBLOCK_EARLY_DYNASTIC_CUNEIFORM:
- aAllSubsets.push_back( Subset( 0x12480, 0x1254F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_EARLY_DYNASTIC_CUNEIFORM)) ) );
+ aAllSubsets.push_back( Subset( 0x12480, 0x1254F, FindIndex(RID_SUBSETSTR_EARLY_DYNASTIC_CUNEIFORM) ) );
break;
case UBLOCK_HATRAN:
- aAllSubsets.push_back( Subset( 0x108E0, 0x108FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_HATRAN)) ) );
+ aAllSubsets.push_back( Subset( 0x108E0, 0x108FF, FindIndex(RID_SUBSETSTR_HATRAN) ) );
break;
case UBLOCK_MULTANI:
- aAllSubsets.push_back( Subset( 0x11280, 0x112AF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MULTANI)) ) );
+ aAllSubsets.push_back( Subset( 0x11280, 0x112AF, FindIndex(RID_SUBSETSTR_MULTANI) ) );
break;
case UBLOCK_OLD_HUNGARIAN:
- aAllSubsets.push_back( Subset( 0x10C80, 0x10CFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_OLD_HUNGARIAN)) ) );
+ aAllSubsets.push_back( Subset( 0x10C80, 0x10CFF, FindIndex(RID_SUBSETSTR_OLD_HUNGARIAN) ) );
break;
case UBLOCK_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS:
- aAllSubsets.push_back( Subset( 0x1F900, 0x1F9FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS)) ) );
+ aAllSubsets.push_back( Subset( 0x1F900, 0x1F9FF, FindIndex(RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS) ) );
break;
case UBLOCK_SUTTON_SIGNWRITING:
- aAllSubsets.push_back( Subset( 0x1D800, 0x1DAAF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_SUTTON_SIGNWRITING)) ) );
+ aAllSubsets.push_back( Subset( 0x1D800, 0x1DAAF, FindIndex(RID_SUBSETSTR_SUTTON_SIGNWRITING) ) );
break;
#endif
#if (U_ICU_VERSION_MAJOR_NUM >= 58)
case UBLOCK_ADLAM:
- aAllSubsets.push_back( Subset( 0x1E900, 0x1E95F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_ADLAM)) ) );
+ aAllSubsets.push_back( Subset( 0x1E900, 0x1E95F, FindIndex(RID_SUBSETSTR_ADLAM) ) );
break;
case UBLOCK_BHAIKSUKI:
- aAllSubsets.push_back( Subset( 0x11C00, 0x11C6F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_BHAIKSUKI)) ) );
+ aAllSubsets.push_back( Subset( 0x11C00, 0x11C6F, FindIndex(RID_SUBSETSTR_BHAIKSUKI) ) );
break;
case UBLOCK_CYRILLIC_EXTENDED_C:
- aAllSubsets.push_back( Subset( 0x1C80, 0x1C8F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_CYRILLIC_EXTENDED_C)) ) );
+ aAllSubsets.push_back( Subset( 0x1C80, 0x1C8F, FindIndex(RID_SUBSETSTR_CYRILLIC_EXTENDED_C) ) );
break;
case UBLOCK_GLAGOLITIC_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x1E000, 0x1E02F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT)) ) );
+ aAllSubsets.push_back( Subset( 0x1E000, 0x1E02F, FindIndex(RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT) ) );
break;
case UBLOCK_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION:
- aAllSubsets.push_back( Subset( 0x16FE0, 0x16FFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION)) ) );
+ aAllSubsets.push_back( Subset( 0x16FE0, 0x16FFF, FindIndex(RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION) ) );
break;
case UBLOCK_MARCHEN:
- aAllSubsets.push_back( Subset( 0x11C70, 0x11CBF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MARCHEN)) ) );
+ aAllSubsets.push_back( Subset( 0x11C70, 0x11CBF, FindIndex(RID_SUBSETSTR_MARCHEN) ) );
break;
case UBLOCK_MONGOLIAN_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x11660, 0x1167F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT)) ) );
+ aAllSubsets.push_back( Subset( 0x11660, 0x1167F, FindIndex(RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT) ) );
break;
case UBLOCK_NEWA:
- aAllSubsets.push_back( Subset( 0x11400, 0x1147F, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_NEWA)) ) );
+ aAllSubsets.push_back( Subset( 0x11400, 0x1147F, FindIndex(RID_SUBSETSTR_NEWA) ) );
break;
case UBLOCK_OSAGE:
- aAllSubsets.push_back( Subset( 0x104B0, 0x104FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_OSAGE)) ) );
+ aAllSubsets.push_back( Subset( 0x104B0, 0x104FF, FindIndex(RID_SUBSETSTR_OSAGE) ) );
break;
case UBLOCK_TANGUT:
- aAllSubsets.push_back( Subset( 0x17000, 0x187FF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TANGUT)) ) );
+ aAllSubsets.push_back( Subset( 0x17000, 0x187FF, FindIndex(RID_SUBSETSTR_TANGUT) ) );
break;
case UBLOCK_TANGUT_COMPONENTS:
- aAllSubsets.push_back( Subset( 0x18800, 0x18AFF, aStringList.GetString(aStringList.FindIndex(RID_SUBSETSTR_TANGUT_COMPONENTS)) ) );
+ aAllSubsets.push_back( Subset( 0x18800, 0x18AFF, FindIndex(RID_SUBSETSTR_TANGUT_COMPONENTS) ) );
break;
#endif
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx
index 1ba75a6d0e41..ac3a32f5e2e3 100644
--- a/svx/source/dialog/checklbx.cxx
+++ b/svx/source/dialog/checklbx.cxx
@@ -21,7 +21,7 @@
#include <svtools/treelistentry.hxx>
#include <svx/checklbx.hxx>
#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <vcl/builderfactory.hxx>
SvxCheckListBox::SvxCheckListBox( vcl::Window* pParent, WinBits nWinStyle ) :
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index 683cc80ed0d6..00c7de098be0 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -26,6 +26,7 @@
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <vcl/slider.hxx>
+#include <svx/strings.hrc>
#include <svx/svdograf.hxx>
#include <svx/sdgcpitm.hxx>
#include <svx/dialmgr.hxx>
@@ -35,8 +36,6 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include "compressgraphicdialog.hrc"
-
using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
diff --git a/svx/source/dialog/compressgraphicdialog.hrc b/svx/source/dialog/compressgraphicdialog.hrc
deleted file mode 100644
index 2dd73ca251ac..000000000000
--- a/svx/source/dialog/compressgraphicdialog.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 .
- */
-
-#define STR_IMAGE_ORIGINAL_SIZE 256
-#define STR_IMAGE_VIEW_SIZE 257
-#define STR_IMAGE_CAPACITY 258
-#define STR_IMAGE_GIF 259
-#define STR_IMAGE_JPEG 260
-#define STR_IMAGE_PNG 261
-#define STR_IMAGE_TIFF 262
-#define STR_IMAGE_WMF 263
-#define STR_IMAGE_MET 264
-#define STR_IMAGE_PCT 265
-#define STR_IMAGE_SVG 266
-#define STR_IMAGE_BMP 267
-#define STR_IMAGE_UNKNOWN 268
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/compressgraphicdialog.src b/svx/source/dialog/compressgraphicdialog.src
deleted file mode 100644
index b2377c814c14..000000000000
--- a/svx/source/dialog/compressgraphicdialog.src
+++ /dev/null
@@ -1,87 +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 "compressgraphicdialog.hrc"
-
-String STR_IMAGE_ORIGINAL_SIZE
-{
- Text [ en-US ] = "$(WIDTH) x $(HEIGHT) ($(WIDTH_IN_PX) x $(HEIGHT_IN_PX) px)" ;
-};
-
-String STR_IMAGE_VIEW_SIZE
-{
- Text [ en-US ] = "$(WIDTH) x $(HEIGHT) at $(DPI) DPI" ;
-};
-
-String STR_IMAGE_CAPACITY
-{
- Text [ en-US ] = "$(CAPACITY) kiB" ;
-};
-
-String STR_IMAGE_GIF
-{
- Text [ en-US ] = "Gif image";
-};
-
-String STR_IMAGE_JPEG
-{
- Text [ en-US ] = "Jpeg image";
-};
-
-String STR_IMAGE_PNG
-{
- Text [ en-US ] = "PNG image";
-};
-
-String STR_IMAGE_TIFF
-{
- Text [ en-US ] = "TIFF image";
-};
-
-String STR_IMAGE_WMF
-{
- Text [ en-US ] = "WMF image";
-};
-
-String STR_IMAGE_MET
-{
- Text [ en-US ] = "MET image";
-};
-
-String STR_IMAGE_PCT
-{
- Text [ en-US ] = "PCT image";
-};
-
-String STR_IMAGE_SVG
-{
- Text [ en-US ] = "SVG image";
-};
-
-String STR_IMAGE_BMP
-{
- Text [ en-US ] = "BMP image";
-};
-
-String STR_IMAGE_UNKNOWN
-{
- Text [ en-US ] = "Unknown";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index 12934170aea3..b644c3e56fe1 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -18,7 +18,7 @@
*/
#include <svx/xoutbmp.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <svx/svxids.hrc>
#include <contwnd.hxx>
#include <svx/svdpage.hxx>
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index b84393490c6f..0928a31a4aed 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -32,7 +32,7 @@
#include <editeng/unolingu.hxx>
#include <svx/dialmgr.hxx>
-#include "svx/dialogs.hrc"
+#include "svx/strings.hrc"
#include <svx/ctredlin.hxx>
#include "helpid.hrc"
diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx
index 68c8ffa6bf7c..ea4ee37041f3 100644
--- a/svx/source/dialog/databaseregistrationui.cxx
+++ b/svx/source/dialog/databaseregistrationui.cxx
@@ -21,6 +21,7 @@
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <sfx2/app.hxx>
#include <svl/itemset.hxx>
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx
index 14d75def2647..c13faa7110f3 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -18,9 +18,8 @@
*/
#include "svx/dialcontrol.hxx"
-#include "bmpmask.hrc"
#include <svx/dialmgr.hxx>
-#include <tools/rcid.h>
+#include <svx/strings.hrc>
#include <cmath>
#include <vcl/virdev.hxx>
#include <vcl/svapp.hxx>
diff --git a/svx/source/dialog/dialmgr.cxx b/svx/source/dialog/dialmgr.cxx
index 05d9de4fc3e9..145ef6bf0745 100644
--- a/svx/source/dialog/dialmgr.cxx
+++ b/svx/source/dialog/dialmgr.cxx
@@ -19,17 +19,18 @@
#include <tools/resmgr.hxx>
#include <svx/dialmgr.hxx>
-#include <svl/solar.hrc>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
-static ResMgr* pResMgr=nullptr;
+const std::locale& SvxResLocale()
+{
+ static std::locale loc = Translate::Create("svx", Application::GetSettings().GetUILanguageTag());
+ return loc;
+}
-ResMgr* DialogsResMgr::GetResMgr()
+OUString SvxResId(const char* pId)
{
- if (!pResMgr)
- pResMgr = ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag());
- return pResMgr;
+ return Translate::get(pId, SvxResLocale());
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index a971e4871b0d..0f9955db0d3b 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -19,7 +19,7 @@
#include <svx/dlgctl3d.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <svx/view3d.hxx>
#include <svx/fmmodel.hxx>
#include <svl/itempool.hxx>
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index b55c16ef6cdb..74fe85448178 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -23,8 +23,7 @@
#include <sfx2/dialoghelper.hxx>
#include <svx/xtable.hxx>
#include <svx/xpool.hxx>
-#include <svx/dialogs.hrc>
-#include <accessibility.hrc>
+#include <svx/strings.hrc>
#include "bitmaps.hlst"
#include <svx/dlgctrl.hxx>
#include <svx/dialmgr.hxx>
diff --git a/svx/source/dialog/dlgctrl.src b/svx/source/dialog/dlgctrl.src
deleted file mode 100644
index 20e8d3ecec6a..000000000000
--- a/svx/source/dialog/dlgctrl.src
+++ /dev/null
@@ -1,27 +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>
-
-String STR_SWITCH
-{
- Text [ en-US ] = "Switch" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 1aa77acce4df..b71546962395 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -22,7 +22,7 @@
#include <sal/macros.h>
#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include "bitmaps.hlst"
#include "docrecovery.hxx"
@@ -801,16 +801,16 @@ void RecovDocListEntry::Paint(const Point& aPos, SvTreeListBox& aDevice, vcl::Re
}
}
-RecovDocList::RecovDocList(SvSimpleTableContainer& rParent, ResMgr &rResMgr)
+RecovDocList::RecovDocList(SvSimpleTableContainer& rParent)
: SvSimpleTable ( rParent )
, m_aGreenCheckImg (BitmapEx(RID_SVXBMP_GREENCHECK))
, m_aYellowCheckImg (BitmapEx(RID_SVXBMP_YELLOWCHECK))
, m_aRedCrossImg (BitmapEx(RID_SVXBMP_REDCROSS))
- , m_aSuccessRecovStr ( ResId(RID_SVXSTR_SUCCESSRECOV, rResMgr ) )
- , m_aOrigDocRecovStr ( ResId(RID_SVXSTR_ORIGDOCRECOV, rResMgr ) )
- , m_aRecovFailedStr ( ResId(RID_SVXSTR_RECOVFAILED, rResMgr ) )
- , m_aRecovInProgrStr ( ResId(RID_SVXSTR_RECOVINPROGR, rResMgr ) )
- , m_aNotRecovYetStr ( ResId(RID_SVXSTR_NOTRECOVYET, rResMgr ) )
+ , m_aSuccessRecovStr (SvxResId(RID_SVXSTR_SUCCESSRECOV))
+ , m_aOrigDocRecovStr (SvxResId(RID_SVXSTR_ORIGDOCRECOV))
+ , m_aRecovFailedStr (SvxResId(RID_SVXSTR_RECOVFAILED))
+ , m_aRecovInProgrStr (SvxResId(RID_SVXSTR_RECOVINPROGR))
+ , m_aNotRecovYetStr (SvxResId(RID_SVXSTR_NOTRECOVYET))
{
}
@@ -828,9 +828,9 @@ void RecovDocList::InitEntry(SvTreeListEntry* pEntry,
}
-short impl_askUserForWizardCancel(vcl::Window* pParent, sal_Int16 nRes)
+short impl_askUserForWizardCancel(vcl::Window* pParent, const char* pRes)
{
- ScopedVclPtrInstance< MessageDialog > aQuery(pParent, SvxResId(nRes), VclMessageType::Question, VclButtonsType::YesNo);
+ ScopedVclPtrInstance< MessageDialog > aQuery(pParent, SvxResId(pRes), VclMessageType::Question, VclButtonsType::YesNo);
if (aQuery->Execute() == RET_YES)
return DLG_RET_OK;
else
@@ -857,7 +857,7 @@ RecoveryDialog::RecoveryDialog(vcl::Window* pParent, RecoveryCore* pCore)
SvSimpleTableContainer* pFileListLBContainer = get<SvSimpleTableContainer>("filelist");
Size aSize(LogicToPixel(Size(RECOV_CONTROLWIDTH, 68), MapUnit::MapAppFont));
pFileListLBContainer->set_height_request(aSize.Height());
- m_pFileListLB = VclPtr<RecovDocList>::Create(*pFileListLBContainer, DIALOG_MGR());
+ m_pFileListLB = VclPtr<RecovDocList>::Create(*pFileListLBContainer);
static long nTabs[] = { 2, 0, 40*RECOV_CONTROLWIDTH/100 };
m_pFileListLB->SetTabs( &nTabs[0] );
diff --git a/svx/source/dialog/docrecovery.src b/svx/source/dialog/docrecovery.src
deleted file mode 100644
index db0aa574e854..000000000000
--- a/svx/source/dialog/docrecovery.src
+++ /dev/null
@@ -1,28 +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>
-#include "helpid.hrc"
-
-String RID_SVXSTR_QUERY_EXIT_RECOVERY
-{
- Text [ en-US ] = "Are you sure you want to discard the %PRODUCTNAME document recovery data?";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 213126c069c1..bd5ff70a24ff 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -38,7 +38,8 @@
#include <svtools/sampletext.hxx>
#include <svx/fntctrl.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
+#include <svx/strings.hrc>
#include <svx/sdasitm.hxx>
// Item set includes
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 0bf45c59a96f..7ee1da514845 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -30,7 +30,8 @@
#include <svx/dialmgr.hxx>
#include "svx/dlgutil.hxx"
-#include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
+#include <svx/strings.hrc>
#include "bitmaps.hlst"
#include <svx/fontwork.hxx>
#include <editeng/outlobj.hxx>
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 894fadc00a25..aaf935418702 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -30,11 +30,9 @@
#include <vcl/settings.hxx>
#include <drawinglayer/processor2d/processor2dtools.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include "bitmaps.hlst"
-#include <tools/rcid.h>
-
using namespace ::com::sun::star;
using namespace ::editeng;
diff --git a/svx/source/dialog/frmsel.src b/svx/source/dialog/frmsel.src
deleted file mode 100644
index 5b5541399ff5..000000000000
--- a/svx/source/dialog/frmsel.src
+++ /dev/null
@@ -1,54 +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>
-
-StringArray RID_SVXSTR_FRMSEL_TEXTS
-{
- ItemList [ en-US ] =
- {
- < "Border setting" ; 0; > ;
- < "Left border line" ; 1; > ;
- < "Right border line" ; 2; > ;
- < "Top border line" ; 3; > ;
- < "Bottom border line" ; 4; > ;
- < "Horizontal border line" ; 5; > ;
- < "Vertical border line" ; 6; > ;
- < "Diagonal border line from top left to bottom right" ; 7; > ;
- < "Diagonal border line from bottom left to top right" ; 8; > ;
- };
-};
-
-StringArray RID_SVXSTR_FRMSEL_DESCRIPTIONS
-{
- ItemList [ en-US ] =
- {
- < "Border setting" ; 0; > ;
- < "Left border line" ; 1; > ;
- < "Right border line" ; 2; > ;
- < "Top border line" ; 3; > ;
- < "Bottom border line" ; 4; > ;
- < "Horizontal border line" ; 5; > ;
- < "Vertical border line" ; 6; > ;
- < "Diagonal border line from top left to bottom right" ; 7; > ;
- < "Diagonal border line from bottom left to top right" ; 8; > ;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx
index c8858fd16487..0ca19dfe68f3 100644
--- a/svx/source/dialog/grfflt.cxx
+++ b/svx/source/dialog/grfflt.cxx
@@ -25,7 +25,8 @@
#include <svx/dialmgr.hxx>
#include <svx/grfflt.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
#include <svx/svxdlg.hxx>
#include <memory>
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 24b263019f08..5ae16c739c10 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -25,7 +25,7 @@
#include <vcl/graph.hxx>
#include <sfx2/sfxsids.hrc>
#include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <svl/intitem.hxx>
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 638b44951f2f..4e09745ffe97 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -42,7 +42,7 @@
#include <vcl/layout.hxx>
#include <svx/imapdlg.hxx>
#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <svx/svxids.hrc>
#include "imapdlg.hrc"
#include "imapwnd.hxx"
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 8b7456d585a9..13698841f019 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -28,7 +28,7 @@
#include <svx/xoutbmp.hxx>
#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <svx/svxids.hrc>
#include <imapdlg.hrc>
#include <imapwnd.hxx>
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index b6ef358e6a9d..38b3ed4332d1 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -30,7 +30,7 @@
#include <editeng/unolingu.hxx>
#include <svx/langbox.hxx>
#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include "bitmaps.hlst"
#include <vcl/builderfactory.hxx>
#include <vcl/i18nhelp.hxx>
diff --git a/svx/source/dialog/language.src b/svx/source/dialog/language.src
deleted file mode 100644
index f3275f72757b..000000000000
--- a/svx/source/dialog/language.src
+++ /dev/null
@@ -1,29 +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>
-
- // Language-Strings ------------------------------------------------------
-
-String RID_SVXSTR_LANGUAGE_ALL
-{
- Text [ en-US ] = "[All]" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/numberingtype.src b/svx/source/dialog/numberingtype.src
deleted file mode 100644
index eac9cafd9f60..000000000000
--- a/svx/source/dialog/numberingtype.src
+++ /dev/null
@@ -1,57 +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>
-
-StringArray RID_SVXSTRARY_NUMBERINGTYPE
-{
- ItemList [ en-US ] =
- {
- < "None" ; 5/*SVX_NUM_NUMBER_NONE */; > ;
- < "Bullet" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ;
- < "Graphics" ; 8/*SVX_NUM_BITMAP */; > ;
- < "Linked graphics" ; 136/*SVX_NUM_BITMAP|0x80 */; > ;
- < "1, 2, 3, ..." ; 4/*SVX_NUM_ARABIC */; > ;
- < "A, B, C, ..." ; 0/*SVX_NUM_CHARS_UPPER_LETTER */; > ;
- < "a, b, c, ..." ; 1/*SVX_NUM_CHARS_LOWER_LETTER */; > ;
- < "I, II, III, ..." ; 2/*SVX_NUM_ROMAN_UPPER */; > ;
- < "i, ii, iii, ..." ; 3/*SVX_NUM_ROMAN_LOWER */; > ;
- < "A, .., AA, .., AAA, ..." ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
- < "a, .., aa, .., aaa, ..." ; 10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
- < "Native Numbering" ; 12 /*NATIVE_NUMBERING */; > ;
- < "А, Б, .., Аа, Аб, ... (Bulgarian)" ; 38 /*CHARS_CYRILLIC_UPPER_LETTER_BG */; > ;
- < "а, б, .., аа, аб, ... (Bulgarian)" ; 39 /*CHARS_CYRILLIC_LOWER_LETTER_BG */; > ;
- < "А, Б, .., Аа, Бб, ... (Bulgarian)" ; 40 /*CHARS_CYRILLIC_UPPER_LETTER_N_BG */; > ;
- < "а, б, .., аа, бб, ... (Bulgarian)" ; 41 /*CHARS_CYRILLIC_LOWER_LETTER_N_BG */; > ;
- < "А, Б, .., Аа, Аб, ... (Russian)" ; 42 /*CHARS_CYRILLIC_UPPER_LETTER_RU */; > ;
- < "а, б, .., аа, аб, ... (Russian)" ; 43 /*CHARS_CYRILLIC_LOWER_LETTER_RU */; > ;
- < "А, Б, .., Аа, Бб, ... (Russian)" ; 44 /*CHARS_CYRILLIC_UPPER_LETTER_N_RU */; > ;
- < "а, б, .., аа, бб, ... (Russian)" ; 45 /*CHARS_CYRILLIC_LOWER_LETTER_N_RU */; > ;
- < "А, Б, .., Аа, Аб, ... (Serbian)" ; 48 /*CHARS_CYRILLIC_UPPER_LETTER_SR */; > ;
- < "а, б, .., аа, аб, ... (Serbian)" ; 49 /*CHARS_CYRILLIC_LOWER_LETTER_SR */; > ;
- < "А, Б, .., Аа, Бб, ... (Serbian)" ; 50 /*CHARS_CYRILLIC_UPPER_LETTER_N_SR */; > ;
- < "а, б, .., аа, бб, ... (Serbian)" ; 51 /*CHARS_CYRILLIC_LOWER_LETTER_N_SR */; > ;
- < "Α, Β, Γ, ... (Greek Upper Letter)"; 52 /*CHARS_GREEK_UPPER_LETTER */; > ;
- < "α, β, γ, ... (Greek Lower Letter)"; 53 /*CHARS_GREEK_LOWER_LETTER */; > ;
- < "א...י, יא...כ, ..." ; 56 /*NUMBER_HEBREW */; > ;
- < "א...ת, אא...תת, ..." ; 33 /*CHARS_HEBREW */; > ;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index c5034273c10b..15897fbc3526 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -24,7 +24,7 @@
#include <svx/svxids.hrc>
#include <svx/dialmgr.hxx>
#include "svx/optgrid.hxx"
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include "svx/dlgutil.hxx"
// local functions
diff --git a/svx/source/dialog/page.src b/svx/source/dialog/page.src
deleted file mode 100644
index b39830ce9a47..000000000000
--- a/svx/source/dialog/page.src
+++ /dev/null
@@ -1,99 +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>
-#include "page.h"
-
- // RID_SVXPAGE_PAGE ------------------------------------------------------
-
-StringArray RID_SVXSTRARY_PAPERSIZE_STD
-{
- ItemList [ en-US ] =
- {
- < "A6" ; PAPERSIZE_A6 ; > ;
- < "A5" ; PAPERSIZE_A5 ; > ;
- < "A4" ; PAPERSIZE_A4 ; > ;
- < "A3" ; PAPERSIZE_A3 ; > ;
- < "B6 (ISO)" ; PAPERSIZE_B6_ISO ; > ;
- < "B5 (ISO)" ; PAPERSIZE_B5_ISO ; > ;
- < "B4 (ISO)" ; PAPERSIZE_B4_ISO ; > ;
- < "Letter" ; PAPERSIZE_LETTER ; > ;
- < "Legal" ; PAPERSIZE_LEGAL ; > ;
- < "Long Bond" ; PAPERSIZE_LEGAL2 ; > ;
- < "Tabloid" ; PAPERSIZE_TABLOID ; > ;
- < "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
- < "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
- < "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
- < "16 Kai" ; PAPERSIZE_KAI16; > ;
- < "32 Kai" ; PAPERSIZE_KAI32; > ;
- < "Big 32 Kai" ; PAPERSIZE_KAI32BIG; > ;
- < "User" ; PAPERSIZE_USER ; > ;
- < "DL Envelope" ; PAPERSIZE_DL ; > ;
- < "C6 Envelope" ; PAPERSIZE_C6 ; > ;
- < "C6/5 Envelope" ; PAPERSIZE_C65 ; > ;
- < "C5 Envelope" ; PAPERSIZE_C5 ; > ;
- < "C4 Envelope" ; PAPERSIZE_C4 ; > ;
- < "#6¾ Envelope" ; PAPERSIZE_COM675; > ;
- < "#7¾ (Monarch) Envelope" ; PAPERSIZE_MONARCH; > ;
- < "#9 Envelope" ; PAPERSIZE_COM9; > ;
- < "#10 Envelope" ; PAPERSIZE_COM10; > ;
- < "#11 Envelope" ; PAPERSIZE_COM11; > ;
- < "#12 Envelope" ; PAPERSIZE_COM12; > ;
- < "Japanese Postcard" ; PAPERSIZE_POSTCARD_JP; > ;
- };
-};
-StringArray RID_SVXSTRARY_PAPERSIZE_DRAW
-{
- ItemList [ en-US ] =
- {
- < "A6" ; PAPERSIZE_A6 ; > ;
- < "A5" ; PAPERSIZE_A5 ; > ;
- < "A4" ; PAPERSIZE_A4 ; > ;
- < "A3" ; PAPERSIZE_A3 ; > ;
- < "A2" ; PAPERSIZE_A2 ; > ;
- < "A1" ; PAPERSIZE_A1 ; > ;
- < "A0" ; PAPERSIZE_A0 ; > ;
- < "B6 (ISO)" ; PAPERSIZE_B6_ISO ; > ;
- < "B5 (ISO)" ; PAPERSIZE_B5_ISO ; > ;
- < "B4 (ISO)" ; PAPERSIZE_B4_ISO ; > ;
- < "Letter" ; PAPERSIZE_LETTER ; > ;
- < "Legal" ; PAPERSIZE_LEGAL ; > ;
- < "Long Bond" ; PAPERSIZE_LEGAL2 ; > ;
- < "Tabloid" ; PAPERSIZE_TABLOID ; > ;
- < "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
- < "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
- < "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
- < "16 Kai" ; PAPERSIZE_KAI16; > ;
- < "32 Kai" ; PAPERSIZE_KAI32; > ;
- < "Big 32 Kai" ; PAPERSIZE_KAI32BIG; > ;
- < "User" ; PAPERSIZE_USER ; > ;
- < "DL Envelope" ; PAPERSIZE_DL ; > ;
- < "C6 Envelope" ; PAPERSIZE_C6 ; > ;
- < "C6/5 Envelope" ; PAPERSIZE_C65 ; > ;
- < "C5 Envelope" ; PAPERSIZE_C5 ; > ;
- < "C4 Envelope" ; PAPERSIZE_C4 ; > ;
- < "Dia Slide" ; PAPERSIZE_DIA ; > ;
- < "Screen 4:3" ; PAPERSIZE_SCREEN_4_3 ; > ;
- < "Screen 16:9" ; PAPERSIZE_SCREEN_16_9 ; > ;
- < "Screen 16:10" ; PAPERSIZE_SCREEN_16_10 ; > ;
- < "Japanese Postcard" ; PAPERSIZE_POSTCARD_JP; > ;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/pagenumberlistbox.cxx b/svx/source/dialog/pagenumberlistbox.cxx
index 37b8f6a56188..0670d6856320 100644
--- a/svx/source/dialog/pagenumberlistbox.cxx
+++ b/svx/source/dialog/pagenumberlistbox.cxx
@@ -16,23 +16,20 @@
* 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>
+#include <svx/strings.hrc>
#include <svx/dialmgr.hxx>
#include <svx/pagenumberlistbox.hxx>
#include <editeng/numitem.hxx>
-#include <tools/resary.hxx>
#include <vcl/builderfactory.hxx>
#include <com/sun/star/style/NumberingType.hpp>
+#include "numberingtype.hrc"
PageNumberListBox::PageNumberListBox(vcl::Window* pParent)
: ListBox( pParent, WB_BORDER | WB_DROPDOWN)
{
- ResStringArray aPaperAry( ResId(RID_SVXSTRARY_NUMBERINGTYPE, DIALOG_MGR()) );
- sal_uInt32 nCnt = aPaperAry.Count();
-
- for ( sal_uInt32 i = 0; i < nCnt; ++i )
+ for (size_t i = 0; i < SAL_N_ELEMENTS(RID_SVXSTRARY_NUMBERINGTYPE); ++i)
{
- sal_uInt16 nData = aPaperAry.GetValue(i);
+ sal_uInt16 nData = RID_SVXSTRARY_NUMBERINGTYPE[i].second;
switch (nData)
{
// String list array is also used in Writer and contains strings
@@ -43,7 +40,7 @@ PageNumberListBox::PageNumberListBox(vcl::Window* pParent)
break;
default:
{
- OUString aStr = aPaperAry.GetString(i);
+ OUString aStr = SvxResId(RID_SVXSTRARY_NUMBERINGTYPE[i].first);
sal_Int32 nPos = InsertEntry( aStr );
SetEntryData( nPos, reinterpret_cast<void*>((sal_uLong)nData) );
}
diff --git a/svx/source/dialog/papersizelistbox.cxx b/svx/source/dialog/papersizelistbox.cxx
index 263de1e0712a..e0361e104d47 100644
--- a/svx/source/dialog/papersizelistbox.cxx
+++ b/svx/source/dialog/papersizelistbox.cxx
@@ -17,12 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <svx/dialmgr.hxx>
#include <svx/papersizelistbox.hxx>
-#include <tools/resary.hxx>
#include <vcl/builderfactory.hxx>
-
+#include "page.hrc"
PaperSizeListBox::PaperSizeListBox(vcl::Window* pParent)
: ListBox( pParent, WB_BORDER | WB_DROPDOWN)
@@ -34,14 +33,15 @@ VCL_BUILDER_FACTORY(PaperSizeListBox);
void PaperSizeListBox::FillPaperSizeEntries( PaperSizeApp eApp )
{
- ResStringArray aPaperAry( ResId( ( eApp == PaperSizeApp::Std ) ?
- RID_SVXSTRARY_PAPERSIZE_STD : RID_SVXSTRARY_PAPERSIZE_DRAW, DIALOG_MGR() ) );
- sal_uInt32 nCnt = aPaperAry.Count();
+ const std::pair<const char*, int>* pPaperAry = eApp == PaperSizeApp::Std ?
+ RID_SVXSTRARY_PAPERSIZE_STD : RID_SVXSTRARY_PAPERSIZE_DRAW;
+ sal_uInt32 nCnt = eApp == PaperSizeApp::Std ?
+ SAL_N_ELEMENTS(RID_SVXSTRARY_PAPERSIZE_STD) : SAL_N_ELEMENTS(RID_SVXSTRARY_PAPERSIZE_DRAW);
for ( sal_uInt32 i = 0; i < nCnt; ++i )
{
- OUString aStr = aPaperAry.GetString(i);
- Paper eSize = (Paper)aPaperAry.GetValue(i);
+ OUString aStr = SvxResId(pPaperAry[i].first);
+ Paper eSize = (Paper)pPaperAry[i].second;
sal_Int32 nPos = InsertEntry( aStr );
SetEntryData( nPos, reinterpret_cast<void*>((sal_uLong)eSize) );
}
diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx
index b5e37d9f8dcd..24a9db6167f9 100644
--- a/svx/source/dialog/passwd.cxx
+++ b/svx/source/dialog/passwd.cxx
@@ -21,7 +21,7 @@
#include <vcl/layout.hxx>
#include "svx/passwd.hxx"
#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
IMPL_LINK_NOARG(SvxPasswordDialog, ButtonHdl, Button*, void)
{
diff --git a/svx/source/dialog/passwd.src b/svx/source/dialog/passwd.src
deleted file mode 100644
index 11d4e0cf1f27..000000000000
--- a/svx/source/dialog/passwd.src
+++ /dev/null
@@ -1,32 +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>
-
-String RID_SVXSTR_ERR_OLD_PASSWD
-{
- Text [ en-US ] = "Invalid password" ;
-};
-
-String RID_SVXSTR_ERR_REPEAT_PASSWD
-{
- Text [ en-US ] = "Passwords do not match" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/prtqry.cxx b/svx/source/dialog/prtqry.cxx
index a7876a19e106..26a3bbf6e550 100644
--- a/svx/source/dialog/prtqry.cxx
+++ b/svx/source/dialog/prtqry.cxx
@@ -18,7 +18,7 @@
*/
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <svx/prtqry.hxx>
#include <svx/dialmgr.hxx>
diff --git a/svx/source/dialog/prtqry.src b/svx/source/dialog/prtqry.src
deleted file mode 100644
index 57fe9f976041..000000000000
--- a/svx/source/dialog/prtqry.src
+++ /dev/null
@@ -1,39 +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>
-
-String RID_SVXSTR_QRY_PRINT_TITLE
-{
- Text [ en-US ] = "Printing selection";
-};
-String RID_SVXSTR_QRY_PRINT_MSG
-{
- Text [ en-US ] = "Do you want to print the selection or the entire document?";
-};
-String RID_SVXSTR_QRY_PRINT_ALL
-{
- Text [ en-US ] = "~All";
-};
-String RID_SVXSTR_QRY_PRINT_SELECTION
-{
- Text [ en-US ] = "~Selection";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx
index b7ab5198a854..cf7413968749 100644
--- a/svx/source/dialog/rlrcitem.cxx
+++ b/svx/source/dialog/rlrcitem.cxx
@@ -20,7 +20,8 @@
#include <svl/rectitem.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
#include <svx/ruler.hxx>
#include <editeng/lrspitem.hxx>
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 1ee45524aed9..55b7d562bdcb 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -23,7 +23,7 @@
#include <o3tl/any.hxx>
#include <svx/rubydialog.hxx>
#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <sfx2/app.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/viewfrm.hxx>
diff --git a/svx/source/dialog/ruler.src b/svx/source/dialog/ruler.src
deleted file mode 100644
index 0e8cc51b89ff..000000000000
--- a/svx/source/dialog/ruler.src
+++ /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 .
- */
-#include <svx/dialogs.hrc>
-
-String RID_SVXSTR_RULER_TAB_LEFT
-{
- Text [ en-US ] = "Left" ;
-};
-String RID_SVXSTR_RULER_TAB_RIGHT
-{
- Text [ en-US ] = "Right" ;
-};
-String RID_SVXSTR_RULER_TAB_CENTER
-{
- Text [ en-US ] = "Center" ;
-};
-String RID_SVXSTR_RULER_TAB_DECIMAL
-{
- Text [ en-US ] = "Decimal" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index 241b9f73be0a..02b9f1fdf345 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -17,7 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
#include "svx/rulritem.hxx"
#include <tools/mapunit.hxx>
#include <osl/diagnose.h>
diff --git a/svx/source/dialog/samecontent.src b/svx/source/dialog/samecontent.src
deleted file mode 100644
index 38666d4c6503..000000000000
--- a/svx/source/dialog/samecontent.src
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <svx/dialogs.hrc>
-
-StringArray RID_SVXSTRARY_SAMECONTENT
-{
- ItemList [ en-US ] =
- {
- < "All Pages" ; 0; > ;
- < "First Page" ; 1; > ;
- < "Left and Right Pages" ; 2; > ;
- < "First, Left and Right Pages" ; 3; > ;
- };
-}; \ No newline at end of file
diff --git a/svx/source/dialog/samecontentlistbox.cxx b/svx/source/dialog/samecontentlistbox.cxx
index 5e46d593cd87..2cc3b8f5e07f 100644
--- a/svx/source/dialog/samecontentlistbox.cxx
+++ b/svx/source/dialog/samecontentlistbox.cxx
@@ -16,22 +16,19 @@
* 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>
+#include <svx/strings.hrc>
#include <svx/dialmgr.hxx>
#include <svx/samecontentlistbox.hxx>
-#include <tools/resary.hxx>
#include <vcl/builderfactory.hxx>
+#include "samecontent.hrc"
SameContentListBox::SameContentListBox(vcl::Window* pParent)
: ListBox( pParent, WB_BORDER | WB_DROPDOWN)
{
- ResStringArray aSameContentAry( ResId(RID_SVXSTRARY_SAMECONTENT, DIALOG_MGR()) );
- sal_uInt32 nCnt = aSameContentAry.Count();
-
- for ( sal_uInt32 i = 0; i < nCnt; ++i )
+ for (size_t i = 0; i < SAL_N_ELEMENTS(RID_SVXSTRARY_SAMECONTENT); ++i)
{
- OUString aStr = aSameContentAry.GetString(i);
- sal_uInt16 nData = aSameContentAry.GetValue(i);
+ OUString aStr = SvxResId(RID_SVXSTRARY_SAMECONTENT[i].first);
+ sal_uInt16 nData = RID_SVXSTRARY_SAMECONTENT[i].second;
sal_Int32 nPos = InsertEntry( aStr );
SetEntryData( nPos, reinterpret_cast<void*>((sal_uLong)nData) );
}
diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src
deleted file mode 100644
index 2142f7840d75..000000000000
--- a/svx/source/dialog/sdstring.src
+++ /dev/null
@@ -1,2288 +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 the Draw-Dialog --------------------------------------------
-String RID_SVXSTR_SOLID
-{
- Text [ en-US ] = "Continuous" ;
-};
-String RID_SVXSTR_GRADIENT
-{
- Text [ en-US ] = "Gradient" ;
-};
-String RID_SVXSTR_BITMAP
-{
- Text [ en-US ] = "Bitmap" ;
-};
-String RID_SVXSTR_PATTERN
-{
- Text [ en-US ] = "Pattern";
-};
-String RID_SVXSTR_PATTERN_UNTITLED
-{
- Text [ en-US ] = "Untitled Pattern";
-};
-String RID_SVXSTR_LINESTYLE
-{
- Text [ en-US ] = "Line Style" ;
-};
-String RID_SVXSTR_INVISIBLE
-{
- Text [ en-US ] = "None" ;
-};
-String RID_SVXSTR_COLOR
-{
- Text [ en-US ] = "Color" ;
-};
-String RID_SVXSTR_HATCH
-{
- Text [ en-US ] = "Hatching" ;
-};
-String RID_SVXSTR_LINEEND
-{
- Text [ en-US ] = "Arrowheads" ;
-};
-
-String RID_SVXSTR_COLOR_BLACK
-{
- Text [ en-US ] = "Black" ;
-};
-String RID_SVXSTR_COLOR_BLUE
-{
- Text [ en-US ] = "Blue" ;
-};
-String RID_SVXSTR_COLOR_GREEN
-{
- Text [ en-US ] = "Green" ;
-};
-String RID_SVXSTR_COLOR_CYAN
-{
- Text [ en-US ] = "Cyan" ;
-};
-String RID_SVXSTR_COLOR_RED
-{
- Text [ en-US ] = "Red" ;
-};
-String RID_SVXSTR_COLOR_MAGENTA
-{
- Text [ en-US ] = "Magenta" ;
-};
-String RID_SVXSTR_COLOR_GREY
-{
- Text [ en-US ] = "Gray" ;
-};
-String RID_SVXSTR_COLOR_YELLOW
-{
- Text [ en-US ] = "Yellow" ;
-};
-String RID_SVXSTR_COLOR_WHITE
-{
- Text [ en-US ] = "White" ;
-};
-String RID_SVXSTR_COLOR_BLUEGREY
-{
- Text [ en-US ] = "Blue gray" ;
-};
-String RID_SVXSTR_COLOR_BLUE_CLASSIC
-{
- /* Old default color Blue9, probably often used in saved files */
- Text [ en-US ] = "Blue classic" ;
-};
-String RID_SVXSTR_COLOR_ORANGE
-{
- Text [ en-US ] = "Orange" ;
-};
-String RID_SVXSTR_ARROW
-{
- Text [ en-US ] = "Arrow" ;
-};
-String RID_SVXSTR_SQUARE
-{
- Text [ en-US ] = "Square" ;
-};
-String RID_SVXSTR_CIRCLE
-{
- Text [ en-US ] = "Circle" ;
-};
-String RID_SVXSTR_NONE
-{
- Text [ en-US ] = "- none -" ;
-};
-String RID_SVXSTR_TRANSPARENCE
-{
- Text [ en-US ] = "Transparency" ;
-};
-String RID_SVXSTR_CENTERED
-{
- Text [ en-US ] = "Centered" ;
-};
-String RID_SVXSTR_NOTCENTERED
-{
- Text [ en-US ] = "Not centered" ;
-};
-String RID_SVXSTR_GRAFMODE_STANDARD
-{
- Text [ en-US ] = "Default";
-};
-String RID_SVXSTR_GRAFMODE_GREYS
-{
- Text [ en-US ] = "Grayscale";
-};
-String RID_SVXSTR_GRAFMODE_MONO
-{
- Text [ en-US ] = "Black/White";
-};
-String RID_SVXSTR_GRAFMODE_WATERMARK
-{
- Text [ en-US ] = "Watermark";
-};
-
-// BM: some additional standard colors
-
-String RID_SVXSTR_COLOR_VIOLET
-{
- Text [ en-US ] = "Violet";
-};
-
-String RID_SVXSTR_COLOR_BORDEAUX
-{
- Text [ en-US ] = "Bordeaux";
-};
-
-String RID_SVXSTR_COLOR_PALE_YELLOW
-{
- Text [ en-US ] = "Pale yellow";
-};
-
-String RID_SVXSTR_COLOR_PALE_GREEN
-{
- Text [ en-US ] = "Pale green";
-};
-
-String RID_SVXSTR_COLOR_DARKVIOLET
-{
- Text [ en-US ] = "Dark violet";
-};
-
-String RID_SVXSTR_COLOR_SALMON
-{
- Text [ en-US ] = "Salmon";
-};
-
-String RID_SVXSTR_COLOR_SEABLUE
-{
- Text [ en-US ] = "Sea blue";
-};
-
-String RID_SVXSTR_COLOR_CHART
-{
- Text [ en-US ] = "Chart" ;
-};
-
-String RID_SVXSTR_COLOR_PURPLE
-{
- Text [ en-US ] = "Purple";
-};
-
-String RID_SVXSTR_COLOR_SKYBLUE
-{
- Text [ en-US ] = "Sky blue";
-};
-
-String RID_SVXSTR_COLOR_YELLOWGREEN
-{
- Text [ en-US ] = "Yellow green";
-};
-
-String RID_SVXSTR_COLOR_PINK
-{
- Text [ en-US ] = "Pink";
-};
-
-String RID_SVXSTR_COLOR_TURQUOISE
-{
- Text [ en-US ] = "Turquoise" ;
-};
-
-String RID_SVXSTR_TBLAFMT_3D
-{
- Text [ en-US ] = "3D";
-};
-String RID_SVXSTR_TBLAFMT_BLACK1
-{
- Text [ en-US ] = "Black 1";
-};
-String RID_SVXSTR_TBLAFMT_BLACK2
-{
- Text [ en-US ] = "Black 2";
-};
-String RID_SVXSTR_TBLAFMT_BLUE
-{
- Text [ en-US ] = "Blue";
-};
-String RID_SVXSTR_TBLAFMT_BROWN
-{
- Text [ en-US ] = "Brown";
-};
-String RID_SVXSTR_TBLAFMT_CURRENCY
-{
- Text [ en-US ] = "Currency";
-};
-String RID_SVXSTR_TBLAFMT_CURRENCY_3D
-{
- Text [ en-US ] = "Currency 3D";
-};
-String RID_SVXSTR_TBLAFMT_CURRENCY_GRAY
-{
- Text [ en-US ] = "Currency Gray";
-};
-String RID_SVXSTR_TBLAFMT_CURRENCY_LAVENDER
-{
- Text [ en-US ] = "Currency Lavender";
-};
-String RID_SVXSTR_TBLAFMT_CURRENCY_TURQUOISE
-{
- Text [ en-US ] = "Currency Turquoise";
-};
-String RID_SVXSTR_TBLAFMT_GRAY
-{
- Text [ en-US ] = "Gray";
-};
-String RID_SVXSTR_TBLAFMT_GREEN
-{
- Text [ en-US ] = "Green";
-};
-String RID_SVXSTR_TBLAFMT_LAVENDER
-{
- Text [ en-US ] = "Lavender";
-};
-String RID_SVXSTR_TBLAFMT_RED
-{
- Text [ en-US ] = "Red";
-};
-String RID_SVXSTR_TBLAFMT_TURQUOISE
-{
- Text [ en-US ] = "Turquoise";
-};
-String RID_SVXSTR_TBLAFMT_YELLOW
-{
- Text [ en-US ] = "Yellow";
-};
-
-String RID_SVXSTR_LINEJOINT_MIDDLE
-{
- Text [ en-US ] = "Line joint averaged";
-};
-String RID_SVXSTR_LINEJOINT_BEVEL
-{
- Text [ en-US ] = "Line joint bevel";
-};
-String RID_SVXSTR_LINEJOINT_MITER
-{
- Text [ en-US ] = "Line joint miter";
-};
-String RID_SVXSTR_LINEJOINT_ROUND
-{
- Text [ en-US ] = "Line joint round";
-};
-String RID_SVXSTR_LINECAP_BUTT
-{
- Text [ en-US ] = "Line cap flat"; // the familiar name for it
-};
-String RID_SVXSTR_LINECAP_ROUND
-{
- Text [ en-US ] = "Line cap round";
-};
-String RID_SVXSTR_LINECAP_SQUARE
-{
- Text [ en-US ] = "Line cap square";
-};
-
-// Reference-strings for standardcolor-table
-
-/* do not translate */
-String RID_SVXSTR_COLOR_BLACK_DEF
-{
- Text = "Black" ;
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_BLUE_DEF
-{
- Text = "Blue" ;
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_GREEN_DEF
-{
- Text = "Green" ;
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_CYAN_DEF
-{
- Text = "Cyan" ;
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_RED_DEF
-{
- Text = "Red" ;
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_MAGENTA_DEF
-{
- Text = "Magenta" ;
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_GREY_DEF
-{
- Text = "Gray" ;
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_YELLOW_DEF
-{
- Text = "Yellow" ;
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_WHITE_DEF
-{
- Text = "White" ;
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_BLUEGREY_DEF
-{
- Text = "Blue gray" ;
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_ORANGE_DEF
-{
- Text = "Orange" ;
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_VIOLET_DEF
-{
- Text = "Violet";
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_BORDEAUX_DEF
-{
- Text = "Bordeaux";
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_PALE_YELLOW_DEF
-{
- Text = "Pale yellow";
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_PALE_GREEN_DEF
-{
- Text = "Pale green";
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_DARKVIOLET_DEF
-{
- Text = "Dark violet";
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_SALMON_DEF
-{
- Text = "Salmon";
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_SEABLUE_DEF
-{
- Text = "Sea blue";
-};
-/* do not translate */
-String RID_SVXSTR_COLOR_CHART_DEF
-{
- Text = "Chart";
-};
-/* DO NOT TRANSLATE */
-String RID_SVXSTR_COLOR_PURPLE_DEF
-{
- Text = "Purple";
-};
-/* DO NOT TRANSLATE */
-String RID_SVXSTR_COLOR_SKYBLUE_DEF
-{
- Text = "Sky blue";
-};
-/* DO NOT TRANSLATE */
-String RID_SVXSTR_COLOR_YELLOWGREEN_DEF
-{
- Text = "Yellow green";
-};
-/* DO NOT TRANSLATE */
-String RID_SVXSTR_COLOR_PINK_DEF
-{
- Text = "Pink";
-};
-/* DO NOT TRANSLATE */
-String RID_SVXSTR_COLOR_TURQUOISE_DEF
-{
- Text = "Turquoise" ;
-};
-/* DO NOT TRANSLATE */
-String RID_SVXSTR_COLOR_BLUE_CLASSIC_DEF
-{
- Text = "Blue classic" ;
-};
-
-// Reference-strings for standard-gradient-table
-
-/* do not translate */
-String RID_SVXSTR_GRDT0_DEF
-{
- Text = "Gradient";
-};
-/* do not translate */
-String RID_SVXSTR_GRDT1_DEF
-{
- Text = "Linear blue/white";
-};
-/* do not translate */
-String RID_SVXSTR_GRDT2_DEF
-{
- Text = "Linear magenta/green";
-};
-/* do not translate */
-String RID_SVXSTR_GRDT3_DEF
-{
- Text = "Linear yellow/brown";
-};
-/* do not translate */
-String RID_SVXSTR_GRDT4_DEF
-{
- Text = "Radial green/black";
-};
-/* do not translate */
-String RID_SVXSTR_GRDT5_DEF
-{
- Text = "Radial red/yellow";
-};
-/* do not translate */
-String RID_SVXSTR_GRDT6_DEF
-{
- Text = "Rectangular red/white";
-};
-/* do not translate */
-String RID_SVXSTR_GRDT7_DEF
-{
- Text = "Square yellow/white";
-};
-/* do not translate */
-String RID_SVXSTR_GRDT8_DEF
-{
- Text = "Ellipsoid blue grey/light blue";
-};
-/* do not translate */
-String RID_SVXSTR_GRDT9_DEF
-{
- Text = "Axial light red/white";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT10_DEF
-{
- Text = "Diagonal 1l";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT11_DEF
-{
- Text = "Diagonal 1r";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT12_DEF
-{
- Text = "Diagonal 2l";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT13_DEF
-{
- Text = "Diagonal 2r";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT14_DEF
-{
- Text = "Diagonal 3l";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT15_DEF
-{
- Text = "Diagonal 3r";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT16_DEF
-{
- Text = "Diagonal 4l";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT17_DEF
-{
- Text = "Diagonal 4r";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT18_DEF
-{
- Text = "Diagonal Blue";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT19_DEF
-{
- Text = "Diagonal Green";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT20_DEF
-{
- Text = "Diagonal Orange";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT21_DEF
-{
- Text = "Diagonal Red";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT22_DEF
-{
- Text = "Diagonal Turquoise";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT23_DEF
-{
- Text = "Diagonal Violet";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT24_DEF
-{
- Text = "From a Corner";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT25_DEF
-{
- Text = "From a Corner, Blue";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT26_DEF
-{
- Text = "From a Corner, Green";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT27_DEF
-{
- Text = "From a Corner, Orange";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT28_DEF
-{
- Text = "From a Corner, Red";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT29_DEF
-{
- Text = "From a Corner, Turquoise";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT30_DEF
-{
- Text = "From a Corner, Violet";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT31_DEF
-{
- Text = "From the Middle";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT32_DEF
-{
- Text = "From the Middle, Blue";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT33_DEF
-{
- Text = "From the Middle, Green";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT34_DEF
-{
- Text = "From the Middle, Orange";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT35_DEF
-{
- Text = "From the Middle, Red";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT36_DEF
-{
- Text = "From the Middle, Turquoise";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT37_DEF
-{
- Text = "From the Middle, Violet";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT38_DEF
-{
- Text = "Horizontal";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT39_DEF
-{
- Text = "Horizontal Blue";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT40_DEF
-{
- Text = "Horizontal Green";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT41_DEF
-{
- Text = "Horizontal Orange";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT42_DEF
-{
- Text = "Horizontal Red";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT43_DEF
-{
- Text = "Horizontal Turquoise";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT44_DEF
-{
- Text = "Horizontal Violet";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT45_DEF
-{
- Text = "Radial";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT46_DEF
-{
- Text = "Radial Blue";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT47_DEF
-{
- Text = "Radial Green";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT48_DEF
-{
- Text = "Radial Orange";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT49_DEF
-{
- Text = "Radial Red";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT50_DEF
-{
- Text = "Radial Turquoise";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT51_DEF
-{
- Text = "Radial Violet";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT52_DEF
-{
- Text = "Vertical";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT53_DEF
-{
- Text = "Vertical Blue";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT54_DEF
-{
- Text = "Vertical Green";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT55_DEF
-{
- Text = "Vertical Orange";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT56_DEF
-{
- Text = "Vertical Red";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT57_DEF
-{
- Text = "Vertical Turquoise";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT58_DEF
-{
- Text = "Vertical Violet";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT59_DEF
-{
- Text = "Gray Gradient";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT60_DEF
-{
- Text = "Yellow Gradient";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT61_DEF
-{
- Text = "Orange Gradient";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT62_DEF
-{
- Text = "Red Gradient";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT63_DEF
-{
- Text = "Pink Gradient";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT64_DEF
-{
- Text = "Sky";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT65_DEF
-{
- Text = "Cyan Gradient";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT66_DEF
-{
- Text = "Blue Gradient";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT67_DEF
-{
- Text = "Purple Pipe";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT68_DEF
-{
- Text = "Night";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT69_DEF
-{
- Text = "Green Gradient";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT70_DEF
-{
- Text = "Tango Green";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT71_DEF
-{
- Text = "Subtle Tango Green";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT72_DEF
-{
- Text = "Tango Purple";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT73_DEF
-{
- Text = "Tango Red";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT74_DEF
-{
- Text = "Tango Blue";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT75_DEF
-{
- Text = "Tango Yellow";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT76_DEF
-{
- Text = "Tango Orange";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT77_DEF
-{
- Text = "Tango Gray";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT78_DEF
-{
- Text = "Clay";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT79_DEF
-{
- Text = "Olive Green";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT80_DEF
-{
- Text = "Silver";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT81_DEF
-{
- Text = "Sunburst";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT82_DEF
-{
- Text = "Brownie";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT83_DEF
-{
- Text = "Sunset";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT84_DEF
-{
- Text = "Deep Green";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT85_DEF
-{
- Text = "Deep Orange";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT86_DEF
-{
- Text = "Deep Blue";
-};
-
-/* do not translate */
-String RID_SVXSTR_GRDT87_DEF
-{
- Text = "Purple Haze";
-};
-
-String RID_SVXSTR_GRDT0
-{
- Text [ en-US ] = "Gradient";
-};
-String RID_SVXSTR_GRDT1
-{
- Text [ en-US ] = "Linear blue/white";
-};
-String RID_SVXSTR_GRDT2
-{
- Text [ en-US ] = "Linear magenta/green";
-};
-String RID_SVXSTR_GRDT3
-{
- Text [ en-US ] = "Linear yellow/brown";
-};
-String RID_SVXSTR_GRDT4
-{
- Text [ en-US ] = "Radial green/black";
-};
-String RID_SVXSTR_GRDT5
-{
- Text [ en-US ] = "Radial red/yellow";
-};
-String RID_SVXSTR_GRDT6
-{
- Text [ en-US ] = "Rectangular red/white";
-};
-String RID_SVXSTR_GRDT7
-{
- Text [ en-US ] = "Square yellow/white";
-};
-String RID_SVXSTR_GRDT8
-{
- Text [ en-US ] = "Ellipsoid blue gray/light blue";
-};
-String RID_SVXSTR_GRDT9
-{
- Text [ en-US ] = "Axial light red/white";
-};
-
-String RID_SVXSTR_GRDT10
-{
- Text [ en-US ] = "Diagonal 1l";
- Text [ x-comment ] = "l means left";
-};
-
-String RID_SVXSTR_GRDT11
-{
- Text [ en-US ] = "Diagonal 1r";
- Text [ x-comment ] = "r means right";
-};
-
-String RID_SVXSTR_GRDT12
-{
- Text [ en-US ] = "Diagonal 2l";
- Text [ x-comment ] = "l means left";
-};
-
-String RID_SVXSTR_GRDT13
-{
- Text [ en-US ] = "Diagonal 2r";
- Text [ x-comment ] = "r means right";
-};
-
-String RID_SVXSTR_GRDT14
-{
- Text [ en-US ] = "Diagonal 3l";
- Text [ x-comment ] = "l means left";
-};
-
-String RID_SVXSTR_GRDT15
-{
- Text [ en-US ] = "Diagonal 3r";
- Text [ x-comment ] = "r means right";
-};
-
-String RID_SVXSTR_GRDT16
-{
- Text [ en-US ] = "Diagonal 4l";
- Text [ x-comment ] = "l means left";
-};
-
-String RID_SVXSTR_GRDT17
-{
- Text [ en-US ] = "Diagonal 4r";
- Text [ x-comment ] = "r means right";
-};
-
-String RID_SVXSTR_GRDT18
-{
- Text [ en-US ] = "Diagonal Blue";
-};
-
-String RID_SVXSTR_GRDT19
-{
- Text [ en-US ] = "Diagonal Green";
-};
-
-String RID_SVXSTR_GRDT20
-{
- Text [ en-US ] = "Diagonal Orange";
-};
-
-String RID_SVXSTR_GRDT21
-{
- Text [ en-US ] = "Diagonal Red";
-};
-
-String RID_SVXSTR_GRDT22
-{
- Text [ en-US ] = "Diagonal Turquoise";
-};
-
-String RID_SVXSTR_GRDT23
-{
- Text [ en-US ] = "Diagonal Violet";
-};
-
-String RID_SVXSTR_GRDT24
-{
- Text [ en-US ] = "From a Corner";
-};
-
-String RID_SVXSTR_GRDT25
-{
- Text [ en-US ] = "From a Corner, Blue";
-};
-
-String RID_SVXSTR_GRDT26
-{
- Text [ en-US ] = "From a Corner, Green";
-};
-
-String RID_SVXSTR_GRDT27
-{
- Text [ en-US ] = "From a Corner, Orange";
-};
-
-String RID_SVXSTR_GRDT28
-{
- Text [ en-US ] = "From a Corner, Red";
-};
-
-String RID_SVXSTR_GRDT29
-{
- Text [ en-US ] = "From a Corner, Turquoise";
-};
-
-String RID_SVXSTR_GRDT30
-{
- Text [ en-US ] = "From a Corner, Violet";
-};
-
-String RID_SVXSTR_GRDT31
-{
- Text [ en-US ] = "From the Middle";
-};
-
-String RID_SVXSTR_GRDT32
-{
- Text [ en-US ] = "From the Middle, Blue";
-};
-
-String RID_SVXSTR_GRDT33
-{
- Text [ en-US ] = "From the Middle, Green";
-};
-
-String RID_SVXSTR_GRDT34
-{
- Text [ en-US ] = "From the Middle, Orange";
-};
-
-String RID_SVXSTR_GRDT35
-{
- Text [ en-US ] = "From the Middle, Red";
-};
-
-String RID_SVXSTR_GRDT36
-{
- Text [ en-US ] = "From the Middle, Turquoise";
-};
-
-String RID_SVXSTR_GRDT37
-{
- Text [ en-US ] = "From the Middle, Violet";
-};
-
-String RID_SVXSTR_GRDT38
-{
- Text [ en-US ] = "Horizontal";
-};
-
-String RID_SVXSTR_GRDT39
-{
- Text [ en-US ] = "Horizontal Blue";
-};
-
-String RID_SVXSTR_GRDT40
-{
- Text [ en-US ] = "Horizontal Green";
-};
-
-String RID_SVXSTR_GRDT41
-{
- Text [ en-US ] = "Horizontal Orange";
-};
-
-String RID_SVXSTR_GRDT42
-{
- Text [ en-US ] = "Horizontal Red";
-};
-
-String RID_SVXSTR_GRDT43
-{
- Text [ en-US ] = "Horizontal Turquoise";
-};
-
-String RID_SVXSTR_GRDT44
-{
- Text [ en-US ] = "Horizontal Violet";
-};
-
-String RID_SVXSTR_GRDT45
-{
- Text [ en-US ] = "Radial";
-};
-
-String RID_SVXSTR_GRDT46
-{
- Text [ en-US ] = "Radial Blue";
-};
-
-String RID_SVXSTR_GRDT47
-{
- Text [ en-US ] = "Radial Green";
-};
-
-String RID_SVXSTR_GRDT48
-{
- Text [ en-US ] = "Radial Orange";
-};
-
-String RID_SVXSTR_GRDT49
-{
- Text [ en-US ] = "Radial Red";
-};
-
-String RID_SVXSTR_GRDT50
-{
- Text [ en-US ] = "Radial Turquoise";
-};
-
-String RID_SVXSTR_GRDT51
-{
- Text [ en-US ] = "Radial Violet";
-};
-
-String RID_SVXSTR_GRDT52
-{
- Text [ en-US ] = "Vertical";
-};
-
-String RID_SVXSTR_GRDT53
-{
- Text [ en-US ] = "Vertical Blue";
-};
-
-String RID_SVXSTR_GRDT54
-{
- Text [ en-US ] = "Vertical Green";
-};
-
-String RID_SVXSTR_GRDT55
-{
- Text [ en-US ] = "Vertical Orange";
-};
-
-String RID_SVXSTR_GRDT56
-{
- Text [ en-US ] = "Vertical Red";
-};
-
-String RID_SVXSTR_GRDT57
-{
- Text [ en-US ] = "Vertical Turquoise";
-};
-
-String RID_SVXSTR_GRDT58
-{
- Text [ en-US ] = "Vertical Violet";
-};
-
-String RID_SVXSTR_GRDT59
-{
- Text [ en-US ] = "Gray Gradient";
-};
-
-String RID_SVXSTR_GRDT60
-{
- Text [ en-US ] = "Yellow Gradient";
-};
-
-String RID_SVXSTR_GRDT61
-{
- Text [ en-US ] = "Orange Gradient";
-};
-
-String RID_SVXSTR_GRDT62
-{
- Text [ en-US ] = "Red Gradient";
-};
-
-String RID_SVXSTR_GRDT63
-{
- Text [ en-US ] = "Pink Gradient";
-};
-
-String RID_SVXSTR_GRDT64
-{
- Text [ en-US ] = "Sky";
-};
-
-String RID_SVXSTR_GRDT65
-{
- Text [ en-US ] = "Cyan Gradient";
-};
-
-String RID_SVXSTR_GRDT66
-{
- Text [ en-US ] = "Blue Gradient";
-};
-
-String RID_SVXSTR_GRDT67
-{
- Text [ en-US ] = "Purple Pipe";
-};
-
-String RID_SVXSTR_GRDT68
-{
- Text [ en-US ] = "Night";
-};
-
-String RID_SVXSTR_GRDT69
-{
- Text [ en-US ] = "Green Gradient";
-};
-
-String RID_SVXSTR_GRDT70
-{
- Text [ en-US ] = "Tango Green";
-};
-
-String RID_SVXSTR_GRDT71
-{
- Text [ en-US ] = "Subtle Tango Green";
-};
-
-String RID_SVXSTR_GRDT72
-{
- Text [ en-US ] = "Tango Purple";
-};
-
-String RID_SVXSTR_GRDT73
-{
- Text [ en-US ] = "Tango Red";
-};
-
-String RID_SVXSTR_GRDT74
-{
- Text [ en-US ] = "Tango Blue";
-};
-
-String RID_SVXSTR_GRDT75
-{
- Text [ en-US ] = "Tango Yellow";
-};
-
-String RID_SVXSTR_GRDT76
-{
- Text [ en-US ] = "Tango Orange";
-};
-
-String RID_SVXSTR_GRDT77
-{
- Text [ en-US ] = "Tango Gray";
-};
-
-String RID_SVXSTR_GRDT78
-{
- Text [ en-US ] = "Clay";
-};
-
-String RID_SVXSTR_GRDT79
-{
- Text [ en-US ] = "Olive Green";
-};
-
-String RID_SVXSTR_GRDT80
-{
- Text [ en-US ] = "Silver";
-};
-
-String RID_SVXSTR_GRDT81
-{
- Text [ en-US ] = "Sunburst";
-};
-
-String RID_SVXSTR_GRDT82
-{
- Text [ en-US ] = "Brownie";
-};
-
-String RID_SVXSTR_GRDT83
-{
- Text [ en-US ] = "Sunset";
-};
-
-String RID_SVXSTR_GRDT84
-{
- Text [ en-US ] = "Deep Green";
-};
-
-String RID_SVXSTR_GRDT85
-{
- Text [ en-US ] = "Deep Orange";
-};
-
-String RID_SVXSTR_GRDT86
-{
- Text [ en-US ] = "Deep Blue";
-};
-
-String RID_SVXSTR_GRDT87
-{
- Text [ en-US ] = "Purple Haze";
-};
-
-// Reference-strings for standard-hatch-table
-
-/* do not translate */
-String RID_SVXSTR_HATCH0_DEF
-{
- Text = "Black 45 Degrees Wide";
-};
-/* do not translate */
-String RID_SVXSTR_HATCH1_DEF
-{
- Text = "Black 45 Degrees";
-};
-/* do not translate */
-String RID_SVXSTR_HATCH2_DEF
-{
- Text = "Black -45 Degrees";
-};
-/* do not translate */
-String RID_SVXSTR_HATCH3_DEF
-{
- Text = "Black 90 Degrees";
-};
-/* do not translate */
-String RID_SVXSTR_HATCH4_DEF
-{
- Text = "Red Crossed 45 Degrees";
-};
-/* do not translate */
-String RID_SVXSTR_HATCH5_DEF
-{
- Text = "Red Crossed 0 Degrees";
-};
-/* do not translate */
-String RID_SVXSTR_HATCH6_DEF
-{
- Text = "Blue Crossed 45 Degrees";
-};
-/* do not translate */
-String RID_SVXSTR_HATCH7_DEF
-{
- Text = "Blue Crossed 0 Degrees";
-};
-/* do not translate */
-String RID_SVXSTR_HATCH8_DEF
-{
- Text = "Blue Triple 90 Degrees";
-};
-/* do not translate */
-String RID_SVXSTR_HATCH9_DEF
-{
- Text = "Black 0 Degrees";
-};
-/* do not translate */
-String RID_SVXSTR_HATCH10_DEF
-{
- Text = "Hatching";
-};
-
-String RID_SVXSTR_HATCH0
-{
- Text [ en-US ] = "Black 45 Degrees Wide";
-};
-String RID_SVXSTR_HATCH1
-{
- Text [ en-US ] = "Black 45 Degrees";
-};
-String RID_SVXSTR_HATCH2
-{
- Text [ en-US ] = "Black -45 Degrees";
-};
-String RID_SVXSTR_HATCH3
-{
- Text [ en-US ] = "Black 90 Degrees";
-};
-String RID_SVXSTR_HATCH4
-{
- Text [ en-US ] = "Red Crossed 45 Degrees";
-};
-String RID_SVXSTR_HATCH5
-{
- Text [ en-US ] = "Red Crossed 0 Degrees";
-};
-String RID_SVXSTR_HATCH6
-{
- Text [ en-US ] = "Blue Crossed 45 Degrees";
-};
-String RID_SVXSTR_HATCH7
-{
- Text [ en-US ] = "Blue Crossed 0 Degrees";
-};
-String RID_SVXSTR_HATCH8
-{
- Text [ en-US ] = "Blue Triple 90 Degrees";
-};
-String RID_SVXSTR_HATCH9
-{
- Text [ en-US ] = "Black 0 Degrees";
-};
-String RID_SVXSTR_HATCH10
-{
- Text [ en-US ] = "Hatching" ;
-};
-
-// Reference-strings for standard-bitmap-table
-
-/* do not translate */
-String RID_SVXSTR_BMP0_DEF
-{
- Text = "Empty";
-};
-/* do not translate */
-String RID_SVXSTR_BMP1_DEF
-{
- Text = "Sky";
-};
-/* do not translate */
-String RID_SVXSTR_BMP2_DEF
-{
- Text = "Aqua";
-};
-/* do not translate */
-String RID_SVXSTR_BMP3_DEF
-{
- Text = "Coarse";
-};
-/* do not translate */
-String RID_SVXSTR_BMP4_DEF
-{
- Text = "Space Metal";
-};
-/* do not translate */
-String RID_SVXSTR_BMP5_DEF
-{
- Text = "Space";
-};
-/* do not translate */
-String RID_SVXSTR_BMP6_DEF
-{
- Text = "Metal";
-};
-/* do not translate */
-String RID_SVXSTR_BMP7_DEF
-{
- Text = "Wet";
-};
-/* do not translate */
-String RID_SVXSTR_BMP8_DEF
-{
- Text = "Marble";
-};
-/* do not translate */
-String RID_SVXSTR_BMP9_DEF
-{
- Text = "Linen";
-};
-/* do not translate */
-String RID_SVXSTR_BMP10_DEF
-{
- Text = "Stone";
-};
-/* do not translate */
-String RID_SVXSTR_BMP11_DEF
-{
- Text = "Pebbles";
-};
-/* do not translate */
-String RID_SVXSTR_BMP12_DEF
-{
- Text = "Wall";
-};
-/* do not translate */
-String RID_SVXSTR_BMP13_DEF
-{
- Text = "Red Wall";
-};
-/* do not translate */
-String RID_SVXSTR_BMP14_DEF
-{
- Text = "Pattern";
-};
-/* do not translate */
-String RID_SVXSTR_BMP15_DEF
-{
- Text = "Leaves";
-};
-/* do not translate */
-String RID_SVXSTR_BMP16_DEF
-{
- Text = "Lawn Artificial";
-};
-/* do not translate */
-String RID_SVXSTR_BMP17_DEF
-{
- Text = "Daisy";
-};
-/* do not translate */
-String RID_SVXSTR_BMP18_DEF
-{
- Text = "Orange";
-};
-/* do not translate */
-String RID_SVXSTR_BMP19_DEF
-{
- Text = "Fiery";
-};
-/* do not translate */
-String RID_SVXSTR_BMP20_DEF
-{
- Text = "Roses";
-};
-
-/* do not translate */
-String RID_SVXSTR_BMP21_DEF
-{
- Text = "Bitmap";
-};
-
-String RID_SVXSTR_BMP0
-{
- Text [ en-US ] = "Empty";
-};
-String RID_SVXSTR_BMP1
-{
- Text [ en-US ] = "Sky";
-};
-String RID_SVXSTR_BMP2
-{
- Text [ en-US ] = "Water";
-};
-String RID_SVXSTR_BMP3
-{
- Text [ en-US ] = "Coarse grained";
-};
-String RID_SVXSTR_BMP4
-{
- Text [ en-US ] = "Mercury";
-};
-String RID_SVXSTR_BMP5
-{
- Text [ en-US ] = "Space";
-};
-String RID_SVXSTR_BMP6
-{
- Text [ en-US ] = "Metal";
-};
-String RID_SVXSTR_BMP7
-{
- Text [ en-US ] = "Droplets";
-};
-String RID_SVXSTR_BMP8
-{
- Text [ en-US ] = "Marble";
-};
-String RID_SVXSTR_BMP9
-{
- Text [ en-US ] = "Linen";
-};
-String RID_SVXSTR_BMP10
-{
- Text [ en-US ] = "Stone";
-};
-String RID_SVXSTR_BMP11
-{
- Text [ en-US ] = "Gravel";
-};
-String RID_SVXSTR_BMP12
-{
- Text [ en-US ] = "Wall";
-};
-String RID_SVXSTR_BMP13
-{
- Text [ en-US ] = "Brownstone";
-};
-String RID_SVXSTR_BMP14
-{
- Text [ en-US ] = "Netting";
-};
-String RID_SVXSTR_BMP15
-{
- Text [ en-US ] = "Leaves";
-};
-String RID_SVXSTR_BMP16
-{
- Text [ en-US ] = "Artificial Turf";
-};
-String RID_SVXSTR_BMP17
-{
- Text [ en-US ] = "Daisy";
-};
-String RID_SVXSTR_BMP18
-{
- Text [ en-US ] = "Orange";
-};
-String RID_SVXSTR_BMP19
-{
- Text [ en-US ] = "Fiery";
-};
-String RID_SVXSTR_BMP20
-{
- Text [ en-US ] = "Roses";
-};
-
-String RID_SVXSTR_BMP21
-{
- Text [ en-US ] = "Bitmap";
-};
-
-// Reference-strings for standard-dash-table
-
-/* do not translate */
-String RID_SVXSTR_DASH0_DEF
-{
- Text = "Ultrafine Dashed";
-};
-/* do not translate */
-String RID_SVXSTR_DASH1_DEF
-{
- Text = "Fine Dashed";
-};
-/* do not translate */
-String RID_SVXSTR_DASH2_DEF
-{
- Text = "Ultrafine 2 Dots 3 Dashes";
-};
-/* do not translate */
-String RID_SVXSTR_DASH3_DEF
-{
- Text = "Fine Dotted";
-};
-/* do not translate */
-String RID_SVXSTR_DASH4_DEF
-{
- Text = "Line with Fine Dots";
-};
-/* do not translate */
-String RID_SVXSTR_DASH5_DEF
-{
- Text = "Fine Dashed (var)";
-};
-/* do not translate */
-String RID_SVXSTR_DASH6_DEF
-{
- Text = "3 Dashes 3 Dots (var)";
-};
-/* do not translate */
-String RID_SVXSTR_DASH7_DEF
-{
- Text = "Ultrafine Dotted (var)";
-};
-/* do not translate */
-String RID_SVXSTR_DASH8_DEF
-{
- Text = "Line Style 9";
-};
-/* do not translate */
-String RID_SVXSTR_DASH9_DEF
-{
- Text = "2 Dots 1 Dash";
-};
-/* do not translate */
-String RID_SVXSTR_DASH10_DEF
-{
- Text = "Dashed (var)";
-};
-/* do not translate */
-String RID_SVXSTR_DASH11_DEF
-{
- Text = "Dash";
-};
-
-/* do not translate */
-String RID_SVXSTR_DASH12_DEF
-{
- Text = "Line Style";
-};
-
-String RID_SVXSTR_DASH0
-{
- Text [ en-US ] = "Ultrafine Dashed";
-};
-String RID_SVXSTR_DASH1
-{
- Text [ en-US ] = "Fine Dashed";
-};
-String RID_SVXSTR_DASH2
-{
- Text [ en-US ] = "2 Dots 3 Dashes";
-};
-String RID_SVXSTR_DASH3
-{
- Text [ en-US ] = "Fine Dotted";
-};
-String RID_SVXSTR_DASH4
-{
- Text [ en-US ] = "Line with Fine Dots";
-};
-String RID_SVXSTR_DASH5
-{
- Text [ en-US ] = "Fine Dashed";
-};
-String RID_SVXSTR_DASH6
-{
- Text [ en-US ] = "3 Dashes 3 Dots";
-};
-String RID_SVXSTR_DASH7
-{
- Text [ en-US ] = "Ultrafine Dotted";
-};
-String RID_SVXSTR_DASH8
-{
- Text [ en-US ] = "Line Style 9";
-};
-String RID_SVXSTR_DASH9
-{
- Text [ en-US ] = "2 Dots 1 Dash";
-};
-String RID_SVXSTR_DASH10
-{
- Text [ en-US ] = "Dashed";
-};
-String RID_SVXSTR_DASH11
-{
- Text [ en-US ] = "Dashed";
-};
-
-String RID_SVXSTR_DASH12
-{
- Text [ en-US ] = "Line Style";
-};
-
-// Reference-strings for standard-line-end-table
-
-/* do not translate */
-String RID_SVXSTR_LEND0_DEF
-{
- Text = "Arrow concave";
-};
-/* do not translate */
-String RID_SVXSTR_LEND1_DEF
-{
- Text = "Square 45";
-};
-/* do not translate */
-String RID_SVXSTR_LEND2_DEF
-{
- Text = "Small Arrow";
-};
-/* do not translate */
-String RID_SVXSTR_LEND3_DEF
-{
- Text = "Dimension Lines";
-};
-/* do not translate */
-String RID_SVXSTR_LEND4_DEF
-{
- Text = "Double Arrow";
-};
-/* do not translate */
-String RID_SVXSTR_LEND5_DEF
-{
- Text = "Rounded short Arrow";
-};
-/* do not translate */
-String RID_SVXSTR_LEND6_DEF
-{
- Text = "Symmetric Arrow";
-};
-/* do not translate */
-String RID_SVXSTR_LEND7_DEF
-{
- Text = "Line Arrow";
-};
-/* do not translate */
-String RID_SVXSTR_LEND8_DEF
-{
- Text = "Rounded large Arrow";
-};
-/* do not translate */
-String RID_SVXSTR_LEND9_DEF
-{
- Text = "Circle";
-};
-/* do not translate */
-String RID_SVXSTR_LEND10_DEF
-{
- Text = "Square";
-};
-/* do not translate */
-String RID_SVXSTR_LEND11_DEF
-{
- Text = "Arrow";
-};
-
-/* do not translate */
-String RID_SVXSTR_LEND12_DEF
-{
- Text = "Short line Arrow";
-};
-/* do not translate */
-String RID_SVXSTR_LEND13_DEF
-{
- Text = "Triangle unfilled";
-};
-/* do not translate */
-String RID_SVXSTR_LEND14_DEF
-{
- Text = "Diamond unfilled";
-};
-/* do not translate */
-String RID_SVXSTR_LEND15_DEF
-{
- Text = "Diamond";
-};
-/* do not translate */
-String RID_SVXSTR_LEND16_DEF
-{
- Text = "Circle unfilled";
-};
-/* do not translate */
-String RID_SVXSTR_LEND17_DEF
-{
- Text = "Square 45 unfilled";
-};
-/* do not translate */
-String RID_SVXSTR_LEND18_DEF
-{
- Text = "Square unfilled";
-};
-/* do not translate */
-String RID_SVXSTR_LEND19_DEF
-{
- Text = "Half Circle unfilled";
-};
-/* do not translate */
-String RID_SVXSTR_LEND20_DEF
-{
- Text = "Arrowhead";
-};
-
-String RID_SVXSTR_LEND0
-{
- Text [ en-US ] = "Arrow concave";
-};
-String RID_SVXSTR_LEND1
-{
- Text [ en-US ] = "Square 45";
-};
-String RID_SVXSTR_LEND2
-{
- Text [ en-US ] = "Small arrow";
-};
-String RID_SVXSTR_LEND3
-{
- Text [ en-US ] = "Dimension lines";
-};
-String RID_SVXSTR_LEND4
-{
- Text [ en-US ] = "Double Arrow";
-};
-String RID_SVXSTR_LEND5
-{
- Text [ en-US ] = "Rounded short arrow";
-};
-String RID_SVXSTR_LEND6
-{
- Text [ en-US ] = "Symmetric arrow";
-};
-String RID_SVXSTR_LEND7
-{
- Text [ en-US ] = "Line arrow";
-};
-String RID_SVXSTR_LEND8
-{
- Text [ en-US ] = "Rounded large arrow";
-};
-String RID_SVXSTR_LEND9
-{
- Text [ en-US ] = "Circle";
-};
-String RID_SVXSTR_LEND10
-{
- Text [ en-US ] = "Square";
-};
-String RID_SVXSTR_LEND11
-{
- Text [ en-US ] = "Arrow";
-};
-
-String RID_SVXSTR_LEND12
-{
- Text [ en-US ] = "Short line arrow";
-};
-String RID_SVXSTR_LEND13
-{
- Text [ en-US ] = "Triangle unfilled";
-};
-String RID_SVXSTR_LEND14
-{
- Text [ en-US ] = "Diamond unfilled";
-};
-String RID_SVXSTR_LEND15
-{
- Text [ en-US ] = "Diamond";
-};
-String RID_SVXSTR_LEND16
-{
- Text [ en-US ] = "Circle unfilled";
-};
-String RID_SVXSTR_LEND17
-{
- Text [ en-US ] = "Square 45 unfilled";
-};
-String RID_SVXSTR_LEND18
-{
- Text [ en-US ] = "Square unfilled";
-};
-String RID_SVXSTR_LEND19
-{
- Text [ en-US ] = "Half circle unfilled";
-};
-String RID_SVXSTR_LEND20
-{
- Text [ en-US ] = "Arrowhead";
-};
-
-// Reference-strings for standard transparence gradients
-
-/* do not translate */
-String RID_SVXSTR_TRASNGR0_DEF
-{
- Text = "Transparency";
-};
-
-String RID_SVXSTR_TRASNGR0
-{
- Text [ en-US ] = "Transparency";
-};
-
- // RID_SVXSTR_FIELDUNIT_TABLE --------------------------------------------
-
-StringArray RID_SVXSTR_FIELDUNIT_TABLE
-{
- ItemList [ en-US ] =
- {
- < "Millimeter" ; FUNIT_MM ; > ;
- < "Centimeter" ; FUNIT_CM ; > ;
- < "Meter" ; FUNIT_M ; > ;
- < "Kilometer" ; FUNIT_KM ; > ;
- < "Inch" ; FUNIT_INCH ; > ;
- < "Foot" ; FUNIT_FOOT ; > ;
- < "Miles" ; FUNIT_MILE ; > ;
- < "Pica" ; FUNIT_PICA ; > ;
- < "Point" ; FUNIT_POINT ; > ;
- < "Char" ; FUNIT_CHAR ; > ;
- < "Line" ; FUNIT_LINE ; > ;
- };
- };
-
-String RID_SVXSTR_COLOR_LIBRE_GREEN_1
-{
- Text [ en-US ] = "Green 1 (%PRODUCTNAME Main Color)" ;
-};
-
-String RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT
-{
- Text [ en-US ] = "Green Accent" ;
-};
-
-String RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT
-{
- Text [ en-US ] = "Blue Accent" ;
-};
-
-String RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT
-{
- Text [ en-US ] = "Orange Accent" ;
-};
-
-String RID_SVXSTR_COLOR_LIBRE_PURPLE
-{
- Text [ en-US ] = "Purple" ;
-};
-
-String RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT
-{
- Text [ en-US ] = "Purple Accent" ;
-};
-
-String RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT
-{
- Text [ en-US ] = "Yellow Accent" ;
-};
-
-String RID_SVXSTR_COLOR_LIBRE_GREEN_1_DEF
-{
- Text = "Green 1 (%PRODUCTNAME Main Color)" ;
-};
-
-String RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT_DEF
-{
- Text = "Green Accent" ;
-};
-
-String RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT_DEF
-{
- Text = "Blue Accent" ;
-};
-
-String RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT_DEF
-{
- Text = "Orange Accent" ;
-};
-
-String RID_SVXSTR_COLOR_LIBRE_PURPLE_DEF
-{
- Text = "Purple" ;
-};
-
-String RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT_DEF
-{
- Text = "Purple Accent" ;
-};
-
-String RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT_DEF
-{
- Text = "Yellow Accent" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_BUTTER
-{
- Text [ en-US ] = "Tango: Butter" ;
- Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_ORANGE
-{
- Text [ en-US ] = "Tango: Orange" ;
- Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_CHOCOLATE
-{
- Text [ en-US ] = "Tango: Chocolate" ;
- Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_CHAMELEON
-{
- Text [ en-US ] = "Tango: Chameleon" ;
- Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_SKY_BLUE
-{
- Text [ en-US ] = "Tango: Sky Blue" ;
- Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_PLUM
-{
- Text [ en-US ] = "Tango: Plum" ;
- Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_SCARLET_RED
-{
- Text [ en-US ] = "Tango: Scarlet Red" ;
- Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_ALUMINIUM
-{
- Text [ en-US ] = "Tango: Aluminium" ;
- Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_BUTTER_DEF
-{
- Text = "Tango: Butter" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_ORANGE_DEF
-{
- Text = "Tango: Orange" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_CHOCOLATE_DEF
-{
- Text = "Tango: Chocolate" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_CHAMELEON_DEF
-{
- Text = "Tango: Chameleon" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_SKY_BLUE_DEF
-{
- Text = "Tango: Sky Blue" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_PLUM_DEF
-{
- Text = "Tango: Plum" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_SCARLET_RED_DEF
-{
- Text = "Tango: Scarlet Red" ;
-};
-
-String RID_SVXSTR_COLOR_TANGO_ALUMINIUM_DEF
-{
- Text = "Tango: Aluminium" ;
-};
-
-String RID_SVXSTR_GALLERYPROPS_GALTHEME
-{
- Text [ en-US ] = "Gallery Theme" ;
-};
-
-String RID_SVXSTR_GALLERY_THEMEITEMS
-{
- Text [ en-US ] = "Theme Items";
-};
-
-String RID_SVXSTR_GALLERY_PREVIEW
-{
- Text [ en-US ] = "Preview";
-};
-
-String RID_SVXSTR_SUCCESSRECOV
-{
- Text[ en-US ] = "Successfully recovered";
-};
-
-String RID_SVXSTR_ORIGDOCRECOV
-{
- Text[ en-US ] = "Original document recovered";
-};
-
-String RID_SVXSTR_RECOVFAILED
-{
- Text[ en-US ] = "Recovery failed";
-};
-
-String RID_SVXSTR_RECOVINPROGR
-{
- Text[ en-US ] = "Recovery in progress";
-};
-
-String RID_SVXSTR_NOTRECOVYET
-{
- Text[ en-US ] = "Not recovered yet";
-};
-
-String RID_SVXSTR_RECOVERY_INPROGRESS
-{
- Text[ en-US ] = "%PRODUCTNAME %PRODUCTVERSION has begun recovering your documents. Depending on the size of the documents this process can take some time." ;
-};
-
-String RID_SVXSTR_RECOVERYONLY_FINISH_DESCR
-{
- Text[ en-US ] = "Recovery of your documents was finished. Click 'Finish' to see your documents.";
-};
-
-String RID_SVXSTR_RECOVERYONLY_FINISH
-{
- Text[ en-US ] = "~Finish";
-};
-
-String RID_SVXSTR_WIDTH_LAST_CUSTOM
-{
- Text[ en-US ] = "Last Custom Value";
-};
-
-String RID_SVXSTR_PT
-{
- Text[ en-US ] = "pt";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/spacing.src b/svx/source/dialog/spacing.src
deleted file mode 100644
index f7e10ee69c99..000000000000
--- a/svx/source/dialog/spacing.src
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <svx/dialogs.hrc>
-
-StringArray RID_SVXSTRARY_SPACING
-{
- ItemList [ en-US ] =
- {
- < "None" ; 0; > ;
- < "Extra Small (1/16\")"; 91; > ;
- < "Small (1/8\")"; 181; > ;
- < "Small Medium (1/4\")"; 363; > ;
- < "Medium (3/8\")"; 539; > ;
- < "Medium Large (1/2\")"; 720; > ;
- < "Large (3/4\")"; 1077; > ;
- < "Extra Large (1\")"; 1440; > ;
- };
-}; \ No newline at end of file
diff --git a/svx/source/dialog/spacinglistbox.cxx b/svx/source/dialog/spacinglistbox.cxx
index 14b8a05ad975..ff50306f7942 100644
--- a/svx/source/dialog/spacinglistbox.cxx
+++ b/svx/source/dialog/spacinglistbox.cxx
@@ -16,22 +16,19 @@
* 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>
+#include <svx/strings.hrc>
#include <svx/dialmgr.hxx>
#include <svx/spacinglistbox.hxx>
-#include <tools/resary.hxx>
#include <vcl/builderfactory.hxx>
+#include "spacing.hrc"
SpacingListBox::SpacingListBox(vcl::Window* pParent)
: ListBox( pParent, WB_BORDER | WB_DROPDOWN)
{
- ResStringArray aSpacingAry( ResId(RID_SVXSTRARY_SPACING, DIALOG_MGR()) );
- sal_uInt32 nCnt = aSpacingAry.Count();
-
- for ( sal_uInt32 i = 0; i < nCnt; ++i )
+ for (size_t i = 0; i < SAL_N_ELEMENTS(RID_SVXSTRARY_SPACING); ++i)
{
- OUString aStr = aSpacingAry.GetString(i);
- sal_uInt16 nData = aSpacingAry.GetValue(i);
+ OUString aStr = SvxResId(RID_SVXSTRARY_SPACING[i].first);
+ sal_uInt16 nData = RID_SVXSTRARY_SPACING[i].second;
sal_Int32 nPos = InsertEntry( aStr );
SetEntryData( nPos, reinterpret_cast<void*>((sal_uLong)nData) );
}
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 8eb35e60fa15..fab2f3f9d459 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -52,8 +52,10 @@
#include <toolkit/helper/vclunohelper.hxx>
#include "svx/srchdlg.hxx"
+#include "svx/strarray.hxx"
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
#include <svx/svxitems.hrc>
#include <svl/srchitem.hxx>
@@ -2118,7 +2120,6 @@ IMPL_LINK( SvxSearchDialog, TimeoutHdl_Impl, Timer *, pTimer, void )
pTimer->Start();
}
-
OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr,
bool bSrchFlag ) const
{
@@ -2155,8 +2156,6 @@ OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr,
default: ;//prevent warning
}
- ResStringArray aAttrNames(ResId(RID_ATTR_NAMES, DIALOG_MGR()));
-
for ( sal_uInt16 i = 0; i < pList->Count(); ++i )
{
const SearchAttrItem& rItem = pList->GetObject(i);
@@ -2178,9 +2177,9 @@ OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr,
}
else
{
- sal_uInt32 nId = aAttrNames.FindIndex( rItem.nSlot );
+ sal_uInt32 nId = SvxAttrNameTable::FindIndex(rItem.nSlot);
if ( RESARRAY_INDEX_NOTFOUND != nId )
- rStr += aAttrNames.GetString( nId );
+ rStr += SvxAttrNameTable::GetString(nId);
}
}
return rStr;
diff --git a/svx/source/dialog/srchdlg.src b/svx/source/dialog/srchdlg.src
deleted file mode 100644
index ec1ca974e906..000000000000
--- a/svx/source/dialog/srchdlg.src
+++ /dev/null
@@ -1,61 +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 ---------------------------------------------------------------
-
-String RID_SVXSTR_SEARCH_STYLES
-{
- Text [ en-US ] = "Including Styles" ;
-};
-String RID_SVXSTR_WRITER_STYLES
-{
- Text [ en-US ] = "Paragraph St~yles" ;
-};
-String RID_SVXSTR_CALC_STYLES
-{
- Text [ en-US ] = "Cell St~yles" ;
-};
-String RID_SVXSTR_SEARCH
-{
- Text [ en-US ] = "(Search)" ;
-};
-String RID_SVXSTR_REPLACE
-{
- Text [ en-US ] = "(Replace)" ;
-};
-String RID_SVXSTR_SEARCH_END
-{
- Text [ en-US ] = "Reached the end of the document" ;
-};
-String RID_SVXSTR_SEARCH_END_SHEET
-{
- Text [ en-US ] = "Reached the end of the sheet" ;
-};
-String RID_SVXSTR_SEARCH_NOT_FOUND
-{
- Text [ en-US ] = "Search key not found" ;
-};
-String RID_SVXSTR_SEARCH_START
-{
- Text [ en-US ] = "Reached the beginning of the document" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/strarray.cxx b/svx/source/dialog/strarray.cxx
index a30be0454610..3e3a92b28270 100644
--- a/svx/source/dialog/strarray.cxx
+++ b/svx/source/dialog/strarray.cxx
@@ -17,31 +17,101 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <svx/dialmgr.hxx>
#include <svx/strarray.hxx>
+#include <tools/resary.hxx>
+#include <svx/svxitems.hrc>
+#include "fieldunit.hrc"
+#include "numberingtype.hrc"
-SvxStringArray::SvxStringArray( sal_uInt32 nResId ) :
- ResStringArray(ResId(nResId, DIALOG_MGR()))
+SvxStringArray::SvxStringArray(const char **pResId, size_t nLength)
+{
+ for (size_t i = 0; i < nLength; ++i)
+ m_aTranslations.push_back(SvxResId(pResId[i]));
+}
+
+const OUString SvxStringArray::GetString(sal_uInt32 nPos) const
+{
+ return m_aTranslations[nPos];
+}
+
+sal_uInt32 SvxFieldUnitTable::Count()
+{
+ return SAL_N_ELEMENTS(RID_SVXSTR_FIELDUNIT_TABLE);
+}
+
+OUString SvxFieldUnitTable::GetString(sal_uInt32 nPos)
+{
+ if (RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count())
+ return SvxResId(RID_SVXSTR_FIELDUNIT_TABLE[nPos].first);
+ return OUString();
+}
+
+FieldUnit SvxFieldUnitTable::GetValue(sal_uInt32 nPos)
+{
+ if (RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count())
+ return RID_SVXSTR_FIELDUNIT_TABLE[nPos].second;
+ return FUNIT_NONE;
+}
+OUString SvxAttrNameTable::GetString(sal_uInt32 nPos)
{
+ if (RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count())
+ return SvxResId(RID_ATTR_NAMES[nPos].first);
+ return OUString();
}
-SvxStringArray::SvxStringArray( const ResId& rResId ) :
- ResStringArray( rResId )
+sal_uInt32 SvxAttrNameTable::Count()
{
+ return SAL_N_ELEMENTS(RID_ATTR_NAMES);
}
+sal_uInt16 SvxAttrNameTable::GetValue(sal_uInt32 nPos)
+{
+ if (RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count())
+ return RID_ATTR_NAMES[nPos].second;
+ return 0;
+}
-SvxStringArray::~SvxStringArray()
+sal_uInt32 SvxAttrNameTable::FindIndex(int nValue)
{
+ for (size_t i = 0; i < SAL_N_ELEMENTS(RID_ATTR_NAMES); ++i)
+ {
+ if (nValue == RID_ATTR_NAMES[i].second)
+ return i;
+ }
+ return RESARRAY_INDEX_NOTFOUND;
}
-const OUString SvxStringArray::GetStringByPos( sal_uInt32 nPos ) const
+OUString SvxNumberingTypeTable::GetString(sal_uInt32 nPos)
{
- if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() )
- return ResStringArray::GetString( nPos );
+ if (RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count())
+ return SvxResId(RID_SVXSTRARY_NUMBERINGTYPE[nPos].first);
return OUString();
}
+sal_uInt32 SvxNumberingTypeTable::Count()
+{
+ return SAL_N_ELEMENTS(RID_SVXSTRARY_NUMBERINGTYPE);
+}
+
+int SvxNumberingTypeTable::GetValue(sal_uInt32 nPos)
+{
+ if (RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count())
+ return RID_SVXSTRARY_NUMBERINGTYPE[nPos].second;
+ return 0;
+}
+
+sal_uInt32 SvxNumberingTypeTable::FindIndex(int nValue)
+{
+ for (size_t i = 0; i < SAL_N_ELEMENTS(RID_SVXSTRARY_NUMBERINGTYPE); ++i)
+ {
+ if (nValue == RID_SVXSTRARY_NUMBERINGTYPE[i].second)
+ return i;
+ }
+ return RESARRAY_INDEX_NOTFOUND;
+}
+
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 7a5230b845f3..1f166ec87a3d 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -18,7 +18,7 @@
*/
#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <i18nlangtag/mslangid.hxx>
#include <svtools/valueset.hxx>
#include <svl/languageoptions.hxx>
@@ -385,6 +385,42 @@ SvxNumValueSet::SvxNumValueSet(vcl::Window* pParent, WinBits nWinBits)
VCL_BUILDER_FACTORY_ARGS(SvxNumValueSet, WB_TABSTOP)
+static const char* RID_SVXSTR_BULLET_DESCRIPTIONS[] =
+{
+ RID_SVXSTR_BULLET_DESCRIPTION_0,
+ RID_SVXSTR_BULLET_DESCRIPTION_1,
+ RID_SVXSTR_BULLET_DESCRIPTION_2,
+ RID_SVXSTR_BULLET_DESCRIPTION_3,
+ RID_SVXSTR_BULLET_DESCRIPTION_4,
+ RID_SVXSTR_BULLET_DESCRIPTION_5,
+ RID_SVXSTR_BULLET_DESCRIPTION_6,
+ RID_SVXSTR_BULLET_DESCRIPTION_7
+};
+
+static const char* RID_SVXSTR_SINGLENUM_DESCRIPTIONS[] =
+{
+ RID_SVXSTR_SINGLENUM_DESCRIPTION_0,
+ RID_SVXSTR_SINGLENUM_DESCRIPTION_1,
+ RID_SVXSTR_SINGLENUM_DESCRIPTION_2,
+ RID_SVXSTR_SINGLENUM_DESCRIPTION_3,
+ RID_SVXSTR_SINGLENUM_DESCRIPTION_4,
+ RID_SVXSTR_SINGLENUM_DESCRIPTION_5,
+ RID_SVXSTR_SINGLENUM_DESCRIPTION_6,
+ RID_SVXSTR_SINGLENUM_DESCRIPTION_7
+};
+
+static const char* RID_SVXSTR_OUTLINENUM_DESCRIPTIONS[] =
+{
+ RID_SVXSTR_OUTLINENUM_DESCRIPTION_0,
+ RID_SVXSTR_OUTLINENUM_DESCRIPTION_1,
+ RID_SVXSTR_OUTLINENUM_DESCRIPTION_2,
+ RID_SVXSTR_OUTLINENUM_DESCRIPTION_3,
+ RID_SVXSTR_OUTLINENUM_DESCRIPTION_4,
+ RID_SVXSTR_OUTLINENUM_DESCRIPTION_5,
+ RID_SVXSTR_OUTLINENUM_DESCRIPTION_6,
+ RID_SVXSTR_OUTLINENUM_DESCRIPTION_7
+};
+
void SvxNumValueSet::init(NumberingPageType eType)
{
ePageType = eType;
@@ -398,7 +434,7 @@ void SvxNumValueSet::init(NumberingPageType eType)
for ( sal_uInt16 i = 0; i < 8; i++ )
{
InsertItem( i + 1, i );
- SetItemText( i + 1, SvxResId( RID_SVXSTR_BULLET_DESCRIPTIONS + i ) );
+ SetItemText(i + 1, SvxResId(RID_SVXSTR_BULLET_DESCRIPTIONS[i]));
}
}
}
@@ -428,7 +464,7 @@ void SvxNumValueSet::SetNumberingSettings(
{
InsertItem( i + 1, i );
if( i < 8 )
- SetItemText( i + 1, SvxResId( RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i ));
+ SetItemText(i + 1, SvxResId(RID_SVXSTR_SINGLENUM_DESCRIPTIONS[i]));
}
}
@@ -446,7 +482,7 @@ void SvxNumValueSet::SetOutlineNumberingSettings(
{
InsertItem( i + 1, i );
if( i < 8 )
- SetItemText( i + 1, SvxResId( RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + i ));
+ SetItemText(i + 1, SvxResId(RID_SVXSTR_OUTLINENUM_DESCRIPTIONS[i]));
}
}
diff --git a/svx/source/dialog/svxbmpnumvalueset.src b/svx/source/dialog/svxbmpnumvalueset.src
deleted file mode 100644
index 93fb4f7b8335..000000000000
--- a/svx/source/dialog/svxbmpnumvalueset.src
+++ /dev/null
@@ -1,121 +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>
-
-String RID_SVXSTR_BULLET_DESCRIPTION_0
-{
- Text [en-US] = "Solid small circular bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_1
-{
- Text [en-US] = "Solid large circular bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_2
-{
- Text [en-US] = "Solid diamond bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_3
-{
- Text [en-US] = "Solid large square bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_4
-{
- Text [en-US] = "Right pointing arrow bullets filled out";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_5
-{
- Text [en-US] = "Right pointing arrow bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_6
-{
- Text [en-US] = "Check mark bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_7
-{
- Text [en-US] = "Tick mark bullets";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_0
-{
- Text [en-US] = "Number 1) 2) 3)";
- //Text [en-US] = "Number %NUMBERINGSAMPLE";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_1
-{
- Text [en-US] = "Number 1. 2. 3.";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_2
-{
- Text [en-US] = "Number (1) (2) (3)";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_3
-{
- Text [en-US] = "Uppercase Roman number I. II. III.";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_4
-{
- Text [en-US] = "Uppercase letter A) B) C)";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_5
-{
- Text [en-US] = "Lowercase letter a) b) c)";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_6
-{
- Text [en-US] = "Lowercase letter (a) (b) (c)";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_7
-{
- Text [en-US] = "Lowercase Roman number i. ii. iii.";
-};
-
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_0
-{
- Text [en-US] = "Numeric, numeric, lowercase letters, solid small circular bullet";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_1
-{
- Text [en-US] = "Numeric, lowercase letters, solid small circular bullet";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_2
-{
- Text [en-US] = "Numeric, lowercase letters, lowercase Roman, uppercase letters, solid small circular bullet";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_3
-{
- Text [en-US] = "Numeric";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_4
-{
- Text [en-US] = "Uppercase Roman, uppercase letters, lowercase Roman, lowercase letters, solid small circular bullet";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_5
-{
- Text [en-US] = "Uppercase letters, uppercase Roman, lowercase letters, lowercase Roman, solid small circular bullet";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_6
-{
- Text [en-US] = "Numeric with all sublevels";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_7
-{
- Text [en-US] = "Right pointing bullet, right pointing arrow bullet, solid diamond bullet, solid small circular bullet";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 5beb625cb0a4..307c31b51863 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -28,10 +28,12 @@
#include <svl/rectitem.hxx>
#include <svl/hint.hxx>
#include <sfx2/dispatch.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
#include <svx/dialmgr.hxx>
#include <svx/ruler.hxx>
#include <svx/rulritem.hxx>
+#include <editeng/editids.hrc>
#include <editeng/tstpitem.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/protitem.hxx>
@@ -3367,6 +3369,14 @@ IMPL_LINK( SvxRuler, TabMenuSelect, Menu *, pMenu, bool )
return false;
}
+static const char* RID_SVXSTR_RULER_TAB[] =
+{
+ RID_SVXSTR_RULER_TAB_LEFT,
+ RID_SVXSTR_RULER_TAB_RIGHT,
+ RID_SVXSTR_RULER_TAB_CENTER,
+ RID_SVXSTR_RULER_TAB_DECIMAL
+};
+
void SvxRuler::Command( const CommandEvent& rCommandEvent )
{
/* Mouse context menu for switching the unit of measurement */
@@ -3394,7 +3404,7 @@ void SvxRuler::Command( const CommandEvent& rCommandEvent )
nStyle |= static_cast<sal_uInt16>(bHorz ? WB_HORZ : WB_VERT);
DrawTab(*pDev, aFillColor, aPt, nStyle);
aMenu->InsertItem(i + 1,
- SvxResId(RID_SVXSTR_RULER_START + i),
+ SvxResId(RID_SVXSTR_RULER_TAB[i]),
Image(BitmapEx(pDev->GetBitmap(Point(), aSz), Color(COL_WHITE))));
aMenu->CheckItem(i + 1, i == mpTabs[mxRulerImpl->nIdx + TAB_GAP].nStyle);
pDev->SetOutputSize(aSz); // delete device
diff --git a/svx/source/dialog/swframeposstrings.cxx b/svx/source/dialog/swframeposstrings.cxx
index 5deb147a62f5..6dd9ae33d05b 100644
--- a/svx/source/dialog/swframeposstrings.cxx
+++ b/svx/source/dialog/swframeposstrings.cxx
@@ -21,24 +21,16 @@
#include <tools/resary.hxx>
#include <tools/debug.hxx>
#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include "swframeposstrings.hrc"
-SvxSwFramePosString::SvxSwFramePosString() :
- pImpl(new ResStringArray(ResId(RID_SVXSW_FRAMEPOSITIONS, DIALOG_MGR())))
-{
- assert(pImpl->Count() == SvxSwFramePosString::STR_MAX);
-}
-
-SvxSwFramePosString::~SvxSwFramePosString()
-{
-}
-
-OUString SvxSwFramePosString::GetString(StringId eId) const
+OUString SvxSwFramePosString::GetString(StringId eId)
{
+ assert(SAL_N_ELEMENTS(RID_SVXSW_FRAMEPOSITIONS) == SvxSwFramePosString::STR_MAX);
DBG_ASSERT(eId >= 0 && eId < STR_MAX, "invalid StringId");
if(!(eId >= 0 && eId < STR_MAX))
eId = LEFT;
- return pImpl->GetString(eId);
+ return SvxResId(RID_SVXSW_FRAMEPOSITIONS[eId]);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/swframeposstrings.src b/svx/source/dialog/swframeposstrings.src
deleted file mode 100644
index e8c1c07b5af1..000000000000
--- a/svx/source/dialog/swframeposstrings.src
+++ /dev/null
@@ -1,71 +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>
-
-//the following string have to match the (enum values) positions in svx/swframeposstrings.hxx!
-StringArray RID_SVXSW_FRAMEPOSITIONS
-{
- ItemList [ en-US ] =
- {
- < "Left" ; > ;
- < "Right" ; > ;
- < "From left" ; > ;
- < "Inside" ; > ;
- < "Outside" ; > ;
- < "From inside" ; > ;
- < "Paragraph area" ; > ;
- < "Paragraph text area" ; > ;
- < "Left page border" ; > ;
- < "Right page border" ; > ;
- < "Left paragraph border" ; > ;
- < "Right paragraph border" ; > ;
- < "Inner page border" ; > ;
- < "Outer page border" ; > ;
- < "Inner paragraph border" ; > ;
- < "Outer paragraph border" ; > ;
- < "Entire page" ; > ;
- < "Page text area" ; > ;
- < "Base line" ; > ;
- < "Character" ; > ;
- < "Row" ; > ;
- < "Margin" ; > ;
- < "Paragraph text area" ; > ;
- < "Left frame border" ; > ;
- < "Right frame border" ; > ;
- < "Entire frame" ; > ;
- < "Frame text area" ; > ;
- < "Inner frame border" ; > ;
- < "Outer frame border" ; > ;
- < "Top" ; > ;
- < "Bottom" ; > ;
- < "Center" ; > ;
- < "Center" ; > ;
- < "From top" ; > ;
- < "From bottom" ; > ;
- < "Below" ; > ;
- < "From right" ; > ;
- < "Top page border" ; > ;
- < "Bottom page border" ; > ;
- < "Top paragraph border" ; > ;
- < "Bottom paragraph border" ; > ;
- < "Line of text" ; > ;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 7434c5e1e3e3..f476ae3bd52a 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -20,8 +20,9 @@
#include <config_features.h>
#include "svx/txencbox.hxx"
+#include <svx/dialmgr.hxx>
#include "svx/txenctab.hxx"
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#if HAVE_FEATURE_DBCONNECTIVITY
#include "svx/dbcharsethelper.hxx"
#endif
@@ -32,11 +33,11 @@
#include <rtl/locale.h>
#include <rtl/strbuf.hxx>
#include <osl/nlsupport.h>
+#include "txenctab.hrc"
SvxTextEncodingBox::SvxTextEncodingBox( vcl::Window* pParent, WinBits nBits )
: ListBox( pParent, nBits )
{
- m_pEncTable = new SvxTextEncodingTable;
}
extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL makeSvxTextEncodingBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
@@ -59,12 +60,6 @@ SvxTextEncodingBox::~SvxTextEncodingBox()
disposeOnce();
}
-void SvxTextEncodingBox::dispose()
-{
- delete m_pEncTable;
- ListBox::dispose();
-}
-
sal_Int32 SvxTextEncodingBox::EncodingToPos_Impl( rtl_TextEncoding nEnc ) const
{
sal_Int32 nCount = GetEntryCount();
@@ -83,11 +78,11 @@ void SvxTextEncodingBox::FillFromTextEncodingTable(
{
rtl_TextEncodingInfo aInfo;
aInfo.StructSize = sizeof(rtl_TextEncodingInfo);
- sal_uInt32 nCount = m_pEncTable->Count();
- for ( sal_uInt32 j=0; j<nCount; j++ )
+ const sal_uInt32 nCount = SAL_N_ELEMENTS(RID_SVXSTR_TEXTENCODING_TABLE);
+ for (sal_uInt32 j = 0; j < nCount; ++j)
{
bool bInsert = true;
- rtl_TextEncoding nEnc = rtl_TextEncoding( m_pEncTable->GetValue( j ) );
+ rtl_TextEncoding nEnc = RID_SVXSTR_TEXTENCODING_TABLE[j].second;
if ( nExcludeInfoFlags )
{
if ( !rtl_getTextEncodingInfo( nEnc, &aInfo ) )
@@ -120,7 +115,7 @@ void SvxTextEncodingBox::FillFromTextEncodingTable(
}
}
if ( bInsert )
- InsertTextEncoding( nEnc, m_pEncTable->GetString( j ) );
+ InsertTextEncoding(nEnc, SvxResId(RID_SVXSTR_TEXTENCODING_TABLE[j].first));
}
}
}
@@ -201,7 +196,7 @@ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc,
void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc )
{
- const OUString& rEntry = m_pEncTable->GetTextString( nEnc );
+ const OUString& rEntry = SvxTextEncodingTable::GetTextString(nEnc);
if ( !rEntry.isEmpty() )
InsertTextEncoding( nEnc, rEntry );
else
diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx
index e60e497c455a..4a17c73fc28a 100644
--- a/svx/source/dialog/txenctab.cxx
+++ b/svx/source/dialog/txenctab.cxx
@@ -18,38 +18,32 @@
*/
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <svx/dialmgr.hxx>
#include "svx/txenctab.hxx"
+#include "txenctab.hrc"
-SvxTextEncodingTable::SvxTextEncodingTable()
- : ResStringArray(ResId(RID_SVXSTR_TEXTENCODING_TABLE, DIALOG_MGR()))
+const OUString SvxTextEncodingTable::GetTextString(const rtl_TextEncoding nEnc)
{
-}
+ const size_t nCount = SAL_N_ELEMENTS(RID_SVXSTR_TEXTENCODING_TABLE);
-SvxTextEncodingTable::~SvxTextEncodingTable()
-{
-}
-
-const OUString SvxTextEncodingTable::GetTextString( const rtl_TextEncoding nEnc ) const
-{
- sal_uInt32 nPos = FindIndex( (long)nEnc );
-
- if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() )
- return ResStringArray::GetString( nPos );
+ for (size_t i = 0; i < nCount; ++i)
+ {
+ if (RID_SVXSTR_TEXTENCODING_TABLE[i].second == nEnc)
+ return SvxResId(RID_SVXSTR_TEXTENCODING_TABLE[i].first);
+ }
return OUString();
}
-
-rtl_TextEncoding SvxTextEncodingTable::GetTextEncoding( const OUString& rStr ) const
+rtl_TextEncoding SvxTextEncodingTable::GetTextEncoding(const OUString& rStr)
{
- sal_uInt32 nCount = Count();
+ const size_t nCount = SAL_N_ELEMENTS(RID_SVXSTR_TEXTENCODING_TABLE);
- for ( sal_uInt32 i = 0; i < nCount; ++i )
+ for (size_t i = 0; i < nCount; ++i)
{
- if (ResStringArray::GetString( i ) == rStr)
- return rtl_TextEncoding( GetValue( i ) );
+ if (SvxResId(RID_SVXSTR_TEXTENCODING_TABLE[i].first).equals(rStr))
+ return RID_SVXSTR_TEXTENCODING_TABLE[i].second;
}
return RTL_TEXTENCODING_DONTKNOW;
}
diff --git a/svx/source/dialog/txenctab.src b/svx/source/dialog/txenctab.src
deleted file mode 100644
index c3cefd8eaf5a..000000000000
--- a/svx/source/dialog/txenctab.src
+++ /dev/null
@@ -1,110 +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>
-#include <rtl/textenc.h>
-
-// Encodings for which no conversion exist yet are commented out.
-
-StringArray RID_SVXSTR_TEXTENCODING_TABLE
-{
- ItemList [ en-US ] =
- {
- < "Western Europe (Windows-1252/WinLatin 1)" ; RTL_TEXTENCODING_MS_1252 ; > ;
- < "Western Europe (Apple Macintosh)" ; RTL_TEXTENCODING_APPLE_ROMAN ; > ;
- < "Western Europe (DOS/OS2-850/International)" ; RTL_TEXTENCODING_IBM_850 ; > ;
- < "Western Europe (DOS/OS2-437/US)" ; RTL_TEXTENCODING_IBM_437 ; > ;
- < "Western Europe (DOS/OS2-860/Portuguese)" ; RTL_TEXTENCODING_IBM_860 ; > ;
- < "Western Europe (DOS/OS2-861/Icelandic)" ; RTL_TEXTENCODING_IBM_861 ; > ;
- < "Western Europe (DOS/OS2-863/French (Can.))" ; RTL_TEXTENCODING_IBM_863 ; > ;
- < "Western Europe (DOS/OS2-865/Nordic)" ; RTL_TEXTENCODING_IBM_865 ; > ;
- < "Western Europe (ASCII/US)" ; RTL_TEXTENCODING_ASCII_US ; > ;
- < "Western Europe (ISO-8859-1)" ; RTL_TEXTENCODING_ISO_8859_1 ; > ;
- < "Eastern Europe (ISO-8859-2)" ; RTL_TEXTENCODING_ISO_8859_2 ; > ;
- < "Latin 3 (ISO-8859-3)" ; RTL_TEXTENCODING_ISO_8859_3 ; > ;
- < "Baltic (ISO-8859-4)" ; RTL_TEXTENCODING_ISO_8859_4 ; > ;
- < "Cyrillic (ISO-8859-5)" ; RTL_TEXTENCODING_ISO_8859_5 ; > ;
- < "Arabic (ISO-8859-6)" ; RTL_TEXTENCODING_ISO_8859_6 ; > ;
- < "Greek (ISO-8859-7)" ; RTL_TEXTENCODING_ISO_8859_7 ; > ;
- < "Hebrew (ISO-8859-8)" ; RTL_TEXTENCODING_ISO_8859_8 ; > ;
- < "Turkish (ISO-8859-9)" ; RTL_TEXTENCODING_ISO_8859_9 ; > ;
- < "Western Europe (ISO-8859-14)" ; RTL_TEXTENCODING_ISO_8859_14 ; > ;
- < "Western Europe (ISO-8859-15/EURO)" ; RTL_TEXTENCODING_ISO_8859_15 ; > ;
- < "Greek (DOS/OS2-737)" ; RTL_TEXTENCODING_IBM_737 ; > ;
- < "Baltic (DOS/OS2-775)" ; RTL_TEXTENCODING_IBM_775 ; > ;
- < "Eastern Europe (DOS/OS2-852)" ; RTL_TEXTENCODING_IBM_852 ; > ;
- < "Cyrillic (DOS/OS2-855)" ; RTL_TEXTENCODING_IBM_855 ; > ;
- < "Turkish (DOS/OS2-857)" ; RTL_TEXTENCODING_IBM_857 ; > ;
- < "Hebrew (DOS/OS2-862)" ; RTL_TEXTENCODING_IBM_862 ; > ;
- < "Arabic (DOS/OS2-864)" ; RTL_TEXTENCODING_IBM_864 ; > ;
- < "Cyrillic (DOS/OS2-866/Russian)" ; RTL_TEXTENCODING_IBM_866 ; > ;
- < "Greek (DOS/OS2-869/Modern)" ; RTL_TEXTENCODING_IBM_869 ; > ;
- < "Eastern Europe (Windows-1250/WinLatin 2)" ; RTL_TEXTENCODING_MS_1250 ; > ;
- < "Cyrillic (Windows-1251)" ; RTL_TEXTENCODING_MS_1251 ; > ;
- < "Greek (Windows-1253)" ; RTL_TEXTENCODING_MS_1253 ; > ;
- < "Turkish (Windows-1254)" ; RTL_TEXTENCODING_MS_1254 ; > ;
- < "Hebrew (Windows-1255)" ; RTL_TEXTENCODING_MS_1255 ; > ;
- < "Arabic (Windows-1256)" ; RTL_TEXTENCODING_MS_1256 ; > ;
- < "Baltic (Windows-1257)" ; RTL_TEXTENCODING_MS_1257 ; > ;
- < "Vietnamese (Windows-1258)" ; RTL_TEXTENCODING_MS_1258 ; > ;
- < "Eastern Europe (Apple Macintosh)" ; RTL_TEXTENCODING_APPLE_CENTEURO ; > ;
- < "Eastern Europe (Apple Macintosh/Croatian)" ; RTL_TEXTENCODING_APPLE_CROATIAN ; > ;
- < "Cyrillic (Apple Macintosh)" ; RTL_TEXTENCODING_APPLE_CYRILLIC ; > ;
- < "Greek (Apple Macintosh)" ; RTL_TEXTENCODING_APPLE_GREEK ; > ;
- < "Western Europe (Apple Macintosh/Icelandic)" ; RTL_TEXTENCODING_APPLE_ICELAND ; > ;
- < "Eastern Europe (Apple Macintosh/Romanian)" ; RTL_TEXTENCODING_APPLE_ROMANIAN ; > ;
- < "Turkish (Apple Macintosh)" ; RTL_TEXTENCODING_APPLE_TURKISH ; > ;
- < "Cyrillic (Apple Macintosh/Ukrainian)" ; RTL_TEXTENCODING_APPLE_UKRAINIAN ; > ;
- < "Chinese simplified (Apple Macintosh)" ; RTL_TEXTENCODING_APPLE_CHINSIMP ; > ;
- < "Chinese traditional (Apple Macintosh)" ; RTL_TEXTENCODING_APPLE_CHINTRAD ; > ;
- < "Japanese (Apple Macintosh)" ; RTL_TEXTENCODING_APPLE_JAPANESE ; > ;
- < "Korean (Apple Macintosh)" ; RTL_TEXTENCODING_APPLE_KOREAN ; > ;
- < "Japanese (Windows-932)" ; RTL_TEXTENCODING_MS_932 ; > ;
- < "Chinese simplified (Windows-936)" ; RTL_TEXTENCODING_MS_936 ; > ;
- < "Korean (Windows-949)" ; RTL_TEXTENCODING_MS_949 ; > ;
- < "Chinese traditional (Windows-950)" ; RTL_TEXTENCODING_MS_950 ; > ;
- < "Japanese (Shift-JIS)" ; RTL_TEXTENCODING_SHIFT_JIS ; > ;
- < "Chinese simplified (GB-2312)" ; RTL_TEXTENCODING_GB_2312 ; > ;
- < "Chinese simplified (GB-18030)" ; RTL_TEXTENCODING_GB_18030 ; > ;
- < "Chinese traditional (GBT-12345)" ; RTL_TEXTENCODING_GBT_12345 ; > ;
- < "Chinese simplified (GBK/GB-2312-80)" ; RTL_TEXTENCODING_GBK ; > ;
- < "Chinese traditional (Big5)" ; RTL_TEXTENCODING_BIG5 ; > ;
- < "Chinese traditional (BIG5-HKSCS)" ; RTL_TEXTENCODING_BIG5_HKSCS ; > ;
- < "Japanese (EUC-JP)" ; RTL_TEXTENCODING_EUC_JP ; > ;
- < "Chinese simplified (EUC-CN)" ; RTL_TEXTENCODING_EUC_CN ; > ;
- < "Chinese traditional (EUC-TW)" ; RTL_TEXTENCODING_EUC_TW ; > ;
- < "Japanese (ISO-2022-JP)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ;
- < "Chinese simplified (ISO-2022-CN)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ;
- < "Cyrillic (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ;
- < "Unicode (UTF-7)" ; RTL_TEXTENCODING_UTF7 ; > ;
- < "Unicode (UTF-8)" ; RTL_TEXTENCODING_UTF8 ; > ;
- < "Eastern Europe (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_8859_10 ; > ;
- < "Eastern Europe (ISO-8859-13)" ; RTL_TEXTENCODING_ISO_8859_13 ; > ;
- < "Korean (EUC-KR)" ; RTL_TEXTENCODING_EUC_KR ; > ;
- < "Korean (ISO-2022-KR)" ; RTL_TEXTENCODING_ISO_2022_KR ; > ;
- < "Korean (Windows-Johab-1361)" ; RTL_TEXTENCODING_MS_1361 ; > ;
- < "Unicode (UTF-16)" ; RTL_TEXTENCODING_UCS2 ; > ;
- < "Thai (ISO-8859-11/TIS-620)" ; RTL_TEXTENCODING_TIS_620 ; > ;
- < "Thai (Windows-874)" ; RTL_TEXTENCODING_MS_874 ; > ;
- < "Cyrillic (KOI8-U)" ; RTL_TEXTENCODING_KOI8_U ; > ;
- < "Cyrillic (PT154)" ; RTL_TEXTENCODING_PT154 ; > ;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/ucsubset.src b/svx/source/dialog/ucsubset.src
deleted file mode 100644
index 9234b6a26463..000000000000
--- a/svx/source/dialog/ucsubset.src
+++ /dev/null
@@ -1,308 +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/ucsubset.hrc>
-
-/*
- * strings for unicode range descriptions (used e.g. by charmap)
- * (see the Unicode Standard & TrueType::OS2.ulUnicodeRange description)
- */
-
-StringArray RID_SUBSETMAP
-{
- ItemList [ en-US ] =
- {
- < "Basic Latin"; RID_SUBSETSTR_BASIC_LATIN ; > ;
- < "Latin-1"; RID_SUBSETSTR_LATIN_1 ; > ;
- < "Latin Extended-A"; RID_SUBSETSTR_LATIN_EXTENDED_A ; > ;
- < "Latin Extended-B"; RID_SUBSETSTR_LATIN_EXTENDED_B ; > ;
- < "IPA Extensions"; RID_SUBSETSTR_IPA_EXTENSIONS ; > ;
- < "Spacing Modifier Letters"; RID_SUBSETSTR_SPACING_MODIFIERS ; > ;
- < "Combining Diacritical Marks"; RID_SUBSETSTR_COMB_DIACRITICAL ; > ;
- < "Basic Greek"; RID_SUBSETSTR_BASIC_GREEK ; > ;
- < "Greek Symbols And Coptic"; RID_SUBSETSTR_GREEK_SYMS_COPTIC ; > ;
- < "Cyrillic"; RID_SUBSETSTR_CYRILLIC ; > ;
- < "Armenian"; RID_SUBSETSTR_ARMENIAN ; > ;
- < "Basic Hebrew"; RID_SUBSETSTR_BASIC_HEBREW ; > ;
- < "Hebrew Extended"; RID_SUBSETSTR_HEBREW_EXTENDED ; > ;
- < "Basic Arabic"; RID_SUBSETSTR_BASIC_ARABIC ; > ;
- < "Arabic Extended"; RID_SUBSETSTR_ARABIC_EXTENDED ; > ;
- < "Devanagari"; RID_SUBSETSTR_DEVANAGARI ; > ;
- < "Bengali"; RID_SUBSETSTR_BENGALI ; > ;
- < "Gurmukhi"; RID_SUBSETSTR_GURMUKHI ; > ;
- < "Gujarati"; RID_SUBSETSTR_GUJARATI ; > ;
- < "Odia"; RID_SUBSETSTR_ODIA ; > ;
- < "Tamil"; RID_SUBSETSTR_TAMIL ; > ;
- < "Telugu"; RID_SUBSETSTR_TELUGU ; > ;
- < "Kannada"; RID_SUBSETSTR_KANNADA ; > ;
- < "Malayalam"; RID_SUBSETSTR_MALAYALAM ; > ;
- < "Thai"; RID_SUBSETSTR_THAI ; > ;
- < "Lao"; RID_SUBSETSTR_LAO ; > ;
- < "Basic Georgian"; RID_SUBSETSTR_BASIC_GEORGIAN ; > ;
- < "Georgian Extended"; RID_SUBSETSTR_GEORGIAN_EXTENDED ; > ;
- < "Hangul Jamo"; RID_SUBSETSTR_HANGUL_JAMO ; > ;
- < "Latin Extended Additionals"; RID_SUBSETSTR_LATIN_EXTENDED_ADDS ; > ;
- < "Greek Extended"; RID_SUBSETSTR_GREEK_EXTENDED ; > ;
- < "General punctuation"; RID_SUBSETSTR_GENERAL_PUNCTUATION ; > ;
- < "Superscripts and Subscripts"; RID_SUBSETSTR_SUB_SUPER_SCRIPTS ; > ;
- < "Currency Symbols"; RID_SUBSETSTR_CURRENCY_SYMBOLS ; > ;
- < "Combining Diacritical Symbols"; RID_SUBSETSTR_COMB_DIACRITIC_SYMS ; > ;
- < "Letterlike Symbols"; RID_SUBSETSTR_LETTERLIKE_SYMBOLS ; > ;
- < "Number Forms"; RID_SUBSETSTR_NUMBER_FORMS ; > ;
- < "Arrows"; RID_SUBSETSTR_ARROWS ; > ;
- < "Mathematical Operators"; RID_SUBSETSTR_MATH_OPERATORS ; > ;
- < "Miscellaneous Technical"; RID_SUBSETSTR_MISC_TECHNICAL ; > ;
- < "Control Pictures"; RID_SUBSETSTR_CONTROL_PICTURES ; > ;
- < "Optical Character Recognition"; RID_SUBSETSTR_OPTICAL_CHAR_REC ; > ;
- < "Enclosed Alphanumerics"; RID_SUBSETSTR_ENCLOSED_ALPHANUM ; > ;
- < "Box Drawing"; RID_SUBSETSTR_BOX_DRAWING ; > ;
- < "Block Elements"; RID_SUBSETSTR_BLOCK_ELEMENTS ; > ;
- < "Geometric Shapes"; RID_SUBSETSTR_GEOMETRIC_SHAPES ; > ;
- < "Miscellaneous Symbols"; RID_SUBSETSTR_MISC_DINGBATS ; > ;
- < "Dingbats"; RID_SUBSETSTR_DINGBATS ; > ;
- < "CJK Symbols And Punctuation"; RID_SUBSETSTR_CJK_SYMS_PUNCTUATION ; > ;
- < "Hiragana"; RID_SUBSETSTR_HIRAGANA ; > ;
- < "Katakana"; RID_SUBSETSTR_KATAKANA ; > ;
- < "Bopomofo"; RID_SUBSETSTR_BOPOMOFO ; > ;
- < "Hangul Compatibility Jamo"; RID_SUBSETSTR_HANGUL_COMPAT_JAMO ; > ;
- < "CJK Miscellaneous"; RID_SUBSETSTR_CJK_MISC ; > ;
- < "Enclosed CJK Letters And Months"; RID_SUBSETSTR_ENCLOSED_CJK_LETTERS ; > ;
- < "CJK Compatibility"; RID_SUBSETSTR_CJK_COMPATIBILITY ; > ;
- < "Hangul"; RID_SUBSETSTR_HANGUL ; > ;
- < "CJK Unified Ideographs"; RID_SUBSETSTR_CJK_UNIFIED_IDGRAPH ; > ;
- < "CJK Unified Ideographs Extension A"; RID_SUBSETSTR_CJK_EXT_A_UNIFIED_IDGRAPH ; > ;
- < "Private Use Area"; RID_SUBSETSTR_PRIVATE_USE_AREA ; > ;
- < "CJK Compatibility Ideographs"; RID_SUBSETSTR_CJK_COMPAT_IDGRAPHS ; > ;
- < "Alphabetic Presentation Forms"; RID_SUBSETSTR_ALPHA_PRESENTATION ; > ;
- < "Arabic Presentation Forms-A"; RID_SUBSETSTR_ARABIC_PRESENT_A ; > ;
- < "Combining Half Marks"; RID_SUBSETSTR_COMBINING_HALF_MARKS ; > ;
- < "CJK Compatibility Forms"; RID_SUBSETSTR_CJK_COMPAT_FORMS ; > ;
- < "Small Form Variants"; RID_SUBSETSTR_SMALL_FORM_VARIANTS ; > ;
- < "Arabic Presentation Forms-B"; RID_SUBSETSTR_ARABIC_PRESENT_B ; > ;
- < "Half-width and Full-width Forms"; RID_SUBSETSTR_HALFW_FULLW_FORMS ; > ;
- < "Specials"; RID_SUBSETSTR_SPECIALS ; > ;
- < "Yi Syllables"; RID_SUBSETSTR_YI_SYLLABLES ; > ;
- < "Yi Radicals"; RID_SUBSETSTR_YI_RADICALS ; > ;
- < "Old Italic"; RID_SUBSETSTR_OLD_ITALIC ; > ;
- < "Gothic"; RID_SUBSETSTR_GOTHIC ; > ;
- < "Deseret"; RID_SUBSETSTR_DESERET ; > ;
- < "Byzantine Musical Symbols"; RID_SUBSETSTR_BYZANTINE_MUSICAL_SYMBOLS ; > ;
- < "Musical Symbols"; RID_SUBSETSTR_MUSICAL_SYMBOLS ; > ;
- < "Mathematical Alphanumeric Symbols"; RID_SUBSETSTR_MATHEMATICAL_ALPHANUMERIC_SYMBOLS ; > ;
- < "CJK Unified Ideographs Extension B"; RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B ; > ;
- < "CJK Unified Ideographs Extension C"; RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C ; > ;
- < "CJK Unified Ideographs Extension D"; RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D ; > ;
- < "CJK Compatibility Ideographs Supplement"; RID_SUBSETSTR_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT ; > ;
- < "Tags"; RID_SUBSETSTR_TAGS ; > ;
- < "Cyrillic Supplement"; RID_SUBSETSTR_CYRILLIC_SUPPLEMENTARY ; > ;
- < "Variation Selectors"; RID_SUBSETSTR_VARIATION_SELECTORS ; > ;
- < "Supplementary Private Use Area-A"; RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_A ; > ;
- < "Supplementary Private Use Area-B"; RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_B ; > ;
- < "Limbu"; RID_SUBSETSTR_LIMBU ; > ;
- < "Tai Le"; RID_SUBSETSTR_TAI_LE ; > ;
- < "Khmer Symbols"; RID_SUBSETSTR_KHMER_SYMBOLS ; > ;
- < "Phonetic Extensions"; RID_SUBSETSTR_PHONETIC_EXTENSIONS ; > ;
- < "Miscellaneous Symbols And Arrows"; RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_ARROWS ; > ;
- < "Yijing Hexagram Symbols"; RID_SUBSETSTR_YIJING_HEXAGRAM_SYMBOLS ; > ;
- < "Linear B Syllabary"; RID_SUBSETSTR_LINEAR_B_SYLLABARY ; > ;
- < "Linear B Ideograms"; RID_SUBSETSTR_LINEAR_B_IDEOGRAMS ; > ;
- < "Aegean Numbers"; RID_SUBSETSTR_AEGEAN_NUMBERS ; > ;
- < "Ugaritic"; RID_SUBSETSTR_UGARITIC ; > ;
- < "Shavian"; RID_SUBSETSTR_SHAVIAN ; > ;
- < "Osmanya"; RID_SUBSETSTR_OSMANYA ; > ;
- < "Sinhala"; RID_SUBSETSTR_SINHALA ; > ;
- < "Tibetan"; RID_SUBSETSTR_TIBETAN ; > ;
- < "Myanmar"; RID_SUBSETSTR_MYANMAR ; > ;
- < "Khmer"; RID_SUBSETSTR_KHMER ; > ;
- < "Ogham"; RID_SUBSETSTR_OGHAM ; > ;
- < "Runic"; RID_SUBSETSTR_RUNIC ; > ;
- < "Syriac"; RID_SUBSETSTR_SYRIAC ; > ;
- < "Thaana"; RID_SUBSETSTR_THAANA ; > ;
- < "Ethiopic"; RID_SUBSETSTR_ETHIOPIC ; > ;
- < "Cherokee"; RID_SUBSETSTR_CHEROKEE ; > ;
- < "Canadian Aboriginal Syllables"; RID_SUBSETSTR_CANADIAN_ABORIGINAL ; > ;
- < "Mongolian"; RID_SUBSETSTR_MONGOLIAN ; > ;
- < "Miscellaneous Mathematical Symbols-A"; RID_SUBSETSTR_MISC_MATH_SYMS_A ; > ;
- < "Supplemental Arrows-A"; RID_SUBSETSTR_SUPPL_ARROWS_A ; > ;
- < "Braille Patterns"; RID_SUBSETSTR_BRAILLE_PATTERNS ; > ;
- < "Supplemental Arrows-B"; RID_SUBSETSTR_SUPPL_ARROWS_B ; > ;
- < "Miscellaneous Mathematical Symbols-B"; RID_SUBSETSTR_MISC_MATH_SYMS_B ; > ;
- < "CJK Radical Supplement"; RID_SUBSETSTR_CJK_RADICAL_SUPPL ; > ;
- < "Kangxi Radicals"; RID_SUBSETSTR_KANGXI_RADICALS ; > ;
- < "Ideographic Description Characters"; RID_SUBSETSTR_IDEO_DESC_CHARS ; > ;
- < "Tagalog"; RID_SUBSETSTR_TAGALOG ; > ;
- < "Hanunoo"; RID_SUBSETSTR_HANUNOO ; > ;
- < "Tagbanwa"; RID_SUBSETSTR_TAGBANWA ; > ;
- < "Buhid"; RID_SUBSETSTR_BUHID ; > ;
- < "Kanbun"; RID_SUBSETSTR_KANBUN ; > ;
- < "Bopomofo Extended"; RID_SUBSETSTR_BOPOMOFO_EXTENDED ; > ;
- < "Katakana Phonetics"; RID_SUBSETSTR_KATAKANA_PHONETIC ; > ;
- < "CJK Strokes"; RID_SUBSETSTR_CJK_STROKES ; > ;
- < "Cypriot Syllabary"; RID_SUBSETSTR_CYPRIOT_SYLLABARY ; > ;
- < "Tai Xuan Jing Symbols"; RID_SUBSETSTR_TAI_XUAN_JING_SYMBOLS ; > ;
- < "Variation Selectors Supplement"; RID_SUBSETSTR_VARIATION_SELECTORS_SUPPLEMENT ; > ;
- < "Ancient Greek Musical Notation"; RID_SUBSETSTR_ANCIENT_GREEK_MUSICAL_NOTATION ; > ;
- < "Ancient Greek Numbers"; RID_SUBSETSTR_ANCIENT_GREEK_NUMBERS ; > ;
- < "Arabic Supplement"; RID_SUBSETSTR_ARABIC_SUPPLEMENT ; > ;
- < "Buginese"; RID_SUBSETSTR_BUGINESE ; > ;
- < "Combining Diacritical Marks Supplement"; RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_SUPPLEMENT ; > ;
- < "Coptic"; RID_SUBSETSTR_COPTIC ; > ;
- < "Ethiopic Extended"; RID_SUBSETSTR_ETHIOPIC_EXTENDED ; > ;
- < "Ethiopic Supplement"; RID_SUBSETSTR_ETHIOPIC_SUPPLEMENT ; > ;
- < "Georgian Supplement"; RID_SUBSETSTR_GEORGIAN_SUPPLEMENT ; > ;
- < "Glagolitic"; RID_SUBSETSTR_GLAGOLITIC ; > ;
- < "Kharoshthi"; RID_SUBSETSTR_KHAROSHTHI ; > ;
- < "Modifier Tone Letters"; RID_SUBSETSTR_MODIFIER_TONE_LETTERS ; > ;
- < "New Tai Lue"; RID_SUBSETSTR_NEW_TAI_LUE ; > ;
- < "Old Persian"; RID_SUBSETSTR_OLD_PERSIAN ; > ;
- < "Phonetic Extensions Supplement"; RID_SUBSETSTR_PHONETIC_EXTENSIONS_SUPPLEMENT ; > ;
- < "Supplemental Punctuation"; RID_SUBSETSTR_SUPPLEMENTAL_PUNCTUATION ; > ;
- < "Syloti Nagri"; RID_SUBSETSTR_SYLOTI_NAGRI ; > ;
- < "Tifinagh"; RID_SUBSETSTR_TIFINAGH ; > ;
- < "Vertical Forms"; RID_SUBSETSTR_VERTICAL_FORMS ; > ;
- < "Nko"; RID_SUBSETSTR_NKO ; > ;
- < "Balinese"; RID_SUBSETSTR_BALINESE ; > ;
- < "Latin Extended-C"; RID_SUBSETSTR_LATIN_EXTENDED_C ; > ;
- < "Latin Extended-D"; RID_SUBSETSTR_LATIN_EXTENDED_D ; > ;
- < "Phags-Pa"; RID_SUBSETSTR_PHAGS_PA ; > ;
- < "Phoenician"; RID_SUBSETSTR_PHOENICIAN ; > ;
- < "Cuneiform"; RID_SUBSETSTR_CUNEIFORM ; > ;
- < "Cuneiform Numbers And Punctuation"; RID_SUBSETSTR_CUNEIFORM_NUMBERS_AND_PUNCTUATION ; > ;
- < "Counting Rod Numerals"; RID_SUBSETSTR_COUNTING_ROD_NUMERALS ; > ;
- < "Sundanese"; RID_SUBSETSTR_SUNDANESE ; > ;
- < "Lepcha"; RID_SUBSETSTR_LEPCHA ; > ;
- < "Ol Chiki"; RID_SUBSETSTR_OL_CHIKI ; > ;
- < "Cyrillic Extended-A"; RID_SUBSETSTR_CYRILLIC_EXTENDED_A ; > ;
- < "Vai"; RID_SUBSETSTR_VAI ; > ;
- < "Cyrillic Extended-B"; RID_SUBSETSTR_CYRILLIC_EXTENDED_B ; > ;
- < "Saurashtra"; RID_SUBSETSTR_SAURASHTRA ; > ;
- < "Kayah Li"; RID_SUBSETSTR_KAYAH_LI ; > ;
- < "Rejang"; RID_SUBSETSTR_REJANG ; > ;
- < "Cham"; RID_SUBSETSTR_CHAM ; > ;
- < "Ancient Symbols"; RID_SUBSETSTR_ANCIENT_SYMBOLS ; > ;
- < "Phaistos Disc"; RID_SUBSETSTR_PHAISTOS_DISC ; > ;
- < "Lycian"; RID_SUBSETSTR_LYCIAN ; > ;
- < "Carian"; RID_SUBSETSTR_CARIAN ; > ;
- < "Lydian"; RID_SUBSETSTR_LYDIAN ; > ;
- < "Mahjong Tiles"; RID_SUBSETSTR_MAHJONG_TILES ; > ;
- < "Domino Tiles"; RID_SUBSETSTR_DOMINO_TILES ; > ;
- < "Samaritan"; RID_SUBSETSTR_SAMARITAN ; > ;
- < "Canadian Aboriginal Syllabics Extended"; RID_SUBSETSTR_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED ; > ;
- < "Tai Tham"; RID_SUBSETSTR_TAI_THAM ; > ;
- < "Vedic Extensions"; RID_SUBSETSTR_VEDIC_EXTENSIONS ; > ;
- < "Lisu"; RID_SUBSETSTR_LISU ; > ;
- < "Bamum"; RID_SUBSETSTR_BAMUM ; > ;
- < "Common Indic Number Forms"; RID_SUBSETSTR_COMMON_INDIC_NUMBER_FORMS ; > ;
- < "Devanagari Extended"; RID_SUBSETSTR_DEVANAGARI_EXTENDED ; > ;
- < "Hangul Jamo Extended-A"; RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_A ; > ;
- < "Javanese"; RID_SUBSETSTR_JAVANESE ; > ;
- < "Myanmar Extended-A"; RID_SUBSETSTR_MYANMAR_EXTENDED_A ; > ;
- < "Tai Viet"; RID_SUBSETSTR_TAI_VIET ; > ;
- < "Meetei Mayek"; RID_SUBSETSTR_MEETEI_MAYEK ; > ;
- < "Hangul Jamo Extended-B"; RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_B ; > ;
- < "Imperial Aramaic"; RID_SUBSETSTR_IMPERIAL_ARAMAIC ; > ;
- < "Old South Arabian"; RID_SUBSETSTR_OLD_SOUTH_ARABIAN ; > ;
- < "Avestan"; RID_SUBSETSTR_AVESTAN ; > ;
- < "Inscriptional Parthian"; RID_SUBSETSTR_INSCRIPTIONAL_PARTHIAN ; > ;
- < "Inscriptional Pahlavi"; RID_SUBSETSTR_INSCRIPTIONAL_PAHLAVI ; > ;
- < "Old Turkic"; RID_SUBSETSTR_OLD_TURKIC ; > ;
- < "Rumi Numeral Symbols"; RID_SUBSETSTR_RUMI_NUMERAL_SYMBOLS ; > ;
- < "Kaithi"; RID_SUBSETSTR_KAITHI ; > ;
- < "Egyptian Hieroglyphs"; RID_SUBSETSTR_EGYPTIAN_HIEROGLYPHS ; > ;
- < "Enclosed Alphanumeric Supplement"; RID_SUBSETSTR_ENCLOSED_ALPHANUMERIC_SUPPLEMENT ; > ;
- < "Enclosed Ideographic Supplement"; RID_SUBSETSTR_ENCLOSED_IDEOGRAPHIC_SUPPLEMENT ; > ;
- < "Mandaic"; RID_SUBSETSTR_MANDAIC ; > ;
- < "Batak"; RID_SUBSETSTR_BATAK ; > ;
- < "Ethiopic Extended-A"; RID_SUBSETSTR_ETHIOPIC_EXTENDED_A ; > ;
- < "Brahmi"; RID_SUBSETSTR_BRAHMI ; > ;
- < "Bamum Supplement"; RID_SUBSETSTR_BAMUM_SUPPLEMENT ; > ;
- < "Kana Supplement"; RID_SUBSETSTR_KANA_SUPPLEMENT ; > ;
- < "Playing Cards"; RID_SUBSETSTR_PLAYING_CARDS ; > ;
- < "Miscellaneous Symbols And Pictographs"; RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS ; > ;
- < "Emoticons"; RID_SUBSETSTR_EMOTICONS ; > ;
- < "Transport And Map Symbols"; RID_SUBSETSTR_TRANSPORT_AND_MAP_SYMBOLS ; > ;
- < "Alchemical Symbols"; RID_SUBSETSTR_ALCHEMICAL_SYMBOLS ; > ;
- < "Arabic Extended-A"; RID_SUBSETSTR_ARABIC_EXTENDED_A ; > ;
- < "Arabic Mathematical Alphabetic Symbols"; RID_SUBSETSTR_ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS ; > ;
- < "Chakma"; RID_SUBSETSTR_CHAKMA ; > ;
- < "Meetei Mayek Extensions"; RID_SUBSETSTR_MEETEI_MAYEK_EXTENSIONS ; > ;
- < "Meroitic Cursive"; RID_SUBSETSTR_MEROITIC_CURSIVE ; > ;
- < "Meroitic Hieroglyphs"; RID_SUBSETSTR_MEROITIC_HIEROGLYPHS ; > ;
- < "Miao"; RID_SUBSETSTR_MIAO ; > ;
- < "Sharada"; RID_SUBSETSTR_SHARADA ; > ;
- < "Sora Sompeng"; RID_SUBSETSTR_SORA_SOMPENG ; > ;
- < "Sundanese Supplement"; RID_SUBSETSTR_SUNDANESE_SUPPLEMENT ; > ;
- < "Takri"; RID_SUBSETSTR_TAKRI ; > ;
- < "Bassa Vah"; RID_SUBSETSTR_BASSA_VAH ; > ;
- < "Caucasian Albanian"; RID_SUBSETSTR_CAUCASIAN_ALBANIAN ; > ;
- < "Coptic Epact Numbers"; RID_SUBSETSTR_COPTIC_EPACT_NUMBERS ; > ;
- < "Combining Diacritical Marks Extended"; RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_EXTENDED ; > ;
- < "Duployan"; RID_SUBSETSTR_DUPLOYAN ; > ;
- < "Elbasan"; RID_SUBSETSTR_ELBASAN ; > ;
- < "Geometric Shapes Extended"; RID_SUBSETSTR_GEOMETRIC_SHAPES_EXTENDED ; > ;
- < "Grantha"; RID_SUBSETSTR_GRANTHA ; > ;
- < "Khojki"; RID_SUBSETSTR_KHOJKI ; > ;
- < "Khudawadi"; RID_SUBSETSTR_KHUDAWADI ; > ;
- < "Latin Extended-E"; RID_SUBSETSTR_LATIN_EXTENDED_E ; > ;
- < "Linear A"; RID_SUBSETSTR_LINEAR_A ; > ;
- < "Mahajani"; RID_SUBSETSTR_MAHAJANI ; > ;
- < "Manichaean"; RID_SUBSETSTR_MANICHAEAN ; > ;
- < "Mende Kikakui"; RID_SUBSETSTR_MENDE_KIKAKUI ; > ;
- < "Modi"; RID_SUBSETSTR_MODI ; > ;
- < "Mro"; RID_SUBSETSTR_MRO ; > ;
- < "Myanmar Extended-B"; RID_SUBSETSTR_MYANMAR_EXTENDED_B ; > ;
- < "Nabataean"; RID_SUBSETSTR_NABATAEAN ; > ;
- < "Old North Arabian"; RID_SUBSETSTR_OLD_NORTH_ARABIAN ; > ;
- < "Old Permic"; RID_SUBSETSTR_OLD_PERMIC ; > ;
- < "Ornamental Dingbats"; RID_SUBSETSTR_ORNAMENTAL_DINGBATS ; > ;
- < "Pahawh Hmong"; RID_SUBSETSTR_PAHAWH_HMONG ; > ;
- < "Palmyrene"; RID_SUBSETSTR_PALMYRENE ; > ;
- < "Pau Cin Hau"; RID_SUBSETSTR_PAU_CIN_HAU ; > ;
- < "Psalter Pahlavi"; RID_SUBSETSTR_PSALTER_PAHLAVI ; > ;
- < "Shorthand Format Controls"; RID_SUBSETSTR_SHORTHAND_FORMAT_CONTROLS ; > ;
- < "Siddham"; RID_SUBSETSTR_SIDDHAM ; > ;
- < "Sinhala Archaic Numbers"; RID_SUBSETSTR_SINHALA_ARCHAIC_NUMBERS ; > ;
- < "Supplemental Arrows-C"; RID_SUBSETSTR_SUPPLEMENTAL_ARROWS_C ; > ;
- < "Tirhuta"; RID_SUBSETSTR_TIRHUTA ; > ;
- < "Warang Citi"; RID_SUBSETSTR_WARANG_CITI ; > ;
- < "Ahom"; RID_SUBSETSTR_AHOM ; > ;
- < "Anatolian Hieroglyphs"; RID_SUBSETSTR_ANATOLIAN_HIEROGLYPHS ; > ;
- < "Cherokee Supplement"; RID_SUBSETSTR_CHEROKEE_SUPPLEMENT ; > ;
- < "CJK Unified Ideographs Extension E"; RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E ; > ;
- < "Early Dynastic Cuneiform"; RID_SUBSETSTR_EARLY_DYNASTIC_CUNEIFORM ; > ;
- < "Hatran"; RID_SUBSETSTR_HATRAN ; > ;
- < "Multani"; RID_SUBSETSTR_MULTANI ; > ;
- < "Old Hungarian"; RID_SUBSETSTR_OLD_HUNGARIAN ; > ;
- < "Supplemental Symbols And Pictographs"; RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS ; > ;
- < "Sutton Signwriting"; RID_SUBSETSTR_SUTTON_SIGNWRITING ; > ;
- < "Adlam"; RID_SUBSETSTR_ADLAM ; > ;
- < "Bhaiksuki"; RID_SUBSETSTR_BHAIKSUKI ; > ;
- < "Cyrillic Extended-C"; RID_SUBSETSTR_CYRILLIC_EXTENDED_C ; > ;
- < "Glagolitic Supplement"; RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT ; > ;
- < "Ideographic Symbols and Punctuation"; RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION ; > ;
- < "Marchen"; RID_SUBSETSTR_MARCHEN ; > ;
- < "Mongolian Supplement"; RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT ; > ;
- < "Newa"; RID_SUBSETSTR_NEWA ; > ;
- < "Osage"; RID_SUBSETSTR_OSAGE ; > ;
- < "Tangut"; RID_SUBSETSTR_TANGUT ; > ;
- < "Tangut Components"; RID_SUBSETSTR_TANGUT_COMPONENTS ; > ;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */