migrate to boost::gettext

* all .ui files go from <interface> to <interface domain="MODULE"> e.g. vcl * all .src files go away and the english source strings folded into the .hrc as NC_("context", "source string") * ResMgr is dropped in favour of std::locale imbued by boost::locale::generator pointed at matching MODULE .mo files * UIConfig translations are folded into the module .mo, so e.g. UIConfig_cui goes from l10n target to normal one, so the res/lang.zips of UI files go away * translation via Translation::get(hrc-define-key, imbued-std::locale) * python can now be translated with its inbuilt gettext support (we keep the name strings.hrc there to keep finding the .hrc file uniform) so magic numbers can go away there * java and starbasic components can be translated via the pre-existing css.resource.StringResourceWithLocation mechanism * en-US res files go away, their strings are now the .hrc keys in the source code * remaining .res files are replaced by .mo files * in .res/.ui-lang-zip files, the old scheme missing translations of strings results in inserting the english original so something can be found, now the standard fallback of using the english original from the source key is used, so partial translations shrink dramatically in size * extract .hrc strings with hrcex which backs onto xgettext -C --add-comments --keyword=NC_:1c,2 --from-code=UTF-8 --no-wrap * extract .ui strings with uiex which backs onto xgettext --add-comments --no-wrap * qtz for gettext translations is generated at runtime as ascii-ified crc32 of content + "|" + msgid * [API CHANGE] remove deprecated binary .res resouce loader related uno apis com::sun::star::resource::OfficeResourceLoader com::sun::star::resource::XResourceBundleLoader com::sun::star::resource::XResourceBundle when translating strings via uno apis com.sun.star.resource.StringResourceWithLocation can continue to be used Change-Id: Ia2594a2672b7301d9c3421fdf31b6cfe7f3f8d0a
author: Caolán McNamara <caolanm@redhat.com> 2017-06-11 20:56:30 +0100
committer: Caolán McNamara <caolanm@redhat.com> 2017-07-21 08:20:50 +0100
commit: 00657aef09d854c74fb426a935a3e8b1fc390bb0 (patch)
tree: fd1a9bb264fe15dcc129498e62060ecd256b1ee7 /svx/source
parent: fa987cbb813cfd729fe490f2f1258b7c8d7fb174 (diff)
243 files changed, 1848 insertions, 9514 deletions
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 031238accff4..7691ed9d868c 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -44,7 +44,7 @@
 #include <comphelper/accessiblewrapper.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdpagv.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <vcl/svapp.hxx>
 #include <algorithm>
 
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index b4f7d9652f55..b7a1a0dd829f 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -35,7 +35,8 @@
 #include <svx/dialmgr.hxx>
 #include "editeng/unolingu.hxx"
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include "frmsel.hrc"
 
 namespace svx {
 namespace a11y {
@@ -58,8 +59,6 @@ AccFrameSelector::AccFrameSelector( FrameSelector& rFrameSel, FrameBorderType eB
     meBorder( eBorder ),
     maFocusListeners( maFocusMutex ),
     maPropertyListeners( maPropertyMutex ),
-    maNames( ResId(RID_SVXSTR_FRMSEL_TEXTS, DIALOG_MGR()) ),
-    maDescriptions( ResId(RID_SVXSTR_FRMSEL_DESCRIPTIONS, DIALOG_MGR()) ),
     mnClientId( 0 )
 {
     if ( mpFrameSel )
@@ -154,14 +153,14 @@ OUString AccFrameSelector::getAccessibleDescription(  )
 {
     SolarMutexGuard aGuard;
     IsValid();
-    return maDescriptions.GetString((sal_uInt32)meBorder);
+    return SvxResId(RID_SVXSTR_FRMSEL_DESCRIPTIONS[(sal_uInt32)meBorder].first);
 }
 
 OUString AccFrameSelector::getAccessibleName(  )
 {
     SolarMutexGuard aGuard;
     IsValid();
-    return maNames.GetString((sal_uInt32)meBorder);
+    return SvxResId(RID_SVXSTR_FRMSEL_TEXTS[(sal_uInt32)meBorder].first);
 }
 
 Reference< XAccessibleRelationSet > AccFrameSelector::getAccessibleRelationSet(  )
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index ac3347c15ff2..c2a7aa15cce5 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -48,8 +48,7 @@
 #include <svx/ShapeTypeHandler.hxx>
 #include <svx/SvxShapeTypes.hxx>
 
-#include "accessibility.hrc"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <svx/dialmgr.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx
index efbb48c58980..ec5b127f96dc 100644
--- a/svx/source/accessibility/DescriptionGenerator.cxx
+++ b/svx/source/accessibility/DescriptionGenerator.cxx
@@ -38,8 +38,7 @@
 #include <com/sun/star/uno/Exception.hpp>
 
 // Includes for string resources.
-#include "accessibility.hrc"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <svx/dialmgr.hxx>
 
 #include <svx/xdef.hxx>
@@ -66,13 +65,13 @@ DescriptionGenerator::~DescriptionGenerator()
 }
 
 
-void DescriptionGenerator::Initialize (sal_Int32 nResourceId)
+void DescriptionGenerator::Initialize(const char* pResourceId)
 {
     // Get the string from the resource for the specified id.
     OUString sPrefix;
     {
         SolarMutexGuard aGuard;
-        sPrefix = SvxResId (nResourceId);
+        sPrefix = SvxResId(pResourceId);
     }
 
     // Forward the call with the resulting string.
@@ -126,13 +125,13 @@ OUString DescriptionGenerator::operator() (void)
 void DescriptionGenerator::AddProperty (
     const OUString& sPropertyName,
     PropertyType aType,
-    const sal_Int32 nLocalizedNameId,
+    const char* pLocalizedNameId,
     long nWhichId)
 {
     OUString sLocalizedName;
     {
         SolarMutexGuard aGuard;
-        sLocalizedName = SvxResId (nLocalizedNameId);
+        sLocalizedName = SvxResId(pLocalizedNameId);
     }
     AddProperty (sPropertyName, aType, sLocalizedName, nWhichId);
 }
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 0f970ee347d2..741c58daaef3 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -40,8 +40,7 @@
 #include <svx/AccessibleShapeInfo.hxx>
 #include "GraphCtlAccessibleContext.hxx"
 #include <svx/graphctl.hxx>
-#include <svx/dialogs.hrc>
-#include "accessibility.hrc"
+#include <svx/strings.hrc>
 #include <svx/svdpage.hxx>
 #include <svx/unomod.hxx>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx
index 4f7f17549d5b..a64a09c3f56b 100644
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -29,7 +29,7 @@
 #include <svx/svdoashp.hxx>
 #include "svx/unoapi.hxx"
 
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
@@ -192,10 +192,9 @@ long ShapeTypeHandler::GetSlotId (const uno::Reference<drawing::XShape>& rxShape
 }
 
 /// get the accessible base name for an object
-OUString
-    ShapeTypeHandler::CreateAccessibleBaseName (const uno::Reference<drawing::XShape>& rxShape)
+OUString ShapeTypeHandler::CreateAccessibleBaseName (const uno::Reference<drawing::XShape>& rxShape)
 {
-    sal_Int32 nResourceId;
+    const char* pResourceId;
     OUString sName;
 
     switch (ShapeTypeHandler::Instance().GetTypeId (rxShape))
@@ -204,74 +203,74 @@ OUString
       // AccessibleShape::CreateAccessibleBaseName.  See issue 11190 for details.
       // Id can be removed from SvxShapeTypes.hxx as well.
         case DRAWING_3D_CUBE:
-            nResourceId = STR_ObjNameSingulCube3d;
+            pResourceId = STR_ObjNameSingulCube3d;
             break;
         case DRAWING_3D_EXTRUDE:
-            nResourceId = STR_ObjNameSingulExtrude3d;
+            pResourceId = STR_ObjNameSingulExtrude3d;
             break;
         case DRAWING_3D_LATHE:
-            nResourceId = STR_ObjNameSingulLathe3d;
+            pResourceId = STR_ObjNameSingulLathe3d;
             break;
         case DRAWING_3D_SCENE:
-            nResourceId = STR_ObjNameSingulScene3d;
+            pResourceId = STR_ObjNameSingulScene3d;
             break;
         case DRAWING_3D_SPHERE:
-            nResourceId = STR_ObjNameSingulSphere3d;
+            pResourceId = STR_ObjNameSingulSphere3d;
             break;
         case DRAWING_CAPTION:
-            nResourceId = STR_ObjNameSingulCAPTION;
+            pResourceId = STR_ObjNameSingulCAPTION;
             break;
         case DRAWING_CLOSED_BEZIER:
-            nResourceId = STR_ObjNameSingulPATHFILL;
+            pResourceId = STR_ObjNameSingulPATHFILL;
             break;
         case DRAWING_CLOSED_FREEHAND:
-            nResourceId = STR_ObjNameSingulFREEFILL;
+            pResourceId = STR_ObjNameSingulFREEFILL;
             break;
         case DRAWING_CONNECTOR:
-            nResourceId = STR_ObjNameSingulEDGE;
+            pResourceId = STR_ObjNameSingulEDGE;
             break;
         case DRAWING_CONTROL:
-            nResourceId = STR_ObjNameSingulUno;
+            pResourceId = STR_ObjNameSingulUno;
             break;
         case DRAWING_ELLIPSE:
-            nResourceId = STR_ObjNameSingulCIRCE;
+            pResourceId = STR_ObjNameSingulCIRCE;
             break;
         case DRAWING_GROUP:
-            nResourceId = STR_ObjNameSingulGRUP;
+            pResourceId = STR_ObjNameSingulGRUP;
             break;
         case DRAWING_LINE:
-            nResourceId = STR_ObjNameSingulLINE;
+            pResourceId = STR_ObjNameSingulLINE;
             break;
         case DRAWING_MEASURE:
-            nResourceId = STR_ObjNameSingulMEASURE;
+            pResourceId = STR_ObjNameSingulMEASURE;
             break;
         case DRAWING_OPEN_BEZIER:
-            nResourceId = STR_ObjNameSingulPATHLINE;
+            pResourceId = STR_ObjNameSingulPATHLINE;
             break;
         case DRAWING_OPEN_FREEHAND:
-            nResourceId = STR_ObjNameSingulFREELINE;
+            pResourceId = STR_ObjNameSingulFREELINE;
             break;
         case DRAWING_PAGE:
-            nResourceId = STR_ObjNameSingulPAGE;
+            pResourceId = STR_ObjNameSingulPAGE;
             break;
         case DRAWING_POLY_LINE:
-            nResourceId = STR_ObjNameSingulPLIN;
+            pResourceId = STR_ObjNameSingulPLIN;
             break;
         case DRAWING_POLY_LINE_PATH:
-            nResourceId = STR_ObjNameSingulPLIN;
+            pResourceId = STR_ObjNameSingulPLIN;
             break;
         case DRAWING_POLY_POLYGON:
-            nResourceId = STR_ObjNameSingulPOLY;
+            pResourceId = STR_ObjNameSingulPOLY;
             break;
         case DRAWING_POLY_POLYGON_PATH:
-            nResourceId = STR_ObjNameSingulPOLY;
+            pResourceId = STR_ObjNameSingulPOLY;
             break;
         case DRAWING_RECTANGLE:
-            nResourceId = STR_ObjNameSingulRECT;
+            pResourceId = STR_ObjNameSingulRECT;
             break;
         case DRAWING_CUSTOM:
             {
-                nResourceId = STR_ObjNameSingulCUSTOMSHAPE;
+                pResourceId = STR_ObjNameSingulCUSTOMSHAPE;
 
                 SvxShape* pShape = SvxShape::getImplementation( rxShape );
                 if (pShape)
@@ -285,10 +284,10 @@ OUString
                             if(pCustomShape)
                             {
                                 if (pCustomShape->IsTextPath())
-                                    nResourceId = STR_ObjNameSingulFONTWORK;
+                                    pResourceId = STR_ObjNameSingulFONTWORK;
                                 else
                                 {
-                                    nResourceId = -1;
+                                    pResourceId = nullptr;
                                     sName = pCustomShape->GetCustomShapeName();
                                 }
                             }
@@ -298,10 +297,10 @@ OUString
                 break;
             }
         case DRAWING_TEXT:
-            nResourceId = STR_ObjNameSingulTEXT;
+            pResourceId = STR_ObjNameSingulTEXT;
             break;
         default:
-            nResourceId = -1;
+            pResourceId = nullptr;
             sName = "UnknownAccessibleShape";
             uno::Reference<drawing::XShapeDescriptor> xDescriptor (rxShape, uno::UNO_QUERY);
             if (xDescriptor.is())
@@ -309,10 +308,10 @@ OUString
             break;
     }
 
-    if (nResourceId != -1)
+    if (pResourceId)
     {
         SolarMutexGuard aGuard;
-        sName = SvxResId((unsigned short)nResourceId);
+        sName = SvxResId(pResourceId);
     }
 
     return sName;
diff --git a/svx/source/accessibility/accessibility.src b/svx/source/accessibility/accessibility.src
deleted file mode 100644
index 37986e929a66..000000000000
--- a/svx/source/accessibility/accessibility.src
+++ /dev/null
@@ -1,193 +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 "accessibility.hrc"
-
-String RID_SVXSTR_A11Y_3D_MATERIAL_COLOR
-{
-    Text [ en-US ] = "3D material color" ;
-};
-String RID_SVXSTR_A11Y_FILLSTYLE_NONE
-{
-    Text [ en-US ] = "None" ;
-};
-String RID_SVXSTR_A11Y_FILLSTYLE_SOLID
-{
-    Text [ en-US ] = "Solid" ;
-};
-String RID_SVXSTR_A11Y_FILLSTYLE_HATCH
-{
-    Text [ en-US ] = "With hatching" ;
-};
-String RID_SVXSTR_A11Y_FILLSTYLE_GRADIENT
-{
-    Text [ en-US ] = "Gradient" ;
-};
-String RID_SVXSTR_A11Y_FILLSTYLE_BITMAP
-{
-    Text [ en-US ] = "Bitmap" ;
-};
-String RID_SVXSTR_A11Y_WITH
-{
-    Text [ en-US ] = "with" ;
-};
-String RID_SVXSTR_A11Y_STYLE
-{
-    Text [ en-US ] = "Style" ;
-};
-String RID_SVXSTR_A11Y_AND
-{
-    Text [ en-US ] = "and" ;
-};
-
-// SvxRectCtl
-
-String RID_SVXSTR_RECTCTL_ACC_CORN_NAME
-{
-    Text [ en-US ] = "Corner control" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CORN_DESCR
-{
-    Text [ en-US ] = "Selection of a corner point." ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_ANGL_NAME
-{
-    Text [ en-US ] = "Angle control" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_ANGL_DESCR
-{
-    Text [ en-US ] = "Selection of a major angle." ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_LT
-{
-    Text [ en-US ] = "Top left" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_MT
-{
-    Text [ en-US ] = "Top middle" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_RT
-{
-    Text [ en-US ] = "Top right" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_LM
-{
-    Text [ en-US ] = "Left center" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_MM
-{
-    Text [ en-US ] = "Center" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_RM
-{
-    Text [ en-US ] = "Right center" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_LB
-{
-    Text [ en-US ] = "Bottom left" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_MB
-{
-    Text [ en-US ] = "Bottom middle" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_RB
-{
-    Text [ en-US ] = "Bottom right" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_A000
-{
-    Text [ en-US ] = "0 degrees" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_A045
-{
-    Text [ en-US ] = "45 degrees" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_A090
-{
-    Text [ en-US ] = "90 degrees" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_A135
-{
-    Text [ en-US ] = "135 degrees" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_A180
-{
-    Text [ en-US ] = "180 degrees" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_A225
-{
-    Text [ en-US ] = "225 degrees" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_A270
-{
-    Text [ en-US ] = "270 degrees" ;
-};
-
-String RID_SVXSTR_RECTCTL_ACC_CHLD_A315
-{
-    Text [ en-US ] = "315 degrees" ;
-};
-
-// SvxGraphCtrlAccessibleContext
-String RID_SVXSTR_GRAPHCTRL_ACC_NAME
-{
-    Text [ en-US ] = "Contour control" ;
-};
-
-String RID_SVXSTR_GRAPHCTRL_ACC_DESCRIPTION
-{
-    Text [ en-US ] = "This is where you can edit the contour." ;
-};
-
-String RID_SVXSTR_CHARACTER_SELECTION
-{
-    Text [ en-US ] = "Special character selection";
-};
-
-String RID_SVXSTR_CHAR_SEL_DESC
-{
-    Text [ en-US ] = "Select special characters in this area.";
-};
-
-String RID_SVXSTR_CHARACTER_CODE
-{
-    // The space behind is a must.
-    Text [ en-US ] = "Character code ";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index 25ebf7640145..9e8c3ab5fa71 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -29,7 +29,7 @@
 #include <toolkit/helper/convert.hxx>
 #include <osl/interlck.h>
 #include <svx/dialmgr.hxx>
-#include "accessibility.hrc"
+#include <svx/strings.hrc>
 #include <comphelper/types.hxx>
 
 namespace svx
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index c2a048a82853..e48d24b50dbc 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -34,8 +34,7 @@
 #include <tools/debug.hxx>
 #include <tools/gen.hxx>
 
-#include <svx/dialogs.hrc>
-#include "accessibility.hrc"
+#include <svx/strings.hrc>
 #include <svx/dlgctrl.hxx>
 
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 6bdc0c05c3e2..ab060c469658 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -33,8 +33,7 @@
 #include <tools/debug.hxx>
 #include <tools/gen.hxx>
 
-#include <svx/dialogs.hrc>
-#include "accessibility.hrc"
+#include <svx/strings.hrc>
 #include <svx/dlgctrl.hxx>
 #include <svx/dialmgr.hxx>
 #include <comphelper/accessibleeventnotifier.hxx>
@@ -57,8 +56,8 @@ namespace
 {
     struct ChildIndexToPointData
     {
-        short       nResIdName;
-        short       nResIdDescr;
+        const char* pResIdName;
+        const char* pResIdDescr;
         RectPoint  ePoint;
     };
 }
@@ -226,8 +225,8 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChil
         if( !xChild.is() )
         {
             const ChildIndexToPointData*    p = IndexToPoint( nIndex );
-            OUString aName(SvxResId(p->nResIdName));
-            OUString aDescr(SvxResId(p->nResIdDescr));
+            OUString aName(SvxResId(p->pResIdName));
+            OUString aDescr(SvxResId(p->pResIdDescr));
 
             tools::Rectangle       aFocusRect( mpRepr->CalculateFocusRectangle( p->ePoint ) );
 
diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx
index 450026b95513..5aa82122c969 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -24,7 +24,7 @@
 #include <svx/xoutbmp.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/graphichelper.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 
 #include <vcl/layout.hxx>
 
diff --git a/svx/source/core/graphichelper.src b/svx/source/core/graphichelper.src
deleted file mode 100644
index c866076bed4d..000000000000
--- a/svx/source/core/graphichelper.src
+++ /dev/null
@@ -1,36 +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_EXPORT_GRAPHIC_TITLE
-{
-    Text [ en-US ] = "Image Export" ;
-};
-
-String RID_SVXSTR_SAVEAS_IMAGE
-{
-    Text [ en-US ] = "Save as Image" ;
-};
-
-String RID_SVXSTR_SAVE_MODIFIED_IMAGE
-{
-    Text [ en-US ] = "The image has been modified. By default the original image will be saved.\nDo you want to save the modified version instead ?" ;
-};
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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: */
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index e6816c596f99..1f9b21998aad 100644
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include <svx/cube3d.hxx>
 #include "svx/globl3d.hxx"
diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx
index 14a4b993e1f8..4ccf6948bd97 100644
--- a/svx/source/engine3d/dragmt3d.cxx
+++ b/svx/source/engine3d/dragmt3d.cxx
@@ -26,7 +26,7 @@
 #include <svx/svdtrans.hxx>
 #include <svx/obj3d.hxx>
 #include <svx/e3dundo.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/sdr/overlay/overlaypolypolygon.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx
index 26f371ea174f..a52678399973 100644
--- a/svx/source/engine3d/extrud3d.cxx
+++ b/svx/source/engine3d/extrud3d.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include <svx/svdpage.hxx>
 #include "svx/globl3d.hxx"
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index d2b3077d71fa..359eb476b725 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -46,7 +46,7 @@
 #include <svx/viewpt3d.hxx>
 
 #include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 
 #include <editeng/colritem.hxx>
 #include <svx/e3ditem.hxx>
diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src
deleted file mode 100644
index f8d12a88f99e..000000000000
--- a/svx/source/engine3d/float3d.src
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <svx/dialogs.hrc>
-#include "float3d.hrc"
-#include <svx/svxcommands.h>
-
-String RID_SVXFLOAT3D_FAVORITE
-{
-    Text [ en-US ] = "Favorite";
-};
-
-String RID_SVXFLOAT3D_FIX_R
-{
-    Text [ en-US ] = "R:";
-};
-
-String RID_SVXFLOAT3D_FIX_G
-{
-    Text [ en-US ] = "G:";
-};
-
-String RID_SVXFLOAT3D_FIX_B
-{
-    Text [ en-US ] = "B:";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index 186e922e7177..a93db14a763a 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include <tools/poly.hxx>
 #include <svx/svdpage.hxx>
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index b19530a0c534..5bb9e66b2a6d 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -19,7 +19,7 @@
 
 #include <o3tl/numeric.hxx>
 
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include <svx/svdview.hxx>
 #include <svx/svdattr.hxx>
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 7e80afac9779..13cdd51ee04a 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include "svx/svditer.hxx"
 
diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx
index 854a677b7c5a..168e8af898c9 100644
--- a/svx/source/engine3d/sphere3d.cxx
+++ b/svx/source/engine3d/sphere3d.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
diff --git a/svx/source/engine3d/string3d.src b/svx/source/engine3d/string3d.src
deleted file mode 100644
index d7451ae414c8..000000000000
--- a/svx/source/engine3d/string3d.src
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <svx/dialogs.hrc>
-
- // Strings for the Draw Dialog --------------------------------------------
-String RID_SVX_3D_UNDO_EXCHANGE_PASTE
-{
-    Text [ en-US ] = "Insert object(s)" ;
-};
-String RID_SVX_3D_UNDO_ROTATE
-{
-    Text [ en-US ] = "Rotate 3D object" ;
-};
-String RID_SVX_3D_UNDO_EXTRUDE
-{
-    Text [ en-US ] = "Create extrusion object" ;
-};
-String RID_SVX_3D_UNDO_LATHE
-{
-    Text [ en-US ] = "Create rotation object" ;
-};
-String RID_SVX_3D_UNDO_BREAK_LATHE
-{
-    Text [ en-US ] = "Split 3D object" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index d90aba0823b7..bb6f9dc0b1d1 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -31,7 +31,7 @@
 #include <editeng/eeitem.hxx>
 #include <svx/xtable.hxx>
 #include <svx/svdview.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include "svx/globl3d.hxx"
 #include <svx/obj3d.hxx>
diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx
index 1e8909606cc5..9027efbbe219 100644
--- a/svx/source/engine3d/view3d1.cxx
+++ b/svx/source/engine3d/view3d1.cxx
@@ -24,7 +24,7 @@
 #include <svx/svxids.hrc>
 #include <svx/xtable.hxx>
 #include <svx/fmview.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include "svx/globl3d.hxx"
 #include <svx/obj3d.hxx>
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index d1ce99b84dcb..a254f807dffc 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -21,7 +21,6 @@
 #include "fmitems.hxx"
 #include "fmprop.hrc"
 #include "svx/fmtools.hxx"
-#include "svx/fmresids.hrc"
 #include "fmservs.hxx"
 #include "fmurl.hxx"
 #include "formcontrolfactory.hxx"
@@ -29,7 +28,7 @@
 #include "gridcols.hxx"
 #include "svx/dbaexchange.hxx"
 #include "svx/dialmgr.hxx"
-#include "svx/dialogs.hrc"
+#include "svx/strings.hrc"
 #include "svx/fmgridcl.hxx"
 #include "svx/svxdlg.hxx"
 #include "svx/svxids.hrc"
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 2a58190fda9c..7581d8da9223 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -21,7 +21,7 @@
 #include <memory>
 #include <sal/macros.h>
 #include "fmprop.hrc"
-#include "svx/fmresids.hrc"
+#include "svx/strings.hrc"
 #include "svx/fmtools.hxx"
 #include "gridcell.hxx"
 #include "gridcols.hxx"
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 2b0aa598f9bd..795e329ed08f 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -41,14 +41,13 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
 #include <comphelper/processfactory.hxx>
-#include <tools/resid.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/fract.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/settings.hxx>
 
-#include "svx/fmresids.hrc"
+#include "svx/strings.hrc"
 
 #include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index d9e0a43e4b5c..333907a5b35a 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -20,14 +20,14 @@
 
 #include <sal/macros.h>
 #include "svx/ParseContext.hxx"
-#include "svx/fmresids.hrc"
+#include "svx/strings.hrc"
 
 #include <svx/dialmgr.hxx>
 
 #include <unotools/syslocale.hxx>
-#include <tools/resary.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
+#include "fmstring.hrc"
 
 using namespace svxform;
 using namespace ::connectivity;
@@ -35,10 +35,8 @@ using namespace ::connectivity;
 OSystemParseContext::OSystemParseContext()
     : IParseContext()
 {
-    SolarMutexGuard aGuard;
-    ResStringArray aLocalizedKeywords(ResId(RID_RSC_SQL_INTERNATIONAL, DIALOG_MGR()));
-    for (sal_uInt32 i = 0; i < aLocalizedKeywords.Count(); ++i)
-        m_aLocalizedKeywords.push_back(aLocalizedKeywords.GetString(i));
+    for (size_t i = 0; i < SAL_N_ELEMENTS(RID_RSC_SQL_INTERNATIONAL); ++i)
+        m_aLocalizedKeywords.push_back(SvxResId(RID_RSC_SQL_INTERNATIONAL[i]));
 }
 
 OSystemParseContext::~OSystemParseContext()
diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx
index e461c58e9bb7..83ec24fd291d 100644
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -21,7 +21,7 @@
 #include "svx/databaselocationinput.hxx"
 #include "svx/dialmgr.hxx"
 
-#include "svx/fmresids.hrc"
+#include "svx/strings.hrc"
 
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 1c2ece9f4891..1efc8de7081a 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -27,15 +27,15 @@
 
 #include "fmhelp.hrc"
 #include "bitmaps.hlst"
+#include "fpicker/fpicker.hrc"
 #include <svx/svxids.hrc>
-#include <tools/rcid.h>
 #include <tools/diagnose_ex.h>
+#include <tools/resmgr.hxx>
 #include <svx/xmlexchg.hxx>
 #include <svx/fmshell.hxx>
 #include <svtools/miscopt.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/viewoptions.hxx>
-#include <svtools/svtools.hrc>
 #include "svtools/treelistentry.hxx"
 #include <sfx2/app.hxx>
 #include <sfx2/filedlghelper.hxx>
@@ -517,7 +517,7 @@ namespace svxform
                 ItemNode* pNode = nullptr;
                 Reference< css::xml::dom::XNode > xParentNode;
                 Reference< XPropertySet > xNewBinding;
-                sal_uInt16 nResId = 0;
+                const char* pResId = nullptr;
                 bool bIsElement = true;
                 if ( DGTInstance == m_eGroup )
                 {
@@ -537,7 +537,7 @@ namespace svxform
                     {
                         try
                         {
-                            nResId = RID_STR_DATANAV_ADD_ELEMENT;
+                            pResId = RID_STR_DATANAV_ADD_ELEMENT;
                             xNewNode = m_xUIHelper->createElement( xParentNode, NEW_ELEMENT );
                         }
                         catch ( Exception& )
@@ -547,7 +547,7 @@ namespace svxform
                     }
                     else
                     {
-                        nResId = RID_STR_DATANAV_ADD_ATTRIBUTE;
+                        pResId = RID_STR_DATANAV_ADD_ATTRIBUTE;
                         bIsElement = false;
                         eType = DITAttribute;
                         try
@@ -605,7 +605,7 @@ namespace svxform
                 {
                     try
                     {
-                        nResId = RID_STR_DATANAV_ADD_BINDING;
+                        pResId = RID_STR_DATANAV_ADD_BINDING;
                         xNewBinding = xModel->createBinding();
                         Reference< XSet > xBindings( xModel->getBindings(), UNO_QUERY );
                         xBindings->insert( makeAny( xNewBinding ) );
@@ -619,7 +619,7 @@ namespace svxform
                 }
 
                 ScopedVclPtrInstance< AddDataItemDialog > aDlg( this, pNode, m_xUIHelper );
-                aDlg->SetText( SvxResId( nResId ) );
+                aDlg->SetText( SvxResId( pResId ) );
                 aDlg->InitText( eType );
                 short nReturn = aDlg->Execute();
                 if (  DGTInstance == m_eGroup )
@@ -693,7 +693,7 @@ namespace svxform
 
                     ScopedVclPtrInstance< AddDataItemDialog > aDlg( this, pNode, m_xUIHelper );
                     DataItemType eType = DITElement;
-                    sal_uInt16 nResId = RID_STR_DATANAV_EDIT_ELEMENT;
+                    const char* pResId = RID_STR_DATANAV_EDIT_ELEMENT;
                     if ( pNode && pNode->m_xNode.is() )
                     {
                         try
@@ -701,7 +701,7 @@ namespace svxform
                             css::xml::dom::NodeType eChildType = pNode->m_xNode->getNodeType();
                             if ( eChildType == css::xml::dom::NodeType_ATTRIBUTE_NODE )
                             {
-                                nResId = RID_STR_DATANAV_EDIT_ATTRIBUTE;
+                                pResId = RID_STR_DATANAV_EDIT_ATTRIBUTE;
                                 eType = DITAttribute;
                             }
                         }
@@ -712,10 +712,10 @@ namespace svxform
                     }
                     else if ( DGTBinding == m_eGroup )
                     {
-                        nResId = RID_STR_DATANAV_EDIT_BINDING;
+                        pResId = RID_STR_DATANAV_EDIT_BINDING;
                         eType = DITBinding;
                     }
-                    aDlg->SetText( SvxResId( nResId ) );
+                    aDlg->SetText( SvxResId( pResId ) );
                     aDlg->InitText( eType );
                     if ( aDlg->Execute() == RET_OK )
                     {
@@ -951,9 +951,9 @@ namespace svxform
                     DBG_ASSERT( pNode->m_xNode.is(), "XFormsPage::RemoveEntry(): no XNode" );
                     css::xml::dom::NodeType eChildType = pNode->m_xNode->getNodeType();
                     bool bIsElement = ( eChildType == css::xml::dom::NodeType_ELEMENT_NODE );
-                    sal_uInt16 nResId = bIsElement ? RID_STR_QRY_REMOVE_ELEMENT : RID_STR_QRY_REMOVE_ATTRIBUTE;
+                    const char* pResId = bIsElement ? RID_STR_QRY_REMOVE_ELEMENT : RID_STR_QRY_REMOVE_ATTRIBUTE;
                     OUString sVar = bIsElement ? OUString(ELEMENTNAME) : OUString(ATTRIBUTENAME);
-                    ScopedVclPtrInstance< MessageDialog > aQBox(this, SvxResId(nResId), VclMessageType::Question, VclButtonsType::YesNo);
+                    ScopedVclPtrInstance< MessageDialog > aQBox(this, SvxResId(pResId), VclMessageType::Question, VclButtonsType::YesNo);
                     OUString sMessText = aQBox->get_primary_text();
                     sMessText = sMessText.replaceFirst(
                         sVar, m_xUIHelper->getNodeDisplayName( pNode->m_xNode, false ) );
@@ -983,7 +983,7 @@ namespace svxform
             {
                 DBG_ASSERT( pNode->m_xPropSet.is(), "XFormsPage::RemoveEntry(): no propset" );
                 bool bSubmission = ( DGTSubmission == m_eGroup );
-                sal_uInt16 nResId = bSubmission ? RID_STR_QRY_REMOVE_SUBMISSION : RID_STR_QRY_REMOVE_BINDING;
+                const char* pResId = bSubmission ? RID_STR_QRY_REMOVE_SUBMISSION : RID_STR_QRY_REMOVE_BINDING;
                 OUString sProperty = bSubmission ? OUString(PN_SUBMISSION_ID) : OUString(PN_BINDING_ID);
                 OUString sSearch = bSubmission ? OUString(SUBMISSIONNAME) : OUString(BINDINGNAME);
                 OUString sName;
@@ -995,7 +995,7 @@ namespace svxform
                 {
                     SAL_WARN( "svx.form", "XFormsPage::RemoveEntry(): exception caught" );
                 }
-                ScopedVclPtrInstance<MessageDialog> aQBox(this, SvxResId(nResId),
+                ScopedVclPtrInstance<MessageDialog> aQBox(this, SvxResId(pResId),
                                                           VclMessageType::Question, VclButtonsType::YesNo);
                 OUString sMessText = aQBox->get_primary_text();
                 sMessText = sMessText.replaceFirst( sSearch, sName);
@@ -1314,8 +1314,8 @@ namespace svxform
         }
         if ( DGTInstance == m_eGroup )
         {
-            sal_uInt16 nResId1 = RID_STR_DATANAV_EDIT_ELEMENT;
-            sal_uInt16 nResId2 = RID_STR_DATANAV_REMOVE_ELEMENT;
+            const char* pResId1 = RID_STR_DATANAV_EDIT_ELEMENT;
+            const char* pResId2 = RID_STR_DATANAV_REMOVE_ELEMENT;
             if ( pEntry )
             {
                 ItemNode* pNode = static_cast< ItemNode* >( pEntry->GetUserData() );
@@ -1326,8 +1326,8 @@ namespace svxform
                         css::xml::dom::NodeType eChildType = pNode->m_xNode->getNodeType();
                         if ( eChildType == css::xml::dom::NodeType_ATTRIBUTE_NODE )
                         {
-                            nResId1 = RID_STR_DATANAV_EDIT_ATTRIBUTE;
-                            nResId2 = RID_STR_DATANAV_REMOVE_ATTRIBUTE;
+                            pResId1 = RID_STR_DATANAV_EDIT_ATTRIBUTE;
+                            pResId2 = RID_STR_DATANAV_REMOVE_ATTRIBUTE;
                         }
                     }
                     catch ( Exception& )
@@ -1336,12 +1336,12 @@ namespace svxform
                     }
                 }
             }
-            m_pToolBox->SetItemText( m_nEditId, SvxResId( nResId1 ) );
-            m_pToolBox->SetItemText( m_nRemoveId, SvxResId( nResId2 ) );
+            m_pToolBox->SetItemText( m_nEditId, SvxResId( pResId1 ) );
+            m_pToolBox->SetItemText( m_nRemoveId, SvxResId( pResId2 ) );
             if ( _pMenu )
             {
-                _pMenu->SetItemText(_pMenu->GetItemId("edit"), SvxResId( nResId1 ) );
-                _pMenu->SetItemText(_pMenu->GetItemId("delete"), SvxResId( nResId2 ) );
+                _pMenu->SetItemText(_pMenu->GetItemId("edit"), SvxResId( pResId1 ) );
+                _pMenu->SetItemText(_pMenu->GetItemId("delete"), SvxResId( pResId2 ) );
             }
         }
     }
@@ -3354,8 +3354,8 @@ namespace svxform
         m_pURLED->DisableHistory();
         m_pFilePickerBtn->SetClickHdl( LINK( this, AddInstanceDialog, FilePickerHdl ) );
 
-        // load the filter name from fps_office resource
-        m_sAllFilterName = ResId(STR_FILTERNAME_ALL, *ResMgr::CreateResMgr("fps_office"));
+        // load the filter name from fps resource
+        m_sAllFilterName = Translate::get(STR_FILTERNAME_ALL, Translate::Create("fps", Application::GetSettings().GetUILanguageTag()));
     }
 
     AddInstanceDialog::~AddInstanceDialog()
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
deleted file mode 100644
index cca33a4c7bf1..000000000000
--- a/svx/source/form/datanavi.src
+++ /dev/null
@@ -1,209 +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 "svx/fmresids.hrc"
-#include "fmhelp.hrc"
-
-String RID_STR_QRY_REMOVE_MODEL
-{
-    Text [ en-US ] = "Deleting the model '$MODELNAME' affects all controls currently bound to this model.\nDo you really want to delete this model?" ;
-};
-
-String RID_STR_QRY_REMOVE_INSTANCE
-{
-    Text [ en-US ] = "Deleting the instance '$INSTANCENAME' affects all controls currently bound to this instance.\nDo you really want to delete this instance?" ;
-};
-
-String RID_STR_QRY_REMOVE_ELEMENT
-{
-    Text [ en-US ] = "Deleting the element '$ELEMENTNAME' affects all controls currently bound to this element.\nDo you really want to delete this element?" ;
-};
-
-String RID_STR_QRY_REMOVE_ATTRIBUTE
-{
-    Text [ en-US ] = "Do you really want to delete the attribute '$ATTRIBUTENAME'?" ;
-};
-
-String RID_STR_QRY_REMOVE_SUBMISSION
-{
-    Text [ en-US ] = "Deleting the submission '$SUBMISSIONNAME' affects all controls currently bound to this submission.\n\nDo you really want to delete this submission?" ;
-};
-
-String RID_STR_QRY_REMOVE_BINDING
-{
-    Text [ en-US ] = "Deleting the binding '$BINDINGNAME' affects all controls currently bound to this binding.\n\nDo you really want to delete this binding?" ;
-};
-
-String RID_STR_INVALID_XMLNAME
-{
-    Text [ en-US ] = "The name '%1' is not valid in XML. Please enter a different name." ;
-};
-
-String RID_STR_INVALID_XMLPREFIX
-{
-    Text [ en-US ] = "The prefix '%1' is not valid in XML. Please enter a different prefix." ;
-};
-
-String RID_STR_DOUBLE_MODELNAME
-{
-    Text [ en-US ] = "The name '%1' already exists. Please enter a new name." ;
-};
-
-String RID_STR_EMPTY_SUBMISSIONNAME
-{
-    Text [ en-US ] = "The submission must have a name." ;
-};
-
-String RID_STR_METHOD_POST
-{
-    Text [ en-US ] = "Post" ;
-};
-
-String RID_STR_METHOD_PUT
-{
-    Text [ en-US ] = "Put" ;
-};
-
-String RID_STR_METHOD_GET
-{
-    Text [ en-US ] = "Get" ;
-};
-
-String RID_STR_REPLACE_NONE
-{
-    Text [ en-US ] = "None" ;
-};
-
-String RID_STR_REPLACE_INST
-{
-    Text [ en-US ] = "Instance" ;
-};
-
-String RID_STR_REPLACE_DOC
-{
-    Text [ en-US ] = "Document" ;
-};
-
-String RID_STR_DATANAV_SUBM_BIND
-{
-    Text [ en-US ] = "Binding: " ;
-};
-
-String RID_STR_DATANAV_SUBM_REF
-{
-    Text [ en-US ] = "Reference: " ;
-};
-
-String RID_STR_DATANAV_SUBM_ACTION
-{
-    Text [ en-US ] = "Action: " ;
-};
-
-String RID_STR_DATANAV_SUBM_METHOD
-{
-    Text [ en-US ] = "Method: " ;
-};
-
-String RID_STR_DATANAV_SUBM_REPLACE
-{
-    Text [ en-US ] = "Replace: " ;
-};
-
-String RID_STR_DATANAV_ADD_ELEMENT
-{
-    Text [ en-US ] = "Add Element" ;
-};
-
-String RID_STR_DATANAV_EDIT_ELEMENT
-{
-    Text [ en-US ] = "Edit Element" ;
-};
-
-String RID_STR_DATANAV_REMOVE_ELEMENT
-{
-    Text [ en-US ] = "Delete Element" ;
-};
-
-String RID_STR_DATANAV_ADD_ATTRIBUTE
-{
-    Text [ en-US ] = "Add Attribute" ;
-};
-
-String RID_STR_DATANAV_EDIT_ATTRIBUTE
-{
-    Text [ en-US ] = "Edit Attribute" ;
-};
-
-String RID_STR_DATANAV_REMOVE_ATTRIBUTE
-{
-    Text [ en-US ] = "Delete Attribute" ;
-};
-
-String RID_STR_DATANAV_ADD_BINDING
-{
-    Text [ en-US ] = "Add Binding" ;
-};
-
-String RID_STR_DATANAV_EDIT_BINDING
-{
-    Text [ en-US ] = "Edit Binding" ;
-};
-
-String RID_STR_DATANAV_REMOVE_BINDING
-{
-    Text [ en-US ] = "Delete Binding" ;
-};
-
-String RID_STR_DATANAV_ADD_SUBMISSION
-{
-    Text [ en-US ] = "Add Submission" ;
-};
-
-String RID_STR_DATANAV_EDIT_SUBMISSION
-{
-    Text [ en-US ] = "Edit Submission" ;
-};
-
-String RID_STR_DATANAV_REMOVE_SUBMISSION
-{
-    Text [ en-US ] = "Delete Submission" ;
-};
-
-String RID_STR_ELEMENT
-{
-    Text [ en-US ] = "Element" ;
-};
-
-String RID_STR_ATTRIBUTE
-{
-    Text [ en-US ] = "Attribute" ;
-};
-
-String RID_STR_BINDING
-{
-    Text [ en-US ] = "Binding" ;
-};
-
-String RID_STR_BINDING_EXPR
-{
-    Text [ en-US ] = "Binding expression" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index e6a855e860d4..3eb21268652d 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -23,7 +23,7 @@
 #include "fmhelp.hrc"
 #include "fmitems.hxx"
 #include "fmprop.hrc"
-#include "svx/fmresids.hrc"
+#include <svx/strings.hrc>
 
 #include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/awt/XControl.hpp>
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 93f7c5bd2339..c0611b084cd9 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -23,7 +23,7 @@
 #include "fmhelp.hrc"
 #include "fmprop.hrc"
 #include "fmPropBrw.hxx"
-#include "svx/fmresids.hrc"
+#include "svx/strings.hrc"
 #include "fmservs.hxx"
 #include "fmshimp.hxx"
 #include "fmpgeimp.hxx"
@@ -104,7 +104,7 @@ const long STD_MIN_SIZE_Y = 250;
 
 OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj)
 {
-    sal_uInt16 nClassNameResourceId = 0;
+    const char* pClassNameResourceId = nullptr;
 
     switch ( nClassId )
     {
@@ -112,12 +112,12 @@ OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj)
         {
             Reference< XInterface >  xIFace;
             aUnoObj >>= xIFace;
-            nClassNameResourceId = RID_STR_PROPTITLE_EDIT;
+            pClassNameResourceId = RID_STR_PROPTITLE_EDIT;
             if (xIFace.is())
             {   // we have a chance to check if it's a formatted field model
                 Reference< XServiceInfo >  xInfo(xIFace, UNO_QUERY);
                 if (xInfo.is() && (xInfo->supportsService(FM_SUN_COMPONENT_FORMATTEDFIELD)))
-                    nClassNameResourceId = RID_STR_PROPTITLE_FORMATTED;
+                    pClassNameResourceId = RID_STR_PROPTITLE_FORMATTED;
                 else if (!xInfo.is())
                 {
                     // couldn't distinguish between formatted and edit with the service name, so try with the properties
@@ -126,7 +126,7 @@ OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj)
                     {
                         Reference< XPropertySetInfo >  xPropsInfo = xProps->getPropertySetInfo();
                         if (xPropsInfo.is() && xPropsInfo->hasPropertyByName(FM_PROP_FORMATSSUPPLIER))
-                            nClassNameResourceId = RID_STR_PROPTITLE_FORMATTED;
+                            pClassNameResourceId = RID_STR_PROPTITLE_FORMATTED;
                     }
                 }
             }
@@ -134,51 +134,51 @@ OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj)
         break;
 
         case FormComponentType::COMMANDBUTTON:
-            nClassNameResourceId = RID_STR_PROPTITLE_PUSHBUTTON; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_PUSHBUTTON; break;
         case FormComponentType::RADIOBUTTON:
-            nClassNameResourceId = RID_STR_PROPTITLE_RADIOBUTTON; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_RADIOBUTTON; break;
         case FormComponentType::CHECKBOX:
-            nClassNameResourceId = RID_STR_PROPTITLE_CHECKBOX; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_CHECKBOX; break;
         case FormComponentType::LISTBOX:
-            nClassNameResourceId = RID_STR_PROPTITLE_LISTBOX; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_LISTBOX; break;
         case FormComponentType::COMBOBOX:
-            nClassNameResourceId = RID_STR_PROPTITLE_COMBOBOX; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_COMBOBOX; break;
         case FormComponentType::GROUPBOX:
-            nClassNameResourceId = RID_STR_PROPTITLE_GROUPBOX; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_GROUPBOX; break;
         case FormComponentType::IMAGEBUTTON:
-            nClassNameResourceId = RID_STR_PROPTITLE_IMAGEBUTTON; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_IMAGEBUTTON; break;
         case FormComponentType::FIXEDTEXT:
-            nClassNameResourceId = RID_STR_PROPTITLE_FIXEDTEXT; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_FIXEDTEXT; break;
         case FormComponentType::GRIDCONTROL:
-            nClassNameResourceId = RID_STR_PROPTITLE_DBGRID; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_DBGRID; break;
         case FormComponentType::FILECONTROL:
-            nClassNameResourceId = RID_STR_PROPTITLE_FILECONTROL; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_FILECONTROL; break;
         case FormComponentType::DATEFIELD:
-            nClassNameResourceId = RID_STR_PROPTITLE_DATEFIELD; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_DATEFIELD; break;
         case FormComponentType::TIMEFIELD:
-            nClassNameResourceId = RID_STR_PROPTITLE_TIMEFIELD; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_TIMEFIELD; break;
         case FormComponentType::NUMERICFIELD:
-            nClassNameResourceId = RID_STR_PROPTITLE_NUMERICFIELD; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_NUMERICFIELD; break;
         case FormComponentType::CURRENCYFIELD:
-            nClassNameResourceId = RID_STR_PROPTITLE_CURRENCYFIELD; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_CURRENCYFIELD; break;
         case FormComponentType::PATTERNFIELD:
-            nClassNameResourceId = RID_STR_PROPTITLE_PATTERNFIELD; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_PATTERNFIELD; break;
         case FormComponentType::IMAGECONTROL:
-            nClassNameResourceId = RID_STR_PROPTITLE_IMAGECONTROL; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_IMAGECONTROL; break;
         case FormComponentType::HIDDENCONTROL:
-            nClassNameResourceId = RID_STR_PROPTITLE_HIDDEN; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_HIDDEN; break;
         case FormComponentType::SCROLLBAR:
-            nClassNameResourceId = RID_STR_PROPTITLE_SCROLLBAR; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_SCROLLBAR; break;
         case FormComponentType::SPINBUTTON:
-            nClassNameResourceId = RID_STR_PROPTITLE_SPINBUTTON; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_SPINBUTTON; break;
         case FormComponentType::NAVIGATIONBAR:
-            nClassNameResourceId = RID_STR_PROPTITLE_NAVBAR; break;
+            pClassNameResourceId = RID_STR_PROPTITLE_NAVBAR; break;
         case FormComponentType::CONTROL:
         default:
-            nClassNameResourceId = RID_STR_CONTROL; break;
+            pClassNameResourceId = RID_STR_CONTROL; break;
     }
 
-    return SvxResId(nClassNameResourceId);
+    return SvxResId(pClassNameResourceId);
 }
 
 FmPropBrw::FmPropBrw( const Reference< XComponentContext >& _xORB, SfxBindings* _pBindings,
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 39be171835b2..5d0b439e6fd4 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "svx/fmresids.hrc"
+#include <svx/strings.hrc>
 #include "fmexpl.hxx"
 
 #include "fmhelp.hrc"
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index acb25f5758b9..a792f3919b53 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -21,7 +21,6 @@
 #include "fmprop.hrc"
 #include "fmvwimp.hxx"
 #include "fmpgeimp.hxx"
-#include "svx/fmresids.hrc"
 #include "svx/fmview.hxx"
 #include "svx/fmglob.hxx"
 #include "svx/fmpage.hxx"
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index 8755138a576d..924010787f16 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -35,9 +35,7 @@
 
 #include <svx/svxids.hrc>
 #include "tbxform.hxx"
-#include <tools/resid.hxx>
 
-#include "svx/fmresids.hrc"
 #include <svx/dialmgr.hxx>
 #include "tabwin.hxx"
 #include "fmexpl.hxx"
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index 394dd5a863a0..ef2c1d7a0fd9 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -26,7 +26,6 @@
 
 #include "fmobj.hxx"
 
-#include <svx/fmresids.hrc>
 #include <svx/dialmgr.hxx>
 
 #include "fmpgeimp.hxx"
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index 3da638ebcc24..cd579f0fe24a 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -27,7 +27,7 @@
 #include "fmobj.hxx"
 #include "formcontrolfactory.hxx"
 #include "svx/svditer.hxx"
-#include "svx/fmresids.hrc"
+#include "svx/strings.hrc"
 #include "treevisitor.hxx"
 
 #include <com/sun/star/sdb/CommandType.hpp>
@@ -39,7 +39,6 @@
 #include <svx/fmglob.hxx>
 #include <svx/fmpage.hxx>
 #include <svx/fmmodel.hxx>
-#include <tools/resid.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/stdtext.hxx>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 1d6e48f2ebdf..5d700e69a4d6 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -55,7 +55,6 @@
 
 #include <svx/svxids.hrc>
 
-#include "svx/fmresids.hrc"
 #include "fmexch.hxx"
 #include <svx/fmglob.hxx>
 #include <svl/eitem.hxx>
@@ -77,7 +76,7 @@
 #include "formtoolbars.hxx"
 
 #include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 
 #include "svx/sdrobjectfilter.hxx"
 
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 0e285474c6ad..d463f66b8ffc 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -24,7 +24,6 @@
 #include "fmpgeimp.hxx"
 #include "svx/fmtools.hxx"
 #include "fmprop.hrc"
-#include "svx/fmresids.hrc"
 #include "fmservs.hxx"
 #include "fmshimp.hxx"
 #include "fmtextcontrolshell.hxx"
@@ -35,7 +34,7 @@
 #include "gridcols.hxx"
 #include "svx/svditer.hxx"
 #include "svx/dialmgr.hxx"
-#include "svx/dialogs.hrc"
+#include "svx/strings.hrc"
 #include "svx/fmglob.hxx"
 #include "svx/fmmodel.hxx"
 #include "svx/fmpage.hxx"
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index cbcc635a3296..cd5e94199c46 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -19,7 +19,6 @@
 
 
 #include <rtl/strbuf.hxx>
-#include "svx/fmresids.hrc"
 #include "svx/fmtools.hxx"
 #include "svx/fmsrccfg.hxx"
 #include <tools/debug.hxx>
diff --git a/svx/source/form/fmstring.src b/svx/source/form/fmstring.src
deleted file mode 100644
index f2b0f1e2963e..000000000000
--- a/svx/source/form/fmstring.src
+++ /dev/null
@@ -1,366 +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/fmresids.hrc"
-/* Strings for translation */
-String RID_ERR_FIELDREQUIRED
-{
-    Text [ en-US ] = "Input required in field '#'. Please enter a value.";
-};
-String RID_STR_FORMS
-{
-    Text [ en-US ] = "Forms";
-};
-String RID_STR_NO_PROPERTIES
-{
-    Text [ en-US ] = "No control selected";
-};
-String RID_STR_PROPERTIES_CONTROL
-{
-    Text [ en-US ] = "Properties: ";
-};
-String RID_STR_PROPERTIES_FORM
-{
-    Text [ en-US ] = "Form Properties";
-};
-String RID_STR_FMEXPLORER
-{
-    Text [ en-US ] = "Form Navigator";
-};
-String RID_STR_FORM
-{
-    Text [ en-US ] = "Form";
-};
-StringArray RID_RSC_TABWIN_PREFIX
-{
-    ItemList [ en-US ] =
-    {
-        < "Table"; >;
-        < "Query"; >;
-        < "SQL"; >;
-    };
-};
-String RID_STR_STDFORMNAME
-{
-    Text [ en-US ]= "Form";
-};
-String RID_STR_PROPTITLE_HIDDEN
-{
-    Text [ en-US ] = "Hidden Control";
-};
-String RID_STR_CONTROL
-{
-    Text [ en-US ] = "Control";
-};
-String RID_STR_REC_TEXT
-{
-    Text [ en-US ] = "Record";
-};
-String RID_STR_REC_FROM_TEXT
-{
-    Text [ en-US ] = "of";
-};
-String RID_STR_FIELDSELECTION
-{
-    Text [ en-US ] = "Add field:";
-};
-String RID_STR_WRITEERROR
-{
-    Text [ en-US ] = "Error writing data to database";
-};
-
-String RID_STR_SYNTAXERROR
-{
-    Text [ en-US ] = "Syntax error in query expression";
-};
-
-String RID_STR_DELETECONFIRM_RECORD
-{
-    Text [ en-US ] = "You intend to delete 1 record.";
-};
-String RID_STR_DELETECONFIRM_RECORDS
-{
-    Text [ en-US ] = "# records will be deleted.";
-};
-String RID_STR_DELETECONFIRM
-{
-    Text [ en-US ] = "If you click Yes, you won't be able to undo this operation.\nDo you want to continue anyway?";
-};
-
-String RID_STR_NAVIGATIONBAR
-{
-    Text [ en-US ] = "Navigation bar";
-};
-String RID_STR_COLUMN
-{
-    Text [ en-US ] = "Col";
-};
-String RID_STR_UNDO_PROPERTY
-{
-    Text [ en-US ] = "Set property '#'";
-};
-String RID_STR_UNDO_CONTAINER_INSERT
-{
-    Text [ en-US ] = "Insert in container";
-};
-String RID_STR_UNDO_CONTAINER_REMOVE
-{
-    Text [ en-US ] = "Delete #";
-};
-String RID_STR_UNDO_CONTAINER_REMOVE_MULTIPLE
-{
-    Text [ en-US ] = "Delete # objects";
-};
-String RID_STR_UNDO_CONTAINER_REPLACE
-{
-    Text [ en-US ] = "Replace a container element";
-};
-String RID_STR_UNDO_MODEL_REPLACE
-{
-    Text [ en-US ] = "Replace Control";
-};
-String RID_STR_PROPTITLE_PUSHBUTTON
-{
-    Text [ en-US ] = "Push Button";
-};
-String RID_STR_PROPTITLE_RADIOBUTTON
-{
-    Text [ en-US ] = "Option Button";
-};
-String RID_STR_PROPTITLE_CHECKBOX
-{
-    Text [ en-US ] = "Check Box";
-};
-String RID_STR_PROPTITLE_FIXEDTEXT
-{
-    Text [ en-US ] = "Label Field";
-};
-String RID_STR_PROPTITLE_GROUPBOX
-{
-    Text [ en-US ] = "Group Box";
-};
-String RID_STR_PROPTITLE_EDIT
-{
-    Text [ en-US ] = "Text Box";
-};
-String RID_STR_PROPTITLE_FORMATTED
-{
-    Text [ en-US ] = "Formatted Field";
-};
-String RID_STR_PROPTITLE_LISTBOX
-{
-    Text [ en-US ] = "List Box";
-};
-String RID_STR_PROPTITLE_COMBOBOX
-{
-    Text [ en-US ] = "Combo Box";
-};
-String RID_STR_PROPTITLE_IMAGEBUTTON
-{
-    Text [ en-US ] = "Image Button";
-};
-String RID_STR_PROPTITLE_IMAGECONTROL
-{
-    Text [ en-US ] = "Image Control";
-};
-String RID_STR_PROPTITLE_FILECONTROL
-{
-    Text [ en-US ] = "File Selection";
-};
-String RID_STR_PROPTITLE_DATEFIELD
-{
-    Text [ en-US ] = "Date Field";
-};
-String RID_STR_PROPTITLE_TIMEFIELD
-{
-    Text [ en-US ] = "Time Field";
-};
-String RID_STR_PROPTITLE_NUMERICFIELD
-{
-    Text [ en-US ] = "Numeric Field";
-};
-String RID_STR_PROPTITLE_CURRENCYFIELD
-{
-    Text [ en-US ] = "Currency Field";
-};
-String RID_STR_PROPTITLE_PATTERNFIELD
-{
-    Text [ en-US ] = "Pattern Field";
-};
-String RID_STR_PROPTITLE_DBGRID
-{
-    Text [ en-US ] = "Table Control ";
-};
-String RID_STR_PROPTITLE_SCROLLBAR
-{
-    Text [ en-US ] = "Scrollbar";
-};
-String RID_STR_PROPTITLE_SPINBUTTON
-{
-    Text [ en-US ] = "Spin Button";
-};
-String RID_STR_PROPTITLE_NAVBAR
-{
-    Text [ en-US ] = "Navigation Bar";
-};
-String RID_STR_PROPTITLE_MULTISELECT
-{
-    Text [ en-US ] = "Multiselection";
-};
-String RID_STR_NODATACONTROLS
-{
-    Text [ en-US ] = "No data-related controls in the current form!";
-};
-String RID_STR_POSTFIX_DATE
-{
-    Text [ en-US ] = " (Date)";
-};
-String RID_STR_POSTFIX_TIME
-{
-    Text [ en-US ] = " (Time)";
-};
-String RID_STR_FILTER_NAVIGATOR
-{
-    Text [ en-US ] = "Filter navigator";
-};
-
-String RID_STR_FILTER_FILTER_FOR
-{
-    Text [ en-US ] = "Filter for";
-};
-
-String RID_STR_FILTER_FILTER_OR
-{
-    Text [ en-US ] = "Or";
-};
-
-String RID_STR_NOCONTROLS_FOR_EXTERNALDISPLAY
-{
-    Text [ en-US ] = "Valid bound controls which can be used in the table view do not exist in the current form.";
-};
-String RID_STR_AUTOFIELD
-{
-    Text [ en-US ] = "<AutoField>";
-};
-
-StringArray RID_RSC_SQL_INTERNATIONAL
-{
-    ItemList [ en-US ] =
-    {
-        < "LIKE"; >;
-        < "NOT"; >;
-        < "EMPTY"; >;
-        < "TRUE"; >;
-        < "FALSE"; >;
-        < "IS"; >;
-        < "BETWEEN"; >;
-        < "OR"; >;
-        < "AND"; >;
-        < "Average"; >;
-        < "Count"; >;
-        < "Maximum"; >;
-        < "Minimum"; >;
-        < "Sum"; >;
-        < "Every"; >;
-        < "Any"; >;
-        < "Some"; >;
-        < "STDDEV_POP"; >;
-        < "STDDEV_SAMP"; >;
-        < "VAR_SAMP"; >;
-        < "VAR_POP"; >;
-        < "Collect"; >;
-        < "Fusion"; >;
-        < "Intersection"; >;
-    };
-};
-
-String RID_STR_SVT_SQL_SYNTAX_ERROR
-{
-    Text [ en-US ] = "Syntax error in SQL statement";
-};
-
-String RID_STR_SVT_SQL_SYNTAX_VALUE_NO_LIKE
-{
-    Text [ en-US ] = "The value #1 cannot be used with LIKE.";
-};
-
-String RID_STR_SVT_SQL_SYNTAX_FIELD_NO_LIKE
-{
-    Text [ en-US ] = "LIKE cannot be used with this field.";
-};
-
-String RID_STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID
-{
-    Text [ en-US ] = "The value entered is not a valid date. Please enter a date in a valid format, for example, MM/DD/YY.";
-};
-
-String RID_STR_SVT_SQL_SYNTAX_INT_NO_VALID
-{
-    Text [ en-US ] = "The field cannot be compared with an integer.";
-};
-String RID_STR_SVT_SQL_SYNTAX_TABLE
-{
-    Text [ en-US ] = "The database does not contain a table named \"#\".";
-};
-String RID_STR_SVT_SQL_SYNTAX_TABLE_OR_QUERY
-{
-    Text [ en-US ] = "The database does contain neither a table nor a query named \"#\".";
-};
-String RID_STR_SVT_SQL_SYNTAX_TABLE_EXISTS
-{
-    Text [ en-US ] = "The database already contains a table or view with name \"#\".";
-};
-String RID_STR_SVT_SQL_SYNTAX_QUERY_EXISTS
-{
-    Text [ en-US ] = "The database already contains a query with name \"#\".";
-};
-String RID_STR_SVT_SQL_SYNTAX_COLUMN
-{
-    Text [ en-US ] = "The column \"#1\" is unknown in the table \"#2\".";
-};
-String RID_STR_SVT_SQL_SYNTAX_REAL_NO_VALID
-{
-    Text [ en-US ] = "The field cannot be compared with a floating point number.";
-};
-
-String RID_STR_SVT_SQL_SYNTAX_CRIT_NO_COMPARE
-{
-    Text [ en-US ] = "The entered criterion cannot be compared with this field.";
-};
-
-String RID_STR_DATANAVIGATOR
-{
-    Text [ en-US ] = "Data Navigator";
-};
-
-String RID_STR_READONLY_VIEW
-{
-    Text [ en-US ] = " (read-only)";
-};
-
-String RID_STR_ALREADYEXISTOVERWRITE
-{
-    Text [ en-US ] = "The file already exists. Overwrite?" ;
-};
-String RID_STR_OBJECT_LABEL
-{
-    Text [ en-US ] = "#object# label";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx
index 2a8580e6827b..e2b298b99728 100644
--- a/svx/source/form/fmtextcontroldialogs.cxx
+++ b/svx/source/form/fmtextcontroldialogs.cxx
@@ -20,6 +20,7 @@
 #include "fmtextcontroldialogs.hxx"
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 
 #include <editeng/eeitem.hxx>
 
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 9d742c2f600b..5d71b38977f6 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -19,7 +19,6 @@
 
 
 #include "fmprop.hrc"
-#include "svx/fmresids.hrc"
 #include "fmtextcontroldialogs.hxx"
 #include "fmtextcontrolfeature.hxx"
 #include "fmtextcontrolshell.hxx"
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index dd149236bfe3..7e3bd870fe77 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -27,7 +27,7 @@
 #include "svx/svditer.hxx"
 #include "fmobj.hxx"
 #include "fmprop.hrc"
-#include "svx/fmresids.hrc"
+#include "svx/strings.hrc"
 #include "svx/fmglob.hxx"
 #include "svx/dialmgr.hxx"
 #include "svx/fmmodel.hxx"
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 019419d204cd..029f2d6cc708 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -23,7 +23,7 @@
 #include "fmobj.hxx"
 #include "fmpgeimp.hxx"
 #include "fmprop.hrc"
-#include "svx/fmresids.hrc"
+#include "svx/strings.hrc"
 #include "fmservs.hxx"
 #include "fmshimp.hxx"
 #include "svx/fmtools.hxx"
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index 8224dcc6b79a..728166409e43 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -21,7 +21,7 @@
 #include "formcontrolfactory.hxx"
 #include "fmcontrollayout.hxx"
 #include "fmprop.hrc"
-#include "svx/fmresids.hrc"
+#include "svx/strings.hrc"
 #include "fmservs.hxx"
 #include "svx/dialmgr.hxx"
 #include "svx/svdouno.hxx"
@@ -464,18 +464,18 @@ namespace svxform
                     OUString sInitialLabel;
                     OSL_VERIFY( _rxControlModel->getPropertyValue( FM_PROP_NAME ) >>= sInitialLabel );
 
-                    sal_uInt16 nTitleResId = 0;
+                    const char* pTitleResId = nullptr;
                     switch ( nClassId )
                     {
-                        case FormComponentType::COMMANDBUTTON:  nTitleResId = RID_STR_PROPTITLE_PUSHBUTTON;      break;
-                        case FormComponentType::RADIOBUTTON:    nTitleResId = RID_STR_PROPTITLE_RADIOBUTTON;     break;
-                        case FormComponentType::CHECKBOX:       nTitleResId = RID_STR_PROPTITLE_CHECKBOX;        break;
-                        case FormComponentType::GROUPBOX:       nTitleResId = RID_STR_PROPTITLE_GROUPBOX;        break;
-                        case FormComponentType::FIXEDTEXT:      nTitleResId = RID_STR_PROPTITLE_FIXEDTEXT;       break;
+                        case FormComponentType::COMMANDBUTTON:  pTitleResId = RID_STR_PROPTITLE_PUSHBUTTON;      break;
+                        case FormComponentType::RADIOBUTTON:    pTitleResId = RID_STR_PROPTITLE_RADIOBUTTON;     break;
+                        case FormComponentType::CHECKBOX:       pTitleResId = RID_STR_PROPTITLE_CHECKBOX;        break;
+                        case FormComponentType::GROUPBOX:       pTitleResId = RID_STR_PROPTITLE_GROUPBOX;        break;
+                        case FormComponentType::FIXEDTEXT:      pTitleResId = RID_STR_PROPTITLE_FIXEDTEXT;       break;
                     }
 
-                    if ( nTitleResId )
-                        sInitialLabel = SvxResId(nTitleResId);
+                    if (pTitleResId)
+                        sInitialLabel = SvxResId(pTitleResId);
 
                     _rxControlModel->setPropertyValue(
                         FM_PROP_LABEL,
@@ -644,42 +644,42 @@ namespace svxform
 
     OUString FormControlFactory::getDefaultName( sal_Int16 _nClassId, const Reference< XServiceInfo >& _rxObject )
     {
-        sal_uInt16 nResId(0);
+        const char* pResId(nullptr);
 
         switch ( _nClassId )
         {
-            case FormComponentType::COMMANDBUTTON:  nResId = RID_STR_PROPTITLE_PUSHBUTTON;  break;
-            case FormComponentType::RADIOBUTTON:    nResId = RID_STR_PROPTITLE_RADIOBUTTON; break;
-            case FormComponentType::CHECKBOX:       nResId = RID_STR_PROPTITLE_CHECKBOX;    break;
-            case FormComponentType::LISTBOX:        nResId = RID_STR_PROPTITLE_LISTBOX;     break;
-            case FormComponentType::COMBOBOX:       nResId = RID_STR_PROPTITLE_COMBOBOX;    break;
-            case FormComponentType::GROUPBOX:       nResId = RID_STR_PROPTITLE_GROUPBOX;    break;
-            case FormComponentType::IMAGEBUTTON:    nResId = RID_STR_PROPTITLE_IMAGEBUTTON; break;
-            case FormComponentType::FIXEDTEXT:      nResId = RID_STR_PROPTITLE_FIXEDTEXT;   break;
-            case FormComponentType::GRIDCONTROL:    nResId = RID_STR_PROPTITLE_DBGRID;      break;
-            case FormComponentType::FILECONTROL:    nResId = RID_STR_PROPTITLE_FILECONTROL; break;
-            case FormComponentType::DATEFIELD:      nResId = RID_STR_PROPTITLE_DATEFIELD;   break;
-            case FormComponentType::TIMEFIELD:      nResId = RID_STR_PROPTITLE_TIMEFIELD;   break;
-            case FormComponentType::NUMERICFIELD:   nResId = RID_STR_PROPTITLE_NUMERICFIELD;    break;
-            case FormComponentType::CURRENCYFIELD:  nResId = RID_STR_PROPTITLE_CURRENCYFIELD;   break;
-            case FormComponentType::PATTERNFIELD:   nResId = RID_STR_PROPTITLE_PATTERNFIELD;    break;
-            case FormComponentType::IMAGECONTROL:   nResId = RID_STR_PROPTITLE_IMAGECONTROL;    break;
-            case FormComponentType::HIDDENCONTROL:  nResId = RID_STR_PROPTITLE_HIDDEN;      break;
-            case FormComponentType::SCROLLBAR:      nResId = RID_STR_PROPTITLE_SCROLLBAR;   break;
-            case FormComponentType::SPINBUTTON:     nResId = RID_STR_PROPTITLE_SPINBUTTON;  break;
-            case FormComponentType::NAVIGATIONBAR:  nResId = RID_STR_PROPTITLE_NAVBAR;      break;
+            case FormComponentType::COMMANDBUTTON:  pResId = RID_STR_PROPTITLE_PUSHBUTTON;  break;
+            case FormComponentType::RADIOBUTTON:    pResId = RID_STR_PROPTITLE_RADIOBUTTON; break;
+            case FormComponentType::CHECKBOX:       pResId = RID_STR_PROPTITLE_CHECKBOX;    break;
+            case FormComponentType::LISTBOX:        pResId = RID_STR_PROPTITLE_LISTBOX;     break;
+            case FormComponentType::COMBOBOX:       pResId = RID_STR_PROPTITLE_COMBOBOX;    break;
+            case FormComponentType::GROUPBOX:       pResId = RID_STR_PROPTITLE_GROUPBOX;    break;
+            case FormComponentType::IMAGEBUTTON:    pResId = RID_STR_PROPTITLE_IMAGEBUTTON; break;
+            case FormComponentType::FIXEDTEXT:      pResId = RID_STR_PROPTITLE_FIXEDTEXT;   break;
+            case FormComponentType::GRIDCONTROL:    pResId = RID_STR_PROPTITLE_DBGRID;      break;
+            case FormComponentType::FILECONTROL:    pResId = RID_STR_PROPTITLE_FILECONTROL; break;
+            case FormComponentType::DATEFIELD:      pResId = RID_STR_PROPTITLE_DATEFIELD;   break;
+            case FormComponentType::TIMEFIELD:      pResId = RID_STR_PROPTITLE_TIMEFIELD;   break;
+            case FormComponentType::NUMERICFIELD:   pResId = RID_STR_PROPTITLE_NUMERICFIELD;    break;
+            case FormComponentType::CURRENCYFIELD:  pResId = RID_STR_PROPTITLE_CURRENCYFIELD;   break;
+            case FormComponentType::PATTERNFIELD:   pResId = RID_STR_PROPTITLE_PATTERNFIELD;    break;
+            case FormComponentType::IMAGECONTROL:   pResId = RID_STR_PROPTITLE_IMAGECONTROL;    break;
+            case FormComponentType::HIDDENCONTROL:  pResId = RID_STR_PROPTITLE_HIDDEN;      break;
+            case FormComponentType::SCROLLBAR:      pResId = RID_STR_PROPTITLE_SCROLLBAR;   break;
+            case FormComponentType::SPINBUTTON:     pResId = RID_STR_PROPTITLE_SPINBUTTON;  break;
+            case FormComponentType::NAVIGATIONBAR:  pResId = RID_STR_PROPTITLE_NAVBAR;      break;
 
             case FormComponentType::TEXTFIELD:
-                nResId = RID_STR_PROPTITLE_EDIT;
+                pResId = RID_STR_PROPTITLE_EDIT;
                 if ( _rxObject.is() && _rxObject->supportsService( FM_SUN_COMPONENT_FORMATTEDFIELD ) )
-                    nResId = RID_STR_PROPTITLE_FORMATTED;
+                    pResId = RID_STR_PROPTITLE_FORMATTED;
                 break;
 
             default:
-                nResId = RID_STR_CONTROL;     break;
+                pResId = RID_STR_CONTROL;     break;
         }
 
-        return SvxResId(nResId);
+        return SvxResId(pResId);
     }
 
 
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 37e4bb1b3676..1c8baa032b56 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -26,7 +26,7 @@
 #include "formcontrolling.hxx"
 #include "fmprop.hrc"
 #include "svx/dialmgr.hxx"
-#include "svx/fmresids.hrc"
+#include "svx/strings.hrc"
 #include "fmservs.hxx"
 #include "svx/fmtools.hxx"
 #include "fmurl.hxx"
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index a81783be56bd..ef6d24af1eed 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -27,7 +27,6 @@
 
 #include "fmhelp.hrc"
 #include "fmexpl.hxx"
-#include "svx/fmresids.hrc"
 #include "fmshimp.hxx"
 #include "fmservs.hxx"
 #include "fmundo.hxx"
@@ -50,7 +49,7 @@
 #include <svx/sdrpaintwindow.hxx>
 
 #include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include "bitmaps.hlst"
 #include "svtools/treelistentry.hxx"
 
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index f7d6d3673973..b176b61fd5bf 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -31,7 +31,7 @@
 #include "fmundo.hxx"
 #include "fmhelp.hrc"
 #include "fmexpl.hxx"
-#include "svx/fmresids.hrc"
+#include "svx/strings.hrc"
 #include "fmshimp.hxx"
 #include "fmobj.hxx"
 #include <sfx2/objsh.hxx>
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index c426054fcb7c..df06fec08719 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -22,6 +22,7 @@
 #include "svx/fmtools.hxx"
 #include "fmservs.hxx"
 
+#include <svx/strings.hrc>
 #include <svx/svxids.hrc>
 #include <svx/dbaexchange.hxx>
 #include <com/sun/star/sdb/CommandType.hpp>
@@ -41,7 +42,6 @@
 
 #include "fmprop.hrc"
 
-#include "svx/fmresids.hrc"
 #include <svx/dialmgr.hxx>
 #include <svx/svdpagv.hxx>
 #include <sfx2/objitem.hxx>
@@ -50,8 +50,8 @@
 #include <sfx2/frame.hxx>
 #include <svx/dataaccessdescriptor.hxx>
 #include "svtools/treelistentry.hxx"
-#include <tools/resary.hxx>
 #include <vcl/settings.hxx>
+#include "tabwin.hrc"
 
 const long STD_WIN_SIZE_X = 120;
 const long STD_WIN_SIZE_Y = 150;
@@ -332,18 +332,17 @@ void FmFieldWin::UpdateContent(const css::uno::Reference< css::form::XForm > & x
 
         // set prefix
         OUString  aPrefix;
-        ResStringArray aPrefixes(ResId(RID_RSC_TABWIN_PREFIX, DIALOG_MGR()));
 
         switch (m_nObjectType)
         {
             case CommandType::TABLE:
-                aPrefix = aPrefixes.GetString(0);
+                aPrefix = SvxResId(RID_RSC_TABWIN_PREFIX[0]);
                 break;
             case CommandType::QUERY:
-                aPrefix = aPrefixes.GetString(1);
+                aPrefix = SvxResId(RID_RSC_TABWIN_PREFIX[1]);
                 break;
             default:
-                aPrefix = aPrefixes.GetString(2);
+                aPrefix = SvxResId(RID_RSC_TABWIN_PREFIX[2]);
                 break;
         }
 
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index b2051704ce33..90b4cae4aa74 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -30,10 +30,10 @@
 
 
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
+#include <svx/strings.hrc>
 #include "svx/tbxctl.hxx"
 #include "tbxform.hxx"
-#include "svx/fmresids.hrc"
 #include "fmhelp.hrc"
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx
index 8228852dba7d..755c162850b2 100644
--- a/svx/source/gallery2/GalleryControl.cxx
+++ b/svx/source/gallery2/GalleryControl.cxx
@@ -19,7 +19,7 @@
 
 #include "GalleryControl.hxx"
 
-#include "gallery.hrc"
+#include "svx/strings.hrc"
 #include "svx/galmisc.hxx"
 #include "svx/gallery1.hxx"
 #include "galbrws1.hxx"
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index b53c711b1061..f690357da5d3 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -32,9 +32,9 @@
 #include "svx/galmisc.hxx"
 #include "galbrws1.hxx"
 #include <com/sun/star/util/DateTime.hpp>
-#include "gallery.hrc"
+#include "svx/strings.hrc"
 #include <algorithm>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 
 #include <svx/svxdlg.hxx>
@@ -121,7 +121,7 @@ GalleryBrowser1::GalleryBrowser1(
     StartListening( *mpGallery );
 
     maNewTheme->SetHelpId( HID_GALLERY_NEWTHEME );
-    maNewTheme->SetText( GalResId(RID_SVXSTR_GALLERY_CREATETHEME));
+    maNewTheme->SetText( SvxResId(RID_SVXSTR_GALLERY_CREATETHEME));
     maNewTheme->SetClickHdl( LINK( this, GalleryBrowser1, ClickNewThemeHdl ) );
 
     // disable creation of new themes if a writable directory is not available
@@ -604,7 +604,7 @@ IMPL_LINK_NOARG(GalleryBrowser1, SelectThemeHdl, ListBox&, void)
 
 IMPL_LINK_NOARG(GalleryBrowser1, ClickNewThemeHdl, Button*, void)
 {
-    OUString  aNewTheme( GalResId(RID_SVXSTR_GALLERY_NEWTHEME) );
+    OUString  aNewTheme( SvxResId(RID_SVXSTR_GALLERY_NEWTHEME) );
     OUString  aName( aNewTheme );
     sal_uIntPtr nCount = 0;
 
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index cff892c4f875..6582b61d7e92 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -34,19 +34,20 @@
 #include <editeng/brushitem.hxx>
 #include "helpid.hrc"
 #include "svx/gallery.hxx"
+#include "svx/svxids.hrc"
 #include "galobj.hxx"
 #include "svx/gallery1.hxx"
 #include "svx/galtheme.hxx"
 #include "svx/galctrl.hxx"
 #include "svx/galmisc.hxx"
 #include "galbrws2.hxx"
-#include "gallery.hrc"
+#include "svx/strings.hrc"
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <svx/fmmodel.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include "GalleryControl.hxx"
 #include "bitmaps.hlst"
 
@@ -402,12 +403,12 @@ GalleryBrowser2::GalleryBrowser2( vcl::Window* pParent, Gallery* pGallery ) :
     maViewBox->InsertItem( TBX_ID_ICON, aDummyImage );
     maViewBox->SetItemBits( TBX_ID_ICON, ToolBoxItemBits::RADIOCHECK | ToolBoxItemBits::AUTOCHECK );
     maViewBox->SetHelpId( TBX_ID_ICON, HID_GALLERY_ICONVIEW );
-    maViewBox->SetQuickHelpText( TBX_ID_ICON, GalResId(RID_SVXSTR_GALLERY_ICONVIEW) );
+    maViewBox->SetQuickHelpText( TBX_ID_ICON, SvxResId(RID_SVXSTR_GALLERY_ICONVIEW) );
 
     maViewBox->InsertItem( TBX_ID_LIST, aDummyImage );
     maViewBox->SetItemBits( TBX_ID_LIST, ToolBoxItemBits::RADIOCHECK | ToolBoxItemBits::AUTOCHECK );
     maViewBox->SetHelpId( TBX_ID_LIST, HID_GALLERY_LISTVIEW );
-    maViewBox->SetQuickHelpText( TBX_ID_LIST, GalResId(RID_SVXSTR_GALLERY_LISTVIEW) );
+    maViewBox->SetQuickHelpText( TBX_ID_LIST, SvxResId(RID_SVXSTR_GALLERY_LISTVIEW) );
 
     MiscHdl( nullptr );
     maViewBox->SetSelectHdl( LINK( this, GalleryBrowser2, SelectTbxHdl ) );
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 9e10d6786228..4e1c02bcccf6 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -24,6 +24,7 @@
 #include <avmedia/mediaplayer.hxx>
 #include "helpid.hrc"
 #include "galbrws2.hxx"
+#include "svx/dialmgr.hxx"
 #include "svx/galtheme.hxx"
 #include "svx/galmisc.hxx"
 #include "svx/galctrl.hxx"
@@ -31,7 +32,7 @@
 #include <editeng/svxfont.hxx>
 #include "galobj.hxx"
 #include <avmedia/mediawindow.hxx>
-#include "gallery.hrc"
+#include "svx/strings.hrc"
 #include <vcl/graphicfilter.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
@@ -411,7 +412,7 @@ GalleryListView::GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme
 
     SetMode( BrowserMode::AUTO_VSCROLL | BrowserMode::AUTOSIZE_LASTCOL | BrowserMode::AUTO_HSCROLL );
     SetDataRowHeight( 28 );
-    InsertDataColumn( GALLERY_BRWBOX_TITLE, GalResId(RID_SVXSTR_GALLERY_TITLE), 256  );
+    InsertDataColumn( GALLERY_BRWBOX_TITLE, SvxResId(RID_SVXSTR_GALLERY_TITLE), 256  );
 }
 
 void GalleryListView::InitSettings()
diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src
deleted file mode 100644
index 5c1275e898e8..000000000000
--- a/svx/source/gallery2/gallery.src
+++ /dev/null
@@ -1,49 +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 <sfx2/sfxsids.hrc>
-#include "helpid.hrc"
-#include "gallery.hrc"
-
-String RID_SVXSTR_GALLERY_FILTER
-{
-    Text [ en-US ] = "Graphics filter" ;
-};
-String RID_SVXSTR_GALLERY_NEWTHEME
-{
-    Text [ en-US ] = "New Theme" ;
-};
-String RID_SVXSTR_GALLERY_CREATETHEME
-{
-    Text [ en-US ] = "New Theme..." ;
-};
-String RID_SVXSTR_GALLERY_TITLE
-{
-    Text [ en-US ] = "Title" ;
-};
-String RID_SVXSTR_GALLERY_ICONVIEW
-{
-    Text [ en-US ] = "Icon View";
-};
-String RID_SVXSTR_GALLERY_LISTVIEW
-{
-    Text [ en-US ] = "Detailed View";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 38abd6a0b9e7..2428e48cb5dc 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -32,13 +32,15 @@
 #include <comphelper/string.hxx>
 #include <osl/thread.h>
 #include <tools/vcompat.hxx>
+#include <vcl/lstbox.hxx>
 #include <ucbhelper/content.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/pathoptions.hxx>
 #include <sfx2/docfile.hxx>
+#include "svx/dialmgr.hxx"
 #include "svx/gallery.hxx"
-#include "gallery.hrc"
+#include "svx/strings.hrc"
 #include "strings.hxx"
 #include "svx/galmisc.hxx"
 #include "svx/galtheme.hxx"
@@ -58,6 +60,61 @@ static bool FileExists( const INetURLObject &rURL, const rtl::OUString &rExt )
     return FileExists( aURL );
 }
 
+const std::pair<sal_uInt16, const char*> aUnlocalized[] =
+{
+    { GALLERY_THEME_HOMEPAGE, RID_GALLERYSTR_THEME_HTMLBUTTONS },
+    { GALLERY_THEME_POWERPOINT, RID_GALLERYSTR_THEME_POWERPOINT },
+    { GALLERY_THEME_USERSOUNDS, RID_GALLERYSTR_THEME_USERSOUNDS },
+    { GALLERY_THEME_DUMMY5, RID_GALLERYSTR_THEME_DUMMY5 },
+    { GALLERY_THEME_RULERS, RID_GALLERYSTR_THEME_RULERS },
+    { GALLERY_THEME_FONTWORK, RID_GALLERYSTR_THEME_FONTWORK },
+    { GALLERY_THEME_FONTWORK_VERTICAL, RID_GALLERYSTR_THEME_FONTWORK_VERTICAL }
+};
+
+const std::pair<sal_uInt16, const char*> aLocalized[] =
+{
+    { RID_GALLERY_THEME_3D, RID_GALLERYSTR_THEME_3D },
+    { RID_GALLERY_THEME_ANIMATIONS, RID_GALLERYSTR_THEME_ANIMATIONS },
+    { RID_GALLERY_THEME_BULLETS, RID_GALLERYSTR_THEME_BULLETS },
+    { RID_GALLERY_THEME_OFFICE, RID_GALLERYSTR_THEME_OFFICE },
+    { RID_GALLERY_THEME_FLAGS, RID_GALLERYSTR_THEME_FLAGS },
+    { RID_GALLERY_THEME_FLOWCHARTS, RID_GALLERYSTR_THEME_FLOWCHARTS },
+    { RID_GALLERY_THEME_EMOTICONS, RID_GALLERYSTR_THEME_EMOTICONS },
+    { RID_GALLERY_THEME_PHOTOS, RID_GALLERYSTR_THEME_PHOTOS },
+    { RID_GALLERY_THEME_BACKGROUNDS, RID_GALLERYSTR_THEME_BACKGROUNDS },
+    { RID_GALLERY_THEME_HOMEPAGE, RID_GALLERYSTR_THEME_HOMEPAGE },
+    { RID_GALLERY_THEME_INTERACTION, RID_GALLERYSTR_THEME_INTERACTION },
+    { RID_GALLERY_THEME_MAPS, RID_GALLERYSTR_THEME_MAPS },
+    { RID_GALLERY_THEME_PEOPLE, RID_GALLERYSTR_THEME_PEOPLE },
+    { RID_GALLERY_THEME_SURFACES, RID_GALLERYSTR_THEME_SURFACES },
+    { RID_GALLERY_THEME_SOUNDS, RID_GALLERYSTR_THEME_SOUNDS },
+    { RID_GALLERY_THEME_SYMBOLS, RID_GALLERYSTR_THEME_SYMBOLS },
+    { RID_GALLERY_THEME_MYTHEME, RID_GALLERYSTR_THEME_MYTHEME },
+
+    { RID_GALLERY_THEME_ARROWS, RID_GALLERYSTR_THEME_ARROWS },
+    { RID_GALLERY_THEME_BALLOONS, RID_GALLERYSTR_THEME_BALLOONS },
+    { RID_GALLERY_THEME_KEYBOARD, RID_GALLERYSTR_THEME_KEYBOARD },
+    { RID_GALLERY_THEME_TIME, RID_GALLERYSTR_THEME_TIME },
+    { RID_GALLERY_THEME_PRESENTATION, RID_GALLERYSTR_THEME_PRESENTATION },
+    { RID_GALLERY_THEME_CALENDAR, RID_GALLERYSTR_THEME_CALENDAR },
+    { RID_GALLERY_THEME_NAVIGATION, RID_GALLERYSTR_THEME_NAVIGATION },
+    { RID_GALLERY_THEME_COMMUNICATION, RID_GALLERYSTR_THEME_COMMUNICATION },
+    { RID_GALLERY_THEME_FINANCES, RID_GALLERYSTR_THEME_FINANCES },
+    { RID_GALLERY_THEME_COMPUTER, RID_GALLERYSTR_THEME_COMPUTER },
+
+    { RID_GALLERY_THEME_CLIMA, RID_GALLERYSTR_THEME_CLIMA },
+    { RID_GALLERY_THEME_EDUCATION, RID_GALLERYSTR_THEME_EDUCATION },
+    { RID_GALLERY_THEME_TROUBLE, RID_GALLERYSTR_THEME_TROUBLE },
+    { RID_GALLERY_THEME_SCREENBEANS, RID_GALLERYSTR_THEME_SCREENBEANS },
+
+    { RID_GALLERY_THEME_COMPUTERS, RID_GALLERYSTR_THEME_COMPUTERS },
+    { RID_GALLERY_THEME_DIAGRAMS, RID_GALLERYSTR_THEME_DIAGRAMS },
+    { RID_GALLERY_THEME_ENVIRONMENT, RID_GALLERYSTR_THEME_ENVIRONMENT },
+    { RID_GALLERY_THEME_FINANCE, RID_GALLERYSTR_THEME_FINANCE },
+    { RID_GALLERY_THEME_TRANSPORT, RID_GALLERYSTR_THEME_TRANSPORT },
+    { RID_GALLERY_THEME_TXTSHAPES, RID_GALLERYSTR_THEME_TXTSHAPES }
+};
+
 GalleryThemeEntry::GalleryThemeEntry( bool bCreateUniqueURL,
                                       const INetURLObject& rBaseURL, const OUString& rName,
                                       bool _bReadOnly, bool _bNewFile,
@@ -104,15 +161,6 @@ GalleryThemeEntry::GalleryThemeEntry( bool bCreateUniqueURL,
     {
         //some of these are supposed to *not* be localized
         //so catch them before looking up the resource
-        const std::pair<sal_uInt16, const char*> aUnlocalized[] =
-        {
-            { GALLERY_THEME_HOMEPAGE, RID_GALLERYSTR_THEME_HTMLBUTTONS },
-            { GALLERY_THEME_POWERPOINT, RID_GALLERYSTR_THEME_POWERPOINT },
-            { GALLERY_THEME_USERSOUNDS, RID_GALLERYSTR_THEME_USERSOUNDS },
-            { GALLERY_THEME_DUMMY5, RID_GALLERYSTR_THEME_DUMMY5 },
-            { GALLERY_THEME_FONTWORK, RID_GALLERYSTR_THEME_FONTWORK },
-            { GALLERY_THEME_FONTWORK_VERTICAL, RID_GALLERYSTR_THEME_FONTWORK_VERTICAL }
-        };
         for (size_t i = 0; i < SAL_N_ELEMENTS(aUnlocalized); ++i)
         {
             if (aUnlocalized[i].first == nId)
@@ -123,13 +171,31 @@ GalleryThemeEntry::GalleryThemeEntry( bool bCreateUniqueURL,
         }
         //look up the rest of the ids in string resources
         if (aName.isEmpty())
-            aName = GalResId(RID_GALLERYSTR_THEME_START + (sal_uInt16) nId);
+        {
+            for (size_t i = 0; i < SAL_N_ELEMENTS(aLocalized); ++i)
+            {
+                if (aLocalized[i].first == nId)
+                {
+                    aName = SvxResId(aLocalized[i].second);
+                    break;
+                }
+            }
+        }
     }
 
     if( aName.isEmpty() )
         aName = rName;
 }
 
+void GalleryTheme::InsertAllThemes( ListBox& rListBox )
+{
+    for (size_t i = 0; i < SAL_N_ELEMENTS(aUnlocalized); ++i)
+        rListBox.InsertEntry(OUString::createFromAscii(aUnlocalized[i].second));
+
+    for (size_t i = 0; i < SAL_N_ELEMENTS(aLocalized); ++i)
+        rListBox.InsertEntry(SvxResId(aLocalized[i].second));
+}
+
 INetURLObject GalleryThemeEntry::ImplGetURLIgnoreCase( const INetURLObject& rURL )
 {
     INetURLObject   aURL( rURL );
@@ -473,13 +539,13 @@ OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const
         switch( nThemeId )
         {
             case GALLERY_THEME_3D:
-                aFallback = GalResId(RID_GALLERYSTR_THEME_3D);
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_3D);
                 break;
             case GALLERY_THEME_BULLETS:
-                aFallback = GalResId(RID_GALLERYSTR_THEME_BULLETS);
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_BULLETS);
                 break;
             case GALLERY_THEME_HOMEPAGE:
-                aFallback = GalResId(RID_GALLERYSTR_THEME_HOMEPAGE);
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_HOMEPAGE);
                 break;
             case GALLERY_THEME_POWERPOINT:
                 aFallback = RID_GALLERYSTR_THEME_POWERPOINT;
@@ -491,19 +557,37 @@ OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const
                 aFallback = RID_GALLERYSTR_THEME_FONTWORK_VERTICAL;
                 break;
             case GALLERY_THEME_SOUNDS:
-                aFallback = GalResId(RID_GALLERYSTR_THEME_SOUNDS);
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_SOUNDS);
+                break;
+            case RID_GALLERY_THEME_ARROWS:
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_ARROWS);
+                break;
+            case RID_GALLERY_THEME_COMPUTERS:
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_COMPUTERS);
+                break;
+            case RID_GALLERY_THEME_DIAGRAMS:
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_DIAGRAMS);
+                break;
+            case RID_GALLERY_THEME_EDUCATION:
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_EDUCATION);
+                break;
+            case RID_GALLERY_THEME_ENVIRONMENT:
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_ENVIRONMENT);
+                break;
+            case RID_GALLERY_THEME_FINANCE:
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_FINANCE);
+                break;
+            case RID_GALLERY_THEME_PEOPLE:
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_PEOPLE);
+                break;
+            case RID_GALLERY_THEME_SYMBOLS:
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_SYMBOLS);
+                break;
+            case RID_GALLERY_THEME_TRANSPORT:
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_TRANSPORT);
                 break;
-            case RID_GALLERYSTR_THEME_ARROWS:
-            case RID_GALLERYSTR_THEME_COMPUTERS:
-            case RID_GALLERYSTR_THEME_DIAGRAMS:
-            case RID_GALLERYSTR_THEME_EDUCATION:
-            case RID_GALLERYSTR_THEME_ENVIRONMENT:
-            case RID_GALLERYSTR_THEME_FINANCE:
-            case RID_GALLERYSTR_THEME_PEOPLE:
-            case RID_GALLERYSTR_THEME_SYMBOLS:
-            case RID_GALLERYSTR_THEME_TRANSPORT:
-            case RID_GALLERYSTR_THEME_TXTSHAPES:
-                aFallback = GalResId(static_cast<sal_uInt32>(nThemeId));
+            case RID_GALLERY_THEME_TXTSHAPES:
+                aFallback = SvxResId(RID_GALLERYSTR_THEME_TXTSHAPES);
                 break;
             default:
                 break;
@@ -697,7 +781,7 @@ void Gallery::ReleaseTheme( GalleryTheme* pTheme, SfxListener& rListener )
 
 bool GalleryThemeEntry::IsDefault() const
 {
-    return ( nId > 0 ) && ( nId != ( RID_GALLERYSTR_THEME_MYTHEME - RID_GALLERYSTR_THEME_START ) );
+    return nId > 0 && nId != GALLERY_THEME_MYTHEME;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 4fac07003ebc..aed3a7169e4e 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -36,12 +36,13 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <svx/svdpage.hxx>
+#include <svx/dialmgr.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/fmmodel.hxx>
 #include <svx/fmview.hxx>
 #include <svx/unomodel.hxx>
 #include "codec.hxx"
-#include "gallery.hrc"
+#include "svx/strings.hrc"
 #include "svx/gallery1.hxx"
 #include "svx/galtheme.hxx"
 #include "svx/galmisc.hxx"
@@ -53,19 +54,6 @@
 
 using namespace ::com::sun::star;
 
-ResMgr* GetGalleryResMgr()
-{
-    static ResMgr* pGalleryResMgr = nullptr;
-
-    if( !pGalleryResMgr )
-    {
-        pGalleryResMgr = ResMgr::CreateResMgr(
-            "gal", Application::GetSettings().GetUILanguageTag() );
-    }
-
-    return pGalleryResMgr;
-}
-
 BitmapEx GalleryResGetBitmapEx(const OUString &rId)
 {
     BitmapEx aBmpEx(rId);
@@ -371,7 +359,7 @@ GalleryProgress::GalleryProgress( GraphicFilter* pFilter ) :
 
             if( mpFilter )
             {
-                aProgressText = GalResId(RID_SVXSTR_GALLERY_FILTER);
+                aProgressText = SvxResId(RID_SVXSTR_GALLERY_FILTER);
 //              mpFilter->SetUpdatePercentHdl( LINK( this, GalleryProgress, Update ) );     // sj: progress wasn't working up from SO7 at all
 //                                                                                          // so I am removing this. The gallery progress should
 //                                                                                          // be changed to use the XStatusIndicator instead of XProgressMonitor
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index 2f23545905ce..8f5ea2dc91d5 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -24,7 +24,6 @@
 #include <comphelper/classids.hxx>
 #include <comphelper/string.hxx>
 #include <unotools/pathoptions.hxx>
-#include <tools/rcid.h>
 #include <tools/resmgr.hxx>
 #include <tools/vcompat.hxx>
 #include <tools/helpers.hxx>
@@ -33,7 +32,7 @@
 #include <svx/fmmodel.hxx>
 #include <svx/fmview.hxx>
 #include <svx/fmpage.hxx>
-#include "gallery.hrc"
+#include "svx/strings.hrc"
 #include "svx/galmisc.hxx"
 #include "galobj.hxx"
 #include <vcl/svapp.hxx>
@@ -219,33 +218,7 @@ void SgaObject::ReadData(SvStream& rIn, sal_uInt16& rReadVersion )
 
 const OUString SgaObject::GetTitle() const
 {
-    OUString aReturnValue( aTitle );
-    if ( !getenv( "GALLERY_SHOW_PRIVATE_TITLE" ) )
-    {
-        if ( comphelper::string::getTokenCount(aReturnValue, ':') == 3 )
-        {
-            OUString    aPrivateInd  ( aReturnValue.getToken( 0, ':' ) );
-            OUString    aResourceName( aReturnValue.getToken( 1, ':' ) );
-            sal_Int32   nResId       ( aReturnValue.getToken( 2, ':' ).toInt32() );
-            if ( aPrivateInd == "private" &&
-                !aResourceName.isEmpty() && ( nResId > 0 ) && ( nResId < 0x10000 ) )
-            {
-                OString aMgrName(OUStringToOString(aResourceName, RTL_TEXTENCODING_UTF8));
-                std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( aMgrName.getStr(),
-                            Application::GetSettings().GetUILanguageTag() ));
-                if ( pResMgr )
-                {
-                    ResId aResId( (sal_uInt16)nResId, *pResMgr );
-                    aResId.SetRT( RSC_STRING );
-                    if ( pResMgr->IsAvailable( aResId ) )
-                    {
-                        aReturnValue = aResId;
-                    }
-                }
-            }
-        }
-    }
-    return aReturnValue;
+    return aTitle;
 }
 
 void SgaObject::SetTitle( const OUString& rTitle )
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 4b3576eda7b3..d71a2c4b280b 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -39,6 +39,8 @@
 #include <svl/itempool.hxx>
 #include <sfx2/docfile.hxx>
 #include <avmedia/mediawindow.hxx>
+#include <svx/dialmgr.hxx>
+#include <svx/svxids.hrc>
 #include <svx/svdograf.hxx>
 #include <svx/fmpage.hxx>
 #include "codec.hxx"
@@ -52,7 +54,6 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include "galobj.hxx"
 #include <svx/gallery1.hxx>
-#include "galtheme.hrc"
 #include <vcl/lstbox.hxx>
 #include "gallerydrawmodel.hxx"
 #include <memory>
@@ -1521,10 +1522,4 @@ const tools::SvRef<SotStorage>& GalleryTheme::GetSvDrawStorage() const
 
 const OUString& GalleryTheme::GetName() const { return pThm->GetThemeName(); }
 
-void GalleryTheme::InsertAllThemes( ListBox& rListBox )
-{
-    for( sal_uInt16 i = RID_GALLERYSTR_THEME_FIRST; i <= RID_GALLERYSTR_THEME_LAST; i++ )
-        rListBox.InsertEntry(GalResId(i));
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/gallery2/galtheme.src b/svx/source/gallery2/galtheme.src
deleted file mode 100644
index 8a75bf77f88b..000000000000
--- a/svx/source/gallery2/galtheme.src
+++ /dev/null
@@ -1,207 +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 "gallery.hrc"
-
-String RID_GALLERYSTR_THEME_3D
-{
-    Text [ en-US ] = "3D Effects";
-};
-
-String RID_GALLERYSTR_THEME_ANIMATIONS
-{
-    Text [ en-US ] = "Animations";
-};
-
-String RID_GALLERYSTR_THEME_BULLETS
-{
-    Text [ en-US ] = "Bullets";
-};
-
-String RID_GALLERYSTR_THEME_OFFICE
-{
-    Text [ en-US ] = "Office";
-};
-
-String RID_GALLERYSTR_THEME_FLAGS
-{
-    Text [ en-US ] = "Flags";
-};
-
-String RID_GALLERYSTR_THEME_FLOWCHARTS
-{
-    Text [ en-US ] = "Flow Charts";
-};
-
-String RID_GALLERYSTR_THEME_EMOTICONS
-{
-    Text [ en-US ] = "Emoticons";
-};
-
-String RID_GALLERYSTR_THEME_PHOTOS
-{
-    Text [ en-US ] = "Images";
-};
-
-String RID_GALLERYSTR_THEME_BACKGROUNDS
-{
-    Text [ en-US ] = "Backgrounds";
-};
-
-String RID_GALLERYSTR_THEME_HOMEPAGE
-{
-    Text [ en-US ] = "Homepage";
-};
-
-String RID_GALLERYSTR_THEME_INTERACTION
-{
-    Text [ en-US ] = "Interaction";
-};
-
-String RID_GALLERYSTR_THEME_MAPS
-{
-    Text [ en-US ] = "Maps";
-};
-
-String RID_GALLERYSTR_THEME_PEOPLE
-{
-    Text [ en-US ] = "People";
-};
-
-String RID_GALLERYSTR_THEME_SURFACES
-{
-    Text [ en-US ] = "Surfaces";
-};
-
-String RID_GALLERYSTR_THEME_COMPUTERS
-{
-       Text [ en-US ] = "Computers";
-};
-
-String RID_GALLERYSTR_THEME_DIAGRAMS
-{
-       Text [ en-US ] = "Diagrams";
-};
-
-String RID_GALLERYSTR_THEME_ENVIRONMENT
-{
-       Text [ en-US ] = "Environment";
-};
-
-String RID_GALLERYSTR_THEME_FINANCE
-{
-       Text [ en-US ] = "Finance";
-};
-
-String RID_GALLERYSTR_THEME_TRANSPORT
-{
-       Text [ en-US ] = "Transport";
-};
-
-String RID_GALLERYSTR_THEME_TXTSHAPES
-{
-       Text [ en-US ] = "Textshapes";
-};
-
-String RID_GALLERYSTR_THEME_SOUNDS
-{
-    Text [ en-US ] = "Sounds";
-};
-
-String RID_GALLERYSTR_THEME_SYMBOLS
-{
-    Text [ en-US ] = "Symbols";
-};
-
-String RID_GALLERYSTR_THEME_MYTHEME
-{
-    Text [ en-US ] = "My Theme";
-};
-
-String RID_GALLERYSTR_THEME_ARROWS
-{
-    Text [ en-US ] = "Arrows";
-};
-
-String RID_GALLERYSTR_THEME_BALLOONS
-{
-    Text [ en-US ] = "Balloons";
-};
-
-String RID_GALLERYSTR_THEME_KEYBOARD
-{
-    Text [ en-US ] = "Keyboard";
-};
-
-String RID_GALLERYSTR_THEME_TIME
-{
-    Text [ en-US ] = "Time";
-};
-
-String RID_GALLERYSTR_THEME_PRESENTATION
-{
-    Text [ en-US ] = "Presentation";
-};
-
-String RID_GALLERYSTR_THEME_CALENDAR
-{
-    Text [ en-US ] = "Calendar";
-};
-
-String RID_GALLERYSTR_THEME_NAVIGATION
-{
-    Text [ en-US ] = "Navigation";
-};
-
-String RID_GALLERYSTR_THEME_COMMUNICATION
-{
-    Text [ en-US ] = "Communication";
-};
-
-String RID_GALLERYSTR_THEME_FINANCES
-{
-    Text [ en-US ] = "Finances";
-};
-
-String RID_GALLERYSTR_THEME_COMPUTER
-{
-    Text [ en-US ] = "Computers";
-};
-
-String RID_GALLERYSTR_THEME_CLIMA
-{
-    Text [ en-US ] = "Climate";
-};
-
-String RID_GALLERYSTR_THEME_EDUCATION
-{
-    Text [ en-US ] = "School & University";
-};
-
-String RID_GALLERYSTR_THEME_TROUBLE
-{
-    Text [ en-US ] = "Problem Solving";
-};
-
-String RID_GALLERYSTR_THEME_SCREENBEANS
-{
-    Text [ en-US ] = "Screen Beans";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx
index a7737003222f..42c870b04a06 100644
--- a/svx/source/inc/AccessibleFrameSelector.hxx
+++ b/svx/source/inc/AccessibleFrameSelector.hxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/accessibility/XAccessibleComponent.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
 #include <tools/link.hxx>
-#include <tools/resary.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 #include <comphelper/accessibleeventnotifier.hxx>
@@ -115,9 +114,6 @@ private:
     ::comphelper::OInterfaceContainerHelper2 maFocusListeners;
     ::comphelper::OInterfaceContainerHelper2 maPropertyListeners;
 
-    ResStringArray      maNames;
-    ResStringArray      maDescriptions;
-
     ::comphelper::AccessibleEventNotifier::TClientId    mnClientId;
 };
 
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 0c6793f5bd7c..35d44db70725 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -37,8 +37,7 @@
 #include <sfx2/childwin.hxx>
 #include <sfx2/ctrlitem.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
-#include <svx/fmresids.hrc>
+#include <svx/strings.hrc>
 #include <svx/svxdllapi.h>
 #include <rtl/ref.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 1f3b3fa70ddf..5ec8fab16e9c 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -463,7 +463,7 @@ class RecovDocList : public SvSimpleTable
 
 
         /** @short TODO */
-        RecovDocList(SvSimpleTableContainer& rParent, ResMgr& rResMgr);
+        RecovDocList(SvSimpleTableContainer& rParent);
 
         /** @short TODO */
         virtual void InitEntry(SvTreeListEntry* pEntry,
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index e05a1348ebe4..b06b0e482cdd 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -18,7 +18,8 @@
  */
 
 #include <svx/svxitems.hrc>
-
+#include <svx/strings.hrc>
+#include <osl/diagnose.h>
 #include <tools/stream.hxx>
 #include <tools/mapunit.hxx>
 #include <com/sun/star/table/BorderLine.hpp>
@@ -224,19 +225,19 @@ bool SvxMarginItem::GetPresentation
         {
             rText = SvxResId(RID_SVXITEMS_MARGIN_LEFT) +
                         GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ) +
-                        " " + EditResId::GetString(GetMetricId(ePresUnit)) +
+                        " " + EditResId(GetMetricId(ePresUnit)) +
                         cpDelimTmp +
                         SvxResId(RID_SVXITEMS_MARGIN_TOP) +
                         GetMetricText( (long)nTopMargin, eCoreUnit, ePresUnit, pIntl ) +
-                        " " + EditResId::GetString(GetMetricId(ePresUnit)) +
+                        " " + EditResId(GetMetricId(ePresUnit)) +
                         cpDelimTmp +
                         SvxResId(RID_SVXITEMS_MARGIN_RIGHT) +
                         GetMetricText( (long)nRightMargin, eCoreUnit, ePresUnit, pIntl ) +
-                        " " + EditResId::GetString(GetMetricId(ePresUnit)) +
+                        " " + EditResId(GetMetricId(ePresUnit)) +
                         cpDelimTmp +
                         SvxResId(RID_SVXITEMS_MARGIN_BOTTOM) +
                         GetMetricText( (long)nBottomMargin, eCoreUnit, ePresUnit, pIntl ) +
-                        " " + EditResId::GetString(GetMetricId(ePresUnit));
+                        " " + EditResId(GetMetricId(ePresUnit));
             return true;
         }
         default: ; //prevent warning
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index eb5d023a3fd3..fc288024393a 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -21,9 +21,8 @@
 
 #include <utility>
 
+#include <osl/diagnose.h>
 #include <tools/stream.hxx>
-
-
 #include <svx/pageitem.hxx>
 #include <editeng/itemtype.hxx>
 #include <svx/unomid.hxx>
@@ -31,12 +30,12 @@
 #include <com/sun/star/style/PageStyleLayout.hpp>
 #include <com/sun/star/style/BreakType.hpp>
 #include <svl/itemset.hxx>
+#include <svx/strings.hrc>
 #include <svx/svxitems.hrc>
 #include <svx/dialmgr.hxx>
 
 using namespace ::com::sun::star;
 
-
 SfxPoolItem* SvxPageItem::CreateDefault() { return new   SvxPageItem(0);}
 
 SvxPageItem::SvxPageItem( const sal_uInt16 nId ) : SfxPoolItem( nId ),
@@ -86,6 +85,15 @@ inline OUString GetUsageText( const SvxPageUsage eU )
     }
 }
 
+static const char* RID_SVXITEMS_PAGE_NUMS[] =
+{
+    RID_SVXITEMS_PAGE_NUM_CHR_UPPER,
+    RID_SVXITEMS_PAGE_NUM_CHR_LOWER,
+    RID_SVXITEMS_PAGE_NUM_ROM_UPPER,
+    RID_SVXITEMS_PAGE_NUM_ROM_LOWER,
+    RID_SVXITEMS_PAGE_NUM_ARABIC,
+    RID_SVXITEMS_PAGE_NUM_NONE
+};
 
 bool SvxPageItem::GetPresentation
 (
@@ -106,8 +114,8 @@ bool SvxPageItem::GetPresentation
             {
                 rText = aDescName + cpDelimTmp;
             }
-            DBG_ASSERT( eNumType <= css::style::NumberingType::NUMBER_NONE, "enum overflow" );
-            rText += SvxResId(RID_SVXITEMS_PAGE_NUM_BEGIN + eNumType) + cpDelimTmp;
+            assert(eNumType <= css::style::NumberingType::NUMBER_NONE && "enum overflow");
+            rText += SvxResId(RID_SVXITEMS_PAGE_NUMS[eNumType]) + cpDelimTmp;
             if ( bLandscape )
                 rText += SvxResId(RID_SVXITEMS_PAGE_LAND_TRUE);
             else
@@ -126,8 +134,8 @@ bool SvxPageItem::GetPresentation
             {
                 rText += aDescName + cpDelimTmp;
             }
-            DBG_ASSERT( eNumType <= css::style::NumberingType::NUMBER_NONE, "enum overflow" );
-            rText += SvxResId(RID_SVXITEMS_PAGE_NUM_BEGIN + eNumType) + cpDelimTmp;
+            assert(eNumType <= css::style::NumberingType::NUMBER_NONE && "enum overflow");
+            rText += SvxResId(RID_SVXITEMS_PAGE_NUMS[eNumType]) + cpDelimTmp;
             if ( bLandscape )
                 rText += SvxResId(RID_SVXITEMS_PAGE_LAND_TRUE);
             else
diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx
index 056a9e13dba9..9a3f4127e14b 100644
--- a/svx/source/items/postattr.cxx
+++ b/svx/source/items/postattr.cxx
@@ -19,10 +19,10 @@
 
 #include "svx/postattr.hxx"
 #include <editeng/itemtype.hxx>
+#include <svx/strings.hrc>
 #include <svx/svxitems.hrc>
 #include <svx/dialmgr.hxx>
 
-
 SfxPoolItem* SvxPostItAuthorItem::CreateDefault() { return new SvxPostItAuthorItem(0); }
 SfxPoolItem* SvxPostItDateItem::CreateDefault() { return new SvxPostItDateItem(0); }
 SfxPoolItem* SvxPostItTextItem::CreateDefault() { return new SvxPostItTextItem(0); }
diff --git a/svx/source/items/svxerr.cxx b/svx/source/items/svxerr.cxx
index 308f70ae5f9b..e3266825c30a 100644
--- a/svx/source/items/svxerr.cxx
+++ b/svx/source/items/svxerr.cxx
@@ -19,14 +19,13 @@
 
 #include "svx/svxerr.hxx"
 #include <svx/dialmgr.hxx>
-
-#include <svx/dialogs.hrc>
-
+#include <svx/strings.hrc>
 #include <rtl/instance.hxx>
+#include "svxerr.hrc"
 
 SvxErrorHandler::SvxErrorHandler() :
   SfxErrorHandler(
-      RID_SVXERRCODE, ErrCode(ERRCODE_AREA_SVX), ErrCode(ERRCODE_AREA_SVX_END), &DIALOG_MGR() )
+      getRID_SVXERRCODE(), ErrCode(ERRCODE_AREA_SVX), ErrCode(ERRCODE_AREA_SVX_END), &SvxResLocale())
 {
 }
 
@@ -41,4 +40,14 @@ void SvxErrorHandler::ensure()
     theSvxErrorHandler::get();
 }
 
+const ErrMsgCode* getRID_SVXERRCODE()
+{
+    return RID_SVXERRCODE;
+}
+
+const ErrMsgCode* getRID_SVXERRCTX()
+{
+    return RID_SVXERRCTX;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/svxerr.src b/svx/source/items/svxerr.src
deleted file mode 100644
index 614694f6e028..000000000000
--- a/svx/source/items/svxerr.src
+++ /dev/null
@@ -1,98 +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/svxerr.hxx"
-#include <svx/dialogs.hrc>
-#include <editeng/editerr.hxx>
-
- // Error-Context ---------------------------------------------------------
-StringArray RID_SVXERRCTX
-{
-    ItemList [ en-US ] =
-    {
-        < "$(ERR) executing the thesaurus." ;
-          ERRCTX_SVX_LINGU_THESAURUS&ERRCODE_RES_MASK ; >;
-        < "$(ERR) executing the spellcheck." ;
-          ERRCTX_SVX_LINGU_SPELLING&ERRCODE_RES_MASK ; >;
-        < "$(ERR) executing the hyphenation." ;
-          ERRCTX_SVX_LINGU_HYPHENATION&ERRCODE_RES_MASK ; >;
-        < "$(ERR) creating a dictionary." ;
-          ERRCTX_SVX_LINGU_DICTIONARY&ERRCODE_RES_MASK ; >;
-        < "$(ERR) setting background attribute." ;
-          ERRCTX_SVX_BACKGROUND&ERRCODE_RES_MASK ; >;
-        < "$(ERR) loading the graphics." ;
-          ERRCTX_SVX_IMPORT_GRAPHIC&ERRCODE_RES_MASK ; >;
-    };
-};
-
- // Error-Code ------------------------------------------------------------
-StringArray RID_SVXERRCODE
-{
-    ItemList [ en-US ] =
-    {
-        < "No thesaurus available for the current language.\nPlease check your installation and install the desired language." ;
-          ERRCODE_SVX_LINGU_THESAURUSNOTEXISTS&ERRCODE_RES_MASK ; >;
-        < "$(ARG1) is not supported by the spellcheck function or is not presently active.\nPlease check your installation and, if necessary, install the required language module\n or activate it under 'Tools - Options -  Language Settings - Writing Aids'.";
-          ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS&ERRCODE_RES_MASK ; >;
-        < "Spellcheck is not available." ;
-          ERRCODE_SVX_LINGU_LINGUNOTEXISTS&ERRCODE_RES_MASK ; >;
-        < "Hyphenation not available." ;
-          ERRCODE_SVX_LINGU_HYPHENNOTEXISTS&ERRCODE_RES_MASK ; >;
-        < "The custom dictionary $(ARG1) cannot be read." ;
-          ERRCODE_SVX_LINGU_DICT_NOTREADABLE&ERRCODE_RES_MASK ; >;
-        < "The custom dictionary $(ARG1) cannot be created." ;
-          ERRCODE_SVX_LINGU_DICT_NOTWRITEABLE&ERRCODE_RES_MASK ; >;
-        < "The graphic $(ARG1) could not be found." ;
-          ERRCODE_SVX_GRAPHIC_NOTREADABLE&ERRCODE_RES_MASK ; >;
-        < "An unlinked graphic could not be loaded.";
-          ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT&ERRCODE_RES_MASK ; >;
-        < "A language has not been fixed for the selected term.";
-          ERRCODE_SVX_LINGU_NOLANGUAGE&ERRCODE_RES_MASK ; >;
-        < "The form layer wasn't loaded as the required IO-services (com.sun.star.io.*) could not be instantiated.";
-          (ERRCODE_SVX_FORMS_NOIOSERVICES | ERRCODE_CLASS_READ) & ERRCODE_RES_MASK ; >;
-        < "The form layer wasn't written as the required IO services (com.sun.star.io.*) could not be instantiated.";
-          (ERRCODE_SVX_FORMS_NOIOSERVICES | ERRCODE_CLASS_WRITE) & ERRCODE_RES_MASK ; >;
-        < "An error occurred while reading the form controls. The form layer has not been loaded.";
-          (ERRCODE_SVX_FORMS_READWRITEFAILED | ERRCODE_CLASS_READ) & ERRCODE_RES_MASK ; >;
-        < "An error occurred while writing the form controls. The form layer has not been saved.";
-          (ERRCODE_SVX_FORMS_READWRITEFAILED | ERRCODE_CLASS_WRITE) & ERRCODE_RES_MASK ; >;
-        < "An error occurred while reading one of the bullets. Not all of the bullets were loaded.";
-          (ERRCODE_SVX_BULLETITEM_NOBULLET | ERRCODE_CLASS_READ) & ERRCODE_RES_MASK ; >;
-
-        < "All changes to the Basic Code are lost. The original VBA Macro Code is saved instead.";
-          ERRCODE_SVX_MODIFIED_VBASIC_STORAGE & ERRCODE_RES_MASK ; >;
-
-        < "The original VBA Basic Code contained in the document will not be saved.";
-          ERRCODE_SVX_VBASIC_STORAGE_EXIST & ERRCODE_RES_MASK ; >;
-
-        < "The password is incorrect. The document cannot be opened.";
-          ERRCODE_SVX_WRONGPASS & ERRCODE_RES_MASK ; >;
-
-        < "The encryption method used in this document is not supported. Only Microsoft Office 97/2000 compatible password encryption is supported.";
-          ERRCODE_SVX_READ_FILTER_CRYPT & ERRCODE_RES_MASK ; >;
-
-        < "The loading of password-encrypted Microsoft PowerPoint presentations is not supported.";
-          ERRCODE_SVX_READ_FILTER_PPOINT & ERRCODE_RES_MASK ; >;
-
-        < "Password protection is not supported when documents are saved in a Microsoft Office format.\nDo you want to save the document without password protection?";
-          ERRCODE_SVX_EXPORT_FILTER_CRYPT & ERRCODE_RES_MASK ; >;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/svxitems.src b/svx/source/items/svxitems.src
deleted file mode 100644
index 90ad9c097edc..000000000000
--- a/svx/source/items/svxitems.src
+++ /dev/null
@@ -1,192 +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/svxitems.hrc"
-#include "svx/svxids.hrc"
-#include <editeng/editids.hrc>
-
-StringArray RID_ATTR_NAMES
-{
-    ItemList [ en-US ] =
-    {
-        < "Scale"           ;           SID_ATTR_ZOOM ; > ;
-        < "Brush"           ;           SID_ATTR_BRUSH ; > ;
-        < "Tab stops"               ;   SID_ATTR_TABSTOP ; > ;
-        < "Character"               ;   SID_ATTR_CHAR ; > ;
-        < "Font"            ;           SID_ATTR_CHAR_FONT ; > ;
-        < "Font posture"        ;       SID_ATTR_CHAR_POSTURE ; > ;
-        < "Font weight"             ;   SID_ATTR_CHAR_WEIGHT ; > ;
-        < "Shadowed"            ;       SID_ATTR_CHAR_SHADOWED ; > ;
-        < "Individual words"        ;   SID_ATTR_CHAR_WORDLINEMODE ; > ;
-        < "Outline"         ;           SID_ATTR_CHAR_CONTOUR ; > ;
-        < "Strikethrough"           ;   SID_ATTR_CHAR_STRIKEOUT ; > ;
-        < "Underline"           ;       SID_ATTR_CHAR_UNDERLINE ; > ;
-        < "Font size"               ;   SID_ATTR_CHAR_FONTHEIGHT ; > ;
-        < "Rel. Font size"      ;       SID_ATTR_CHAR_PROPSIZE ; > ;
-        < "Font color"          ;       SID_ATTR_CHAR_COLOR ; > ;
-        < "Kerning"     ;               SID_ATTR_CHAR_KERNING ; > ;
-        < "Effects"     ;               SID_ATTR_CHAR_CASEMAP ; > ;
-        < "Language";                   SID_ATTR_CHAR_LANGUAGE ; > ;
-        < "Position"        ;           SID_ATTR_CHAR_ESCAPEMENT ; > ;
-        < "Character blinking"    ;     SID_ATTR_CHAR_AUTOKERN ; > ;
-        < "Character set color"       ; SID_ATTR_CHAR_CHARSETCOLOR ; > ;
-        < "Overline"      ;             SID_ATTR_CHAR_OVERLINE ; > ;
-        < "Paragraph"       ;           SID_ATTR_PARA ; > ;
-        < "Alignment"       ;           SID_ATTR_PARA_ADJUST ; > ;
-        < "Line spacing"        ;       SID_ATTR_PARA_LINESPACE ; > ;
-        < "Page Break"      ;           SID_ATTR_PARA_PAGEBREAK ; > ;
-        < "Hyphenation"     ;           SID_ATTR_PARA_HYPHENZONE ; > ;
-        < "Do not split paragraph";     SID_ATTR_PARA_SPLIT ; > ;
-        < "Orphans"     ;               SID_ATTR_PARA_ORPHANS ; > ;
-        < "Widows"      ;               SID_ATTR_PARA_WIDOWS ; > ;
-        < "Paragraph spacing"     ;     SID_ATTR_PARA_ULSPACE ; > ;
-        < "Paragraph indent"      ;     SID_ATTR_PARA_LRSPACE ; > ;
-        < "Indent"      ;               SID_ATTR_LRSPACE ; > ;
-        < "Spacing"     ;               SID_ATTR_ULSPACE ; > ;
-        < "Page"        ;               SID_ATTR_PAGE ; > ;
-        < "Page Style"      ;           SID_ATTR_PARA_MODEL ; > ;
-        < "Keep with next paragraph";   SID_ATTR_PARA_KEEP ; > ;
-        < "Blinking"        ;           SID_ATTR_FLASH ; > ;
-        < "Register-true"       ;       SID_ATTR_PARA_REGISTER ; > ;
-        < "Character background"    ;   SID_ATTR_BRUSH_CHAR ; > ;
-        < "Asian font"      ;           SID_ATTR_CHAR_CJK_FONT ; > ;
-        < "Size of Asian font"      ;   SID_ATTR_CHAR_CJK_FONTHEIGHT ; > ;
-        < "Language of Asian font";     SID_ATTR_CHAR_CJK_LANGUAGE ; > ;
-        < "Posture of Asian font"   ;   SID_ATTR_CHAR_CJK_POSTURE ; > ;
-        < "Weight of Asian font"    ;   SID_ATTR_CHAR_CJK_WEIGHT ; > ;
-        < "CTL"     ;                   SID_ATTR_CHAR_CTL_FONT ; > ;
-        < "Size of complex scripts" ;   SID_ATTR_CHAR_CTL_FONTHEIGHT ; > ;
-        < "Language of complex scripts";SID_ATTR_CHAR_CTL_LANGUAGE ; > ;
-        < "Posture of complex scripts"; SID_ATTR_CHAR_CTL_POSTURE ; > ;
-        < "Weight of complex scripts";  SID_ATTR_CHAR_CTL_WEIGHT ; > ;
-        < "Double-lined"        ;       SID_ATTR_CHAR_TWO_LINES ; > ;
-        < "Emphasis mark"       ;       SID_ATTR_CHAR_EMPHASISMARK ; > ;
-        < "Text spacing"        ;       SID_ATTR_PARA_SCRIPTSPACE ; > ;
-        < "Hanging punctuation"     ;   SID_ATTR_PARA_HANGPUNCTUATION ; > ;
-        < "Forbidden characters"    ;   SID_ATTR_PARA_FORBIDDEN_RULES ; > ;
-        < "Rotation"        ;           SID_ATTR_CHAR_ROTATED ; > ;
-        < "Character scaling"       ;   SID_ATTR_CHAR_SCALEWIDTH ; > ;
-        < "Relief"      ;               SID_ATTR_CHAR_RELIEF ; > ;
-        < "Vertical text alignment" ;   SID_PARA_VERTALIGN ; > ;
-    };
-};
-
-// end enum ColorName -----------------------------------------------------------
-String RID_SVXITEMS_ORI_STANDARD
-{
-    Text [ en-US ] = "Default orientation" ;
-};
-String RID_SVXITEMS_ORI_TOPBOTTOM
-{
-    Text [ en-US ] = "From top to bottom" ;
-};
-String RID_SVXITEMS_ORI_BOTTOMTOP
-{
-    Text [ en-US ] = "Bottom to Top" ;
-};
-String RID_SVXITEMS_ORI_STACKED
-{
-    Text [ en-US ] = "Stacked" ;
-};
-String RID_SVXITEMS_MARGIN_LEFT
-{
-    Text [ en-US ] = "Left margin: " ;
-};
-String RID_SVXITEMS_MARGIN_TOP
-{
-    Text [ en-US ] = "Top margin: " ;
-};
-String RID_SVXITEMS_MARGIN_RIGHT
-{
-    Text [ en-US ] = "Right margin: " ;
-};
-String RID_SVXITEMS_MARGIN_BOTTOM
-{
-    Text [ en-US ] = "Bottom margin: " ;
-};
-String RID_SVXITEMS_PAGE_COMPLETE
-{
-    Text [ en-US ] = "Page Description: " ;
-};
-String RID_SVXITEMS_PAGE_NUM_CHR_UPPER
-{
-    Text [ en-US ] = "Capitals" ;
-};
-String RID_SVXITEMS_PAGE_NUM_CHR_LOWER
-{
-    Text [ en-US ] = "Lowercase" ;
-};
-String RID_SVXITEMS_PAGE_NUM_ROM_UPPER
-{
-    Text [ en-US ] = "Uppercase Roman" ;
-};
-String RID_SVXITEMS_PAGE_NUM_ROM_LOWER
-{
-    Text [ en-US ] = "Lowercase Roman" ;
-};
-String RID_SVXITEMS_PAGE_NUM_ARABIC
-{
-    Text [ en-US ] = "Arabic" ;
-};
-String RID_SVXITEMS_PAGE_NUM_NONE
-{
-    Text [ en-US ] = "None" ;
-};
-String RID_SVXITEMS_PAGE_LAND_TRUE
-{
-    Text [ en-US ] = "Landscape" ;
-};
-String RID_SVXITEMS_PAGE_LAND_FALSE
-{
-    Text [ en-US ] = "Portrait" ;
-};
-String RID_SVXITEMS_PAGE_USAGE_LEFT
-{
-    Text [ en-US ] = "Left" ;
-};
-String RID_SVXITEMS_PAGE_USAGE_RIGHT
-{
-    Text [ en-US ] = "Right" ;
-};
-String RID_SVXITEMS_PAGE_USAGE_ALL
-{
-    Text [ en-US ] = "All" ;
-};
-String RID_SVXITEMS_PAGE_USAGE_MIRROR
-{
-    Text [ en-US ] = "Mirrored" ;
-};
-String RID_SVXITEMS_AUTHOR_COMPLETE
-{
-    Text [ en-US ] = "Author: " ;
-};
-String RID_SVXITEMS_DATE_COMPLETE
-{
-    Text [ en-US ] = "Date: " ;
-};
-String RID_SVXITEMS_TEXT_COMPLETE
-{
-    Text [ en-US ] = "Text: " ;
-};
-String RID_SVXITEMS_BRUSH_CHAR
-{
-    Text [ en-US ] = "Character background";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index 505aca582944..ce0018aad9d1 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -29,7 +29,7 @@
 #include <svx/sdr/contact/objectcontact.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <sdr/primitive2d/sdrgrafprimitive2d.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <svdglob.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
index cbbc44efb654..d40a0f30e544 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
@@ -36,7 +36,7 @@
 #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx>
 #include <vcl/lazydelete.hxx>
 #include <vcl/settings.hxx>
-#include <svx/svdstr.hrc>
+#include <svx/strings.hrc>
 #include <svdglob.hxx>
 #include <drawinglayer/primitive2d/discreteshadowprimitive2d.hxx>
 #include <drawinglayer/attribute/sdrfillattribute.hxx>
diff --git a/svx/source/sidebar/EmptyPanel.cxx b/svx/source/sidebar/EmptyPanel.cxx
index b94b59be08fb..74c9f45beb9e 100644
--- a/svx/source/sidebar/EmptyPanel.cxx
+++ b/svx/source/sidebar/EmptyPanel.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "EmptyPanel.hxx"
-#include "svx/dialogs.hrc"
+#include "svx/strings.hrc"
 #include "svx/dialmgr.hxx"
 
 namespace svx { namespace sidebar {
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 10f3798e5bdb..39c98404b0cc 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -19,7 +19,8 @@
 
 #include <sfx2/sidebar/ControlFactory.hxx>
 #include <AreaPropertyPanel.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
 #include <sfx2/objsh.hxx>
 #include <svx/xfltrit.hxx>
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 464189990860..186e0f9b6c48 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -20,7 +20,8 @@
 #include <sfx2/sidebar/SidebarController.hxx>
 #include <sfx2/sidebar/ControlFactory.hxx>
 #include <svx/sidebar/AreaPropertyPanelBase.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
 #include <sfx2/objsh.hxx>
 #include <svx/xfltrit.hxx>
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index a286dd1a4902..44bfc5aa11cb 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -18,7 +18,8 @@
  */
 #include <sfx2/sidebar/ControlFactory.hxx>
 #include <GraphicPropertyPanel.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
 #include <vcl/field.hxx>
 #include <vcl/lstbox.hxx>
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 85bb09bf8083..a2285eb6ad04 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -18,7 +18,8 @@
  */
 #include <sfx2/sidebar/ControlFactory.hxx>
 #include <LinePropertyPanel.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
index 191600c4ca16..3f15d5e85402 100644
--- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
@@ -20,7 +20,8 @@
 #include <memory>
 #include <sfx2/sidebar/ControlFactory.hxx>
 #include <svx/sidebar/LinePropertyPanelBase.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx
index 408619a6d364..b811fe90dc4f 100644
--- a/svx/source/sidebar/line/LineWidthPopup.cxx
+++ b/svx/source/sidebar/line/LineWidthPopup.cxx
@@ -19,7 +19,7 @@
 #include <svx/sidebar/LineWidthPopup.hxx>
 #include <svx/sidebar/LinePropertyPanelBase.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/xlnwtit.hxx>
 #include <unotools/viewoptions.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 6a81478a0c9b..e21778be3705 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -31,7 +31,7 @@
 #include <svx/gallery.hxx>
 #include <editeng/brushitem.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <vcl/graph.hxx>
 #include <vcl/settings.hxx>
 
@@ -319,12 +319,6 @@ void BulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
     if ( pFont )
         pActualBullets[nIndex]->aFont = *pFont;
     pActualBullets[nIndex]->bIsCustomized = true;
-
-    OUString aStrFromRES = SvxResId( RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION);
-    OUString aReplace = "%LIST_NUM";
-    OUString sNUM = OUString::number( nIndex + 1 );
-    aStrFromRES = aStrFromRES.replaceFirst(aReplace,sNUM);
-    pActualBullets[nIndex]->sDescription = aStrFromRES;
 }
 
 void BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt16 mLevel, bool /*isDefault*/, bool isResetSize)
@@ -391,6 +385,18 @@ NumberingTypeMgr::~NumberingTypeMgr()
 {
 }
 
+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
+};
+
 class theNumberingTypeMgr : public rtl::Static<NumberingTypeMgr, theNumberingTypeMgr> {};
 
 NumberingTypeMgr& NumberingTypeMgr::GetInstance()
@@ -418,7 +424,7 @@ void NumberingTypeMgr::Init()
             NumberSettings_Impl* pNumEntry = new NumberSettings_Impl;
             pNumEntry->pNumSetting = pNew;
             if ( i < 8 )
-                pNumEntry->sDescription = SvxResId( RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i );
+                pNumEntry->sDescription = SvxResId(RID_SVXSTR_SINGLENUM_DESCRIPTIONS[i]);
             maNumberSettingsArr.push_back(std::shared_ptr<NumberSettings_Impl>(pNumEntry));
         }
     }
@@ -489,12 +495,7 @@ void NumberingTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_
     ApplyNumRule(aTmpRule1,nIndex,mLevel,true);
     ApplyNumRule(aTmpRule2,nIndex,mLevel);
     if (aTmpRule1==aTmpRule2) _pSet->bIsCustomized=false;
-    if (_pSet->bIsCustomized) {
-        OUString aStrFromRES = SvxResId( RID_SVXSTR_NUMBULLET_CUSTOM_NUMBERING_DESCRIPTION);
-        OUString sNUM = OUString::number( nIndex + 1 );
-        aStrFromRES = aStrFromRES.replaceFirst("%LIST_NUM",sNUM);
-        _pSet->sDescription = aStrFromRES;
-    } else {
+    if (!_pSet->bIsCustomized) {
         _pSet->sDescription = GetDescription(nIndex,true);
     }
     ImplStore("standard.syb");
@@ -752,12 +753,7 @@ void OutlineTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
     ApplyNumRule(aTmpRule1,nIndex,mLevel,true);
     ApplyNumRule(aTmpRule2,nIndex,mLevel);
     if (aTmpRule1==aTmpRule2) pItemArr->bIsCustomized=false;
-    if (pItemArr->bIsCustomized) {
-        OUString aStrFromRES = SvxResId( RID_SVXSTR_NUMBULLET_CUSTOM_MULTILEVEL_DESCRIPTION);
-        OUString sNUM = OUString::number( nIndex + 1 );
-        aStrFromRES = aStrFromRES.replaceFirst("%LIST_NUM",sNUM);
-        pItemArr->sDescription = aStrFromRES;
-    } else {
+    if (!pItemArr->bIsCustomized) {
         pItemArr->sDescription = GetDescription(nIndex,true);
     }
     ImplStore("standard.syc");
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 293969610614..86c17ccf8198 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "ParaPropertyPanel.hxx"
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <sfx2/sidebar/Tools.hxx>
 #include <sfx2/dispatch.hxx>
 #include <editeng/lrspitem.hxx>
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 3b76365ed6ff..d892d8d4d9e5 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -20,7 +20,8 @@
 #include <sfx2/sidebar/ControlFactory.hxx>
 #include "PosSizePropertyPanel.hxx"
 #include <svx/sidebar/SidebarDialControl.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
index 0766550e29cd..eacdf09ad734 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
@@ -11,7 +11,8 @@
 #include <comphelper/string.hxx>
 #include <sfx2/sidebar/ControlFactory.hxx>
 #include <svx/colorbox.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index b499c686bb28..e0bfe2d2fc43 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -19,7 +19,7 @@
 #include <sfx2/bindings.hxx>
 #include "TextCharacterSpacingControl.hxx"
 #include "TextPropertyPanel.hrc"
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <unotools/viewoptions.hxx>
 #include <editeng/kernitem.hxx>
diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx
index 6c1df6a2d9bd..ed8a51bf48d1 100644
--- a/svx/source/sidebar/text/TextUnderlineControl.cxx
+++ b/svx/source/sidebar/text/TextUnderlineControl.cxx
@@ -18,7 +18,7 @@
  */
 #include "TextUnderlineControl.hxx"
 #include "TextPropertyPanel.hrc"
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/sidebar/Theme.hxx>
diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
index 1f8fe0d9569a..8330edccb1b0 100644
--- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
+++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "svx/sidebar/ValueSetWithTextControl.hxx"
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <sfx2/sidebar/Theme.hxx>
 
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index 62f7220959e6..42bdbe3718e0 100644
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -22,7 +22,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 
 #include "svx/insctrl.hxx"
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index 1ace4873094d..d152013e86c0 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -24,7 +24,7 @@
 #include <svl/eitem.hxx>
 #include <sfx2/app.hxx>
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/modctrl.hxx>
 #include <svx/dialmgr.hxx>
 
@@ -89,8 +89,8 @@ void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState,
 
     _repaint();
 
-    int nResId = modified ? RID_SVXSTR_DOC_MODIFIED_YES : RID_SVXSTR_DOC_MODIFIED_NO;
-    GetStatusBar().SetQuickHelpText(GetId(), SvxResId(nResId));
+    const char* pResId = modified ? RID_SVXSTR_DOC_MODIFIED_YES : RID_SVXSTR_DOC_MODIFIED_NO;
+    GetStatusBar().SetQuickHelpText(GetId(), SvxResId(pResId));
 
     if ( start )
         mxImpl->maIdle.Start();
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 1999b5a1465c..afa7e6a6da54 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -41,7 +41,8 @@
 #include "svx/dlgutil.hxx"
 #include "stbctrls.h"
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include "bitmaps.hlst"
 #include <unotools/localedatawrapper.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index fd73a7418b8a..79e7237c350c 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -26,7 +26,7 @@
 
 #include <svx/selctrl.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 
 #include "stbctrls.h"
 #include "bitmaps.hlst"
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
deleted file mode 100644
index 7c58b4bbc9a2..000000000000
--- a/svx/source/stbctrls/stbctrls.src
+++ /dev/null
@@ -1,153 +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"
-#include "stbctrls.h"
-
- // Strings ---------------------------------------------------------------
-String RID_SVXSTR_INSERT_HELPTEXT
-{
-    Text [ en-US ] = "Insert mode. Click to change to overwrite mode." ;
-};
-String RID_SVXSTR_OVERWRITE_HELPTEXT
-{
-    Text [ en-US ] = "Overwrite mode. Click to change to insert mode." ;
-};
-String RID_SVXSTR_OVERWRITE_TEXT
-{
-    Text [ x-comment ] = "To be shown in the status bar when in overwrite mode, please try to make it not longer than the word 'Overwrite'." ;
-    Text [ en-US ] = "Overwrite" ;
-};
-
-String RID_SVXSTR_XMLSEC_SIG_OK
-{
-    Text [ en-US ] = "Digital Signature: The document signature is OK.";
-};
-
-String RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY
-{
-    Text [ en-US ] = "Digital Signature: The document signature is OK, but the certificates could not be validated.";
-};
-
-String RID_SVXSTR_XMLSEC_SIG_NOT_OK
-{
-    Text [ en-US ] = "Digital Signature: The document signature does not match the document content. We strongly recommend you to do not trust this document.";
-};
-
-String RID_SVXSTR_XMLSEC_NO_SIG
-{
-    Text [ en-US ] = "Digital Signature: The document is not signed.";
-};
-
-String RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG
-{
-    Text [ en-US ] = "Digital Signature: The document signature and the certificate are OK, but not all parts of the document are signed.";
-};
-
-String RID_SVXSTR_DOC_MODIFIED_YES
-{
-    Text [ en-US ] = "The document has been modified. Click to save the document.";
-};
-
-String RID_SVXSTR_DOC_MODIFIED_NO
-{
-    Text [ en-US ] = "The document has not been modified since the last save.";
-};
-
-String RID_SVXSTR_DOC_LOAD
-{
-    Text [ en-US ] = "Loading document...";
-};
-
-String RID_SVXSTR_FIT_SLIDE
-{
-    Text [ en-US ] = "Fit slide to current window.";
-};
-
-String RID_SVXSTR_WARN_MISSING_SMARTART
-{
-    Text [ en-US ] = "Could not load all SmartArts. Saving in Microsoft Office 2010 or later would avoid this issue.";
-};
-
-String RID_SVXSTR_ZOOMTOOL_HINT
-{
-    Text [ en-US ] = "Zoom level. Right-click to change zoom level or click to open Zoom dialog.";
-};
-
-String RID_SVXSTR_ZOOM_IN
-{
-    Text [ en-US ] = "Zoom In";
-};
-
-String RID_SVXSTR_ZOOM_OUT
-{
-    Text [ en-US ] = "Zoom Out";
-};
-
-String RID_SVXSTR_ZOOM_25
-{
-    Text [ en-US ] = "25%" ;
-};
-
-String RID_SVXSTR_ZOOM_50
-{
-    Text [ en-US ] = "50%" ;
-};
-
-String RID_SVXSTR_ZOOM_75
-{
-    Text [ en-US ] = "75%" ;
-};
-
-String RID_SVXSTR_ZOOM_100
-{
-    Text [ en-US ] = "100%" ;
-};
-
-String RID_SVXSTR_ZOOM_150
-{
-    Text [ en-US ] = "150%" ;
-};
-
-String RID_SVXSTR_ZOOM_200
-{
-    Text [ en-US ] = "200%" ;
-};
-
-String RID_SVXSTR_ZOOM_WHOLE_PAGE
-{
-    Text [ en-US ] = "Entire Page" ;
-};
-
-String RID_SVXSTR_ZOOM_PAGE_WIDTH
-{
-    Text [ en-US ] = "Page Width" ;
-};
-
-String RID_SVXSTR_ZOOM_OPTIMAL_VIEW
-{
-    Text [ en-US ] = "Optimal View" ;
-};
-
-String RID_SIDEBAR_EMPTY_PANEL_TEXT
-{
-    Text [ en-US ] = "Properties for the task that you are performing are not available for the current selection" ;
-};
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index f294a945726d..0d7f9035db7e 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -33,7 +33,7 @@
 
 #include <svl/eitem.hxx>
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include "svx/xmlsecctrl.hxx"
 #include <tools/urlobj.hxx>
@@ -86,17 +86,17 @@ void XmlSecStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, cons
 
     GetStatusBar().SetItemText( GetId(), "" );    // necessary ?
 
-    sal_uInt16 nResId = RID_SVXSTR_XMLSEC_NO_SIG;
+    const char* pResId = RID_SVXSTR_XMLSEC_NO_SIG;
     if ( mpImpl->mnState == SignatureState::OK )
-        nResId = RID_SVXSTR_XMLSEC_SIG_OK;
+        pResId = RID_SVXSTR_XMLSEC_SIG_OK;
     else if ( mpImpl->mnState == SignatureState::BROKEN )
-        nResId = RID_SVXSTR_XMLSEC_SIG_NOT_OK;
+        pResId = RID_SVXSTR_XMLSEC_SIG_NOT_OK;
     else if ( mpImpl->mnState == SignatureState::NOTVALIDATED )
-        nResId = RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY;
+        pResId = RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY;
     else if ( mpImpl->mnState == SignatureState::PARTIAL_OK )
-        nResId = RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG;
+        pResId = RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG;
 
-    GetStatusBar().SetQuickHelpText( GetId(), SvxResId( nResId ) );
+    GetStatusBar().SetQuickHelpText(GetId(), SvxResId(pResId));
 }
 
 void XmlSecStatusBarControl::Command( const CommandEvent& rCEvt )
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index ea1059862330..74474e78a71f 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -26,7 +26,7 @@
 #include <sfx2/dispatch.hxx>
 #include <tools/urlobj.hxx>
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 
 #include <svx/zoomctrl.hxx>
 #include <svx/zoomslideritem.hxx>
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx
index be0b0721f260..d36b1eb366c5 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -25,7 +25,7 @@
 #include <vcl/settings.hxx>
 #include <svx/zoomslideritem.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <basegfx/tools/zoomtools.hxx>
 #include "bitmaps.hlst"
 
diff --git a/svx/source/svdraw/ActionDescriptionProvider.cxx b/svx/source/svdraw/ActionDescriptionProvider.cxx
index c04c02de8a10..9ca98e9f7d2e 100644
--- a/svx/source/svdraw/ActionDescriptionProvider.cxx
+++ b/svx/source/svdraw/ActionDescriptionProvider.cxx
@@ -20,46 +20,46 @@
 
 #include "svx/ActionDescriptionProvider.hxx"
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 
 OUString ActionDescriptionProvider::createDescription( ActionType eActionType
                         , const OUString& rObjectName )
 {
-    sal_uInt16 nResID=0;
+    const char* pResID = nullptr;
     switch( eActionType )
     {
     case ActionType::Insert:
-        nResID=STR_UndoInsertObj;
+        pResID=STR_UndoInsertObj;
         break;
     case ActionType::Delete:
-        nResID= STR_EditDelete;
+        pResID= STR_EditDelete;
         break;
     case ActionType::Move:
-        nResID= STR_EditMove;
+        pResID= STR_EditMove;
         break;
     case ActionType::Resize:
-        nResID= STR_EditResize;
+        pResID= STR_EditResize;
         break;
     case ActionType::Rotate:
-        nResID= STR_EditRotate;
+        pResID= STR_EditRotate;
         break;
     case ActionType::Format:
-        nResID= STR_EditSetAttributes;
+        pResID= STR_EditSetAttributes;
         break;
     case ActionType::MoveToTop:
-        nResID= STR_EditMovToTop;
+        pResID= STR_EditMovToTop;
         break;
     case ActionType::MoveToBottom:
-        nResID= STR_EditMovToBtm;
+        pResID= STR_EditMovToBtm;
         break;
     case ActionType::PosSize:
-        nResID = STR_EditPosSize;
+        pResID = STR_EditPosSize;
         break;
     }
-    if(!nResID)
+    if (!pResID)
         return OUString();
 
-    OUString aStr(ImpGetResStr(nResID));
+    OUString aStr(ImpGetResStr(pResID));
     return aStr.replaceAll("%1", rObjectName);
 }
 
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 46ae6858ec01..9c55222fd98f 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -48,8 +48,9 @@
 #include <vcl/settings.hxx>
 
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 
+#include <svx/dialmgr.hxx>
 #include <svx/sdgcpitm.hxx>
 #include <svx/sdtfchim.hxx>
 #include <svx/svdattr.hxx>
@@ -384,226 +385,225 @@ bool SdrItemPool::GetPresentation(
 
 void SdrItemPool::TakeItemName(sal_uInt16 nWhich, OUString& rItemName)
 {
-    ResMgr* pResMgr = ImpGetResMgr();
-    sal_uInt16  nResId = SIP_UNKNOWN_ATTR;
+    const char* pResId = SIP_UNKNOWN_ATTR;
 
     switch (nWhich)
     {
-        case XATTR_LINESTYLE        : nResId = SIP_XA_LINESTYLE;break;
-        case XATTR_LINEDASH         : nResId = SIP_XA_LINEDASH;break;
-        case XATTR_LINEWIDTH        : nResId = SIP_XA_LINEWIDTH;break;
-        case XATTR_LINECOLOR        : nResId = SIP_XA_LINECOLOR;break;
-        case XATTR_LINESTART        : nResId = SIP_XA_LINESTART;break;
-        case XATTR_LINEEND          : nResId = SIP_XA_LINEEND;break;
-        case XATTR_LINESTARTWIDTH   : nResId = SIP_XA_LINESTARTWIDTH;break;
-        case XATTR_LINEENDWIDTH     : nResId = SIP_XA_LINEENDWIDTH;break;
-        case XATTR_LINESTARTCENTER  : nResId = SIP_XA_LINESTARTCENTER;break;
-        case XATTR_LINEENDCENTER    : nResId = SIP_XA_LINEENDCENTER;break;
-        case XATTR_LINETRANSPARENCE : nResId = SIP_XA_LINETRANSPARENCE;break;
-        case XATTR_LINEJOINT        : nResId = SIP_XA_LINEJOINT;break;
-        case XATTRSET_LINE          : nResId = SIP_XATTRSET_LINE;break;
-
-        case XATTR_FILLSTYLE            : nResId = SIP_XA_FILLSTYLE;break;
-        case XATTR_FILLCOLOR            : nResId = SIP_XA_FILLCOLOR;break;
-        case XATTR_FILLGRADIENT         : nResId = SIP_XA_FILLGRADIENT;break;
-        case XATTR_FILLHATCH            : nResId = SIP_XA_FILLHATCH;break;
-        case XATTR_FILLBITMAP           : nResId = SIP_XA_FILLBITMAP;break;
-        case XATTR_FILLTRANSPARENCE     : nResId = SIP_XA_FILLTRANSPARENCE;break;
-        case XATTR_GRADIENTSTEPCOUNT    : nResId = SIP_XA_GRADIENTSTEPCOUNT;break;
-        case XATTR_FILLBMP_TILE         : nResId = SIP_XA_FILLBMP_TILE;break;
-        case XATTR_FILLBMP_POS          : nResId = SIP_XA_FILLBMP_POS;break;
-        case XATTR_FILLBMP_SIZEX        : nResId = SIP_XA_FILLBMP_SIZEX;break;
-        case XATTR_FILLBMP_SIZEY        : nResId = SIP_XA_FILLBMP_SIZEY;break;
-        case XATTR_FILLFLOATTRANSPARENCE: nResId = SIP_XA_FILLFLOATTRANSPARENCE;break;
-        case XATTR_SECONDARYFILLCOLOR   : nResId = SIP_XA_SECONDARYFILLCOLOR;break;
-        case XATTR_FILLBMP_SIZELOG      : nResId = SIP_XA_FILLBMP_SIZELOG;break;
-        case XATTR_FILLBMP_TILEOFFSETX  : nResId = SIP_XA_FILLBMP_TILEOFFSETX;break;
-        case XATTR_FILLBMP_TILEOFFSETY  : nResId = SIP_XA_FILLBMP_TILEOFFSETY;break;
-        case XATTR_FILLBMP_STRETCH      : nResId = SIP_XA_FILLBMP_STRETCH;break;
-        case XATTR_FILLBMP_POSOFFSETX   : nResId = SIP_XA_FILLBMP_POSOFFSETX;break;
-        case XATTR_FILLBMP_POSOFFSETY   : nResId = SIP_XA_FILLBMP_POSOFFSETY;break;
-        case XATTR_FILLBACKGROUND       : nResId = SIP_XA_FILLBACKGROUND;break;
-
-        case XATTRSET_FILL             : nResId = SIP_XATTRSET_FILL;break;
-
-        case XATTR_FORMTXTSTYLE     : nResId = SIP_XA_FORMTXTSTYLE;break;
-        case XATTR_FORMTXTADJUST    : nResId = SIP_XA_FORMTXTADJUST;break;
-        case XATTR_FORMTXTDISTANCE  : nResId = SIP_XA_FORMTXTDISTANCE;break;
-        case XATTR_FORMTXTSTART     : nResId = SIP_XA_FORMTXTSTART;break;
-        case XATTR_FORMTXTMIRROR    : nResId = SIP_XA_FORMTXTMIRROR;break;
-        case XATTR_FORMTXTOUTLINE   : nResId = SIP_XA_FORMTXTOUTLINE;break;
-        case XATTR_FORMTXTSHADOW    : nResId = SIP_XA_FORMTXTSHADOW;break;
-        case XATTR_FORMTXTSHDWCOLOR : nResId = SIP_XA_FORMTXTSHDWCOLOR;break;
-        case XATTR_FORMTXTSHDWXVAL  : nResId = SIP_XA_FORMTXTSHDWXVAL;break;
-        case XATTR_FORMTXTSHDWYVAL  : nResId = SIP_XA_FORMTXTSHDWYVAL;break;
-        case XATTR_FORMTXTHIDEFORM  : nResId = SIP_XA_FORMTXTHIDEFORM;break;
-        case XATTR_FORMTXTSHDWTRANSP: nResId = SIP_XA_FORMTXTSHDWTRANSP;break;
-
-        case SDRATTR_SHADOW            : nResId = SIP_SA_SHADOW;break;
-        case SDRATTR_SHADOWCOLOR       : nResId = SIP_SA_SHADOWCOLOR;break;
-        case SDRATTR_SHADOWXDIST       : nResId = SIP_SA_SHADOWXDIST;break;
-        case SDRATTR_SHADOWYDIST       : nResId = SIP_SA_SHADOWYDIST;break;
-        case SDRATTR_SHADOWTRANSPARENCE: nResId = SIP_SA_SHADOWTRANSPARENCE;break;
-        case SDRATTR_SHADOW3D          : nResId = SIP_SA_SHADOW3D;break;
-        case SDRATTR_SHADOWPERSP       : nResId = SIP_SA_SHADOWPERSP;break;
-
-        case SDRATTR_CAPTIONTYPE      : nResId = SIP_SA_CAPTIONTYPE;break;
-        case SDRATTR_CAPTIONFIXEDANGLE: nResId = SIP_SA_CAPTIONFIXEDANGLE;break;
-        case SDRATTR_CAPTIONANGLE     : nResId = SIP_SA_CAPTIONANGLE;break;
-        case SDRATTR_CAPTIONGAP       : nResId = SIP_SA_CAPTIONGAP;break;
-        case SDRATTR_CAPTIONESCDIR    : nResId = SIP_SA_CAPTIONESCDIR;break;
-        case SDRATTR_CAPTIONESCISREL  : nResId = SIP_SA_CAPTIONESCISREL;break;
-        case SDRATTR_CAPTIONESCREL    : nResId = SIP_SA_CAPTIONESCREL;break;
-        case SDRATTR_CAPTIONESCABS    : nResId = SIP_SA_CAPTIONESCABS;break;
-        case SDRATTR_CAPTIONLINELEN   : nResId = SIP_SA_CAPTIONLINELEN;break;
-        case SDRATTR_CAPTIONFITLINELEN: nResId = SIP_SA_CAPTIONFITLINELEN;break;
-
-        case SDRATTR_ECKENRADIUS            : nResId = SIP_SA_ECKENRADIUS;break;
-        case SDRATTR_TEXT_MINFRAMEHEIGHT    : nResId = SIP_SA_TEXT_MINFRAMEHEIGHT;break;
-        case SDRATTR_TEXT_AUTOGROWHEIGHT    : nResId = SIP_SA_TEXT_AUTOGROWHEIGHT;break;
-        case SDRATTR_TEXT_FITTOSIZE         : nResId = SIP_SA_TEXT_FITTOSIZE;break;
-        case SDRATTR_TEXT_LEFTDIST          : nResId = SIP_SA_TEXT_LEFTDIST;break;
-        case SDRATTR_TEXT_RIGHTDIST         : nResId = SIP_SA_TEXT_RIGHTDIST;break;
-        case SDRATTR_TEXT_UPPERDIST         : nResId = SIP_SA_TEXT_UPPERDIST;break;
-        case SDRATTR_TEXT_LOWERDIST         : nResId = SIP_SA_TEXT_LOWERDIST;break;
-        case SDRATTR_TEXT_VERTADJUST        : nResId = SIP_SA_TEXT_VERTADJUST;break;
-        case SDRATTR_TEXT_MAXFRAMEHEIGHT    : nResId = SIP_SA_TEXT_MAXFRAMEHEIGHT;break;
-        case SDRATTR_TEXT_MINFRAMEWIDTH     : nResId = SIP_SA_TEXT_MINFRAMEWIDTH;break;
-        case SDRATTR_TEXT_MAXFRAMEWIDTH     : nResId = SIP_SA_TEXT_MAXFRAMEWIDTH;break;
-        case SDRATTR_TEXT_AUTOGROWWIDTH     : nResId = SIP_SA_TEXT_AUTOGROWWIDTH;break;
-        case SDRATTR_TEXT_HORZADJUST        : nResId = SIP_SA_TEXT_HORZADJUST;break;
-        case SDRATTR_TEXT_ANIKIND           : nResId = SIP_SA_TEXT_ANIKIND;break;
-        case SDRATTR_TEXT_ANIDIRECTION      : nResId = SIP_SA_TEXT_ANIDIRECTION;break;
-        case SDRATTR_TEXT_ANISTARTINSIDE    : nResId = SIP_SA_TEXT_ANISTARTINSIDE;break;
-        case SDRATTR_TEXT_ANISTOPINSIDE     : nResId = SIP_SA_TEXT_ANISTOPINSIDE;break;
-        case SDRATTR_TEXT_ANICOUNT          : nResId = SIP_SA_TEXT_ANICOUNT;break;
-        case SDRATTR_TEXT_ANIDELAY          : nResId = SIP_SA_TEXT_ANIDELAY;break;
-        case SDRATTR_TEXT_ANIAMOUNT         : nResId = SIP_SA_TEXT_ANIAMOUNT;break;
-        case SDRATTR_TEXT_CONTOURFRAME      : nResId = SIP_SA_TEXT_CONTOURFRAME;break;
-        case SDRATTR_CUSTOMSHAPE_ADJUSTMENT : nResId = SIP_SA_CUSTOMSHAPE_ADJUSTMENT;break;
-        case SDRATTR_XMLATTRIBUTES          : nResId = SIP_SA_XMLATTRIBUTES;break;
-        case SDRATTR_TEXT_USEFIXEDCELLHEIGHT: nResId = SIP_SA_TEXT_USEFIXEDCELLHEIGHT;break;
-        case SDRATTR_TEXT_WORDWRAP          : nResId = SIP_SA_WORDWRAP;break;
-        case SDRATTR_TEXT_CHAINNEXTNAME     : nResId = SIP_SA_CHAINNEXTNAME;break;
-
-        case SDRATTR_EDGEKIND           : nResId = SIP_SA_EDGEKIND;break;
-        case SDRATTR_EDGENODE1HORZDIST  : nResId = SIP_SA_EDGENODE1HORZDIST;break;
-        case SDRATTR_EDGENODE1VERTDIST  : nResId = SIP_SA_EDGENODE1VERTDIST;break;
-        case SDRATTR_EDGENODE2HORZDIST  : nResId = SIP_SA_EDGENODE2HORZDIST;break;
-        case SDRATTR_EDGENODE2VERTDIST  : nResId = SIP_SA_EDGENODE2VERTDIST;break;
-        case SDRATTR_EDGENODE1GLUEDIST  : nResId = SIP_SA_EDGENODE1GLUEDIST;break;
-        case SDRATTR_EDGENODE2GLUEDIST  : nResId = SIP_SA_EDGENODE2GLUEDIST;break;
-        case SDRATTR_EDGELINEDELTAANZ   : nResId = SIP_SA_EDGELINEDELTAANZ;break;
-        case SDRATTR_EDGELINE1DELTA     : nResId = SIP_SA_EDGELINE1DELTA;break;
-        case SDRATTR_EDGELINE2DELTA     : nResId = SIP_SA_EDGELINE2DELTA;break;
-        case SDRATTR_EDGELINE3DELTA     : nResId = SIP_SA_EDGELINE3DELTA;break;
-
-        case SDRATTR_MEASUREKIND             : nResId = SIP_SA_MEASUREKIND;break;
-        case SDRATTR_MEASURETEXTHPOS         : nResId = SIP_SA_MEASURETEXTHPOS;break;
-        case SDRATTR_MEASURETEXTVPOS         : nResId = SIP_SA_MEASURETEXTVPOS;break;
-        case SDRATTR_MEASURELINEDIST         : nResId = SIP_SA_MEASURELINEDIST;break;
-        case SDRATTR_MEASUREHELPLINEOVERHANG : nResId = SIP_SA_MEASUREHELPLINEOVERHANG;break;
-        case SDRATTR_MEASUREHELPLINEDIST     : nResId = SIP_SA_MEASUREHELPLINEDIST;break;
-        case SDRATTR_MEASUREHELPLINE1LEN     : nResId = SIP_SA_MEASUREHELPLINE1LEN;break;
-        case SDRATTR_MEASUREHELPLINE2LEN     : nResId = SIP_SA_MEASUREHELPLINE2LEN;break;
-        case SDRATTR_MEASUREBELOWREFEDGE     : nResId = SIP_SA_MEASUREBELOWREFEDGE;break;
-        case SDRATTR_MEASURETEXTROTA90       : nResId = SIP_SA_MEASURETEXTROTA90;break;
-        case SDRATTR_MEASURETEXTUPSIDEDOWN   : nResId = SIP_SA_MEASURETEXTUPSIDEDOWN;break;
-        case SDRATTR_MEASUREOVERHANG         : nResId = SIP_SA_MEASUREOVERHANG;break;
-        case SDRATTR_MEASUREUNIT             : nResId = SIP_SA_MEASUREUNIT;break;
-        case SDRATTR_MEASURESCALE            : nResId = SIP_SA_MEASURESCALE;break;
-        case SDRATTR_MEASURESHOWUNIT         : nResId = SIP_SA_MEASURESHOWUNIT;break;
-        case SDRATTR_MEASUREFORMATSTRING     : nResId = SIP_SA_MEASUREFORMATSTRING;break;
-        case SDRATTR_MEASURETEXTAUTOANGLE    : nResId = SIP_SA_MEASURETEXTAUTOANGLE;break;
-        case SDRATTR_MEASURETEXTAUTOANGLEVIEW: nResId = SIP_SA_MEASURETEXTAUTOANGLEVIEW;break;
-        case SDRATTR_MEASURETEXTISFIXEDANGLE : nResId = SIP_SA_MEASURETEXTISFIXEDANGLE;break;
-        case SDRATTR_MEASURETEXTFIXEDANGLE   : nResId = SIP_SA_MEASURETEXTFIXEDANGLE;break;
-        case SDRATTR_MEASUREDECIMALPLACES    : nResId = SIP_SA_MEASUREDECIMALPLACES;break;
-
-        case SDRATTR_CIRCKIND      : nResId = SIP_SA_CIRCKIND;break;
-        case SDRATTR_CIRCSTARTANGLE: nResId = SIP_SA_CIRCSTARTANGLE;break;
-        case SDRATTR_CIRCENDANGLE  : nResId = SIP_SA_CIRCENDANGLE;break;
-
-        case SDRATTR_OBJMOVEPROTECT : nResId = SIP_SA_OBJMOVEPROTECT;break;
-        case SDRATTR_OBJSIZEPROTECT : nResId = SIP_SA_OBJSIZEPROTECT;break;
-        case SDRATTR_OBJPRINTABLE   : nResId = SIP_SA_OBJPRINTABLE;break;
-        case SDRATTR_OBJVISIBLE     : nResId = SIP_SA_OBJVISIBLE;break;
-        case SDRATTR_LAYERID        : nResId = SIP_SA_LAYERID;break;
-        case SDRATTR_LAYERNAME      : nResId = SIP_SA_LAYERNAME;break;
-        case SDRATTR_OBJECTNAME     : nResId = SIP_SA_OBJECTNAME;break;
-        case SDRATTR_ALLPOSITIONX   : nResId = SIP_SA_ALLPOSITIONX;break;
-        case SDRATTR_ALLPOSITIONY   : nResId = SIP_SA_ALLPOSITIONY;break;
-        case SDRATTR_ALLSIZEWIDTH   : nResId = SIP_SA_ALLSIZEWIDTH;break;
-        case SDRATTR_ALLSIZEHEIGHT  : nResId = SIP_SA_ALLSIZEHEIGHT;break;
-        case SDRATTR_ONEPOSITIONX   : nResId = SIP_SA_ONEPOSITIONX;break;
-        case SDRATTR_ONEPOSITIONY   : nResId = SIP_SA_ONEPOSITIONY;break;
-        case SDRATTR_ONESIZEWIDTH   : nResId = SIP_SA_ONESIZEWIDTH;break;
-        case SDRATTR_ONESIZEHEIGHT  : nResId = SIP_SA_ONESIZEHEIGHT;break;
-        case SDRATTR_LOGICSIZEWIDTH : nResId = SIP_SA_LOGICSIZEWIDTH;break;
-        case SDRATTR_LOGICSIZEHEIGHT: nResId = SIP_SA_LOGICSIZEHEIGHT;break;
-        case SDRATTR_ROTATEANGLE    : nResId = SIP_SA_ROTATEANGLE;break;
-        case SDRATTR_SHEARANGLE     : nResId = SIP_SA_SHEARANGLE;break;
-        case SDRATTR_MOVEX          : nResId = SIP_SA_MOVEX;break;
-        case SDRATTR_MOVEY          : nResId = SIP_SA_MOVEY;break;
-        case SDRATTR_RESIZEXONE     : nResId = SIP_SA_RESIZEXONE;break;
-        case SDRATTR_RESIZEYONE     : nResId = SIP_SA_RESIZEYONE;break;
-        case SDRATTR_ROTATEONE      : nResId = SIP_SA_ROTATEONE;break;
-        case SDRATTR_HORZSHEARONE   : nResId = SIP_SA_HORZSHEARONE;break;
-        case SDRATTR_VERTSHEARONE   : nResId = SIP_SA_VERTSHEARONE;break;
-        case SDRATTR_RESIZEXALL     : nResId = SIP_SA_RESIZEXALL;break;
-        case SDRATTR_RESIZEYALL     : nResId = SIP_SA_RESIZEYALL;break;
-        case SDRATTR_ROTATEALL      : nResId = SIP_SA_ROTATEALL;break;
-        case SDRATTR_HORZSHEARALL   : nResId = SIP_SA_HORZSHEARALL;break;
-        case SDRATTR_VERTSHEARALL   : nResId = SIP_SA_VERTSHEARALL;break;
-        case SDRATTR_TRANSFORMREF1X : nResId = SIP_SA_TRANSFORMREF1X;break;
-        case SDRATTR_TRANSFORMREF1Y : nResId = SIP_SA_TRANSFORMREF1Y;break;
-        case SDRATTR_TRANSFORMREF2X : nResId = SIP_SA_TRANSFORMREF2X;break;
-        case SDRATTR_TRANSFORMREF2Y : nResId = SIP_SA_TRANSFORMREF2Y;break;
-
-        case SDRATTR_GRAFRED            : nResId = SIP_SA_GRAFRED;break;
-        case SDRATTR_GRAFGREEN          : nResId = SIP_SA_GRAFGREEN;break;
-        case SDRATTR_GRAFBLUE           : nResId = SIP_SA_GRAFBLUE;break;
-        case SDRATTR_GRAFLUMINANCE      : nResId = SIP_SA_GRAFLUMINANCE;break;
-        case SDRATTR_GRAFCONTRAST       : nResId = SIP_SA_GRAFCONTRAST;break;
-        case SDRATTR_GRAFGAMMA          : nResId = SIP_SA_GRAFGAMMA;break;
-        case SDRATTR_GRAFTRANSPARENCE   : nResId = SIP_SA_GRAFTRANSPARENCE;break;
-        case SDRATTR_GRAFINVERT         : nResId = SIP_SA_GRAFINVERT;break;
-        case SDRATTR_GRAFMODE           : nResId = SIP_SA_GRAFMODE;break;
-        case SDRATTR_GRAFCROP           : nResId = SIP_SA_GRAFCROP;break;
-
-        case EE_PARA_HYPHENATE  : nResId = SIP_EE_PARA_HYPHENATE;break;
-        case EE_PARA_BULLETSTATE: nResId = SIP_EE_PARA_BULLETSTATE;break;
-        case EE_PARA_OUTLLRSPACE: nResId = SIP_EE_PARA_OUTLLRSPACE;break;
-        case EE_PARA_OUTLLEVEL  : nResId = SIP_EE_PARA_OUTLLEVEL;break;
-        case EE_PARA_BULLET     : nResId = SIP_EE_PARA_BULLET;break;
-        case EE_PARA_LRSPACE    : nResId = SIP_EE_PARA_LRSPACE;break;
-        case EE_PARA_ULSPACE    : nResId = SIP_EE_PARA_ULSPACE;break;
-        case EE_PARA_SBL        : nResId = SIP_EE_PARA_SBL;break;
-        case EE_PARA_JUST       : nResId = SIP_EE_PARA_JUST;break;
-        case EE_PARA_TABS       : nResId = SIP_EE_PARA_TABS;break;
-
-        case EE_CHAR_COLOR      : nResId = SIP_EE_CHAR_COLOR;break;
-        case EE_CHAR_FONTINFO   : nResId = SIP_EE_CHAR_FONTINFO;break;
-        case EE_CHAR_FONTHEIGHT : nResId = SIP_EE_CHAR_FONTHEIGHT;break;
-        case EE_CHAR_FONTWIDTH  : nResId = SIP_EE_CHAR_FONTWIDTH;break;
-        case EE_CHAR_WEIGHT     : nResId = SIP_EE_CHAR_WEIGHT;break;
-        case EE_CHAR_UNDERLINE  : nResId = SIP_EE_CHAR_UNDERLINE;break;
-        case EE_CHAR_OVERLINE   : nResId = SIP_EE_CHAR_OVERLINE;break;
-        case EE_CHAR_STRIKEOUT  : nResId = SIP_EE_CHAR_STRIKEOUT;break;
-        case EE_CHAR_ITALIC     : nResId = SIP_EE_CHAR_ITALIC;break;
-        case EE_CHAR_OUTLINE    : nResId = SIP_EE_CHAR_OUTLINE;break;
-        case EE_CHAR_SHADOW     : nResId = SIP_EE_CHAR_SHADOW;break;
-        case EE_CHAR_ESCAPEMENT : nResId = SIP_EE_CHAR_ESCAPEMENT;break;
-        case EE_CHAR_PAIRKERNING: nResId = SIP_EE_CHAR_PAIRKERNING;break;
-        case EE_CHAR_KERNING    : nResId = SIP_EE_CHAR_KERNING;break;
-        case EE_CHAR_WLM        : nResId = SIP_EE_CHAR_WLM;break;
-        case EE_FEATURE_TAB     : nResId = SIP_EE_FEATURE_TAB;break;
-        case EE_FEATURE_LINEBR  : nResId = SIP_EE_FEATURE_LINEBR;break;
-        case EE_FEATURE_NOTCONV : nResId = SIP_EE_FEATURE_NOTCONV;break;
-        case EE_FEATURE_FIELD   : nResId = SIP_EE_FEATURE_FIELD;break;
+        case XATTR_LINESTYLE        : pResId = SIP_XA_LINESTYLE;break;
+        case XATTR_LINEDASH         : pResId = SIP_XA_LINEDASH;break;
+        case XATTR_LINEWIDTH        : pResId = SIP_XA_LINEWIDTH;break;
+        case XATTR_LINECOLOR        : pResId = SIP_XA_LINECOLOR;break;
+        case XATTR_LINESTART        : pResId = SIP_XA_LINESTART;break;
+        case XATTR_LINEEND          : pResId = SIP_XA_LINEEND;break;
+        case XATTR_LINESTARTWIDTH   : pResId = SIP_XA_LINESTARTWIDTH;break;
+        case XATTR_LINEENDWIDTH     : pResId = SIP_XA_LINEENDWIDTH;break;
+        case XATTR_LINESTARTCENTER  : pResId = SIP_XA_LINESTARTCENTER;break;
+        case XATTR_LINEENDCENTER    : pResId = SIP_XA_LINEENDCENTER;break;
+        case XATTR_LINETRANSPARENCE : pResId = SIP_XA_LINETRANSPARENCE;break;
+        case XATTR_LINEJOINT        : pResId = SIP_XA_LINEJOINT;break;
+        case XATTRSET_LINE          : pResId = SIP_XATTRSET_LINE;break;
+
+        case XATTR_FILLSTYLE            : pResId = SIP_XA_FILLSTYLE;break;
+        case XATTR_FILLCOLOR            : pResId = SIP_XA_FILLCOLOR;break;
+        case XATTR_FILLGRADIENT         : pResId = SIP_XA_FILLGRADIENT;break;
+        case XATTR_FILLHATCH            : pResId = SIP_XA_FILLHATCH;break;
+        case XATTR_FILLBITMAP           : pResId = SIP_XA_FILLBITMAP;break;
+        case XATTR_FILLTRANSPARENCE     : pResId = SIP_XA_FILLTRANSPARENCE;break;
+        case XATTR_GRADIENTSTEPCOUNT    : pResId = SIP_XA_GRADIENTSTEPCOUNT;break;
+        case XATTR_FILLBMP_TILE         : pResId = SIP_XA_FILLBMP_TILE;break;
+        case XATTR_FILLBMP_POS          : pResId = SIP_XA_FILLBMP_POS;break;
+        case XATTR_FILLBMP_SIZEX        : pResId = SIP_XA_FILLBMP_SIZEX;break;
+        case XATTR_FILLBMP_SIZEY        : pResId = SIP_XA_FILLBMP_SIZEY;break;
+        case XATTR_FILLFLOATTRANSPARENCE: pResId = SIP_XA_FILLFLOATTRANSPARENCE;break;
+        case XATTR_SECONDARYFILLCOLOR   : pResId = SIP_XA_SECONDARYFILLCOLOR;break;
+        case XATTR_FILLBMP_SIZELOG      : pResId = SIP_XA_FILLBMP_SIZELOG;break;
+        case XATTR_FILLBMP_TILEOFFSETX  : pResId = SIP_XA_FILLBMP_TILEOFFSETX;break;
+        case XATTR_FILLBMP_TILEOFFSETY  : pResId = SIP_XA_FILLBMP_TILEOFFSETY;break;
+        case XATTR_FILLBMP_STRETCH      : pResId = SIP_XA_FILLBMP_STRETCH;break;
+        case XATTR_FILLBMP_POSOFFSETX   : pResId = SIP_XA_FILLBMP_POSOFFSETX;break;
+        case XATTR_FILLBMP_POSOFFSETY   : pResId = SIP_XA_FILLBMP_POSOFFSETY;break;
+        case XATTR_FILLBACKGROUND       : pResId = SIP_XA_FILLBACKGROUND;break;
+
+        case XATTRSET_FILL             : pResId = SIP_XATTRSET_FILL;break;
+
+        case XATTR_FORMTXTSTYLE     : pResId = SIP_XA_FORMTXTSTYLE;break;
+        case XATTR_FORMTXTADJUST    : pResId = SIP_XA_FORMTXTADJUST;break;
+        case XATTR_FORMTXTDISTANCE  : pResId = SIP_XA_FORMTXTDISTANCE;break;
+        case XATTR_FORMTXTSTART     : pResId = SIP_XA_FORMTXTSTART;break;
+        case XATTR_FORMTXTMIRROR    : pResId = SIP_XA_FORMTXTMIRROR;break;
+        case XATTR_FORMTXTOUTLINE   : pResId = SIP_XA_FORMTXTOUTLINE;break;
+        case XATTR_FORMTXTSHADOW    : pResId = SIP_XA_FORMTXTSHADOW;break;
+        case XATTR_FORMTXTSHDWCOLOR : pResId = SIP_XA_FORMTXTSHDWCOLOR;break;
+        case XATTR_FORMTXTSHDWXVAL  : pResId = SIP_XA_FORMTXTSHDWXVAL;break;
+        case XATTR_FORMTXTSHDWYVAL  : pResId = SIP_XA_FORMTXTSHDWYVAL;break;
+        case XATTR_FORMTXTHIDEFORM  : pResId = SIP_XA_FORMTXTHIDEFORM;break;
+        case XATTR_FORMTXTSHDWTRANSP: pResId = SIP_XA_FORMTXTSHDWTRANSP;break;
+
+        case SDRATTR_SHADOW            : pResId = SIP_SA_SHADOW;break;
+        case SDRATTR_SHADOWCOLOR       : pResId = SIP_SA_SHADOWCOLOR;break;
+        case SDRATTR_SHADOWXDIST       : pResId = SIP_SA_SHADOWXDIST;break;
+        case SDRATTR_SHADOWYDIST       : pResId = SIP_SA_SHADOWYDIST;break;
+        case SDRATTR_SHADOWTRANSPARENCE: pResId = SIP_SA_SHADOWTRANSPARENCE;break;
+        case SDRATTR_SHADOW3D          : pResId = SIP_SA_SHADOW3D;break;
+        case SDRATTR_SHADOWPERSP       : pResId = SIP_SA_SHADOWPERSP;break;
+
+        case SDRATTR_CAPTIONTYPE      : pResId = SIP_SA_CAPTIONTYPE;break;
+        case SDRATTR_CAPTIONFIXEDANGLE: pResId = SIP_SA_CAPTIONFIXEDANGLE;break;
+        case SDRATTR_CAPTIONANGLE     : pResId = SIP_SA_CAPTIONANGLE;break;
+        case SDRATTR_CAPTIONGAP       : pResId = SIP_SA_CAPTIONGAP;break;
+        case SDRATTR_CAPTIONESCDIR    : pResId = SIP_SA_CAPTIONESCDIR;break;
+        case SDRATTR_CAPTIONESCISREL  : pResId = SIP_SA_CAPTIONESCISREL;break;
+        case SDRATTR_CAPTIONESCREL    : pResId = SIP_SA_CAPTIONESCREL;break;
+        case SDRATTR_CAPTIONESCABS    : pResId = SIP_SA_CAPTIONESCABS;break;
+        case SDRATTR_CAPTIONLINELEN   : pResId = SIP_SA_CAPTIONLINELEN;break;
+        case SDRATTR_CAPTIONFITLINELEN: pResId = SIP_SA_CAPTIONFITLINELEN;break;
+
+        case SDRATTR_ECKENRADIUS            : pResId = SIP_SA_ECKENRADIUS;break;
+        case SDRATTR_TEXT_MINFRAMEHEIGHT    : pResId = SIP_SA_TEXT_MINFRAMEHEIGHT;break;
+        case SDRATTR_TEXT_AUTOGROWHEIGHT    : pResId = SIP_SA_TEXT_AUTOGROWHEIGHT;break;
+        case SDRATTR_TEXT_FITTOSIZE         : pResId = SIP_SA_TEXT_FITTOSIZE;break;
+        case SDRATTR_TEXT_LEFTDIST          : pResId = SIP_SA_TEXT_LEFTDIST;break;
+        case SDRATTR_TEXT_RIGHTDIST         : pResId = SIP_SA_TEXT_RIGHTDIST;break;
+        case SDRATTR_TEXT_UPPERDIST         : pResId = SIP_SA_TEXT_UPPERDIST;break;
+        case SDRATTR_TEXT_LOWERDIST         : pResId = SIP_SA_TEXT_LOWERDIST;break;
+        case SDRATTR_TEXT_VERTADJUST        : pResId = SIP_SA_TEXT_VERTADJUST;break;
+        case SDRATTR_TEXT_MAXFRAMEHEIGHT    : pResId = SIP_SA_TEXT_MAXFRAMEHEIGHT;break;
+        case SDRATTR_TEXT_MINFRAMEWIDTH     : pResId = SIP_SA_TEXT_MINFRAMEWIDTH;break;
+        case SDRATTR_TEXT_MAXFRAMEWIDTH     : pResId = SIP_SA_TEXT_MAXFRAMEWIDTH;break;
+        case SDRATTR_TEXT_AUTOGROWWIDTH     : pResId = SIP_SA_TEXT_AUTOGROWWIDTH;break;
+        case SDRATTR_TEXT_HORZADJUST        : pResId = SIP_SA_TEXT_HORZADJUST;break;
+        case SDRATTR_TEXT_ANIKIND           : pResId = SIP_SA_TEXT_ANIKIND;break;
+        case SDRATTR_TEXT_ANIDIRECTION      : pResId = SIP_SA_TEXT_ANIDIRECTION;break;
+        case SDRATTR_TEXT_ANISTARTINSIDE    : pResId = SIP_SA_TEXT_ANISTARTINSIDE;break;
+        case SDRATTR_TEXT_ANISTOPINSIDE     : pResId = SIP_SA_TEXT_ANISTOPINSIDE;break;
+        case SDRATTR_TEXT_ANICOUNT          : pResId = SIP_SA_TEXT_ANICOUNT;break;
+        case SDRATTR_TEXT_ANIDELAY          : pResId = SIP_SA_TEXT_ANIDELAY;break;
+        case SDRATTR_TEXT_ANIAMOUNT         : pResId = SIP_SA_TEXT_ANIAMOUNT;break;
+        case SDRATTR_TEXT_CONTOURFRAME      : pResId = SIP_SA_TEXT_CONTOURFRAME;break;
+        case SDRATTR_CUSTOMSHAPE_ADJUSTMENT : pResId = SIP_SA_CUSTOMSHAPE_ADJUSTMENT;break;
+        case SDRATTR_XMLATTRIBUTES          : pResId = SIP_SA_XMLATTRIBUTES;break;
+        case SDRATTR_TEXT_USEFIXEDCELLHEIGHT: pResId = SIP_SA_TEXT_USEFIXEDCELLHEIGHT;break;
+        case SDRATTR_TEXT_WORDWRAP          : pResId = SIP_SA_WORDWRAP;break;
+        case SDRATTR_TEXT_CHAINNEXTNAME     : pResId = SIP_SA_CHAINNEXTNAME;break;
+
+        case SDRATTR_EDGEKIND           : pResId = SIP_SA_EDGEKIND;break;
+        case SDRATTR_EDGENODE1HORZDIST  : pResId = SIP_SA_EDGENODE1HORZDIST;break;
+        case SDRATTR_EDGENODE1VERTDIST  : pResId = SIP_SA_EDGENODE1VERTDIST;break;
+        case SDRATTR_EDGENODE2HORZDIST  : pResId = SIP_SA_EDGENODE2HORZDIST;break;
+        case SDRATTR_EDGENODE2VERTDIST  : pResId = SIP_SA_EDGENODE2VERTDIST;break;
+        case SDRATTR_EDGENODE1GLUEDIST  : pResId = SIP_SA_EDGENODE1GLUEDIST;break;
+        case SDRATTR_EDGENODE2GLUEDIST  : pResId = SIP_SA_EDGENODE2GLUEDIST;break;
+        case SDRATTR_EDGELINEDELTAANZ   : pResId = SIP_SA_EDGELINEDELTAANZ;break;
+        case SDRATTR_EDGELINE1DELTA     : pResId = SIP_SA_EDGELINE1DELTA;break;
+        case SDRATTR_EDGELINE2DELTA     : pResId = SIP_SA_EDGELINE2DELTA;break;
+        case SDRATTR_EDGELINE3DELTA     : pResId = SIP_SA_EDGELINE3DELTA;break;
+
+        case SDRATTR_MEASUREKIND             : pResId = SIP_SA_MEASUREKIND;break;
+        case SDRATTR_MEASURETEXTHPOS         : pResId = SIP_SA_MEASURETEXTHPOS;break;
+        case SDRATTR_MEASURETEXTVPOS         : pResId = SIP_SA_MEASURETEXTVPOS;break;
+        case SDRATTR_MEASURELINEDIST         : pResId = SIP_SA_MEASURELINEDIST;break;
+        case SDRATTR_MEASUREHELPLINEOVERHANG : pResId = SIP_SA_MEASUREHELPLINEOVERHANG;break;
+        case SDRATTR_MEASUREHELPLINEDIST     : pResId = SIP_SA_MEASUREHELPLINEDIST;break;
+        case SDRATTR_MEASUREHELPLINE1LEN     : pResId = SIP_SA_MEASUREHELPLINE1LEN;break;
+        case SDRATTR_MEASUREHELPLINE2LEN     : pResId = SIP_SA_MEASUREHELPLINE2LEN;break;
+        case SDRATTR_MEASUREBELOWREFEDGE     : pResId = SIP_SA_MEASUREBELOWREFEDGE;break;
+        case SDRATTR_MEASURETEXTROTA90       : pResId = SIP_SA_MEASURETEXTROTA90;break;
+        case SDRATTR_MEASURETEXTUPSIDEDOWN   : pResId = SIP_SA_MEASURETEXTUPSIDEDOWN;break;
+        case SDRATTR_MEASUREOVERHANG         : pResId = SIP_SA_MEASUREOVERHANG;break;
+        case SDRATTR_MEASUREUNIT             : pResId = SIP_SA_MEASUREUNIT;break;
+        case SDRATTR_MEASURESCALE            : pResId = SIP_SA_MEASURESCALE;break;
+        case SDRATTR_MEASURESHOWUNIT         : pResId = SIP_SA_MEASURESHOWUNIT;break;
+        case SDRATTR_MEASUREFORMATSTRING     : pResId = SIP_SA_MEASUREFORMATSTRING;break;
+        case SDRATTR_MEASURETEXTAUTOANGLE    : pResId = SIP_SA_MEASURETEXTAUTOANGLE;break;
+        case SDRATTR_MEASURETEXTAUTOANGLEVIEW: pResId = SIP_SA_MEASURETEXTAUTOANGLEVIEW;break;
+        case SDRATTR_MEASURETEXTISFIXEDANGLE : pResId = SIP_SA_MEASURETEXTISFIXEDANGLE;break;
+        case SDRATTR_MEASURETEXTFIXEDANGLE   : pResId = SIP_SA_MEASURETEXTFIXEDANGLE;break;
+        case SDRATTR_MEASUREDECIMALPLACES    : pResId = SIP_SA_MEASUREDECIMALPLACES;break;
+
+        case SDRATTR_CIRCKIND      : pResId = SIP_SA_CIRCKIND;break;
+        case SDRATTR_CIRCSTARTANGLE: pResId = SIP_SA_CIRCSTARTANGLE;break;
+        case SDRATTR_CIRCENDANGLE  : pResId = SIP_SA_CIRCENDANGLE;break;
+
+        case SDRATTR_OBJMOVEPROTECT : pResId = SIP_SA_OBJMOVEPROTECT;break;
+        case SDRATTR_OBJSIZEPROTECT : pResId = SIP_SA_OBJSIZEPROTECT;break;
+        case SDRATTR_OBJPRINTABLE   : pResId = SIP_SA_OBJPRINTABLE;break;
+        case SDRATTR_OBJVISIBLE     : pResId = SIP_SA_OBJVISIBLE;break;
+        case SDRATTR_LAYERID        : pResId = SIP_SA_LAYERID;break;
+        case SDRATTR_LAYERNAME      : pResId = SIP_SA_LAYERNAME;break;
+        case SDRATTR_OBJECTNAME     : pResId = SIP_SA_OBJECTNAME;break;
+        case SDRATTR_ALLPOSITIONX   : pResId = SIP_SA_ALLPOSITIONX;break;
+        case SDRATTR_ALLPOSITIONY   : pResId = SIP_SA_ALLPOSITIONY;break;
+        case SDRATTR_ALLSIZEWIDTH   : pResId = SIP_SA_ALLSIZEWIDTH;break;
+        case SDRATTR_ALLSIZEHEIGHT  : pResId = SIP_SA_ALLSIZEHEIGHT;break;
+        case SDRATTR_ONEPOSITIONX   : pResId = SIP_SA_ONEPOSITIONX;break;
+        case SDRATTR_ONEPOSITIONY   : pResId = SIP_SA_ONEPOSITIONY;break;
+        case SDRATTR_ONESIZEWIDTH   : pResId = SIP_SA_ONESIZEWIDTH;break;
+        case SDRATTR_ONESIZEHEIGHT  : pResId = SIP_SA_ONESIZEHEIGHT;break;
+        case SDRATTR_LOGICSIZEWIDTH : pResId = SIP_SA_LOGICSIZEWIDTH;break;
+        case SDRATTR_LOGICSIZEHEIGHT: pResId = SIP_SA_LOGICSIZEHEIGHT;break;
+        case SDRATTR_ROTATEANGLE    : pResId = SIP_SA_ROTATEANGLE;break;
+        case SDRATTR_SHEARANGLE     : pResId = SIP_SA_SHEARANGLE;break;
+        case SDRATTR_MOVEX          : pResId = SIP_SA_MOVEX;break;
+        case SDRATTR_MOVEY          : pResId = SIP_SA_MOVEY;break;
+        case SDRATTR_RESIZEXONE     : pResId = SIP_SA_RESIZEXONE;break;
+        case SDRATTR_RESIZEYONE     : pResId = SIP_SA_RESIZEYONE;break;
+        case SDRATTR_ROTATEONE      : pResId = SIP_SA_ROTATEONE;break;
+        case SDRATTR_HORZSHEARONE   : pResId = SIP_SA_HORZSHEARONE;break;
+        case SDRATTR_VERTSHEARONE   : pResId = SIP_SA_VERTSHEARONE;break;
+        case SDRATTR_RESIZEXALL     : pResId = SIP_SA_RESIZEXALL;break;
+        case SDRATTR_RESIZEYALL     : pResId = SIP_SA_RESIZEYALL;break;
+        case SDRATTR_ROTATEALL      : pResId = SIP_SA_ROTATEALL;break;
+        case SDRATTR_HORZSHEARALL   : pResId = SIP_SA_HORZSHEARALL;break;
+        case SDRATTR_VERTSHEARALL   : pResId = SIP_SA_VERTSHEARALL;break;
+        case SDRATTR_TRANSFORMREF1X : pResId = SIP_SA_TRANSFORMREF1X;break;
+        case SDRATTR_TRANSFORMREF1Y : pResId = SIP_SA_TRANSFORMREF1Y;break;
+        case SDRATTR_TRANSFORMREF2X : pResId = SIP_SA_TRANSFORMREF2X;break;
+        case SDRATTR_TRANSFORMREF2Y : pResId = SIP_SA_TRANSFORMREF2Y;break;
+
+        case SDRATTR_GRAFRED            : pResId = SIP_SA_GRAFRED;break;
+        case SDRATTR_GRAFGREEN          : pResId = SIP_SA_GRAFGREEN;break;
+        case SDRATTR_GRAFBLUE           : pResId = SIP_SA_GRAFBLUE;break;
+        case SDRATTR_GRAFLUMINANCE      : pResId = SIP_SA_GRAFLUMINANCE;break;
+        case SDRATTR_GRAFCONTRAST       : pResId = SIP_SA_GRAFCONTRAST;break;
+        case SDRATTR_GRAFGAMMA          : pResId = SIP_SA_GRAFGAMMA;break;
+        case SDRATTR_GRAFTRANSPARENCE   : pResId = SIP_SA_GRAFTRANSPARENCE;break;
+        case SDRATTR_GRAFINVERT         : pResId = SIP_SA_GRAFINVERT;break;
+        case SDRATTR_GRAFMODE           : pResId = SIP_SA_GRAFMODE;break;
+        case SDRATTR_GRAFCROP           : pResId = SIP_SA_GRAFCROP;break;
+
+        case EE_PARA_HYPHENATE  : pResId = SIP_EE_PARA_HYPHENATE;break;
+        case EE_PARA_BULLETSTATE: pResId = SIP_EE_PARA_BULLETSTATE;break;
+        case EE_PARA_OUTLLRSPACE: pResId = SIP_EE_PARA_OUTLLRSPACE;break;
+        case EE_PARA_OUTLLEVEL  : pResId = SIP_EE_PARA_OUTLLEVEL;break;
+        case EE_PARA_BULLET     : pResId = SIP_EE_PARA_BULLET;break;
+        case EE_PARA_LRSPACE    : pResId = SIP_EE_PARA_LRSPACE;break;
+        case EE_PARA_ULSPACE    : pResId = SIP_EE_PARA_ULSPACE;break;
+        case EE_PARA_SBL        : pResId = SIP_EE_PARA_SBL;break;
+        case EE_PARA_JUST       : pResId = SIP_EE_PARA_JUST;break;
+        case EE_PARA_TABS       : pResId = SIP_EE_PARA_TABS;break;
+
+        case EE_CHAR_COLOR      : pResId = SIP_EE_CHAR_COLOR;break;
+        case EE_CHAR_FONTINFO   : pResId = SIP_EE_CHAR_FONTINFO;break;
+        case EE_CHAR_FONTHEIGHT : pResId = SIP_EE_CHAR_FONTHEIGHT;break;
+        case EE_CHAR_FONTWIDTH  : pResId = SIP_EE_CHAR_FONTWIDTH;break;
+        case EE_CHAR_WEIGHT     : pResId = SIP_EE_CHAR_WEIGHT;break;
+        case EE_CHAR_UNDERLINE  : pResId = SIP_EE_CHAR_UNDERLINE;break;
+        case EE_CHAR_OVERLINE   : pResId = SIP_EE_CHAR_OVERLINE;break;
+        case EE_CHAR_STRIKEOUT  : pResId = SIP_EE_CHAR_STRIKEOUT;break;
+        case EE_CHAR_ITALIC     : pResId = SIP_EE_CHAR_ITALIC;break;
+        case EE_CHAR_OUTLINE    : pResId = SIP_EE_CHAR_OUTLINE;break;
+        case EE_CHAR_SHADOW     : pResId = SIP_EE_CHAR_SHADOW;break;
+        case EE_CHAR_ESCAPEMENT : pResId = SIP_EE_CHAR_ESCAPEMENT;break;
+        case EE_CHAR_PAIRKERNING: pResId = SIP_EE_CHAR_PAIRKERNING;break;
+        case EE_CHAR_KERNING    : pResId = SIP_EE_CHAR_KERNING;break;
+        case EE_CHAR_WLM        : pResId = SIP_EE_CHAR_WLM;break;
+        case EE_FEATURE_TAB     : pResId = SIP_EE_FEATURE_TAB;break;
+        case EE_FEATURE_LINEBR  : pResId = SIP_EE_FEATURE_LINEBR;break;
+        case EE_FEATURE_NOTCONV : pResId = SIP_EE_FEATURE_NOTCONV;break;
+        case EE_FEATURE_FIELD   : pResId = SIP_EE_FEATURE_FIELD;break;
     } // switch
 
-    rItemName = ResId( nResId, *pResMgr );
+    rItemName = SvxResId(pResId);
 }
 
 
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index da33c32f0d26..7fdd997e97fb 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -32,11 +32,11 @@
 #include <svx/svdmark.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/svdpagv.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include <svx/svddrgv.hxx>
 #include <svx/svdograf.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/sdgcpitm.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
@@ -551,7 +551,7 @@ void SdrDragMethod::createSdrDragEntries_GlueDrag()
     }
 }
 
-void SdrDragMethod::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr) const
+void SdrDragMethod::ImpTakeDescriptionStr(const char* pStrCacheID, OUString& rStr) const
 {
     ImpTakeDescriptionOptions nOpt=ImpTakeDescriptionOptions::NONE;
     if (IsDraggingPoints()) {
@@ -559,7 +559,7 @@ void SdrDragMethod::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr
     } else if (IsDraggingGluePoints()) {
         nOpt=ImpTakeDescriptionOptions::GLUEPOINTS;
     }
-    getSdrDragView().ImpTakeDescriptionStr(nStrCacheID,rStr,nOpt);
+    getSdrDragView().ImpTakeDescriptionStr(pStrCacheID,rStr,nOpt);
 }
 
 SdrObject* SdrDragMethod::GetDragObj() const
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 1f8ed61d7817..738d19496dee 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -29,7 +29,7 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdoedge.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include "svddrgm1.hxx"
 #include <svx/obj3d.hxx>
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 08fbfa0caffe..3b1e8d687954 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -29,7 +29,7 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdpoev.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include <svx/e3dsceneupdater.hxx>
 #include <rtl/strbuf.hxx>
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 2a6a33a91bd2..d988aad4fc64 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -31,7 +31,7 @@
 #include "getallcharpropids.hxx"
 #include "svdglob.hxx"
 #include "svx/svditer.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 
 #include <svx/AffineMatrixItem.hxx>
 #include <svx/e3dsceneupdater.hxx>
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index b97868fbf485..d34b0101ff8c 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -28,7 +28,7 @@
 #include "svx/svditer.hxx"
 #include <svx/svdograf.hxx>
 #include <svx/svdoole2.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include "svdfmtf.hxx"
 #include <svx/svdetc.hxx>
@@ -39,7 +39,7 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/svdoashp.hxx>
 #include <basegfx/polygon/b2dpolypolygoncutter.hxx>
 #include <memory>
@@ -1936,26 +1936,26 @@ void SdrEditView::ImpConvertTo(bool bPath, bool bLineToArea)
     if (AreObjectsMarked()) {
         bool bMrkChg = false;
         const size_t nMarkCount=GetMarkedObjectCount();
-        sal_uInt16 nDscrID=0;
+        const char* pDscrID = nullptr;
         if(bLineToArea)
         {
             if(nMarkCount == 1)
-                nDscrID = STR_EditConvToContour;
+                pDscrID = STR_EditConvToContour;
             else
-                nDscrID = STR_EditConvToContours;
+                pDscrID = STR_EditConvToContours;
 
-            BegUndo(ImpGetResStr(nDscrID), GetDescriptionOfMarkedObjects());
+            BegUndo(ImpGetResStr(pDscrID), GetDescriptionOfMarkedObjects());
         }
         else
         {
             if (bPath) {
-                if (nMarkCount==1) nDscrID=STR_EditConvToCurve;
-                else nDscrID=STR_EditConvToCurves;
-                BegUndo(ImpGetResStr(nDscrID),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::ConvertToPath);
+                if (nMarkCount==1) pDscrID=STR_EditConvToCurve;
+                else pDscrID=STR_EditConvToCurves;
+                BegUndo(ImpGetResStr(pDscrID),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::ConvertToPath);
             } else {
-                if (nMarkCount==1) nDscrID=STR_EditConvToPoly;
-                else nDscrID=STR_EditConvToPolys;
-                BegUndo(ImpGetResStr(nDscrID),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::ConvertToPoly);
+                if (nMarkCount==1) pDscrID=STR_EditConvToPoly;
+                else pDscrID=STR_EditConvToPolys;
+                BegUndo(ImpGetResStr(pDscrID),GetDescriptionOfMarkedObjects(),SdrRepeatFunc::ConvertToPoly);
             }
         }
         for (size_t nm=nMarkCount; nm>0;) {
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 04e3b34f8aff..02faf7d3a171 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -48,7 +48,7 @@
 #include <svdibrow.hxx>
 #endif
 #include <svx/svddrgv.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include "svx/globl3d.hxx"
 #include <svx/textchain.hxx>
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index ba73c511b18b..00418251e783 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -21,12 +21,12 @@
 
 #include "editeng/forbiddencharacterstable.hxx"
 #include "officecfg/Office/Common.hxx"
-#include <tools/resmgr.hxx>
+#include <svx/dialmgr.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdtrans.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svx/svdviter.hxx"
 #include <svx/svdview.hxx>
 #include <svx/svdoutl.hxx>
@@ -71,8 +71,7 @@ using namespace ::com::sun::star;
 SdrGlobalData::SdrGlobalData() :
     pSysLocale(nullptr),
     pLocaleData(nullptr),
-    pDefaults(nullptr),
-    pResMgr(nullptr)
+    pDefaults(nullptr)
 {
     if (!utl::ConfigManager::IsAvoidConfig())
     {
@@ -380,29 +379,16 @@ std::vector<Link<SdrObjUserDataCreatorParams, SdrObjUserData*>>& ImpGetUserMakeO
     return rGlobalData.aUserMakeObjUserDataHdl;
 }
 
-ResMgr* ImpGetResMgr()
+OUString ImpGetResStr(const char* pResID)
 {
-    SdrGlobalData& rGlobalData = GetSdrGlobalData();
-
-    if(!rGlobalData.pResMgr)
-    {
-        rGlobalData.pResMgr =
-            ResMgr::CreateResMgr( "svx", Application::GetSettings().GetUILanguageTag() );
-    }
-
-    return rGlobalData.pResMgr;
-}
-
-OUString ImpGetResStr(sal_uInt16 nResID)
-{
-    return ResId(nResID, *ImpGetResMgr());
+    return SvxResId(pResID);
 }
 
 namespace sdr
 {
-    OUString GetResourceString(sal_uInt16 nResID)
+    OUString GetResourceString(const char* pResID)
     {
-        return ImpGetResStr(nResID);
+        return ImpGetResStr(pResID);
     }
 }
 
diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx
index fa46fb917624..16833fa6346d 100644
--- a/svx/source/svdraw/svdglev.cxx
+++ b/svx/source/svdraw/svdglev.cxx
@@ -22,7 +22,7 @@
 #include <math.h>
 
 #include <svx/svdundo.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include <svx/svdpagv.hxx>
 #include <svx/svdglue.hxx>
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 169ec37ef599..f67f22b00d3d 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -32,7 +32,7 @@
 #include <vcl/bitmapaccess.hxx>
 
 #include <svx/sxekitm.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 
 #include <svx/svdmodel.hxx>
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index 7027e004b5a9..0cfa87c62b5a 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -22,7 +22,7 @@
 #include <svx/svdlayer.hxx>
 #include <svx/svdmodel.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 
 bool SdrLayerIDSet::IsEmpty() const
 {
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index 12170197a19e..c5506f3b1c06 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -27,7 +27,7 @@
 #include <svx/svdopath.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdorect.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 
 
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 713d0222d3cf..4fca8bb55982 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -63,7 +63,7 @@
 #include <svx/svdoutl.hxx>
 #include <svx/svdoole2.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdoutlinercache.hxx"
 
 #include "svx/xflclit.hxx"
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 87d1fb24c667..9927b54cfed1 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -37,7 +37,7 @@
 #include "gradtrns.hxx"
 #include <svx/xflftrit.hxx>
 #include <svx/dialmgr.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <svx/svdundo.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/scene3d.hxx>
@@ -2024,9 +2024,9 @@ const tools::Rectangle& SdrMarkView::GetMarkedObjRect() const
 }
 
 
-void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, ImpTakeDescriptionOptions nOpt) const
+void SdrMarkView::ImpTakeDescriptionStr(const char* pStrCacheID, OUString& rStr, ImpTakeDescriptionOptions nOpt) const
 {
-    rStr = ImpGetResStr(nStrCacheID);
+    rStr = ImpGetResStr(pStrCacheID);
     sal_Int32 nPos = rStr.indexOf("%1");
 
     if(nPos != -1)
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 42c105bfe628..2c2bd016378b 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -46,7 +46,7 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdoedge.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <editeng/eeitem.hxx>
 #include "editeng/editstat.hxx"
 #include <editeng/adjustitem.hxx>
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 310eb2834556..975af73c5dda 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -90,7 +90,7 @@
 #include <svx/svdovirt.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdpool.hxx>
-#include <svx/svdstr.hrc>
+#include <svx/strings.hrc>
 #include <svx/svdtrans.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdview.hxx>
@@ -1010,9 +1010,9 @@ OUString SdrObject::TakeObjNamePlural() const
     return ImpGetResStr(STR_ObjNamePluralNONE);
 }
 
-void SdrObject::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr) const
+void SdrObject::ImpTakeDescriptionStr(const char* pStrCacheID, OUString& rStr) const
 {
-    rStr = ImpGetResStr(nStrCacheID);
+    rStr = ImpGetResStr(pStrCacheID);
     sal_Int32 nPos = rStr.indexOf("%1");
     if (nPos >= 0)
     {
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index a29fbc1eb876..fe94193a1df4 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -33,7 +33,7 @@
 
 #include "svdconv.hxx"
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 
 #include <sdr/contact/viewcontactofsdrcaptionobj.hxx>
 #include <sdr/properties/captionproperties.hxx>
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index dc5d7a8f8a43..33220dc67910 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -27,7 +27,7 @@
 #include <svl/style.hxx>
 
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 
 #include <sdr/contact/viewcontactofsdrcircobj.hxx>
 #include <sdr/properties/circleproperties.hxx>
@@ -282,26 +282,26 @@ void SdrCircObj::RecalcXPoly()
 
 OUString SdrCircObj::TakeObjNameSingul() const
 {
-    sal_uInt16 nID=STR_ObjNameSingulCIRC;
+    const char* pID=STR_ObjNameSingulCIRC;
     if (maRect.GetWidth() == maRect.GetHeight() && aGeo.nShearAngle==0)
     {
         switch (meCircleKind) {
-            case OBJ_CIRC: nID=STR_ObjNameSingulCIRC; break;
-            case OBJ_SECT: nID=STR_ObjNameSingulSECT; break;
-            case OBJ_CARC: nID=STR_ObjNameSingulCARC; break;
-            case OBJ_CCUT: nID=STR_ObjNameSingulCCUT; break;
+            case OBJ_CIRC: pID=STR_ObjNameSingulCIRC; break;
+            case OBJ_SECT: pID=STR_ObjNameSingulSECT; break;
+            case OBJ_CARC: pID=STR_ObjNameSingulCARC; break;
+            case OBJ_CCUT: pID=STR_ObjNameSingulCCUT; break;
             default: break;
         }
     } else {
         switch (meCircleKind) {
-            case OBJ_CIRC: nID=STR_ObjNameSingulCIRCE; break;
-            case OBJ_SECT: nID=STR_ObjNameSingulSECTE; break;
-            case OBJ_CARC: nID=STR_ObjNameSingulCARCE; break;
-            case OBJ_CCUT: nID=STR_ObjNameSingulCCUTE; break;
+            case OBJ_CIRC: pID=STR_ObjNameSingulCIRCE; break;
+            case OBJ_SECT: pID=STR_ObjNameSingulSECTE; break;
+            case OBJ_CARC: pID=STR_ObjNameSingulCARCE; break;
+            case OBJ_CCUT: pID=STR_ObjNameSingulCCUTE; break;
             default: break;
         }
     }
-    OUStringBuffer sName(ImpGetResStr(nID));
+    OUStringBuffer sName(ImpGetResStr(pID));
 
     OUString aName(GetName());
     if (!aName.isEmpty())
@@ -316,26 +316,26 @@ OUString SdrCircObj::TakeObjNameSingul() const
 
 OUString SdrCircObj::TakeObjNamePlural() const
 {
-    sal_uInt16 nID=STR_ObjNamePluralCIRC;
+    const char* pID=STR_ObjNamePluralCIRC;
     if (maRect.GetWidth() == maRect.GetHeight() && aGeo.nShearAngle==0)
     {
         switch (meCircleKind) {
-            case OBJ_CIRC: nID=STR_ObjNamePluralCIRC; break;
-            case OBJ_SECT: nID=STR_ObjNamePluralSECT; break;
-            case OBJ_CARC: nID=STR_ObjNamePluralCARC; break;
-            case OBJ_CCUT: nID=STR_ObjNamePluralCCUT; break;
+            case OBJ_CIRC: pID=STR_ObjNamePluralCIRC; break;
+            case OBJ_SECT: pID=STR_ObjNamePluralSECT; break;
+            case OBJ_CARC: pID=STR_ObjNamePluralCARC; break;
+            case OBJ_CCUT: pID=STR_ObjNamePluralCCUT; break;
             default: break;
         }
     } else {
         switch (meCircleKind) {
-            case OBJ_CIRC: nID=STR_ObjNamePluralCIRCE; break;
-            case OBJ_SECT: nID=STR_ObjNamePluralSECTE; break;
-            case OBJ_CARC: nID=STR_ObjNamePluralCARCE; break;
-            case OBJ_CCUT: nID=STR_ObjNamePluralCCUTE; break;
+            case OBJ_CIRC: pID=STR_ObjNamePluralCIRCE; break;
+            case OBJ_SECT: pID=STR_ObjNamePluralSECTE; break;
+            case OBJ_CARC: pID=STR_ObjNamePluralCARCE; break;
+            case OBJ_CCUT: pID=STR_ObjNamePluralCCUTE; break;
             default: break;
         }
     }
-    return ImpGetResStr(nID);
+    return ImpGetResStr(pID);
 }
 
 SdrCircObj* SdrCircObj::Clone() const
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 916562f24ac8..9ef591618ca2 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -19,7 +19,7 @@
 
 #include "svddrgm1.hxx"
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 82bdf58a2f70..a134c6a408ca 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -37,7 +37,7 @@
 #include <sfx2/docfile.hxx>
 #include <svx/svdetc.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <svx/svdpool.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
@@ -773,11 +773,11 @@ OUString SdrGrafObj::TakeObjNameSingul() const
         {
             case GraphicType::Bitmap:
             {
-                const sal_uInt16 nId = ( ( pGraphic->IsTransparent() || static_cast<const SdrGrafTransparenceItem&>( GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ?
+                const char* pId = ( ( pGraphic->IsTransparent() || static_cast<const SdrGrafTransparenceItem&>( GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ?
                                      ( IsLinkedGraphic() ? STR_ObjNameSingulGRAFBMPTRANSLNK : STR_ObjNameSingulGRAFBMPTRANS ) :
                                      ( IsLinkedGraphic() ? STR_ObjNameSingulGRAFBMPLNK : STR_ObjNameSingulGRAFBMP ) );
 
-                sName.append(ImpGetResStr(nId));
+                sName.append(ImpGetResStr(pId));
             }
             break;
 
@@ -843,11 +843,11 @@ OUString SdrGrafObj::TakeObjNamePlural() const
         {
             case GraphicType::Bitmap:
             {
-                const sal_uInt16 nId = ( ( pGraphic->IsTransparent() || static_cast<const SdrGrafTransparenceItem&>( GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ?
+                const char* pId = ( ( pGraphic->IsTransparent() || static_cast<const SdrGrafTransparenceItem&>( GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ?
                                      ( IsLinkedGraphic() ? STR_ObjNamePluralGRAFBMPTRANSLNK : STR_ObjNamePluralGRAFBMPTRANS ) :
                                      ( IsLinkedGraphic() ? STR_ObjNamePluralGRAFBMPLNK : STR_ObjNamePluralGRAFBMP ) );
 
-                sName.append(ImpGetResStr(nId));
+                sName.append(ImpGetResStr(pId));
             }
             break;
 
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index eb60afd57349..e5446948abee 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -38,7 +38,7 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdoedge.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 
 #include <svx/svxids.hrc>
 #include <svl/whiter.hxx>
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 9b1de06053ff..dbc0e2b8ab33 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -19,7 +19,7 @@
 
 #include "svdconv.hxx"
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index a1cf3d03877d..a1220e7afe1f 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -35,7 +35,7 @@
 
 #include <svx/svdmodel.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
 #include <avmedia/mediawindow.hxx>
 
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index f74de525e3b4..bdda4a5bc39c 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -69,7 +69,7 @@
 #include <svx/charthelper.hxx>
 #include <svx/svdmodel.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <svx/svdetc.hxx>
 #include <svx/svdview.hxx>
 #include "unomlstr.hxx"
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx
index 027abf46149c..315af8d7f0bd 100644
--- a/svx/source/svdraw/svdopage.cxx
+++ b/svx/source/svdraw/svdopage.cxx
@@ -20,7 +20,7 @@
 
 #include <svx/svdopage.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <svx/svdtrans.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdmodel.hxx>
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 62e71e615d6b..f82c22977821 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -32,7 +32,7 @@
 #include <svx/svdhdl.hxx>
 #include <svx/svdview.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 
 #include <svx/xlnwtit.hxx>
 #include <svx/xlnclit.hxx>
@@ -1876,7 +1876,7 @@ OUString SdrPathObj::TakeObjNameSingul() const
 
     if(OBJ_LINE == meKind)
     {
-        sal_uInt16 nId(STR_ObjNameSingulLINE);
+        const char* pId(STR_ObjNameSingulLINE);
 
         if(lcl_ImpIsLine(GetPathPoly()))
         {
@@ -1888,11 +1888,11 @@ OUString SdrPathObj::TakeObjNameSingul() const
             {
                 if(aB2DPoint0.getY() == aB2DPoint1.getY())
                 {
-                    nId = STR_ObjNameSingulLINE_Hori;
+                    pId = STR_ObjNameSingulLINE_Hori;
                 }
                 else if(aB2DPoint0.getX() == aB2DPoint1.getX())
                 {
-                    nId = STR_ObjNameSingulLINE_Vert;
+                    pId = STR_ObjNameSingulLINE_Vert;
                 }
                 else
                 {
@@ -1901,31 +1901,31 @@ OUString SdrPathObj::TakeObjNameSingul() const
 
                     if(fDx == fDy)
                     {
-                        nId = STR_ObjNameSingulLINE_Diag;
+                        pId = STR_ObjNameSingulLINE_Diag;
                     }
                 }
             }
         }
 
-        sName.append(ImpGetResStr(nId));
+        sName.append(ImpGetResStr(pId));
     }
     else if(OBJ_PLIN == meKind || OBJ_POLY == meKind)
     {
         const bool bClosed(OBJ_POLY == meKind);
-        sal_uInt16 nId(0);
+        const char* pId(nullptr);
 
         if(mpDAC && mpDAC->IsCreating())
         {
             if(bClosed)
             {
-                nId = STR_ObjNameSingulPOLY;
+                pId = STR_ObjNameSingulPOLY;
             }
             else
             {
-                nId = STR_ObjNameSingulPLIN;
+                pId = STR_ObjNameSingulPLIN;
             }
 
-            sName.append(ImpGetResStr(nId));
+            sName.append(ImpGetResStr(pId));
         }
         else
         {
@@ -1940,14 +1940,14 @@ OUString SdrPathObj::TakeObjNameSingul() const
 
             if(bClosed)
             {
-                nId = STR_ObjNameSingulPOLY_PointCount;
+                pId = STR_ObjNameSingulPOLY_PointCount;
             }
             else
             {
-                nId = STR_ObjNameSingulPLIN_PointCount;
+                pId = STR_ObjNameSingulPLIN_PointCount;
             }
 
-            OUString sTemp(ImpGetResStr(nId));
+            OUString sTemp(ImpGetResStr(pId));
             // #i96537#
             sName.append(sTemp.replaceFirst("%2", OUString::number(nPointCount)));
         }
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index b1e585add4c5..5cd19c1e0168 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -35,7 +35,7 @@
 #include <svx/svdundo.hxx>
 #include <svx/svdopath.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <svx/xflclit.hxx>
 #include <svx/xlnclit.hxx>
 #include <svx/xlnwtit.hxx>
@@ -221,14 +221,17 @@ OUString SdrRectObj::TakeObjNameSingul() const
 
     OUStringBuffer sName;
 
-    sal_uInt16 nResId=STR_ObjNameSingulRECT;
-    if (aGeo.nShearAngle!=0) {
-        nResId+=4;  // parallelogram or, maybe, rhombus
-    } else {
-        if (maRect.GetWidth() == maRect.GetHeight()) nResId+=2; // square
+    bool bRounded = GetEckenradius() != 0; // rounded down
+    const char* pResId = bRounded ? STR_ObjNameSingulRECTRND : STR_ObjNameSingulRECT;
+    if (aGeo.nShearAngle!=0)
+    {
+        pResId = bRounded ? STR_ObjNameSingulPARALRND : STR_ObjNameSingulPARAL;  // parallelogram or, maybe, rhombus
+    }
+    else if (maRect.GetWidth() == maRect.GetHeight())
+    {
+        pResId = bRounded ? STR_ObjNameSingulQUADRND : STR_ObjNameSingulQUAD; // square
     }
-    if (GetEckenradius()!=0) nResId+=8; // rounded down
-    sName.append(ImpGetResStr(nResId));
+    sName.append(ImpGetResStr(pResId));
 
     OUString aName(GetName());
     if (!aName.isEmpty())
@@ -249,22 +252,18 @@ OUString SdrRectObj::TakeObjNamePlural() const
         return SdrTextObj::TakeObjNamePlural();
     }
 
-    sal_uInt16 nResId=STR_ObjNamePluralRECT;
-
+    bool bRounded = GetEckenradius() != 0; // rounded down
+    const char* pResId = bRounded ? STR_ObjNamePluralRECTRND : STR_ObjNamePluralRECT;
     if (aGeo.nShearAngle!=0)
     {
-        nResId+=4;  // parallelogram or rhombus
+        pResId = bRounded ? STR_ObjNamePluralPARALRND : STR_ObjNamePluralPARAL;  // parallelogram or rhombus
     }
-    else
+    else if (maRect.GetWidth() == maRect.GetHeight())
     {
-        if (maRect.GetWidth() == maRect.GetHeight())
-            nResId+=2; // square
+        pResId = bRounded ? STR_ObjNamePluralQUADRND : STR_ObjNamePluralQUAD; // square
     }
 
-    if (GetEckenradius()!=0)
-        nResId+=8; // rounded down
-
-    return ImpGetResStr(nResId);
+    return ImpGetResStr(pResId);
 }
 
 SdrRectObj* SdrRectObj::Clone() const
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index d6226922ed9d..21d588fc89f7 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -27,7 +27,7 @@
 #include <svx/svdoutl.hxx>
 #include <svx/svdmodel.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <editeng/writingmodeitem.hxx>
 #include <svx/sdtfchim.hxx>
 #include <svtools/colorcfg.hxx>
diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx
index 4c020a82bfdf..7592455c493e 100644
--- a/svx/source/svdraw/svdotxdr.cxx
+++ b/svx/source/svdraw/svdotxdr.cxx
@@ -24,7 +24,7 @@
 #include <svx/svdview.hxx>
 #include <svx/svdorect.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <svx/svdoashp.hxx>
 #include <tools/bigint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index 9312569bc14e..88d4d09797a1 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -38,7 +38,7 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdmodel.hxx>
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <svx/svdetc.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdorect.hxx>
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index ec0b23ea94ba..a201188e19f1 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -24,7 +24,7 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdundo.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include <svx/svdtrans.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
deleted file mode 100644
index 79d5726192a6..000000000000
--- a/svx/source/svdraw/svdstr.src
+++ /dev/null
@@ -1,2304 +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/svdstr.hrc"
-
-String STR_ObjNameSingulNONE
-{
-    Text [ en-US ] = "Drawing object" ;
-};
-String STR_ObjNamePluralNONE
-{
-    Text [ en-US ] = "Drawing objects" ;
-};
-
-String STR_ObjNameSingulGRUP
-{
-    Text [ en-US ] = "Group object" ;
-};
-String STR_ObjNamePluralGRUP
-{
-    Text [ en-US ] = "Group objects" ;
-};
-String STR_ObjNameSingulGRUPEMPTY
-{
-    Text [ en-US ] = "Blank group object" ;
-};
-String STR_ObjNamePluralGRUPEMPTY
-{
-    Text [ en-US ] = "Blank group objects" ;
-};
-
-String STR_ObjNameSingulLINE
-{
-    Text [ en-US ] = "Line" ;
-};
-String STR_ObjNameSingulLINE_Hori
-{
-    Text [ en-US ] = "Horizontal line" ;
-};
-String STR_ObjNameSingulLINE_Vert
-{
-    Text [ en-US ] = "Vertical line" ;
-};
-String STR_ObjNameSingulLINE_Diag
-{
-    Text [ en-US ] = "Diagonal line" ;
-};
-String STR_ObjNamePluralLINE
-{
-    Text [ en-US ] = "Lines" ;
-};
-String STR_ObjNameSingulRECT
-{
-    Text [ en-US ] = "Rectangle" ;
-};
-String STR_ObjNamePluralRECT
-{
-    Text [ en-US ] = "Rectangles" ;
-};
-String STR_ObjNameSingulQUAD
-{
-    Text [ en-US ] = "Square" ;
-};
-String STR_ObjNamePluralQUAD
-{
-    Text [ en-US ] = "Squares" ;
-};
-String STR_ObjNameSingulPARAL
-{
-    Text [ en-US ] = "Parallelogram" ;
-};
-String STR_ObjNamePluralPARAL
-{
-    Text [ en-US ] = "Parallelograms" ;
-};
-String STR_ObjNameSingulRAUTE
-{
-    Text [ en-US ] = "Rhombus" ;
-};
-String STR_ObjNamePluralRAUTE
-{
-    Text [ en-US ] = "Rhombuses" ;
-};
-String STR_ObjNameSingulRECTRND
-{
-    Text [ en-US ] = "Rounded rectangle" ;
-};
-String STR_ObjNamePluralRECTRND
-{
-    Text [ en-US ] = "Rounded Rectangles" ;
-};
-String STR_ObjNameSingulQUADRND
-{
-    Text [ en-US ] = "rounded square" ;
-};
-String STR_ObjNamePluralQUADRND
-{
-    Text [ en-US ] = "Rounded Squares" ;
-};
-String STR_ObjNameSingulPARALRND
-{
-    Text [ en-US ] = "Rounded Parallelogram" ;
-};
-String STR_ObjNamePluralPARALRND
-{
-    Text [ en-US ] = "Rounded parallelograms" ;
-};
-String STR_ObjNameSingulRAUTERND
-{
-    Text [ en-US ] = "rounded rhombus" ;
-};
-String STR_ObjNamePluralRAUTERND
-{
-    Text [ en-US ] = "Rounded rhombuses" ;
-};
-String STR_ObjNameSingulCIRC
-{
-    Text [ en-US ] = "Circle" ;
-};
-String STR_ObjNamePluralCIRC
-{
-    Text [ en-US ] = "Circles" ;
-};
-String STR_ObjNameSingulSECT
-{
-    Text [ en-US ] = "Circle sector" ;
-};
-String STR_ObjNamePluralSECT
-{
-    Text [ en-US ] = "Circle sectors" ;
-};
-String STR_ObjNameSingulCARC
-{
-    Text [ en-US ] = "Arc" ;
-};
-String STR_ObjNamePluralCARC
-{
-    Text [ en-US ] = "Arcs" ;
-};
-String STR_ObjNameSingulCCUT
-{
-    Text [ en-US ] = "Circle segment" ;
-};
-String STR_ObjNamePluralCCUT
-{
-    Text [ en-US ] = "Circle segments" ;
-};
-String STR_ObjNameSingulCIRCE
-{
-    Text [ en-US ] = "Ellipse" ;
-};
-String STR_ObjNamePluralCIRCE
-{
-    Text [ en-US ] = "Ellipses" ;
-};
-String STR_ObjNameSingulSECTE
-{
-    Text [ en-US ] = "Ellipse Pie" ;
-};
-String STR_ObjNamePluralSECTE
-{
-    Text [ en-US ] = "Ellipse Pies" ;
-};
-String STR_ObjNameSingulCARCE
-{
-    Text [ en-US ] = "Elliptical arc" ;
-};
-String STR_ObjNamePluralCARCE
-{
-    Text [ en-US ] = "Elliptical arcs" ;
-};
-String STR_ObjNameSingulCCUTE
-{
-    Text [ en-US ] = "Ellipse Segment" ;
-};
-String STR_ObjNamePluralCCUTE
-{
-    Text [ en-US ] = "Ellipse Segments" ;
-};
-
-String STR_ObjNameSingulPOLY
-{
-    Text [ en-US ] = "Polygon" ;
-};
-String STR_ObjNameSingulPOLY_PointCount
-{
-    Text [ en-US ] = "Polygon %2 corners" ;
-};
-String STR_ObjNamePluralPOLY
-{
-    Text [ en-US ] = "Polygons" ;
-};
-String STR_ObjNameSingulPLIN
-{
-    Text [ en-US ] = "Polyline" ;
-};
-String STR_ObjNameSingulPLIN_PointCount
-{
-    Text [ en-US ] = "Polyline with %2 corners" ;
-};
-String STR_ObjNamePluralPLIN
-{
-    Text [ en-US ] = "Polylines" ;
-};
-String STR_ObjNameSingulPATHLINE
-{
-    Text [ en-US ] = "Bézier curve" ;
-};
-String STR_ObjNamePluralPATHLINE
-{
-    Text [ en-US ] = "Bézier curves" ;
-};
-String STR_ObjNameSingulPATHFILL
-{
-    Text [ en-US ] = "Bézier curve" ;
-};
-String STR_ObjNamePluralPATHFILL
-{
-    Text [ en-US ] = "Bézier curves" ;
-};
-String STR_ObjNameSingulFREELINE
-{
-    Text [ en-US ] = "Freeform Line" ;
-};
-String STR_ObjNamePluralFREELINE
-{
-    Text [ en-US ] = "Freeform Lines" ;
-};
-String STR_ObjNameSingulFREEFILL
-{
-    Text [ en-US ] = "Freeform Line" ;
-};
-String STR_ObjNamePluralFREEFILL
-{
-    Text [ en-US ] = "Freeform Lines" ;
-};
-String STR_ObjNameSingulCOMBLINE
-{
-    Text [ en-US ] = "Curve" ;
-};
-
-String STR_ObjNameSingulNATSPLN
-{
-    Text [ en-US ] = "Natural Spline" ;
-};
-String STR_ObjNamePluralNATSPLN
-{
-    Text [ en-US ] = "Natural Splines" ;
-};
-String STR_ObjNameSingulPERSPLN
-{
-    Text [ en-US ] = "Periodic Spline" ;
-};
-String STR_ObjNamePluralPERSPLN
-{
-    Text [ en-US ] = "Periodic Splines" ;
-};
-
-String STR_ObjNameSingulTEXT
-{
-    Text [ en-US ] = "Text Frame" ;
-};
-String STR_ObjNamePluralTEXT
-{
-    Text [ en-US ] = "Text Frame" ;
-};
-String STR_ObjNameSingulTEXTLNK
-{
-    Text [ en-US ] = "Linked text frame" ;
-};
-String STR_ObjNamePluralTEXTLNK
-{
-    Text [ en-US ] = "Linked text frames" ;
-};
-String STR_ObjNameSingulTITLETEXT
-{
-    Text [ en-US ] = "Title text" ;
-};
-String STR_ObjNamePluralTITLETEXT
-{
-    Text [ en-US ] = "Title texts" ;
-};
-String STR_ObjNameSingulOUTLINETEXT
-{
-    Text [ en-US ] = "Outline Text" ;
-};
-String STR_ObjNamePluralOUTLINETEXT
-{
-    Text [ en-US ] = "Outline Texts" ;
-};
-
-String STR_ObjNameSingulGRAF
-{
-    Text [ en-US ] = "Image" ;
-};
-String STR_ObjNamePluralGRAF
-{
-    Text [ en-US ] = "Images" ;
-};
-String STR_ObjNameSingulGRAFLNK
-{
-    Text [ en-US ] = "Linked image" ;
-};
-String STR_ObjNamePluralGRAFLNK
-{
-    Text [ en-US ] = "Linked images" ;
-};
-String STR_ObjNameSingulGRAFNONE
-{
-    Text [ en-US ] = "Blank image object" ;
-};
-String STR_ObjNamePluralGRAFNONE
-{
-    Text [ en-US ] = "Blank image objects" ;
-};
-String STR_ObjNameSingulGRAFNONELNK
-{
-    Text [ en-US ] = "Blank linked image" ;
-};
-String STR_ObjNamePluralGRAFNONELNK
-{
-    Text [ en-US ] = "Blank linked images" ;
-};
-String STR_ObjNameSingulGRAFMTF
-{
-    Text [ en-US ] = "Metafile" ;
-};
-String STR_ObjNamePluralGRAFMTF
-{
-    Text [ en-US ] = "Metafiles" ;
-};
-String STR_ObjNameSingulGRAFMTFLNK
-{
-    Text [ en-US ] = "Linked Metafile" ;
-};
-String STR_ObjNamePluralGRAFMTFLNK
-{
-    Text [ en-US ] = "Linked Metafiles" ;
-};
-String STR_ObjNameSingulGRAFBMP
-{
-    Text [ en-US ] = "Image" ;
-};
-String STR_ObjNameSingulGRAFBMPTRANS
-{
-    Text [ en-US ] = "Image with transparency" ;
-};
-String STR_ObjNameSingulGRAFBMPLNK
-{
-    Text [ en-US ] = "Linked Image" ;
-};
-String STR_ObjNameSingulGRAFBMPTRANSLNK
-{
-    Text [ en-US ] = "Linked image with transparency" ;
-};
-String STR_ObjNamePluralGRAFBMP
-{
-    Text [ en-US ] = "Images" ;
-};
-String STR_ObjNamePluralGRAFBMPTRANS
-{
-    Text [ en-US ] = "Images with transparency" ;
-};
-String STR_ObjNamePluralGRAFBMPLNK
-{
-    Text [ en-US ] = "Linked images" ;
-};
-String STR_ObjNamePluralGRAFBMPTRANSLNK
-{
-    Text [ en-US ] = "Linked images with transparency" ;
-};
-String STR_ObjNameSingulCUSTOMSHAPE
-{
-    Text [ en-US ] =  "Shape";
-};
-String STR_ObjNamePluralCUSTOMSHAPE
-{
-    Text [ en-US ] =  "Shapes";
-};
-
-// Vector Data support
-String STR_ObjNameSingulGRAFSVG
-{
-    Text [ en-US ] = "SVG" ;
-};
-String STR_ObjNamePluralGRAFSVG
-{
-    Text [ en-US ] = "SVGs" ;
-};
-String STR_ObjNameSingulGRAFWMF
-{
-    Text [ en-US ] = "WMF" ;
-};
-String STR_ObjNamePluralGRAFWMF
-{
-    Text [ en-US ] = "WMFs" ;
-};
-String STR_ObjNameSingulGRAFEMF
-{
-    Text [ en-US ] = "EMF" ;
-};
-String STR_ObjNamePluralGRAFEMF
-{
-    Text [ en-US ] = "EMFs" ;
-};
-
-String STR_ObjNameSingulOLE2
-{
-    Text [ en-US ] = "embedded object (OLE)" ;
-};
-String STR_ObjNamePluralOLE2
-{
-    Text [ en-US ] = "Embedded objects (OLE)" ;
-};
-String STR_ObjNameSingulUno
-{
-    Text [ en-US ] = "Control";
-};
-String STR_ObjNamePluralUno
-{
-    Text [ en-US ] = "Controls";
-};
-
-String STR_ObjNameSingulFrame
-{
-    Text [ en-US ] = "Frame" ;
-};
-String STR_ObjNamePluralFrame
-{
-    Text [ en-US ] = "Frames" ;
-};
-
-String STR_ObjNameSingulEDGE
-{
-    Text [ en-US ] = "Object Connectors" ;
-};
-String STR_ObjNamePluralEDGE
-{
-    Text [ en-US ] = "Object Connectors" ;
-};
-String STR_ObjNameSingulCAPTION
-{
-    Text [ en-US ] = "Callout" ;
-};
-String STR_ObjNamePluralCAPTION
-{
-    Text [ en-US ] = "Callouts" ;
-};
-
-String STR_ObjNameSingulPAGE
-{
-    Text [ en-US ] = "Preview object" ;
-};
-String STR_ObjNamePluralPAGE
-{
-    Text [ en-US ] = "Preview objects" ;
-};
-String STR_ObjNameSingulMEASURE
-{
-    Text [ en-US ] = "Dimension line" ;
-};
-String STR_ObjNamePluralMEASURE
-{
-    Text [ en-US ] = "Dimensioning objects" ;
-};
-String STR_ObjNamePlural
-{
-    Text [ en-US ] = "Drawing objects" ;
-};
-String STR_ObjNameNoObj
-{
-    Text [ en-US ] = "No draw object" ;
-};
-String STR_ObjNameSingulPlural
-{
-    Text [ en-US ] = "Draw object(s)" ;
-};
-
-// New in 537: names for 3D objects
-String STR_ObjNameSingulCube3d
-{
-    Text [ en-US ] = "3D cube";
-};
-
-String STR_ObjNamePluralCube3d
-{
-    Text [ en-US ] = "3D cubes";
-};
-
-String STR_ObjNameSingulExtrude3d
-{
-    Text [ en-US ] = "Extrusion object";
-};
-
-String STR_ObjNamePluralExtrude3d
-{
-    Text [ en-US ] = "Extrusion objects";
-};
-
-String STR_ObjNameSingulLathe3d
-{
-    Text [ en-US ] = "Rotation object";
-};
-
-String STR_ObjNamePluralLathe3d
-{
-    Text [ en-US ] = "Rotation objects";
-};
-
-String STR_ObjNameSingulObj3d
-{
-    Text [ en-US ] = "3D object";
-};
-
-String STR_ObjNamePluralObj3d
-{
-    Text [ en-US ] = "3D objects";
-};
-
-String STR_ObjNameSingulScene3d
-{
-    Text [ en-US ] = "3D scene";
-};
-
-String STR_ObjNamePluralScene3d
-{
-    Text [ en-US ] = "3D scenes";
-};
-
-String STR_ObjNameSingulSphere3d
-{
-    Text [ en-US ] = "Sphere";
-};
-
-String STR_ObjNamePluralSphere3d
-{
-    Text [ en-US ] = "Spheres";
-};
-
-String STR_EditWithCopy
-{
-    Text [ en-US ] = "with copy" ;
-};
-String STR_EditPosSize
-{
-    Text [ en-US ] = "Set position and size for %1" ;
-};
-String STR_EditDelete
-{
-    Text [ en-US ] = "Delete %1" ;
-};
-String STR_EditMovToTop
-{
-    Text [ en-US ] = "Move %1 forward" ;
-};
-String STR_EditMovToBtm
-{
-    Text [ en-US ] = "Move %1 further back" ;
-};
-String STR_EditPutToTop
-{
-    Text [ en-US ] = "Move %1 to front" ;
-};
-String STR_EditPutToBtm
-{
-    Text [ en-US ] = "Move %1 to back" ;
-};
-String STR_EditRevOrder
-{
-    Text [ en-US ] = "Reverse order of %1" ;
-};
-String STR_EditMove
-{
-    Text [ en-US ] = "Move %1" ;
-};
-String STR_EditResize
-{
-    Text [ en-US ] = "Resize %1" ;
-};
-String STR_EditRotate
-{
-    Text [ en-US ] = "Rotate %1" ;
-};
-String STR_EditMirrorHori
-{
-    Text [ en-US ] = "Flip %1 horizontal" ;
-};
-String STR_EditMirrorVert
-{
-    Text [ en-US ] = "Flip %1 vertical" ;
-};
-String STR_EditMirrorDiag
-{
-    Text [ en-US ] = "Flip %1 diagonal" ;
-};
-String STR_EditMirrorFree
-{
-    Text [ en-US ] = "Flip %1 freehand" ;
-};
-String STR_EditShear
-{
-    Text [ en-US ] = "Distort %1 (slant)" ;
-};
-String STR_EditCrook
-{
-    Text [ en-US ] = "Arrange %1 in circle" ;
-};
-String STR_EditCrookContortion
-{
-    Text [ en-US ] = "Curve %1 in circle" ;
-};
-String STR_EditDistort
-{
-    Text [ en-US ] = "Distort %1" ;
-};
-String STR_EditRipUp
-{
-    Text [ en-US ] = "Undo %1" ;
-};
-String STR_EditSetPointsSmooth
-{
-    Text [ en-US ] = "Modify bézier properties of %1" ;
-};
-String STR_EditSetSegmentsKind
-{
-    Text [ en-US ] = "Modify bézier properties of %1" ;
-};
-String STR_EditSetGlueEscDir
-{
-    Text [ en-US ] = "Set exit direction for %1" ;
-};
-String STR_EditSetGluePercent
-{
-    Text [ en-US ] = "Set relative attribute at %1" ;
-};
-String STR_EditSetGlueAlign
-{
-    Text [ en-US ] = "Set reference point for %1" ;
-};
-String STR_EditGroup
-{
-    Text [ en-US ] = "Group %1" ;
-};
-String STR_EditUngroup
-{
-    Text [ en-US ] = "Ungroup %1" ;
-};
-String STR_EditSetAttributes
-{
-    Text [ en-US ] = "Apply attributes to %1" ;
-};
-String STR_EditSetStylesheet
-{
-    Text [ en-US ] = "Apply Styles to %1" ;
-};
-String STR_EditDelStylesheet
-{
-    Text [ en-US ] = "Remove Style from %1" ;
-};
-String STR_EditConvToPoly
-{
-    Text [ en-US ] = "Convert %1 to polygon" ;
-};
-String STR_EditConvToPolys
-{
-    Text [ en-US ] = "Convert %1 to polygons" ;
-};
-String STR_EditConvToCurve
-{
-    Text [ en-US ] = "Convert %1 to curve" ;
-};
-String STR_EditConvToCurves
-{
-    Text [ en-US ] = "Convert %1 to curves" ;
-};
-String STR_EditConvToContour
-{
-    Text [ en-US ] = "Convert %1 to contour";
-};
-String STR_EditConvToContours
-{
-    Text [ en-US ] = "Convert %1 to contours";
-};
-String STR_EditAlign
-{
-    Text [ en-US ] = "Align %1" ;
-};
-String STR_EditAlignVTop
-{
-    Text [ en-US ] = "Align %1 to top" ;
-};
-String STR_EditAlignVBottom
-{
-    Text [ en-US ] = "Align %1 to bottom" ;
-};
-String STR_EditAlignVCenter
-{
-    Text [ en-US ] = "Horizontally center %1" ;
-};
-String STR_EditAlignHLeft
-{
-    Text [ en-US ] = "Align %1 to left" ;
-};
-String STR_EditAlignHRight
-{
-    Text [ en-US ] = "Align %1 to right" ;
-};
-String STR_EditAlignHCenter
-{
-    Text [ en-US ] = "Vertically center %1" ;
-};
-String STR_EditAlignCenter
-{
-    Text [ en-US ] = "Center %1" ;
-};
-String STR_EditTransform
-{
-    Text [ en-US ] = "Transform %1" ;
-};
-String STR_EditCombine_PolyPoly
-{
-    Text [ en-US ] = "Combine %1" ;
-};
-String STR_EditMergeMergePoly
-{
-    Text [ en-US ] = "Merge %1";
-};
-String STR_EditMergeSubstractPoly
-{
-    Text [ en-US ] = "Subtract %1";
-};
-String STR_EditMergeIntersectPoly
-{
-    Text [ en-US ] = "Intersect %1";
-};
-String STR_DistributeMarkedObjects
-{
-    Text [ en-US ] = "Distribute selected objects";
-};
-String STR_EqualizeWidthMarkedObjects
-{
-    Text [ en-US ] = "Equalize Width %1";
-};
-String STR_EqualizeHeightMarkedObjects
-{
-    Text [ en-US ] = "Equalize Height %1";
-};
-String STR_EditCombine_OnePoly
-{
-    Text [ en-US ] = "Combine %1" ;
-};
-String STR_EditDismantle_Polys
-{
-    Text [ en-US ] = "Split %1" ;
-};
-String STR_EditDismantle_Lines
-{
-    Text [ en-US ] = "Split %1" ;
-};
-String STR_EditImportMtf
-{
-    Text [ en-US ] = "Split %1" ;
-};
-String STR_ExchangePaste
-{
-    Text [ en-US ] = "Insert object(s)" ;
-};
-String STR_DragInsertPoint
-{
-    Text [ en-US ] = "Insert point to %1" ;
-};
-String STR_DragInsertGluePoint
-{
-    Text [ en-US ] = "Insert glue point to %1" ;
-};
-String STR_DragMethMovHdl
-{
-    Text [ en-US ] = "Move reference-point" ;
-};
-String STR_DragMethObjOwn
-{
-    Text [ en-US ] = "Geometrically change %1" ;
-};
-String STR_DragMethMove
-{
-    Text [ en-US ] = "Move %1" ;
-};
-String STR_DragMethResize
-{
-    Text [ en-US ] = "Resize %1" ;
-};
-String STR_DragMethRotate
-{
-    Text [ en-US ] = "Rotate %1" ;
-};
-String STR_DragMethMirrorHori
-{
-    Text [ en-US ] = "Flip %1 horizontal" ;
-};
-String STR_DragMethMirrorVert
-{
-    Text [ en-US ] = "Flip %1 vertical" ;
-};
-String STR_DragMethMirrorDiag
-{
-    Text [ en-US ] = "Flip %1 diagonal" ;
-};
-String STR_DragMethMirrorFree
-{
-    Text [ en-US ] = "Flip %1 freehand" ;
-};
-String STR_DragMethGradient
-{
-    Text [ en-US ] = "Interactive gradient for %1";
-};
-String STR_DragMethTransparence
-{
-    Text [ en-US ] = "Interactive transparency for %1";
-};
-String STR_DragMethShear
-{
-    Text [ en-US ] = "Distort %1 (slant)" ;
-};
-String STR_DragMethCrook
-{
-    Text [ en-US ] = "Arrange %1 in circle" ;
-};
-String STR_DragMethCrookContortion
-{
-    Text [ en-US ] = "Curve %1 in circle" ;
-};
-String STR_DragMethDistort
-{
-    Text [ en-US ] = "Distort %1" ;
-};
-String STR_DragMethCrop
-{
-    Text [ en-US ] = "Crop %1" ;
-};
-
-String STR_DragRectEckRad
-{
-    Text [ en-US ] = "Alter radius by %1" ;
-};
-String STR_DragPathObj
-{
-    Text [ en-US ] = "Change %1" ;
-};
-String STR_DragRectResize
-{
-    Text [ en-US ] = "Resize %1" ;
-};
-String STR_DragCaptFram
-{
-    Text [ en-US ] = "Move %1" ;
-};
-String STR_DragCaptTail
-{
-    Text [ en-US ] = "Move end point of %1" ;
-};
-String STR_DragCircAngle
-{
-    Text [ en-US ] = "Adjust angle by %1" ;
-};
-String STR_DragEdgeTail
-{
-    Text [ en-US ] = "Change %1" ;
-};
-String STR_ViewTextEdit
-{
-    Text [ en-US ] = "TextEdit: Paragraph %1, Row %2, Column %3" ;
-};
-String STR_ViewMarked
-{
-    Text [ en-US ] = "%1 selected" ;
-};
-String STR_ViewMarkedPoint
-{
-    Text [ en-US ] = "Point from %1" ;
-};
-String STR_ViewMarkedPoints
-{
-    Text [ en-US ] = "%2 points from %1" ;
-};
-String STR_ViewMarkedGluePoint
-{
-    Text [ en-US ] = "Glue point from %1" ;
-};
-String STR_ViewMarkedGluePoints
-{
-    Text [ en-US ] = "%2 glue points from %1" ;
-};
-String STR_ViewMarkObjs
-{
-    Text [ en-US ] = "Mark objects" ;
-};
-String STR_ViewMarkMoreObjs
-{
-    Text [ en-US ] = "Mark additional objects" ;
-};
-String STR_ViewMarkPoints
-{
-    Text [ en-US ] = "Mark points" ;
-};
-String STR_ViewMarkMorePoints
-{
-    Text [ en-US ] = "Mark additional points" ;
-};
-String STR_ViewMarkGluePoints
-{
-    Text [ en-US ] = "Mark glue points" ;
-};
-String STR_ViewMarkMoreGluePoints
-{
-    Text [ en-US ] = "Mark additional glue points" ;
-};
-String STR_ViewCreateObj
-{
-    Text [ en-US ] = "Create %1" ;
-};
-String STR_UndoInsertObj
-{
-    Text [ en-US ] = "Insert %1" ;
-};
-String STR_UndoCopyObj
-{
-    Text [ en-US ] = "Copy %1" ;
-};
-String STR_UndoObjOrdNum
-{
-    Text [ en-US ] = "Change object order of %1" ;
-};
-String STR_UndoObjSetText
-{
-    Text [ en-US ] = "Edit text of %1" ;
-};
-String STR_UndoNewPage
-{
-    Text [ en-US ] = "Insert page" ;
-};
-String STR_UndoDelPage
-{
-    Text [ en-US ] = "Delete page" ;
-};
-String STR_UndoCopPage
-{
-    Text [ en-US ] = "Copy page" ;
-};
-String STR_UndoMovPage
-{
-    Text [ en-US ] = "Change order of pages" ;
-};
-String STR_UndoDelPageMasterDscr
-{
-    Text [ en-US ] = "Clear background page assignment" ;
-};
-String STR_UndoChgPageMasterDscr
-{
-    Text [ en-US ] = "Change background page assignment" ;
-};
-String STR_UndoMergeModel
-{
-    Text [ en-US ] = "Insert document" ;
-};
-String STR_UndoNewLayer
-{
-    Text [ en-US ] = "Insert Layer" ;
-};
-String STR_UndoDelLayer
-{
-    Text [ en-US ] = "Delete layer" ;
-};
-String STR_UndoMovLayer
-{
-    Text [ en-US ] = "Change order of layers" ;
-};
-// Undo/Redo for setting object's name (#i73249#)
-String STR_UndoObjName
-{
-    Text [ en-US ] = "Change object name of %1 to" ;
-};
-String STR_UndoObjTitle
-{
-    Text [ en-US ] = "Change object title of %1" ;
-};
-String STR_UndoObjDescription
-{
-    Text [ en-US ] = "Change object description of %1" ;
-};
-String STR_StandardLayerName
-{
-    Text [ en-US ] = "Standard" ;
-};
-
-String STR_ItemValON
-{
-    Text [ en-US ] = "on" ;
-};
-String STR_ItemValOFF
-{
-    Text [ en-US ] = "off" ;
-};
-String STR_ItemValYES
-{
-    Text [ en-US ] = "yes" ;
-};
-String STR_ItemValNO
-{
-    Text [ en-US ] = "No" ;
-};
-
-String STR_ItemValCAPTIONTYPE1
-{
-    Text [ en-US ] = "Type 1" ;
-};
-String STR_ItemValCAPTIONTYPE2
-{
-    Text [ en-US ] = "Type 2" ;
-};
-String STR_ItemValCAPTIONTYPE3
-{
-    Text [ en-US ] = "Type 3" ;
-};
-String STR_ItemValCAPTIONTYPE4
-{
-    Text [ en-US ] = "Type 4" ;
-};
-String STR_ItemValCAPTIONESCHORI
-{
-    Text [ en-US ] = "Horizontal" ;
-};
-String STR_ItemValCAPTIONESCVERT
-{
-    Text [ en-US ] = "Vertical" ;
-};
-String STR_ItemValCAPTIONESCBESTFIT
-{
-    Text [ en-US ] = "Automatic" ;
-};
-
-String STR_ItemValFITTOSIZENONE
-{
-    Text [ en-US ] = "Off" ;
-};
-String STR_ItemValFITTOSIZEPROP
-{
-    Text [ en-US ] = "Proportional" ;
-};
-String STR_ItemValFITTOSIZEALLLINES
-{
-    Text [ en-US ] = "Fit to size (all rows separately) " ;
-};
-String STR_ItemValFITTOSIZERESIZEAT
-{
-    Text [ en-US ] = "Use hard attributes" ;
-};
-
-String STR_ItemValTEXTVADJTOP
-{
-    Text [ en-US ] = "Top" ;
-};
-String STR_ItemValTEXTVADJCENTER
-{
-    Text [ en-US ] = "Center" ;
-};
-String STR_ItemValTEXTVADJBOTTOM
-{
-    Text [ en-US ] = "Bottom" ;
-};
-String STR_ItemValTEXTVADJBLOCK
-{
-    Text [ en-US ] = "Use entire height" ;
-};
-String STR_ItemValTEXTVADJSTRETCH
-{
-    Text [ en-US ] = "Stretched" ;
-};
-String STR_ItemValTEXTHADJLEFT
-{
-    Text [ en-US ] = "Left" ;
-};
-String STR_ItemValTEXTHADJCENTER
-{
-    Text [ en-US ] = "Center" ;
-};
-String STR_ItemValTEXTHADJRIGHT
-{
-    Text [ en-US ] = "Right" ;
-};
-String STR_ItemValTEXTHADJBLOCK
-{
-    Text [ en-US ] = "Use entire width" ;
-};
-String STR_ItemValTEXTHADJSTRETCH
-{
-    Text [ en-US ] = "Stretched" ;
-};
-
-String STR_ItemValTEXTANI_NONE
-{
-    Text [ en-US ] = "off" ;
-};
-String STR_ItemValTEXTANI_BLINK
-{
-    Text [ en-US ] = "flash" ;
-};
-String STR_ItemValTEXTANI_SCROLL
-{
-    Text [ en-US ] = "Scroll Through" ;
-};
-String STR_ItemValTEXTANI_ALTERNATE
-{
-    Text [ en-US ] = "alternating" ;
-};
-String STR_ItemValTEXTANI_SLIDE
-{
-    Text [ en-US ] = "Scroll In" ;
-};
-String STR_ItemValTEXTANI_LEFT
-{
-    Text [ en-US ] = "left" ;
-};
-String STR_ItemValTEXTANI_UP
-{
-    Text [ en-US ] = "up" ;
-};
-String STR_ItemValTEXTANI_RIGHT
-{
-    Text [ en-US ] = "right" ;
-};
-String STR_ItemValTEXTANI_DOWN
-{
-    Text [ en-US ] = "down" ;
-};
-
-String STR_ItemValEDGE_ORTHOLINES
-{
-    Text [ en-US ] = "Standard Connector" ;
-};
-String STR_ItemValEDGE_THREELINES
-{
-    Text [ en-US ] = "Line Connector" ;
-};
-String STR_ItemValEDGE_ONELINE
-{
-    Text [ en-US ] = "Straight Connector" ;
-};
-String STR_ItemValEDGE_BEZIER
-{
-    Text [ en-US ] = "Curved Connector" ;
-};
-
-String STR_ItemValMEASURE_STD
-{
-    Text [ en-US ] = "Standard" ;
-};
-String STR_ItemValMEASURE_RADIUS
-{
-    Text [ en-US ] = "Radius" ;
-};
-String STR_ItemValMEASURE_TEXTHAUTO
-{
-    Text [ en-US ] = "automatic" ;
-};
-String STR_ItemValMEASURE_TEXTLEFTOUTSIDE
-{
-    Text [ en-US ] = "left outside" ;
-};
-String STR_ItemValMEASURE_TEXTINSIDE
-{
-    Text [ en-US ] = "inside (centered)" ;
-};
-String STR_ItemValMEASURE_TEXTRIGHTOUTSID
-{
-    Text [ en-US ] = "right outside" ;
-};
-String STR_ItemValMEASURE_TEXTVAUTO
-{
-    Text [ en-US ] = "automatic" ;
-};
-String STR_ItemValMEASURE_ABOVE
-{
-    Text [ en-US ] = "on the line" ;
-};
-String STR_ItemValMEASURETEXT_BREAKEDLINE
-{
-    Text [ en-US ] = "broken line" ;
-};
-String STR_ItemValMEASURE_BELOW
-{
-    Text [ en-US ] = "below the line" ;
-};
-String STR_ItemValMEASURETEXT_VERTICALCEN
-{
-    Text [ en-US ] = "centered" ;
-};
-
-String STR_ItemValCIRC_FULL
-{
-    Text [ en-US ] = "full circle" ;
-};
-String STR_ItemValCIRC_SECT
-{
-    Text [ en-US ] = "Circle Pie" ;
-};
-String STR_ItemValCIRC_CUT
-{
-    Text [ en-US ] = "Circle segment" ;
-};
-String STR_ItemValCIRC_ARC
-{
-    Text [ en-US ] = "Arc" ;
-};
-
-// Strings for the templates dialog
-String SIP_UNKNOWN_ATTR
-{
-    Text [ en-US ] = "Unknown attribute";
-};
-
-// Strings for the templates dialog
-String SIP_XA_LINESTYLE
-{
-    Text [ en-US ] = "Line style";
-};
-
-String SIP_XA_LINEDASH
-{
-    Text [ en-US ] = "Line pattern";
-};
-
-String SIP_XA_LINEWIDTH
-{
-    Text [ en-US ] = "Line width";
-};
-
-String SIP_XA_LINECOLOR
-{
-    Text [ en-US ] = "Line color";
-};
-
-String SIP_XA_LINESTART
-{
-    Text [ en-US ] = "Line head";
-};
-
-String SIP_XA_LINEEND
-{
-    Text [ en-US ] = "Line end";
-};
-
-String SIP_XA_LINESTARTWIDTH
-{
-    Text [ en-US ] = "Line head width";
-};
-
-String SIP_XA_LINEENDWIDTH
-{
-    Text [ en-US ] = "Line end width";
-};
-
-String SIP_XA_LINESTARTCENTER
-{
-    Text [ en-US ] = "Center arrowhead";
-};
-
-String SIP_XA_LINEENDCENTER
-{
-    Text [ en-US ] = "Center arrowend";
-};
-
-String SIP_XA_LINETRANSPARENCE
-{
-    Text [ en-US ] = "Line transparency";
-};
-
-String SIP_XA_LINEJOINT
-{
-    Text [ en-US ] = "Line joint";
-};
-
-String SIP_XATTRSET_LINE
-{
-    Text [ en-US ] = "Line attributes";
-};
-
-String SIP_XA_FILLSTYLE
-{
-    Text [ en-US ] = "Fill style";
-};
-
-String SIP_XA_FILLCOLOR
-{
-    Text [ en-US ] = "Fillcolor";
-};
-
-String SIP_XA_FILLGRADIENT
-{
-    Text [ en-US ] = "Gradient";
-};
-
-String SIP_XA_FILLHATCH
-{
-    Text [ en-US ] = "Hatching";
-};
-
-String SIP_XA_FILLBITMAP
-{
-    Text [ en-US ] = "Fillbitmap";
-};
-
-String SIP_XA_FILLTRANSPARENCE
-{
-    Text [ en-US ] = "Transparency";
-};
-
-String SIP_XA_GRADIENTSTEPCOUNT
-{
-    Text [ en-US ] = "Number of gradient steps";
-};
-
-String SIP_XA_FILLBMP_TILE
-{
-    Text [ en-US ] = "Tile fill";
-};
-
-String SIP_XA_FILLBMP_POS
-{
-    Text [ en-US ] = "Fillbitmap position";
-};
-
-String SIP_XA_FILLBMP_SIZEX
-{
-    Text [ en-US ] = "Fillbitmap width";
-};
-
-String SIP_XA_FILLBMP_SIZEY
-{
-    Text [ en-US ] = "Height of fillbitmap";
-};
-
-String SIP_XA_FILLFLOATTRANSPARENCE
-{
-    Text [ en-US ] = "Transparent gradient";
-};
-
-String SIP_XA_SECONDARYFILLCOLOR
-{
-    Text [ en-US ] = "Fill reserved for 2";
-};
-
-String SIP_XA_FILLBMP_SIZELOG
-{
-    Text [ en-US ] = "Tile size not in %";
-};
-
-String SIP_XA_FILLBMP_TILEOFFSETX
-{
-    Text [ en-US ] = "Tile offset X in %";
-};
-
-String SIP_XA_FILLBMP_TILEOFFSETY
-{
-    Text [ en-US ] = "Tile offset Y in %";
-};
-
-String SIP_XA_FILLBMP_STRETCH
-{
-    Text [ en-US ] = "Bitmap scaling";
-};
-
-String SIP_XA_FILLBMP_POSOFFSETX
-{
-    Text [ en-US ] = "Tile position X in %";
-};
-
-String SIP_XA_FILLBMP_POSOFFSETY
-{
-    Text [ en-US ] = "Tile position Y in %";
-};
-
-String SIP_XA_FILLBACKGROUND
-{
-    Text [ en-US ] = "Background fill";
-};
-
-String SIP_XATTRSET_FILL
-{
-    Text [ en-US ] = "Area attributes";
-};
-
-String SIP_XA_FORMTXTSTYLE
-{
-    Text [ en-US ] = "Fontwork style";
-};
-
-String SIP_XA_FORMTXTADJUST
-{
-    Text [ en-US ] = "Fontwork alignment";
-};
-
-String SIP_XA_FORMTXTDISTANCE
-{
-    Text [ en-US ] = "Fontwork spacing";
-};
-
-String SIP_XA_FORMTXTSTART
-{
-    Text [ en-US ] = "Fontwork font begin";
-};
-
-String SIP_XA_FORMTXTMIRROR
-{
-    Text [ en-US ] = "Fontwork mirror";
-};
-
-String SIP_XA_FORMTXTOUTLINE
-{
-    Text [ en-US ] = "Fontwork outline";
-};
-
-String SIP_XA_FORMTXTSHADOW
-{
-    Text [ en-US ] = "Fontwork shadow";
-};
-
-String SIP_XA_FORMTXTSHDWCOLOR
-{
-    Text [ en-US ] = "Fontwork shadow color";
-};
-
-String SIP_XA_FORMTXTSHDWXVAL
-{
-    Text [ en-US ] = "Fontwork shadow offset X";
-};
-
-String SIP_XA_FORMTXTSHDWYVAL
-{
-    Text [ en-US ] = "Fontwork shadow offset Y";
-};
-
-String SIP_XA_FORMTXTHIDEFORM
-{
-    Text [ en-US ] = "Hide fontwork outline";
-};
-
-String SIP_XA_FORMTXTSHDWTRANSP
-{
-    Text [ en-US ] = "Fontwork shadow transparency";
-};
-
-String SIP_SA_SHADOW
-{
-    Text [ en-US ] = "Shadow";
-};
-
-String SIP_SA_SHADOWCOLOR
-{
-    Text [ en-US ] = "Shadow color";
-};
-
-String SIP_SA_SHADOWXDIST
-{
-    Text [ en-US ] = "Shadow spacing X";
-};
-
-String SIP_SA_SHADOWYDIST
-{
-    Text [ en-US ] = "Shadow spacing Y";
-};
-
-String SIP_SA_SHADOWTRANSPARENCE
-{
-    Text [ en-US ] = "Shadow transparency";
-};
-
-String SIP_SA_SHADOW3D
-{
-    Text [ en-US ] = "3D shadow";
-};
-
-String SIP_SA_SHADOWPERSP
-{
-    Text [ en-US ] = "Perspective shadow";
-};
-
-String SIP_SA_CAPTIONTYPE
-{
-    Text [ en-US ] = "Type of legend";
-};
-
-String SIP_SA_CAPTIONFIXEDANGLE
-{
-    Text [ en-US ] = "Fixed legend angle";
-};
-
-String SIP_SA_CAPTIONANGLE
-{
-    Text [ en-US ] = "Legend angle";
-};
-
-String SIP_SA_CAPTIONGAP
-{
-    Text [ en-US ] = "Legend lines spacing";
-};
-
-String SIP_SA_CAPTIONESCDIR
-{
-    Text [ en-US ] = "Legend exit alignment";
-};
-
-String SIP_SA_CAPTIONESCISREL
-{
-    Text [ en-US ] = "Relative exit legend";
-};
-
-String SIP_SA_CAPTIONESCREL
-{
-    Text [ en-US ] = "Relative exit legend";
-};
-
-String SIP_SA_CAPTIONESCABS
-{
-    Text [ en-US ] = "Absolute exit of legend";
-};
-
-String SIP_SA_CAPTIONLINELEN
-{
-    Text [ en-US ] = "Legend line length";
-};
-
-String SIP_SA_CAPTIONFITLINELEN
-{
-    Text [ en-US ] = "AutoLength of legend lines";
-};
-
-String SIP_SA_ECKENRADIUS
-{
-    Text [ en-US ] = "Corner radius";
-};
-
-String SIP_SA_TEXT_MINFRAMEHEIGHT
-{
-    Text [ en-US ] = "Minimal frame height";
-};
-
-String SIP_SA_TEXT_AUTOGROWHEIGHT
-{
-    Text [ en-US ] = "AutoFit height";
-};
-
-String SIP_SA_TEXT_FITTOSIZE
-{
-    Text [ en-US ] = "Fit text to frame";
-};
-
-String SIP_SA_TEXT_LEFTDIST
-{
-    Text [ en-US ] = "Left text frame spacing";
-};
-
-String SIP_SA_TEXT_RIGHTDIST
-{
-    Text [ en-US ] = "Right text frame spacing";
-};
-
-String SIP_SA_TEXT_UPPERDIST
-{
-    Text [ en-US ] = "Upper text frame spacing";
-};
-
-String SIP_SA_TEXT_LOWERDIST
-{
-    Text [ en-US ] = "Lower text frame spacing";
-};
-
-String SIP_SA_TEXT_VERTADJUST
-{
-    Text [ en-US ] = "Vertical text anchor";
-};
-
-String SIP_SA_TEXT_MAXFRAMEHEIGHT
-{
-    Text [ en-US ] = "Maximal frame height";
-};
-
-String SIP_SA_TEXT_MINFRAMEWIDTH
-{
-    Text [ en-US ] = "Minimal frame width";
-};
-
-String SIP_SA_TEXT_MAXFRAMEWIDTH
-{
-    Text [ en-US ] = "Maximal frame width";
-};
-
-String SIP_SA_TEXT_AUTOGROWWIDTH
-{
-    Text [ en-US ] = "AutoFit width";
-};
-
-String SIP_SA_TEXT_HORZADJUST
-{
-    Text [ en-US ] = "Horizontal text anchor";
-};
-
-String SIP_SA_TEXT_ANIKIND
-{
-    Text [ en-US ] = "Ticker";
-};
-
-String SIP_SA_TEXT_ANIDIRECTION
-{
-    Text [ en-US ] = "Ticker direction";
-};
-
-String SIP_SA_TEXT_ANISTARTINSIDE
-{
-    Text [ en-US ] = "Ticker start inside";
-};
-
-String SIP_SA_TEXT_ANISTOPINSIDE
-{
-    Text [ en-US ] = "Ticker stop inside";
-};
-
-String SIP_SA_TEXT_ANICOUNT
-{
-    Text [ en-US ] = "Number of ticker runs";
-};
-
-String SIP_SA_TEXT_ANIDELAY
-{
-    Text [ en-US ] = "Speed of ticker";
-};
-
-String SIP_SA_TEXT_ANIAMOUNT
-{
-    Text [ en-US ] = "Ticker step size";
-};
-
-String SIP_SA_TEXT_CONTOURFRAME
-{
-    Text [ en-US ] = "Outline text flow";
-};
-
-String SIP_SA_CUSTOMSHAPE_ADJUSTMENT
-{
-    Text[ en-US ] = "Shape Adjustment";
-};
-
-String SIP_SA_XMLATTRIBUTES
-{
-    Text [ en-US ] = "User-defined attributes";
-};
-
-String SIP_SA_TEXT_USEFIXEDCELLHEIGHT
-{
-    Text [ en-US ] = "Use font-independent line spacing";
-};
-
-String SIP_SA_WORDWRAP
-{
-    Text[ en-US ] = "Word wrap text in shape";
-};
-
-String SIP_SA_CHAINNEXTNAME
-{
-    Text[ en-US ] = "Next link in text chain";
-};
-
-String SIP_SA_EDGEKIND
-{
-    Text [ en-US ] = "Type of connector";
-};
-
-String SIP_SA_EDGENODE1HORZDIST
-{
-    Text [ en-US ] = "Horz. spacing object 1";
-};
-
-String SIP_SA_EDGENODE1VERTDIST
-{
-    Text [ en-US ] = "Vert. spacing object 1";
-};
-
-String SIP_SA_EDGENODE2HORZDIST
-{
-    Text [ en-US ] = "Horz. spacing object 2";
-};
-
-String SIP_SA_EDGENODE2VERTDIST
-{
-    Text [ en-US ] = "Vert. spacing object 2";
-};
-
-String SIP_SA_EDGENODE1GLUEDIST
-{
-    Text [ en-US ] = "Glue spacing object 1";
-};
-
-String SIP_SA_EDGENODE2GLUEDIST
-{
-    Text [ en-US ] = "Glue spacing object 2";
-};
-
-String SIP_SA_EDGELINEDELTAANZ
-{
-    Text [ en-US ] = "Number of movable lines";
-};
-
-String SIP_SA_EDGELINE1DELTA
-{
-    Text [ en-US ] = "Offset line 1";
-};
-
-String SIP_SA_EDGELINE2DELTA
-{
-    Text [ en-US ] = "Offset line 2";
-};
-
-String SIP_SA_EDGELINE3DELTA
-{
-    Text [ en-US ] = "Offset line 3";
-};
-
-String SIP_SA_MEASUREKIND
-{
-    Text [ en-US ] = "Type of dimensioning";
-};
-
-String SIP_SA_MEASURETEXTHPOS
-{
-    Text [ en-US ] = "Dimension value - horizontal position";
-};
-
-String SIP_SA_MEASURETEXTVPOS
-{
-    Text [ en-US ] = "Dimension value - vertical position";
-};
-
-String SIP_SA_MEASURELINEDIST
-{
-    Text [ en-US ] = "Dimension line space";
-};
-
-String SIP_SA_MEASUREHELPLINEOVERHANG
-{
-    Text [ en-US ] = "Dimension help line overhang";
-};
-
-String SIP_SA_MEASUREHELPLINEDIST
-{
-    Text [ en-US ] = "Dimension help line spacing";
-};
-
-String SIP_SA_MEASUREHELPLINE1LEN
-{
-    Text [ en-US ] = "Backlog of dimension help line 1";
-};
-
-String SIP_SA_MEASUREHELPLINE2LEN
-{
-    Text [ en-US ] = "Backlog of dimension help line 2";
-};
-
-String SIP_SA_MEASUREBELOWREFEDGE
-{
-    Text [ en-US ] = "Lower edge dimensioning";
-};
-
-String SIP_SA_MEASURETEXTROTA90
-{
-    Text [ en-US ] = "Dimension value across dimension line";
-};
-
-String SIP_SA_MEASURETEXTUPSIDEDOWN
-{
-    Text [ en-US ] = "Rotate dimension value by 180 degree";
-};
-
-String SIP_SA_MEASUREOVERHANG
-{
-    Text [ en-US ] = "Dimension line overhang";
-};
-
-String SIP_SA_MEASUREUNIT
-{
-    Text [ en-US ] = "Measure unit";
-};
-
-String SIP_SA_MEASURESCALE
-{
-    Text [ en-US ] = "Additional scale factor";
-};
-
-String SIP_SA_MEASURESHOWUNIT
-{
-    Text [ en-US ] = "Measure unit display";
-};
-
-String SIP_SA_MEASUREFORMATSTRING
-{
-    Text [ en-US ] = "Dimension value format";
-};
-
-String SIP_SA_MEASURETEXTAUTOANGLE
-{
-    Text [ en-US ] = "AutoPositioning of the dimension value";
-};
-
-String SIP_SA_MEASURETEXTAUTOANGLEVIEW
-{
-    Text [ en-US ] = "Angle for the automatic positioning of the dimension value";
-};
-
-String SIP_SA_MEASURETEXTISFIXEDANGLE
-{
-    Text [ en-US ] = "Determination of the dimension value angle";
-};
-
-String SIP_SA_MEASURETEXTFIXEDANGLE
-{
-    Text [ en-US ] = "Angle of the dimension value";
-};
-
-String SIP_SA_MEASUREDECIMALPLACES
-{
-    Text [ en-US ] = "Decimal places";
-};
-
-String SIP_SA_CIRCKIND
-{
-    Text [ en-US ] = "Type of circle";
-};
-
-String SIP_SA_CIRCSTARTANGLE
-{
-    Text [ en-US ] = "Start angle";
-};
-
-String SIP_SA_CIRCENDANGLE
-{
-    Text [ en-US ] = "End angle";
-};
-
-String SIP_SA_OBJMOVEPROTECT
-{
-    Text [ en-US ] = "Protected object position";
-};
-
-String SIP_SA_OBJSIZEPROTECT
-{
-    Text [ en-US ] = "Protected object size";
-};
-
-String SIP_SA_OBJPRINTABLE
-{
-    Text [ en-US ] = "Object, printable";
-};
-
-String SIP_SA_OBJVISIBLE
-{
-    Text [ en-US ] = "Object, visible";
-};
-
-String SIP_SA_LAYERID
-{
-    Text [ en-US ] = "Level ID";
-};
-
-String SIP_SA_LAYERNAME
-{
-    Text [ en-US ] = "Layer";
-};
-
-String SIP_SA_OBJECTNAME
-{
-    Text [ en-US ] = "Object name";
-};
-
-String SIP_SA_ALLPOSITIONX
-{
-    Text [ en-US ] = "Position X, complete";
-};
-
-String SIP_SA_ALLPOSITIONY
-{
-    Text [ en-US ] = "Position Y, complete";
-};
-
-String SIP_SA_ALLSIZEWIDTH
-{
-    Text [ en-US ] = "Total Width";
-};
-
-String SIP_SA_ALLSIZEHEIGHT
-{
-    Text [ en-US ] = "Height, complete";
-};
-
-String SIP_SA_ONEPOSITIONX
-{
-    Text [ en-US ] = "Single position X";
-};
-
-String SIP_SA_ONEPOSITIONY
-{
-    Text [ en-US ] = "Single position Y";
-};
-
-String SIP_SA_ONESIZEWIDTH
-{
-    Text [ en-US ] = "Single width";
-};
-
-String SIP_SA_ONESIZEHEIGHT
-{
-    Text [ en-US ] = "Single height";
-};
-
-String SIP_SA_LOGICSIZEWIDTH
-{
-    Text [ en-US ] = "Logical width";
-};
-
-String SIP_SA_LOGICSIZEHEIGHT
-{
-    Text [ en-US ] = "Logical height";
-};
-
-String SIP_SA_ROTATEANGLE
-{
-    Text [ en-US ] = "Single rotation angle";
-};
-
-String SIP_SA_SHEARANGLE
-{
-    Text [ en-US ] = "Single shear angle";
-};
-
-String SIP_SA_MOVEX
-{
-    Text [ en-US ] = "Move horizontally";
-};
-
-String SIP_SA_MOVEY
-{
-    Text [ en-US ] = "Move vertically";
-};
-
-String SIP_SA_RESIZEXONE
-{
-    Text [ en-US ] = "Resize X, single";
-};
-
-String SIP_SA_RESIZEYONE
-{
-    Text [ en-US ] = "Resize Y, single";
-};
-
-String SIP_SA_ROTATEONE
-{
-    Text [ en-US ] = "Single rotation";
-};
-
-String SIP_SA_HORZSHEARONE
-{
-    Text [ en-US ] = "Single horizontal shear";
-};
-
-String SIP_SA_VERTSHEARONE
-{
-    Text [ en-US ] = "Single vertical shear";
-};
-
-String SIP_SA_RESIZEXALL
-{
-    Text [ en-US ] = "Resize X, complete";
-};
-
-String SIP_SA_RESIZEYALL
-{
-    Text [ en-US ] = "Resize Y, complete";
-};
-
-String SIP_SA_ROTATEALL
-{
-    Text [ en-US ] = "Rotate all";
-};
-
-String SIP_SA_HORZSHEARALL
-{
-    Text [ en-US ] = "Shear horizontal, complete";
-};
-
-String SIP_SA_VERTSHEARALL
-{
-    Text [ en-US ] = "Shear vertical, complete";
-};
-
-String SIP_SA_TRANSFORMREF1X
-{
-    Text [ en-US ] = "Reference point 1 X";
-};
-
-String SIP_SA_TRANSFORMREF1Y
-{
-    Text [ en-US ] = "Reference point 1 Y";
-};
-
-String SIP_SA_TRANSFORMREF2X
-{
-    Text [ en-US ] = "Reference point 2 X";
-};
-
-String SIP_SA_TRANSFORMREF2Y
-{
-    Text [ en-US ] = "Reference point 2 Y";
-};
-
-String SIP_EE_PARA_HYPHENATE
-{
-    Text [ en-US ] = "Hyphenation";
-};
-
-String SIP_EE_PARA_BULLETSTATE
-{
-    Text [ en-US ] = "Display bullets";
-};
-
-String SIP_EE_PARA_OUTLLRSPACE
-{
-    Text [ en-US ] = "Numbering indents";
-};
-
-String SIP_EE_PARA_OUTLLEVEL
-{
-    Text [ en-US ] = "Numbering level";
-};
-
-String SIP_EE_PARA_BULLET
-{
-    Text [ en-US ] = "Bullets and Numberings";
-};
-
-String SIP_EE_PARA_LRSPACE
-{
-    Text [ en-US ] = "Indents";
-};
-
-String SIP_EE_PARA_ULSPACE
-{
-    Text [ en-US ] = "Paragraph spacing";
-};
-
-String SIP_EE_PARA_SBL
-{
-    Text [ en-US ] = "Line spacing";
-};
-
-String SIP_EE_PARA_JUST
-{
-    Text [ en-US ] = "Paragraph alignment";
-};
-
-String SIP_EE_PARA_TABS
-{
-    Text [ en-US ] = "Tabulators";
-};
-
-String SIP_EE_CHAR_COLOR
-{
-    Text [ en-US ] = "Font color";
-};
-
-String SIP_EE_CHAR_FONTINFO
-{
-    Text [ en-US ] = "Character set";
-};
-
-String SIP_EE_CHAR_FONTHEIGHT
-{
-    Text [ en-US ] = "Font size";
-};
-
-String SIP_EE_CHAR_FONTWIDTH
-{
-    Text [ en-US ] = "Font width";
-};
-
-String SIP_EE_CHAR_WEIGHT
-{
-    Text [ en-US ] = "Bold (thickness)";
-};
-
-String SIP_EE_CHAR_UNDERLINE
-{
-    Text [ en-US ] = "Underline";
-};
-
-String SIP_EE_CHAR_OVERLINE
-{
-    Text [ en-US ] = "Overline";
-};
-
-String SIP_EE_CHAR_STRIKEOUT
-{
-    Text [ en-US ] = "Strikethrough";
-};
-
-String SIP_EE_CHAR_ITALIC
-{
-    Text [ en-US ] = "Italic";
-};
-
-String SIP_EE_CHAR_OUTLINE
-{
-    Text [ en-US ] = "Outline";
-};
-
-String SIP_EE_CHAR_SHADOW
-{
-    Text [ en-US ] = "Font shadow";
-};
-
-String SIP_EE_CHAR_ESCAPEMENT
-{
-    Text [ en-US ] = "Superscript/subscript";
-};
-
-String SIP_EE_CHAR_PAIRKERNING
-{
-    Text [ en-US ] = "Kerning";
-};
-
-String SIP_EE_CHAR_KERNING
-{
-    Text [ en-US ] = "Manual kerning";
-};
-
-String SIP_EE_CHAR_WLM
-{
-    Text [ en-US ] = "No underline for spaces";
-};
-
-String SIP_EE_FEATURE_TAB
-{
-    Text [ en-US ] = "Tabulator";
-};
-
-String SIP_EE_FEATURE_LINEBR
-{
-    Text [ en-US ] = "Optional line break";
-};
-
-String SIP_EE_FEATURE_NOTCONV
-{
-    Text [ en-US ] = "Non-convertible character";
-};
-
-String SIP_EE_FEATURE_FIELD
-{
-    Text [ en-US ] = "Fields";
-};
-
-String SIP_SA_GRAFRED
-{
-    Text [ en-US ] = "Red";
-};
-String SIP_SA_GRAFGREEN
-{
-    Text [ en-US ] = "Green";
-};
-String SIP_SA_GRAFBLUE
-{
-    Text [ en-US ] = "Blue";
-};
-String SIP_SA_GRAFLUMINANCE
-{
-    Text [ en-US ] = "Brightness";
-};
-String SIP_SA_GRAFCONTRAST
-{
-    Text [ en-US ] = "Contrast";
-};
-String SIP_SA_GRAFGAMMA
-{
-    Text [ en-US ] = "Gamma";
-};
-String SIP_SA_GRAFTRANSPARENCE
-{
-    Text [ en-US ] = "Transparency";
-};
-String SIP_SA_GRAFINVERT
-{
-    Text [ en-US ] = "Invert";
-};
-String SIP_SA_GRAFMODE
-{
-    Text [ en-US ] = "Image mode";
-};
-String SIP_SA_GRAFCROP
-{
-    Text [ en-US ] = "Crop";
-
-};
-
-String STR_ObjNameSingulMEDIA
-{
-    Text [ en-US ] = "Media object" ;
-};
-String STR_ObjNamePluralMEDIA
-{
-    Text [ en-US ] = "Media objects" ;
-};
-
-// drawing layer table strings
-
-String STR_TABLE_INSCOL
-{
-    Text [ en-US ] = "Insert column" ;
-};
-String STR_TABLE_INSROW
-{
-    Text [ en-US ] = "Insert row" ;
-};
-String STR_UNDO_COL_DELETE
-{
-    Text [ en-US ] = "Delete column" ;
-};
-String STR_UNDO_ROW_DELETE
-{
-    Text [ en-US ] = "Delete row" ;
-};
-String STR_TABLE_SPLIT
-{
-    Text [ en-US ] = "Split cells" ;
-};
-String STR_TABLE_MERGE
-{
-    Text [ en-US ] = "Merge cells" ;
-};
-String STR_TABLE_NUMFORMAT
-{
-    Text [ en-US ] = "Format cell" ;
-};
-
-String STR_TABLE_DISTRIBUTE_ROWS
-{
-    Text [ en-US ] = "Distribute rows" ;
-};
-
-String STR_TABLE_DISTRIBUTE_COLUMNS
-{
-    Text [ en-US ] = "Distribute columns" ;
-};
-
-String STR_TABLE_DELETE_CELL_CONTENTS
-{
-    Text [ en-US ] = "Delete cell contents" ;
-};
-
-String STR_TABLE_STYLE
-{
-    Text [ en-US ] = "Table style" ;
-};
-
-String STR_TABLE_STYLE_SETTINGS
-{
-    Text [ en-US ] = "Table style settings" ;
-};
-
-String STR_ObjNameSingulTable
-{
-    Text [ en-US ] = "Table";
-};
-String STR_ObjNamePluralTable
-{
-    Text [ en-US ] = "Tables";
-};
-
-String STR_ObjNameSingulFONTWORK
-{
-    Text [ en-US ] = "Font work" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index ea5ed60938bb..695a236a9f6a 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -29,7 +29,7 @@
 #include <svx/svdmodel.hxx>
 #include <svx/svdview.hxx>
 #include <svx/xfillit0.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include <svx/scene3d.hxx>
 #include <editeng/editdata.hxx>
@@ -214,9 +214,9 @@ SdrUndoObj::SdrUndoObj(SdrObject& rNewObj)
 {
 }
 
-OUString SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, bool bRepeat )
+OUString SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, const char* pStrCacheID, bool bRepeat )
 {
-    const OUString rStr {ImpGetResStr(nStrCacheID)};
+    const OUString rStr {ImpGetResStr(pStrCacheID)};
 
     const sal_Int32 nPos = rStr.indexOf("%1");
     if (nPos < 0)
@@ -228,10 +228,10 @@ OUString SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject
     return rStr.replaceAt(nPos, 2, _rForObject.TakeObjNameSingul());
 }
 
-void SdrUndoObj::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, bool bRepeat) const
+void SdrUndoObj::ImpTakeDescriptionStr(const char* pStrCacheID, OUString& rStr, bool bRepeat) const
 {
     if ( pObj )
-        rStr = GetDescriptionStringForObject( *pObj, nStrCacheID, bRepeat );
+        rStr = GetDescriptionStringForObject( *pObj, pStrCacheID, bRepeat );
 }
 
 // common call method for possible change of the page when UNDO/REDO is triggered
@@ -1418,9 +1418,9 @@ void SdrUndoPage::ImpMovePage(sal_uInt16 nOldNum, sal_uInt16 nNewNum)
     }
 }
 
-void SdrUndoPage::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr)
+void SdrUndoPage::ImpTakeDescriptionStr(const char* pStrCacheID, OUString& rStr)
 {
-    rStr = ImpGetResStr(nStrCacheID);
+    rStr = ImpGetResStr(pStrCacheID);
 }
 
 
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 9bce8d9c970e..f11e6f6b0055 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -20,7 +20,7 @@
 #include <editeng/eeitem.hxx>
 #include <editeng/outlobj.hxx>
 
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include <svx/svdpagv.hxx>
 #include <svx/svdmrkv.hxx>
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index f4b9a6482084..f81933b05a95 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -35,7 +35,7 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdtrans.hxx>
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include "svx/xoutbmp.hxx"
 #include <vcl/metaact.hxx>
diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx
index 486d55435c69..a0289ae3f95b 100644
--- a/svx/source/table/cellcursor.cxx
+++ b/svx/source/table/cellcursor.cxx
@@ -25,7 +25,7 @@
 #include "tablelayouter.hxx"
 #include "cell.hxx"
 #include "svx/svdmodel.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 
 
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 5adbfde30df4..a88553f0e0b2 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -50,7 +50,7 @@
 #include "svx/framelink.hxx"
 #include "svx/sdr/table/tabledesign.hxx"
 #include "svx/svdundo.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include "editeng/writingmodeitem.hxx"
 #include "editeng/frmdiritem.hxx"
diff --git a/svx/source/table/table.src b/svx/source/table/table.src
deleted file mode 100644
index 27cfa6c0b57f..000000000000
--- a/svx/source/table/table.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 RID_SVXSTR_STYLEFAMILY_TABLEDESIGN
-{
-    Text [ en-US ] = "Table Design Styles";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 96db2db82e80..e3dae07e78bf 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -60,7 +60,7 @@
 #include <editeng/borderline.hxx>
 #include <editeng/colritem.hxx>
 #include "editeng/lineitem.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 #include "svx/svdpage.hxx"
 #include "tableundo.hxx"
diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx
index 3b56970ad81d..321c40d58b4d 100644
--- a/svx/source/table/tabledesign.cxx
+++ b/svx/source/table/tabledesign.cxx
@@ -42,7 +42,7 @@
 #include "svx/unoprov.hxx"
 #include "svx/sdr/table/tabledesign.hxx"
 #include "svx/dialmgr.hxx"
-#include "svx/dialogs.hrc"
+#include "svx/strings.hrc"
 
 #include "celltypes.hxx"
 
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index b48833191503..359df376c1c6 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -35,7 +35,7 @@
 #include "editeng/borderline.hxx"
 #include "editeng/boxitem.hxx"
 #include "svx/svdmodel.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 
 using ::editeng::SvxBorderLine;
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 69202bf8aefe..31a5e5ac3a0e 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -38,7 +38,7 @@
 #include "tableundo.hxx"
 #include "svx/svdotable.hxx"
 #include "svx/svdmodel.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svdglob.hxx"
 
 using namespace ::osl;
diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx
index 4aaadfb22eda..b9e14521af6e 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -23,7 +23,8 @@
 #include <unotools/pathoptions.hxx>
 #include <sfx2/objsh.hxx>
 #include <svx/drawitem.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
 #include <vcl/toolbox.hxx>
 #include <svtools/colrdlg.hxx>
diff --git a/svx/source/tbxctrls/SvxColorChildWindow.cxx b/svx/source/tbxctrls/SvxColorChildWindow.cxx
index 11891d63175b..f236c0d9971d 100644
--- a/svx/source/tbxctrls/SvxColorChildWindow.cxx
+++ b/svx/source/tbxctrls/SvxColorChildWindow.cxx
@@ -20,7 +20,7 @@
 #include <svx/SvxColorChildWindow.hxx>
 #include <sfx2/dockwin.hxx>
 #include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/colrctrl.hxx>
 #include <svx/dialmgr.hxx>
 
diff --git a/svx/source/tbxctrls/SvxPresetListBox.cxx b/svx/source/tbxctrls/SvxPresetListBox.cxx
index e9916bb52ced..ba58a567313d 100644
--- a/svx/source/tbxctrls/SvxPresetListBox.cxx
+++ b/svx/source/tbxctrls/SvxPresetListBox.cxx
@@ -23,7 +23,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/image.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/popupmenuwindow.hxx>
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx
index ab931156aa7e..d9dcda7c749b 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -14,7 +14,7 @@
 #include <i18nlangtag/mslangid.hxx>
 #include <svtools/popupwindowcontroller.hxx>
 #include <svtools/toolbarmenu.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/numvset.hxx>
 #include <vcl/commandinfoprovider.hxx>
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index faaf6552b800..0829234d00a9 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -21,7 +21,8 @@
 
 #include <sot/exchange.hxx>
 #include <sot/storage.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 
 #include <sfx2/viewsh.hxx>
 #include <sfx2/objsh.hxx>
diff --git a/svx/source/tbxctrls/colrctrl.src b/svx/source/tbxctrls/colrctrl.src
deleted file mode 100644
index 3b22a7580bde..000000000000
--- a/svx/source/tbxctrls/colrctrl.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 STR_COLORTABLE
-{
-    Text [ en-US ] = "Color Palette" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 400bc0f72a45..41501d8ea1d4 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -31,7 +31,7 @@
 #include <svl/intitem.hxx>
 #include <editeng/colritem.hxx>
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/svdtrans.hxx>
 #include <svx/sdasitm.hxx>
 #include <svx/dialmgr.hxx>
@@ -39,7 +39,6 @@
 #include "coreservices.hxx"
 #include "helpid.hrc"
 #include "extrusioncontrols.hxx"
-#include "extrusioncontrols.hrc"
 #include "extrusiondepthdialog.hxx"
 
 #include "bitmaps.hlst"
@@ -109,6 +108,19 @@ static const OUStringLiteral aDirectionBmps[] =
     RID_SVXBMP_DIRECTION_DIRECTION_SE
 };
 
+static const char* aDirectionStrs[] =
+{
+    RID_SVXSTR_DIRECTION_NW,
+    RID_SVXSTR_DIRECTION_N,
+    RID_SVXSTR_DIRECTION_NE,
+    RID_SVXSTR_DIRECTION_W,
+    RID_SVXSTR_DIRECTION_NONE,
+    RID_SVXSTR_DIRECTION_E,
+    RID_SVXSTR_DIRECTION_SW,
+    RID_SVXSTR_DIRECTION_S,
+    RID_SVXSTR_DIRECTION_SE
+};
+
 ExtrusionDirectionWindow::ExtrusionDirectionWindow(
     svt::ToolboxController& rController,
     vcl::Window* pParentWindow
@@ -132,8 +144,7 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow(
 
     for (sal_uInt16 i = DIRECTION_NW; i <= DIRECTION_SE; ++i)
     {
-        OUString aText(SvxResId(RID_SVXSTR_DIRECTION + i));
-        mpDirectionSet->InsertItem(i + 1, maImgDirection[i], aText);
+        mpDirectionSet->InsertItem(i + 1, maImgDirection[i], SvxResId(aDirectionStrs[i]));
     }
 
     mpDirectionSet->SetOutputSizePixel(Size(72, 72));
@@ -417,20 +428,39 @@ void ExtrusionDepthWindow::implSetDepth( double fDepth )
     }
 }
 
-
 void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit )
 {
     meUnit = eUnit;
-    sal_uInt16 nResource = IsMetric( eUnit ) ? RID_SVXSTR_DEPTH_0 : RID_SVXSTR_DEPTH_0_INCH;
 
-    for( int i = 0; i < 5; i++ )
+    const char* aDepths[] =
     {
-        OUString aStr( SvxResId( nResource + i ) );
-        setEntryText( i, aStr );
+        RID_SVXSTR_DEPTH_0,
+        RID_SVXSTR_DEPTH_1,
+        RID_SVXSTR_DEPTH_2,
+        RID_SVXSTR_DEPTH_3,
+        RID_SVXSTR_DEPTH_4
+    };
+
+    const char* aDepthsInch[] =
+    {
+        RID_SVXSTR_DEPTH_0_INCH,
+        RID_SVXSTR_DEPTH_1_INCH,
+        RID_SVXSTR_DEPTH_2_INCH,
+        RID_SVXSTR_DEPTH_3_INCH,
+        RID_SVXSTR_DEPTH_4_INCH
+    };
+
+    assert(SAL_N_ELEMENTS(aDepths) == SAL_N_ELEMENTS(aDepthsInch));
+
+    const char** pResource = IsMetric(eUnit) ? aDepths : aDepthsInch;
+
+    for (size_t i = 0; i < SAL_N_ELEMENTS(aDepths); ++i)
+    {
+        OUString aStr(SvxResId(pResource[i]));
+        setEntryText(i, aStr);
     }
 }
 
-
 void ExtrusionDepthWindow::statusChanged(
     const css::frame::FeatureStateEvent& Event
 )
diff --git a/svx/source/tbxctrls/extrusioncontrols.hrc b/svx/source/tbxctrls/extrusioncontrols.hrc
deleted file mode 100644
index 2ed1970bcf34..000000000000
--- a/svx/source/tbxctrls/extrusioncontrols.hrc
+++ /dev/null
@@ -1,42 +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>
-
-// enum to index light images
-#define FROM_TOP_LEFT       0
-#define FROM_TOP            1
-#define FROM_TOP_RIGHT      2
-#define FROM_LEFT           3
-#define FROM_FRONT          4
-#define FROM_RIGHT          5
-#define FROM_BOTTOM_LEFT    6
-#define FROM_BOTTOM         7
-#define FROM_BOTTOM_RIGHT   8
-
-#define DIRECTION_NW        0
-#define DIRECTION_N         1
-#define DIRECTION_NE        2
-#define DIRECTION_W         3
-#define DIRECTION_NONE      4
-#define DIRECTION_E         5
-#define DIRECTION_SW        6
-#define DIRECTION_S         7
-#define DIRECTION_SE        8
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx
index 03c536e0a477..1b40c2d649af 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hxx
+++ b/svx/source/tbxctrls/extrusioncontrols.hxx
@@ -33,6 +33,26 @@
 
 class ValueSet;
 
+// enum to index light images
+#define FROM_TOP_LEFT       0
+#define FROM_TOP            1
+#define FROM_TOP_RIGHT      2
+#define FROM_LEFT           3
+#define FROM_FRONT          4
+#define FROM_RIGHT          5
+#define FROM_BOTTOM_LEFT    6
+#define FROM_BOTTOM         7
+#define FROM_BOTTOM_RIGHT   8
+
+#define DIRECTION_NW        0
+#define DIRECTION_N         1
+#define DIRECTION_NE        2
+#define DIRECTION_W         3
+#define DIRECTION_NONE      4
+#define DIRECTION_E         5
+#define DIRECTION_SW        6
+#define DIRECTION_S         7
+#define DIRECTION_SE        8
 
 namespace svx
 {
diff --git a/svx/source/tbxctrls/extrusioncontrols.src b/svx/source/tbxctrls/extrusioncontrols.src
deleted file mode 100644
index a0d896e2e9f0..000000000000
--- a/svx/source/tbxctrls/extrusioncontrols.src
+++ /dev/null
@@ -1,172 +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 "extrusioncontrols.hrc"
-
-String RID_SVXSTR_PERSPECTIVE
-{
-    Text [ en-US ] = "~Perspective" ;
-};
-
-String RID_SVXSTR_PARALLEL
-{
-    Text [ en-US ] = "P~arallel" ;
-};
-
-String RID_SVXSTR_DIRECTION + DIRECTION_NW
-{
-    Text [ en-US ] = "Extrusion North-West";
-};
-
-String RID_SVXSTR_DIRECTION + DIRECTION_N
-{
-    Text [ en-US ] = "Extrusion North";
-};
-
-String RID_SVXSTR_DIRECTION + DIRECTION_NE
-{
-    Text [ en-US ] = "Extrusion North-East";
-};
-
-String RID_SVXSTR_DIRECTION + DIRECTION_W
-{
-    Text [ en-US ] = "Extrusion West";
-};
-
-String RID_SVXSTR_DIRECTION + DIRECTION_NONE
-{
-    Text [ en-US ] = "Extrusion Backwards";
-};
-
-String RID_SVXSTR_DIRECTION + DIRECTION_E
-{
-    Text [ en-US ] = "Extrusion East";
-};
-
-String RID_SVXSTR_DIRECTION + DIRECTION_SW
-{
-    Text [ en-US ] = "Extrusion South-West";
-};
-
-String RID_SVXSTR_DIRECTION + DIRECTION_S
-{
-    Text [ en-US ] = "Extrusion South";
-};
-
-String RID_SVXSTR_DIRECTION + DIRECTION_SE
-{
-    Text [ en-US ] = "Extrusion South-East";
-};
-String RID_SVXSTR_BRIGHT
-{
-    Text [ en-US ] = "~Bright";
-};
-
-String RID_SVXSTR_NORMAL
-{
-    Text [ en-US ] = "~Normal";
-};
-
-String RID_SVXSTR_DIM
-{
-    Text [ en-US ] = "~Dim";
-};
-
-String RID_SVXSTR_WIREFRAME
-{
-    Text [ en-US ] = "~Wire Frame";
-};
-
-String RID_SVXSTR_MATTE
-{
-    Text [ en-US ] = "~Matt";
-};
-
-String RID_SVXSTR_PLASTIC
-{
-    Text [ en-US ] = "~Plastic";
-};
-
-String RID_SVXSTR_METAL
-{
-    Text [ en-US ] = "Me~tal";
-};
-
-String RID_SVXSTR_DEPTH_0
-{
-    Text [ en-US ] = "~0 cm";
-};
-
-String RID_SVXSTR_DEPTH_1
-{
-    Text [ en-US ] = "~1 cm";
-};
-
-String RID_SVXSTR_DEPTH_2
-{
-    Text [ en-US ] = "~2.5 cm";
-};
-
-String RID_SVXSTR_DEPTH_3
-{
-    Text [ en-US ] = "~5 cm";
-};
-
-String RID_SVXSTR_DEPTH_4
-{
-    Text [ en-US ] = "10 ~cm";
-};
-
-String RID_SVXSTR_DEPTH_0_INCH
-{
-    Text [ en-US ] = "0 inch";
-};
-
-String RID_SVXSTR_DEPTH_1_INCH
-{
-    Text [ en-US ] = "0.~5 inch";
-};
-
-String RID_SVXSTR_DEPTH_2_INCH
-{
-    Text [ en-US ] = "~1 inch";
-};
-
-String RID_SVXSTR_DEPTH_3_INCH
-{
-    Text [ en-US ] = "~2 inch";
-};
-
-String RID_SVXSTR_DEPTH_4_INCH
-{
-    Text [ en-US ] = "~4 inch";
-};
-
-String RID_SVXSTR_CUSTOM
-{
-    Text [ en-US ] = "~Custom...";
-};
-
-String RID_SVXSTR_INFINITY
-{
-    Text [ en-US ] = "~Infinity";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index e63fbd48899e..68729ff95567 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -26,7 +26,8 @@
 #include <rtl/ustring.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/toolbox.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 
 #define TMP_STR_BEGIN   "["
 #define TMP_STR_END     "]"
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index d86c84067e57..ac3f2e5b4da5 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -38,7 +38,7 @@
 #include <svx/fmmodel.hxx>
 #include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/svdpage.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdview.hxx>
diff --git a/svx/source/tbxctrls/fontworkgallery.src b/svx/source/tbxctrls/fontworkgallery.src
deleted file mode 100644
index 246d1f411ffa..000000000000
--- a/svx/source/tbxctrls/fontworkgallery.src
+++ /dev/null
@@ -1,83 +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 "helpid.hrc"
-#include <svx/dialogs.hrc>
-
-String RID_SVXSTR_ALIGN_LEFT
-{
-    Text [ en-US ] = "~Left Align";
-};
-
-String RID_SVXSTR_ALIGN_CENTER
-{
-    Text [ en-US ] = "~Center";
-};
-
-String RID_SVXSTR_ALIGN_RIGHT
-{
-    Text [ en-US ] = "~Right Align";
-};
-
-String RID_SVXSTR_ALIGN_WORD
-{
-    Text [ en-US ] = "~Word Justify";
-};
-
-String RID_SVXSTR_ALIGN_STRETCH
-{
-    Text [ en-US ] = "S~tretch Justify";
-};
-
-String RID_SVXSTR_CHARS_SPACING_VERY_TIGHT
-{
-    Text [ en-US ] = "~Very Tight";
-};
-
-String RID_SVXSTR_CHARS_SPACING_TIGHT
-{
-    Text [ en-US ] = "~Tight";
-};
-
-String RID_SVXSTR_CHARS_SPACING_NORMAL
-{
-    Text [ en-US ] = "~Normal";
-};
-
-String RID_SVXSTR_CHARS_SPACING_LOOSE
-{
-    Text [ en-US ] = "~Loose";
-};
-
-String RID_SVXSTR_CHARS_SPACING_VERY_LOOSE
-{
-    Text [ en-US ] = "Very ~Loose";
-};
-
-String RID_SVXSTR_CHARS_SPACING_CUSTOM
-{
-    Text [ en-US ] = "~Custom...";
-};
-
-String RID_SVXSTR_CHARS_SPACING_KERN_PAIRS
-{
-    Text [ en-US ] = "~Kern Character Pairs";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 3627a470d7f8..12a822e4b858 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -37,8 +37,9 @@
 #include <tools/urlobj.hxx>
 #include <comphelper/processfactory.hxx>
 
-#include <svx/svxids.hrc>
 #include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
+#include <svx/strings.hrc>
 #include <editeng/brushitem.hxx>
 #include <editeng/sizeitem.hxx>
 #include <svx/sdgcpitm.hxx>
@@ -65,7 +66,7 @@ using namespace ::com::sun::star::lang;
 #define SYMBOL_TO_FIELD_OFFSET      4
 #define ITEMVALUE(ItemSet,Id,Cast)  static_cast<const Cast&>((ItemSet).Get(Id)).GetValue()
 #define TOOLBOX_NAME                "colorbar"
-
+#define RID_SVXSTR_UNDO_GRAFCROP    RID_SVXSTR_GRAFCROP
 
 class ImplGrafMetricField : public MetricField
 {
diff --git a/svx/source/tbxctrls/grafctrl.src b/svx/source/tbxctrls/grafctrl.src
deleted file mode 100644
index afa3777a8f0c..000000000000
--- a/svx/source/tbxctrls/grafctrl.src
+++ /dev/null
@@ -1,59 +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_UNDO_GRAFMODE
-{
-    Text [ en-US ] = "Image Mode";
-};
-String RID_SVXSTR_UNDO_GRAFRED
-{
-    Text [ en-US ] = "Red";
-};
-String RID_SVXSTR_UNDO_GRAFGREEN
-{
-    Text [ en-US ] = "Green";
-};
-String RID_SVXSTR_UNDO_GRAFBLUE
-{
-    Text [ en-US ] = "Blue";
-};
-String RID_SVXSTR_UNDO_GRAFLUMINANCE
-{
-    Text [ en-US ] = "Brightness";
-};
-String RID_SVXSTR_UNDO_GRAFCONTRAST
-{
-    Text [ en-US ] = "Contrast";
-};
-String RID_SVXSTR_UNDO_GRAFGAMMA
-{
-    Text [ en-US ] = "Gamma";
-};
-String RID_SVXSTR_UNDO_GRAFTRANSPARENCY
-{
-    Text [ en-US ] = "Transparency";
-};
-String RID_SVXSTR_GRAFCROP
-{
-    Text [ en-US ] = "Crop";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index fb513a9bd596..cd71cb296302 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -29,7 +29,8 @@
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 
 #define DELAY_TIMEOUT           100
 
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index f6fac3b05832..ef22cab1e8e9 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -25,7 +25,8 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/app.hxx>
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include "svx/layctrl.hxx"
 #include <svx/dialmgr.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 69f347c63248..04e8da774545 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -40,7 +40,7 @@
 #include <tools/urlobj.hxx>
 
 #include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
@@ -142,15 +142,12 @@ void SvxUndoRedoControl::Impl_SetInfo( sal_Int32 nCount )
 {
     DBG_ASSERT( pPopupWin, "NULL pointer, PopupWindow missing" );
 
-//    ListBox &rListBox = pPopupWin->GetListBox();
-
-    sal_uInt16 nId;
+    const char* pId;
     if (nCount == 1)
-        nId = SID_UNDO == GetSlotId() ? RID_SVXSTR_NUM_UNDO_ACTION : RID_SVXSTR_NUM_REDO_ACTION;
+        pId = SID_UNDO == GetSlotId() ? RID_SVXSTR_NUM_UNDO_ACTION : RID_SVXSTR_NUM_REDO_ACTION;
     else
-        nId = SID_UNDO == GetSlotId() ? RID_SVXSTR_NUM_UNDO_ACTIONS : RID_SVXSTR_NUM_REDO_ACTIONS;
-
-    aActionStr = SvxResId(nId);
+        pId = SID_UNDO == GetSlotId() ? RID_SVXSTR_NUM_UNDO_ACTIONS : RID_SVXSTR_NUM_REDO_ACTIONS;
+    aActionStr = SvxResId(pId);
 
     OUString aText = aActionStr.replaceAll("$(ARG1)", OUString::number(nCount));
     pPopupWin->SetText(aText);
diff --git a/svx/source/tbxctrls/lboxctrl.src b/svx/source/tbxctrls/lboxctrl.src
deleted file mode 100644
index f9b5ab12004d..000000000000
--- a/svx/source/tbxctrls/lboxctrl.src
+++ /dev/null
@@ -1,43 +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_NUM_UNDO_ACTIONS
-{
-    Text[ en-US ] = "Actions to undo: $(ARG1)";
-};
-
-String RID_SVXSTR_NUM_UNDO_ACTION
-{
-    Text[ en-US ] = "Actions to undo: $(ARG1)" ;
-};
-
-String RID_SVXSTR_NUM_REDO_ACTIONS
-{
-    Text[ en-US ] = "Actions to redo: $(ARG1)";
-};
-
-String RID_SVXSTR_NUM_REDO_ACTION
-{
-    Text[ en-US ] = "Actions to redo: $(ARG1)";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index c6e71154a9a0..f1efc65b123d 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -27,7 +27,8 @@
 #include <svtools/toolbarmenu.hxx>
 #include <svtools/popupwindowcontroller.hxx>
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include "helpid.hrc"
 
 #include "svx/drawitem.hxx"
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 7f9e0523056c..79e9382b835a 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -61,13 +61,15 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/svxitems.hrc>
+#include <svx/svxids.hrc>
 #include "helpid.hrc"
 #include <sfx2/htmlmode.hxx>
 #include <sfx2/sidebar/Sidebar.hxx>
 #include <sfx2/sidebar/SidebarToolBox.hxx>
 #include <svx/xtable.hxx>
+#include <editeng/editids.hrc>
 #include <editeng/fontitem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <editeng/boxitem.hxx>
@@ -1302,7 +1304,7 @@ SvxColorWindow::SvxColorWindow(const OUString&            rCommand,
         case SID_ATTR_CHAR_COLOR2:
         case SID_EXTRUSION_3D_COLOR:
         {
-            mpButtonAutoColor->SetText(EditResId::GetString(RID_SVXSTR_AUTOMATIC));
+            mpButtonAutoColor->SetText(EditResId(RID_SVXSTR_AUTOMATIC));
             break;
         }
         case SID_FM_CTL_PROPERTIES:
@@ -1428,7 +1430,7 @@ namespace
             case SID_EXTRUSION_3D_COLOR:
             default:
                 aColor = COL_AUTO;
-                sColorName = EditResId::GetString(RID_SVXSTR_AUTOMATIC);
+                sColorName = EditResId(RID_SVXSTR_AUTOMATIC);
                 break;
         }
 
diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
deleted file mode 100644
index 61d72cc2b5a2..000000000000
--- a/svx/source/tbxctrls/tbcontrl.src
+++ /dev/null
@@ -1,109 +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_NOFILL
-{
-    Text [ en-US ] = "No Fill" ;
-};
-
-String RID_SVXSTR_TRANSPARENT
-{
-    Text [ en-US ] = "Transparent";
-};
-
-String RID_SVXSTR_DEFAULT
-{
-    Text [ en-US ] = "Default";
-};
-
-String RID_SVXSTR_FRAME
-{
-    Text [ en-US ] = "Borders" ;
-};
-
-String RID_SVXSTR_FRAME_STYLE
-{
-    Text [ en-US ] = "Border Style" ;
-};
-
-String RID_SVXSTR_MORENUMBERING
-{
-    Text [ en-US ] = "More Numbering..." ;
-};
-
-String RID_SVXSTR_MOREBULLETS
-{
-    Text [ en-US ] = "More Bullets..." ;
-};
-
-String RID_SVXSTR_BY_AUTHOR
-{
-    Text [ en-US ] = "By author";
-};
-
-String RID_SVXSTR_PAGES
-{
-    Text [ en-US ] = "Pages";
-};
-
-String RID_SVXSTR_CLEARFORM
-{
-    Text [ en-US ] = "Clear formatting";
-};
-
-String RID_SVXSTR_MORE_STYLES
-{
-    Text [ en-US ] = "More Styles...";
-};
-
-String RID_SVXSTR_MORE
-{
-    Text [ en-US ] = "More Options...";
-};
-
-// This is duplicated in GenericCommands.xcu in officecfg.
-String RID_SVXSTR_CHARFONTNAME
-{
-    Text [ en-US ] = "Font Name";
-};
-
-String RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE
-{
-    Text [ en-US ] = "Font Name. The current font is not available and will be substituted.";
-};
-
-String RID_SVXSTR_CUSTOM_PAL
-{
-    Text [ en-US ] = "custom";
-};
-
-String RID_SVXSTR_DOC_COLORS
-{
-    Text [ en-US ] = "Document colors";
-};
-
-String RID_SVXSTR_DOC_COLOR_PREFIX
-{
-    Text [ en-US ] = "Document Color";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 91347d99cad5..a5e1fe1b9e1c 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -24,7 +24,7 @@
 
 #include <config_features.h>
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 
 #include <comphelper/processfactory.hxx>
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.src b/svx/source/tbxctrls/tbunosearchcontrollers.src
deleted file mode 100644
index 1e537a9c1760..000000000000
--- a/svx/source/tbxctrls/tbunosearchcontrollers.src
+++ /dev/null
@@ -1,37 +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_FINDBAR_FIND
-{
-    Text [ en-US ] = "Find" ;
-};
-
-String RID_SVXSTR_FINDBAR_MATCHCASE
-{
-    Text [ en-US ] = "Match Case" ;
-};
-
-String RID_SVXSTR_FINDBAR_SEARCHFORMATTED
-{
-    Text [ en-US ] = "Formatted Display" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index cc45215d388a..134dc4d90559 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -27,7 +27,7 @@
 #include <vcl/toolbox.hxx>
 
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include "svx/tbxctl.hxx"
 #include "svx/tbxcolor.hxx"
 #include <com/sun/star/frame/XLayoutManager.hpp>
diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx
index 3b1a33daf093..ed7184fca627 100644
--- a/svx/source/tbxctrls/verttexttbxctrl.cxx
+++ b/svx/source/tbxctrls/verttexttbxctrl.cxx
@@ -19,7 +19,8 @@
 
 
 #include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include <svx/verttexttbxctrl.hxx>
 #include <svl/languageoptions.hxx>
 #include <sfx2/app.hxx>
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index 0446e9ec819b..f6b17f66fa07 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/drawing/Position3D.hpp>
 #include <com/sun/star/drawing/Direction3D.hpp>
 #include <com/sun/star/drawing/ProjectionMode.hpp>
+#include <svx/svxids.hrc>
 #include <svx/svdundo.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/request.hxx>
@@ -33,7 +34,7 @@
 #include <svx/xsflclit.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/svdoashp.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/svdview.hxx>
 #include <editeng/colritem.hxx>
 #include "svx/chrtitem.hxx"
@@ -451,7 +452,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
 void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBindings )
 {
     sal_uInt16 nSID = rReq.GetSlot();
-    sal_uInt16 nStrResId = 0;
+    const char* pStrResId = nullptr;
 
     const bool bUndo = pSdrView && pSdrView->IsUndoEnabled();
 
@@ -459,74 +460,74 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB
     {
         case SID_EXTRUSION_TOOGLE:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ON_OFF;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ON_OFF;
             SAL_FALLTHROUGH;
         }
         case SID_EXTRUSION_TILT_DOWN:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_DOWN;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_DOWN;
             SAL_FALLTHROUGH;
         }
         case SID_EXTRUSION_TILT_UP:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_UP;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_UP;
             SAL_FALLTHROUGH;
         }
         case SID_EXTRUSION_TILT_LEFT:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_LEFT;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_LEFT;
             SAL_FALLTHROUGH;
         }
         case SID_EXTRUSION_TILT_RIGHT:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_RIGHT;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_RIGHT;
             SAL_FALLTHROUGH;
         }
         case SID_EXTRUSION_DIRECTION:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ORIENTATION;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ORIENTATION;
             SAL_FALLTHROUGH;
         }
         case SID_EXTRUSION_PROJECTION:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_PROJECTION;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_PROJECTION;
             SAL_FALLTHROUGH;
         }
         case SID_EXTRUSION_DEPTH:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_DEPTH;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_DEPTH;
             SAL_FALLTHROUGH;
         }
         case SID_EXTRUSION_3D_COLOR:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_COLOR;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_COLOR;
             SAL_FALLTHROUGH;
         }
         case SID_EXTRUSION_SURFACE:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_SURFACE;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_SURFACE;
             SAL_FALLTHROUGH;
         }
         case SID_EXTRUSION_LIGHTING_INTENSITY:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_BRIGHTNESS;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_BRIGHTNESS;
             SAL_FALLTHROUGH;
         }
         case SID_EXTRUSION_LIGHTING_DIRECTION:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_LIGHTING;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_LIGHTING;
 
             if (pSdrView)
             {
@@ -540,7 +541,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB
                     {
                         if( bUndo )
                         {
-                            OUString aStr( SvxResId( nStrResId ) );
+                            OUString aStr( SvxResId( pStrResId ) );
                             pSdrView->BegUndo( aStr );
                             pSdrView->AddUndo( pSdrView->GetModel()->GetSdrUndoFactory().CreateUndoAttrObject( *pObj ) );
                         }
diff --git a/svx/source/toolbars/extrusionbar.src b/svx/source/toolbars/extrusionbar.src
deleted file mode 100644
index 3401256ad56a..000000000000
--- a/svx/source/toolbars/extrusionbar.src
+++ /dev/null
@@ -1,77 +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>
-
-String RID_SVX_EXTRUSION_BAR
-{
-    Text [ en-US ] = "Extrusion";
-};
-
-String RID_SVXSTR_UNDO_APPLY_EXTRUSION_ON_OFF
-{
-    Text [ en-US ] = "Apply Extrusion On/Off";
-};
-String RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_DOWN
-{
-    Text [ en-US ] = "Tilt Down";
-};
-String RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_UP
-{
-    Text [ en-US ] = "Tilt Up";
-};
-String RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_LEFT
-{
-    Text [ en-US ] = "Tilt Left";
-};
-String RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_RIGHT
-{
-    Text [ en-US ] = "Tilt Right";
-};
-String RID_SVXSTR_UNDO_APPLY_EXTRUSION_DEPTH
-{
-    Text [ en-US ] = "Change Extrusion Depth";
-};
-String RID_SVXSTR_UNDO_APPLY_EXTRUSION_ORIENTATION
-{
-    Text [ en-US ] = "Change Orientation";
-};
-String RID_SVXSTR_UNDO_APPLY_EXTRUSION_PROJECTION
-{
-    Text [ en-US ] = "Change Projection Type";
-};
-String RID_SVXSTR_UNDO_APPLY_EXTRUSION_LIGHTING
-{
-    Text [ en-US ] = "Change Lighting";
-};
-String RID_SVXSTR_UNDO_APPLY_EXTRUSION_BRIGHTNESS
-{
-    Text [ en-US ] = "Change Brightness";
-};
-String RID_SVXSTR_UNDO_APPLY_EXTRUSION_SURFACE
-{
-    Text [ en-US ] = "Change Extrusion Surface";
-};
-String RID_SVXSTR_UNDO_APPLY_EXTRUSION_COLOR
-{
-    Text [ en-US ] = "Change Extrusion Color";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 7919070045e3..b1fd0c339272 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
 #include <svx/dialmgr.hxx>
 #include <svx/svdoashp.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/svdview.hxx>
 #include <svx/sdasitm.hxx>
 #include "svx/gallery.hxx"
@@ -417,7 +417,7 @@ void GetGeometryForCustomShape( SdrCustomShapeGeometryItem& rGeometryItem, const
 
 void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBindings )
 {
-    sal_uInt16 nStrResId = 0;
+    const char* pStrResId = nullptr;
 
     sal_uInt16 nSID = rReq.GetSlot();
     switch( nSID )
@@ -498,26 +498,26 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi
         case SID_FONTWORK_SHAPE:
         case SID_FONTWORK_ALIGNMENT:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_ALIGNMENT;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_ALIGNMENT;
             SAL_FALLTHROUGH;
         }
         case SID_FONTWORK_CHARACTER_SPACING:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING;
             SAL_FALLTHROUGH;
         }
         case SID_FONTWORK_KERN_CHARACTER_PAIRS:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING;
             SAL_FALLTHROUGH;
         }
         case SID_FONTWORK_SAME_LETTER_HEIGHTS:
         {
-            if ( !nStrResId )
-                nStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_SAME_LETTER_HEIGHT;
+            if ( !pStrResId )
+                pStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_SAME_LETTER_HEIGHT;
 
             const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
             const size_t nCount = rMarkList.GetMarkCount();
@@ -529,7 +529,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi
                     const bool bUndo = pSdrView->IsUndoEnabled();
                     if( bUndo )
                     {
-                        OUString aStr( SvxResId( nStrResId ) );
+                        OUString aStr( SvxResId( pStrResId ) );
                         pSdrView->BegUndo( aStr );
                         pSdrView->AddUndo( pSdrView->GetModel()->GetSdrUndoFactory().CreateUndoAttrObject( *pObj ) );
                     }
diff --git a/svx/source/toolbars/fontworkbar.src b/svx/source/toolbars/fontworkbar.src
deleted file mode 100644
index fd64a174bdd9..000000000000
--- a/svx/source/toolbars/fontworkbar.src
+++ /dev/null
@@ -1,47 +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_SVX_FONTWORK_BAR
-{
-    Text [ en-US ] = "Fontwork";
-};
-
-String RID_SVXSTR_UNDO_APPLY_FONTWORK_SHAPE
-{
-    Text [ en-US ] = "Apply Fontwork Shape";
-};
-
-String RID_SVXSTR_UNDO_APPLY_FONTWORK_SAME_LETTER_HEIGHT
-{
-    Text [ en-US ] = "Apply Fontwork Same Letter Heights";
-};
-
-String RID_SVXSTR_UNDO_APPLY_FONTWORK_ALIGNMENT
-{
-    Text [ en-US ] = "Apply Fontwork Alignment";
-};
-
-String RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING
-{
-    Text [ en-US ] = "Apply Fontwork Character Spacing";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index ece9db430bbe..3397653a2a3d 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -33,7 +33,7 @@
 #include <svx/svdoole2.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
-#include <svx/svdstr.hrc>
+#include <svx/strings.hrc>
 #include <svx/svdview.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdundo.hxx>
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index afae4101d256..92d9f1b7ff4c 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -37,7 +37,8 @@
 #include <svx/unoshprp.hxx>
 #include <editeng/editeng.hxx>
 #include "svx/globl3d.hxx"
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include "strings.hxx"
 #include <svx/svdpool.hxx>
 #include <svx/svdobj.hxx>
 
@@ -1038,58 +1039,416 @@ bool SvxFieldUnitToMeasureUnit( const FieldUnit eVcl, short& eApi ) throw()
     return true;
 }
 
-bool SvxUnoGetResourceRanges( const short nWhich, int& nApiResIds, int& nIntResIds, int& nCount ) throw()
+static const char* RID_SVXSTR_BMP_DEF[] =
+{
+    RID_SVXSTR_BMP0_DEF,
+    RID_SVXSTR_BMP1_DEF,
+    RID_SVXSTR_BMP2_DEF,
+    RID_SVXSTR_BMP3_DEF,
+    RID_SVXSTR_BMP4_DEF,
+    RID_SVXSTR_BMP5_DEF,
+    RID_SVXSTR_BMP6_DEF,
+    RID_SVXSTR_BMP7_DEF,
+    RID_SVXSTR_BMP8_DEF,
+    RID_SVXSTR_BMP9_DEF,
+    RID_SVXSTR_BMP10_DEF,
+    RID_SVXSTR_BMP11_DEF,
+    RID_SVXSTR_BMP12_DEF,
+    RID_SVXSTR_BMP13_DEF,
+    RID_SVXSTR_BMP14_DEF,
+    RID_SVXSTR_BMP15_DEF,
+    RID_SVXSTR_BMP16_DEF,
+    RID_SVXSTR_BMP17_DEF,
+    RID_SVXSTR_BMP18_DEF,
+    RID_SVXSTR_BMP19_DEF,
+    RID_SVXSTR_BMP20_DEF,
+    RID_SVXSTR_BMP21_DEF
+};
+
+static const char* RID_SVXSTR_BMP[] =
+{
+    RID_SVXSTR_BMP0,
+    RID_SVXSTR_BMP1,
+    RID_SVXSTR_BMP2,
+    RID_SVXSTR_BMP3,
+    RID_SVXSTR_BMP4,
+    RID_SVXSTR_BMP5,
+    RID_SVXSTR_BMP6,
+    RID_SVXSTR_BMP7,
+    RID_SVXSTR_BMP8,
+    RID_SVXSTR_BMP9,
+    RID_SVXSTR_BMP10,
+    RID_SVXSTR_BMP11,
+    RID_SVXSTR_BMP12,
+    RID_SVXSTR_BMP13,
+    RID_SVXSTR_BMP14,
+    RID_SVXSTR_BMP15,
+    RID_SVXSTR_BMP16,
+    RID_SVXSTR_BMP17,
+    RID_SVXSTR_BMP18,
+    RID_SVXSTR_BMP19,
+    RID_SVXSTR_BMP20,
+    RID_SVXSTR_BMP21
+};
+
+static const char* RID_SVXSTR_DASH_DEF[] =
+{
+    RID_SVXSTR_DASH0_DEF,
+    RID_SVXSTR_DASH1_DEF,
+    RID_SVXSTR_DASH2_DEF,
+    RID_SVXSTR_DASH3_DEF,
+    RID_SVXSTR_DASH4_DEF,
+    RID_SVXSTR_DASH5_DEF,
+    RID_SVXSTR_DASH6_DEF,
+    RID_SVXSTR_DASH7_DEF,
+    RID_SVXSTR_DASH8_DEF,
+    RID_SVXSTR_DASH9_DEF,
+    RID_SVXSTR_DASH10_DEF,
+    RID_SVXSTR_DASH11_DEF,
+    RID_SVXSTR_DASH12_DEF
+};
+
+static const char* RID_SVXSTR_DASH[] =
+{
+    RID_SVXSTR_DASH0,
+    RID_SVXSTR_DASH1,
+    RID_SVXSTR_DASH2,
+    RID_SVXSTR_DASH3,
+    RID_SVXSTR_DASH4,
+    RID_SVXSTR_DASH5,
+    RID_SVXSTR_DASH6,
+    RID_SVXSTR_DASH7,
+    RID_SVXSTR_DASH8,
+    RID_SVXSTR_DASH9,
+    RID_SVXSTR_DASH10,
+    RID_SVXSTR_DASH11,
+    RID_SVXSTR_DASH12
+};
+
+static const char* RID_SVXSTR_LEND_DEF[] =
+{
+    RID_SVXSTR_LEND0_DEF,
+    RID_SVXSTR_LEND1_DEF,
+    RID_SVXSTR_LEND2_DEF,
+    RID_SVXSTR_LEND3_DEF,
+    RID_SVXSTR_LEND4_DEF,
+    RID_SVXSTR_LEND5_DEF,
+    RID_SVXSTR_LEND6_DEF,
+    RID_SVXSTR_LEND7_DEF,
+    RID_SVXSTR_LEND8_DEF,
+    RID_SVXSTR_LEND9_DEF,
+    RID_SVXSTR_LEND10_DEF,
+    RID_SVXSTR_LEND11_DEF,
+    RID_SVXSTR_LEND12_DEF,
+    RID_SVXSTR_LEND13_DEF,
+    RID_SVXSTR_LEND14_DEF,
+    RID_SVXSTR_LEND15_DEF,
+    RID_SVXSTR_LEND16_DEF,
+    RID_SVXSTR_LEND17_DEF,
+    RID_SVXSTR_LEND18_DEF,
+    RID_SVXSTR_LEND19_DEF,
+    RID_SVXSTR_LEND20_DEF
+};
+
+static const char* RID_SVXSTR_LEND[] =
+{
+    RID_SVXSTR_LEND0,
+    RID_SVXSTR_LEND1,
+    RID_SVXSTR_LEND2,
+    RID_SVXSTR_LEND3,
+    RID_SVXSTR_LEND4,
+    RID_SVXSTR_LEND5,
+    RID_SVXSTR_LEND6,
+    RID_SVXSTR_LEND7,
+    RID_SVXSTR_LEND8,
+    RID_SVXSTR_LEND9,
+    RID_SVXSTR_LEND10,
+    RID_SVXSTR_LEND11,
+    RID_SVXSTR_LEND12,
+    RID_SVXSTR_LEND13,
+    RID_SVXSTR_LEND14,
+    RID_SVXSTR_LEND15,
+    RID_SVXSTR_LEND16,
+    RID_SVXSTR_LEND17,
+    RID_SVXSTR_LEND18,
+    RID_SVXSTR_LEND19,
+    RID_SVXSTR_LEND20
+};
+
+static const char* RID_SVXSTR_GRDT_DEF[] =
+{
+    RID_SVXSTR_GRDT0_DEF,
+    RID_SVXSTR_GRDT1_DEF,
+    RID_SVXSTR_GRDT2_DEF,
+    RID_SVXSTR_GRDT3_DEF,
+    RID_SVXSTR_GRDT4_DEF,
+    RID_SVXSTR_GRDT5_DEF,
+    RID_SVXSTR_GRDT6_DEF,
+    RID_SVXSTR_GRDT7_DEF,
+    RID_SVXSTR_GRDT8_DEF,
+    RID_SVXSTR_GRDT9_DEF,
+    RID_SVXSTR_GRDT10_DEF,
+    RID_SVXSTR_GRDT11_DEF,
+    RID_SVXSTR_GRDT12_DEF,
+    RID_SVXSTR_GRDT13_DEF,
+    RID_SVXSTR_GRDT14_DEF,
+    RID_SVXSTR_GRDT15_DEF,
+    RID_SVXSTR_GRDT16_DEF,
+    RID_SVXSTR_GRDT17_DEF,
+    RID_SVXSTR_GRDT18_DEF,
+    RID_SVXSTR_GRDT19_DEF,
+    RID_SVXSTR_GRDT20_DEF,
+    RID_SVXSTR_GRDT21_DEF,
+    RID_SVXSTR_GRDT22_DEF,
+    RID_SVXSTR_GRDT23_DEF,
+    RID_SVXSTR_GRDT24_DEF,
+    RID_SVXSTR_GRDT25_DEF,
+    RID_SVXSTR_GRDT26_DEF,
+    RID_SVXSTR_GRDT27_DEF,
+    RID_SVXSTR_GRDT28_DEF,
+    RID_SVXSTR_GRDT29_DEF,
+    RID_SVXSTR_GRDT30_DEF,
+    RID_SVXSTR_GRDT31_DEF,
+    RID_SVXSTR_GRDT32_DEF,
+    RID_SVXSTR_GRDT33_DEF,
+    RID_SVXSTR_GRDT34_DEF,
+    RID_SVXSTR_GRDT35_DEF,
+    RID_SVXSTR_GRDT36_DEF,
+    RID_SVXSTR_GRDT37_DEF,
+    RID_SVXSTR_GRDT38_DEF,
+    RID_SVXSTR_GRDT39_DEF,
+    RID_SVXSTR_GRDT40_DEF,
+    RID_SVXSTR_GRDT41_DEF,
+    RID_SVXSTR_GRDT42_DEF,
+    RID_SVXSTR_GRDT43_DEF,
+    RID_SVXSTR_GRDT44_DEF,
+    RID_SVXSTR_GRDT45_DEF,
+    RID_SVXSTR_GRDT46_DEF,
+    RID_SVXSTR_GRDT47_DEF,
+    RID_SVXSTR_GRDT48_DEF,
+    RID_SVXSTR_GRDT49_DEF,
+    RID_SVXSTR_GRDT50_DEF,
+    RID_SVXSTR_GRDT51_DEF,
+    RID_SVXSTR_GRDT52_DEF,
+    RID_SVXSTR_GRDT53_DEF,
+    RID_SVXSTR_GRDT54_DEF,
+    RID_SVXSTR_GRDT55_DEF,
+    RID_SVXSTR_GRDT56_DEF,
+    RID_SVXSTR_GRDT57_DEF,
+    RID_SVXSTR_GRDT58_DEF,
+    RID_SVXSTR_GRDT59_DEF,
+    RID_SVXSTR_GRDT60_DEF,
+    RID_SVXSTR_GRDT61_DEF,
+    RID_SVXSTR_GRDT62_DEF,
+    RID_SVXSTR_GRDT63_DEF,
+    RID_SVXSTR_GRDT64_DEF,
+    RID_SVXSTR_GRDT65_DEF,
+    RID_SVXSTR_GRDT66_DEF,
+    RID_SVXSTR_GRDT67_DEF,
+    RID_SVXSTR_GRDT68_DEF,
+    RID_SVXSTR_GRDT69_DEF,
+    RID_SVXSTR_GRDT70_DEF,
+    RID_SVXSTR_GRDT71_DEF,
+    RID_SVXSTR_GRDT72_DEF,
+    RID_SVXSTR_GRDT73_DEF,
+    RID_SVXSTR_GRDT74_DEF,
+    RID_SVXSTR_GRDT75_DEF,
+    RID_SVXSTR_GRDT76_DEF,
+    RID_SVXSTR_GRDT77_DEF,
+    RID_SVXSTR_GRDT78_DEF,
+    RID_SVXSTR_GRDT79_DEF,
+    RID_SVXSTR_GRDT80_DEF,
+    RID_SVXSTR_GRDT81_DEF,
+    RID_SVXSTR_GRDT82_DEF,
+    RID_SVXSTR_GRDT83_DEF,
+    RID_SVXSTR_GRDT84_DEF,
+    RID_SVXSTR_GRDT85_DEF,
+    RID_SVXSTR_GRDT86_DEF,
+    RID_SVXSTR_GRDT87_DEF
+};
+
+static const char* RID_SVXSTR_GRDT[] =
+{
+    RID_SVXSTR_GRDT0,
+    RID_SVXSTR_GRDT1,
+    RID_SVXSTR_GRDT2,
+    RID_SVXSTR_GRDT3,
+    RID_SVXSTR_GRDT4,
+    RID_SVXSTR_GRDT5,
+    RID_SVXSTR_GRDT6,
+    RID_SVXSTR_GRDT7,
+    RID_SVXSTR_GRDT8,
+    RID_SVXSTR_GRDT9,
+    RID_SVXSTR_GRDT10,
+    RID_SVXSTR_GRDT11,
+    RID_SVXSTR_GRDT12,
+    RID_SVXSTR_GRDT13,
+    RID_SVXSTR_GRDT14,
+    RID_SVXSTR_GRDT15,
+    RID_SVXSTR_GRDT16,
+    RID_SVXSTR_GRDT17,
+    RID_SVXSTR_GRDT18,
+    RID_SVXSTR_GRDT19,
+    RID_SVXSTR_GRDT20,
+    RID_SVXSTR_GRDT21,
+    RID_SVXSTR_GRDT22,
+    RID_SVXSTR_GRDT23,
+    RID_SVXSTR_GRDT24,
+    RID_SVXSTR_GRDT25,
+    RID_SVXSTR_GRDT26,
+    RID_SVXSTR_GRDT27,
+    RID_SVXSTR_GRDT28,
+    RID_SVXSTR_GRDT29,
+    RID_SVXSTR_GRDT30,
+    RID_SVXSTR_GRDT31,
+    RID_SVXSTR_GRDT32,
+    RID_SVXSTR_GRDT33,
+    RID_SVXSTR_GRDT34,
+    RID_SVXSTR_GRDT35,
+    RID_SVXSTR_GRDT36,
+    RID_SVXSTR_GRDT37,
+    RID_SVXSTR_GRDT38,
+    RID_SVXSTR_GRDT39,
+    RID_SVXSTR_GRDT40,
+    RID_SVXSTR_GRDT41,
+    RID_SVXSTR_GRDT42,
+    RID_SVXSTR_GRDT43,
+    RID_SVXSTR_GRDT44,
+    RID_SVXSTR_GRDT45,
+    RID_SVXSTR_GRDT46,
+    RID_SVXSTR_GRDT47,
+    RID_SVXSTR_GRDT48,
+    RID_SVXSTR_GRDT49,
+    RID_SVXSTR_GRDT50,
+    RID_SVXSTR_GRDT51,
+    RID_SVXSTR_GRDT52,
+    RID_SVXSTR_GRDT53,
+    RID_SVXSTR_GRDT54,
+    RID_SVXSTR_GRDT55,
+    RID_SVXSTR_GRDT56,
+    RID_SVXSTR_GRDT57,
+    RID_SVXSTR_GRDT58,
+    RID_SVXSTR_GRDT59,
+    RID_SVXSTR_GRDT60,
+    RID_SVXSTR_GRDT61,
+    RID_SVXSTR_GRDT62,
+    RID_SVXSTR_GRDT63,
+    RID_SVXSTR_GRDT64,
+    RID_SVXSTR_GRDT65,
+    RID_SVXSTR_GRDT66,
+    RID_SVXSTR_GRDT67,
+    RID_SVXSTR_GRDT68,
+    RID_SVXSTR_GRDT69,
+    RID_SVXSTR_GRDT70,
+    RID_SVXSTR_GRDT71,
+    RID_SVXSTR_GRDT72,
+    RID_SVXSTR_GRDT73,
+    RID_SVXSTR_GRDT74,
+    RID_SVXSTR_GRDT75,
+    RID_SVXSTR_GRDT76,
+    RID_SVXSTR_GRDT77,
+    RID_SVXSTR_GRDT78,
+    RID_SVXSTR_GRDT79,
+    RID_SVXSTR_GRDT80,
+    RID_SVXSTR_GRDT81,
+    RID_SVXSTR_GRDT82,
+    RID_SVXSTR_GRDT83,
+    RID_SVXSTR_GRDT84,
+    RID_SVXSTR_GRDT85,
+    RID_SVXSTR_GRDT86,
+    RID_SVXSTR_GRDT87
+};
+
+static const char* RID_SVXSTR_HATCHS_DEF[] =
+{
+    RID_SVXSTR_HATCH0_DEF,
+    RID_SVXSTR_HATCH1_DEF,
+    RID_SVXSTR_HATCH2_DEF,
+    RID_SVXSTR_HATCH3_DEF,
+    RID_SVXSTR_HATCH4_DEF,
+    RID_SVXSTR_HATCH5_DEF,
+    RID_SVXSTR_HATCH6_DEF,
+    RID_SVXSTR_HATCH7_DEF,
+    RID_SVXSTR_HATCH8_DEF,
+    RID_SVXSTR_HATCH9_DEF,
+    RID_SVXSTR_HATCH10_DEF
+};
+
+static const char* RID_SVXSTR_HATCHS[] =
+{
+    RID_SVXSTR_HATCH0,
+    RID_SVXSTR_HATCH1,
+    RID_SVXSTR_HATCH2,
+    RID_SVXSTR_HATCH3,
+    RID_SVXSTR_HATCH4,
+    RID_SVXSTR_HATCH5,
+    RID_SVXSTR_HATCH6,
+    RID_SVXSTR_HATCH7,
+    RID_SVXSTR_HATCH8,
+    RID_SVXSTR_HATCH9,
+    RID_SVXSTR_HATCH10
+};
+
+static const char* RID_SVXSTR_TRASNGR_DEF[] =
+{
+    RID_SVXSTR_TRASNGR0_DEF
+};
+
+static const char* RID_SVXSTR_TRASNGR[] =
+{
+    RID_SVXSTR_TRASNGR0
+};
+
+bool SvxUnoGetResourceRanges( const short nWhich, const char**& pApiResIds, const char**& pIntResIds, int& nCount ) throw()
 {
     switch( nWhich )
     {
     case XATTR_FILLBITMAP:
-        nApiResIds = RID_SVXSTR_BMP_DEF_START;
-        nIntResIds = RID_SVXSTR_BMP_START;
-        nCount = RID_SVXSTR_BMP_DEF_END - RID_SVXSTR_BMP_DEF_START + 1;
+        pApiResIds = RID_SVXSTR_BMP_DEF;
+        pIntResIds = RID_SVXSTR_BMP;
+        nCount = SAL_N_ELEMENTS(RID_SVXSTR_BMP_DEF);
         break;
-
     case XATTR_LINEDASH:
-        nApiResIds = RID_SVXSTR_DASH_DEF_START;
-        nIntResIds = RID_SVXSTR_DASH_START;
-        nCount = RID_SVXSTR_DASH_DEF_END - RID_SVXSTR_DASH_DEF_START + 1;
+        pApiResIds = RID_SVXSTR_DASH_DEF;
+        pIntResIds = RID_SVXSTR_DASH;
+        nCount = SAL_N_ELEMENTS(RID_SVXSTR_DASH_DEF);
         break;
 
     case XATTR_LINESTART:
     case XATTR_LINEEND:
-        nApiResIds = RID_SVXSTR_LEND_DEF_START;
-        nIntResIds = RID_SVXSTR_LEND_START;
-        nCount = RID_SVXSTR_LEND_DEF_END - RID_SVXSTR_LEND_DEF_START + 1;
+        pApiResIds = RID_SVXSTR_LEND_DEF;
+        pIntResIds = RID_SVXSTR_LEND;
+        nCount = SAL_N_ELEMENTS(RID_SVXSTR_LEND_DEF);
         break;
 
     case XATTR_FILLGRADIENT:
-        nApiResIds = RID_SVXSTR_GRDT_DEF_START;
-        nIntResIds = RID_SVXSTR_GRDT_START;
-        nCount = RID_SVXSTR_GRDT_DEF_END - RID_SVXSTR_GRDT_DEF_START + 1;
+        pApiResIds = RID_SVXSTR_GRDT_DEF;
+        pIntResIds = RID_SVXSTR_GRDT;
+        nCount = SAL_N_ELEMENTS(RID_SVXSTR_GRDT_DEF);
         break;
 
     case XATTR_FILLHATCH:
-        nApiResIds = RID_SVXSTR_HATCH_DEF_START;
-        nIntResIds = RID_SVXSTR_HATCH_START;
-        nCount = RID_SVXSTR_HATCH_DEF_END - RID_SVXSTR_HATCH_DEF_START + 1;
+        pApiResIds = RID_SVXSTR_HATCHS_DEF;
+        pIntResIds = RID_SVXSTR_HATCHS;
+        nCount = SAL_N_ELEMENTS(RID_SVXSTR_HATCHS_DEF);
         break;
 
     case XATTR_FILLFLOATTRANSPARENCE:
-        nApiResIds = RID_SVXSTR_TRASNGR_DEF_START;
-        nIntResIds = RID_SVXSTR_TRASNGR_START;
-        nCount = RID_SVXSTR_TRASNGR_DEF_END - RID_SVXSTR_TRASNGR_DEF_START + 1;
+        pApiResIds = RID_SVXSTR_TRASNGR_DEF;
+        pIntResIds = RID_SVXSTR_TRASNGR;
+        nCount = SAL_N_ELEMENTS(RID_SVXSTR_TRASNGR_DEF);
         break;
 
     default:
         return false;
     }
-
     return true;
 }
 
 /// @throws std::exception
-bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount, OUString& rString )
+bool SvxUnoConvertResourceString(const char **pSourceResIds, const char** pDestResIds, int nCount, OUString& rString, bool bToApi)
 {
-    // first, calculate the search string length without an optional number behind the name
+    // first, calculate the search string length without an optional number after the name
     sal_Int32 nLength = rString.getLength();
     while( nLength > 0 )
     {
@@ -1115,21 +1474,17 @@ bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount
 
     const OUString aShortString( rString.copy( 0, nLength ) );
 
-    int i;
-    for( i = 0; i < nCount; i++ )
+    for (int i = 0; i < nCount; ++i)
     {
-        sal_uInt16 nResId = (sal_uInt16)(nSourceResIds + i);
-        const OUString aCompare(SvxResId(nResId));
+        const OUString aCompare = bToApi ? SvxResId(pSourceResIds[i]) : OUString::createFromAscii(pSourceResIds[i]);
         if( aShortString == aCompare )
         {
-            sal_uInt16 nNewResId = (sal_uInt16)(nDestResIds + i);
-            rString = rString.replaceAt( 0, aShortString.getLength(), SvxResId( nNewResId ) );
+            rString = rString.replaceAt( 0, aShortString.getLength(), bToApi ? OUString::createFromAscii(pDestResIds[i]) : SvxResId(pDestResIds[i]) );
             return true;
         }
         else if( rString == aCompare )
         {
-            sal_uInt16 nNewResId = (sal_uInt16)(nDestResIds + i);
-            rString = SvxResId(nNewResId);
+            rString = bToApi ? OUString::createFromAscii(pDestResIds[i]) : SvxResId(pDestResIds[i]);
             return true;
         }
     }
@@ -1149,7 +1504,7 @@ bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount
 //   the possibility to define it wrong
 // - change the compare to also work when a shorter name is in front of a longer one
 
-static const sal_uInt16 SvxUnoColorNameDefResId[] =
+static const char* SvxUnoColorNameDefResId[] =
 {
     RID_SVXSTR_COLOR_BLUEGREY_DEF,
     RID_SVXSTR_COLOR_BLACK_DEF,
@@ -1193,7 +1548,7 @@ static const sal_uInt16 SvxUnoColorNameDefResId[] =
     RID_SVXSTR_COLOR_TANGO_ALUMINIUM_DEF
 };
 
-static const sal_uInt16 SvxUnoColorNameResId[] =
+static const char* SvxUnoColorNameResId[] =
 {
     RID_SVXSTR_COLOR_BLUEGREY,
     RID_SVXSTR_COLOR_BLACK,
@@ -1238,7 +1593,7 @@ static const sal_uInt16 SvxUnoColorNameResId[] =
 };
 
 /// @throws std::exception
-bool SvxUnoConvertResourceString( const sal_uInt16* pSourceResIds, const sal_uInt16* pDestResIds, int nCount, OUString& rString )
+bool SvxUnoConvertResourceStringBuiltIn(const char** pSourceResIds, const char** pDestResIds, int nCount, OUString& rString, bool bToApi)
 {
     //We replace e.g. "Gray 10%" with the translation of Gray, but we shouldn't
     //replace "Red Hat 1" with the translation of Red :-)
@@ -1254,10 +1609,10 @@ bool SvxUnoConvertResourceString( const sal_uInt16* pSourceResIds, const sal_uIn
 
     for(int i = 0; i < nCount; ++i )
     {
-        OUString aStrDefName = SvxResId( pSourceResIds[i] );
+        OUString aStrDefName = bToApi ? SvxResId(pSourceResIds[i]) : OUString::createFromAscii(pSourceResIds[i]);
         if( sStr == aStrDefName )
         {
-            OUString aReplace = SvxResId( pDestResIds[i] );
+            OUString aReplace = bToApi ? OUString::createFromAscii(pDestResIds[i]) : SvxResId(pDestResIds[i]);
             rString = rString.replaceAt( 0, aStrDefName.getLength(), aReplace );
             return true;
         }
@@ -1275,20 +1630,20 @@ OUString SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rIntern
 
     if( nWhich == XATTR_LINECOLOR )
     {
-        if( SvxUnoConvertResourceString( SvxUnoColorNameResId, SvxUnoColorNameDefResId, SAL_N_ELEMENTS( SvxUnoColorNameResId ), aNew ) )
+        if (SvxUnoConvertResourceStringBuiltIn(SvxUnoColorNameResId, SvxUnoColorNameDefResId, SAL_N_ELEMENTS(SvxUnoColorNameResId), aNew, true))
         {
             return aNew;
         }
     }
     else
     {
-        int nApiResIds;
-        int nIntResIds;
+        const char** pApiResIds;
+        const char** pIntResIds;
         int nCount;
 
-        if( SvxUnoGetResourceRanges( nWhich, nApiResIds, nIntResIds, nCount ) )
+        if( SvxUnoGetResourceRanges(nWhich, pApiResIds, pIntResIds, nCount))
         {
-            if(SvxUnoConvertResourceString( nIntResIds, nApiResIds, nCount, aNew ) )
+            if (SvxUnoConvertResourceString(pIntResIds, pApiResIds, nCount, aNew, true))
             {
                 return aNew;
             }
@@ -1308,20 +1663,20 @@ OUString SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rA
 
     if( nWhich == XATTR_LINECOLOR )
     {
-        if( SvxUnoConvertResourceString( SvxUnoColorNameDefResId, SvxUnoColorNameResId, SAL_N_ELEMENTS( SvxUnoColorNameResId ), aNew ) )
+        if (SvxUnoConvertResourceStringBuiltIn(SvxUnoColorNameDefResId, SvxUnoColorNameResId, SAL_N_ELEMENTS(SvxUnoColorNameResId), aNew, false))
         {
             return aNew;
         }
     }
     else
     {
-        int nApiResIds;
-        int nIntResIds;
+        const char** pApiResIds;
+        const char** pIntResIds;
         int nCount;
 
-        if( SvxUnoGetResourceRanges( nWhich, nApiResIds, nIntResIds, nCount ) )
+        if (SvxUnoGetResourceRanges(nWhich, pApiResIds, pIntResIds, nCount))
         {
-            if(SvxUnoConvertResourceString( nApiResIds, nIntResIds, nCount, aNew ) )
+            if (SvxUnoConvertResourceString(pApiResIds, pIntResIds, nCount, aNew, false))
             {
                 return aNew;
             }
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 96184b68e8f1..3f309e678b82 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -50,7 +50,7 @@
 #include "svx/svdpagv.hxx"
 #include "svx/svdview.hxx"
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include <vcl/wmf.hxx>
 #include <svtools/embedhlp.hxx>
 
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 42b0f4b16463..9f49e7a6a0b3 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -67,7 +67,7 @@
 #include "svx/svdpool.hxx"
 #include <tools/gen.hxx>
 #include "svx/dialmgr.hxx"
-#include "svx/dialogs.hrc"
+#include "svx/strings.hrc"
 #include "svx/svdocapt.hxx"
 #include <svx/obj3d.hxx>
 #include <tools/diagnose_ex.h>
@@ -78,7 +78,7 @@
 #include "svx/xflhtit.hxx"
 #include "svx/xlndsit.hxx"
 #include "svdglob.hxx"
-#include "svx/svdstr.hrc"
+#include "svx/strings.hrc"
 #include "svx/unomaster.hxx"
 #include <editeng/outlobj.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 92ba35b7c1d6..57c28add93c7 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -44,8 +44,8 @@
 
 #include <tools/bigint.hxx>
 #include <svl/itemset.hxx>
-#include <svx/dialogs.hrc>
-#include "svx/svdstr.hrc"
+#include <svx/strings.hrc>
+#include "svx/strings.hrc"
 #include "svx/xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/dialmgr.hxx>
@@ -136,7 +136,7 @@ SvStream& NameOrIndex::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
     Argument pPool2 can be null.
     If returned string equals NameOrIndex->GetName(), the name was already unique.
 */
-OUString NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* /*pPool2*/, SvxCompareValueFunc pCompareValueFunc, sal_uInt16 nPrefixResId, const XPropertyListRef &pDefaults )
+OUString NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* /*pPool2*/, SvxCompareValueFunc pCompareValueFunc, const char* pPrefixResId, const XPropertyListRef &pDefaults )
 {
     bool bForceNew = false;
 
@@ -173,7 +173,7 @@ OUString NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_u
     if (aUniqueName.isEmpty())
     {
         sal_Int32 nUserIndex = 1;
-        OUString aUser(SvxResId(nPrefixResId));
+        OUString aUser(SvxResId(pPrefixResId));
         aUser += " ";
 
         if( pDefaults.get() )
@@ -392,21 +392,21 @@ bool XLineStyleItem::GetPresentation
 {
     rText.clear();
 
-    sal_uInt16 nId = 0;
+    const char* pId = nullptr;
 
     switch( GetValue() )
     {
         case css::drawing::LineStyle_NONE:
-            nId = RID_SVXSTR_INVISIBLE;
+            pId = RID_SVXSTR_INVISIBLE;
             break;
         case css::drawing::LineStyle_SOLID:
-            nId = RID_SVXSTR_SOLID;
+            pId = RID_SVXSTR_SOLID;
             break;
         default: break;
     }
 
-    if ( nId )
-        rText = SvxResId( nId );
+    if (pId)
+        rText = SvxResId(pId);
     return true;
 }
 
@@ -1049,7 +1049,7 @@ bool XLineWidthItem::GetPresentation
 {
     rText = GetMetricText( (long) GetValue(),
                             eCoreUnit, ePresUnit, pIntl) +
-            " " + EditResId::GetString( GetMetricId( ePresUnit) );
+            " " + EditResId( GetMetricId( ePresUnit) );
     return true;
 }
 
@@ -1938,7 +1938,7 @@ bool XLineStartWidthItem::GetPresentation
 {
     rText = GetMetricText( (long) GetValue(),
                             eCoreUnit, ePresUnit, pIntl) +
-            " " + EditResId::GetString( GetMetricId( ePresUnit) );
+            " " + EditResId( GetMetricId( ePresUnit) );
     return true;
 }
 
@@ -1986,7 +1986,7 @@ bool XLineEndWidthItem::GetPresentation
 {
     rText = GetMetricText( (long) GetValue(),
                             eCoreUnit, ePresUnit, pIntl) +
-            " " + EditResId::GetString( GetMetricId( ePresUnit) );
+            " " + EditResId( GetMetricId( ePresUnit) );
     return true;
 }
 
@@ -2032,8 +2032,7 @@ bool XLineStartCenterItem::GetPresentation
     OUString&           rText, const IntlWrapper *
 )   const
 {
-    rText = OUString( ResId( GetValue() ? RID_SVXSTR_CENTERED :
-                    RID_SVXSTR_NOTCENTERED, DIALOG_MGR() ) );
+    rText = SvxResId(GetValue() ? RID_SVXSTR_CENTERED : RID_SVXSTR_NOTCENTERED);
     return true;
 }
 
@@ -2082,8 +2081,7 @@ bool XLineEndCenterItem::GetPresentation
     OUString&           rText, const IntlWrapper *
 )   const
 {
-    rText = OUString( ResId( GetValue() ? RID_SVXSTR_CENTERED :
-                    RID_SVXSTR_NOTCENTERED, DIALOG_MGR() ) );
+    rText = SvxResId(GetValue() ? RID_SVXSTR_CENTERED : RID_SVXSTR_NOTCENTERED);
     return true;
 }
 
@@ -2139,30 +2137,30 @@ bool XFillStyleItem::GetPresentation
 {
     rText.clear();
 
-    sal_uInt16 nId = 0;
+    const char* pId = nullptr;
 
     switch( GetValue() )
     {
         case drawing::FillStyle_NONE:
-            nId = RID_SVXSTR_INVISIBLE;
+            pId = RID_SVXSTR_INVISIBLE;
             break;
         case drawing::FillStyle_SOLID:
-            nId = RID_SVXSTR_SOLID;
+            pId = RID_SVXSTR_SOLID;
             break;
         case drawing::FillStyle_GRADIENT:
-            nId = RID_SVXSTR_GRADIENT;
+            pId = RID_SVXSTR_GRADIENT;
             break;
         case drawing::FillStyle_HATCH:
-            nId = RID_SVXSTR_HATCH;
+            pId = RID_SVXSTR_HATCH;
             break;
         case drawing::FillStyle_BITMAP:
-            nId = RID_SVXSTR_BITMAP;
+            pId = RID_SVXSTR_BITMAP;
             break;
         default: break;
     }
 
-    if ( nId )
-        rText = SvxResId( nId );
+    if (pId)
+        rText = SvxResId(pId);
     return true;
 }
 
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index e8338699f6e5..8bd12e6682df 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -22,7 +22,8 @@
 #include <com/sun/star/uno/Any.hxx>
 
 #include <i18nutil/unicode.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/svxids.hrc>
 #include "svx/xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/dialmgr.hxx>
@@ -116,37 +117,37 @@ bool XLineJointItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*e
 {
     rText.clear();
 
-    sal_uInt16 nId = 0;
+    const char* pId = nullptr;
 
     switch( GetValue() )
     {
         case css::drawing::LineJoint::LineJoint_MAKE_FIXED_SIZE:
         case css::drawing::LineJoint_NONE:
-            nId = RID_SVXSTR_LINEJOINT_NONE;
+            pId = RID_SVXSTR_NONE;
         break;
 
         case css::drawing::LineJoint_MIDDLE:
-            nId = RID_SVXSTR_LINEJOINT_MIDDLE;
+            pId = RID_SVXSTR_LINEJOINT_MIDDLE;
         break;
 
 
         case css::drawing::LineJoint_BEVEL:
-            nId = RID_SVXSTR_LINEJOINT_BEVEL;
+            pId = RID_SVXSTR_LINEJOINT_BEVEL;
         break;
 
 
         case css::drawing::LineJoint_MITER:
-            nId = RID_SVXSTR_LINEJOINT_MITER;
+            pId = RID_SVXSTR_LINEJOINT_MITER;
         break;
 
 
         case css::drawing::LineJoint_ROUND:
-            nId = RID_SVXSTR_LINEJOINT_ROUND;
+            pId = RID_SVXSTR_LINEJOINT_ROUND;
         break;
     }
 
-    if( nId )
-        rText = SvxResId( nId );
+    if (pId)
+        rText = SvxResId(pId);
 
     return true;
 }
@@ -320,25 +321,25 @@ bool XLineCapItem::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCo
 {
     rText.clear();
 
-    sal_uInt16 nId = 0;
+    const char* pId = nullptr;
 
     switch( GetValue() )
     {
         default: /*css::drawing::LineCap_BUTT*/
-            nId = RID_SVXSTR_LINECAP_BUTT;
+            pId = RID_SVXSTR_LINECAP_BUTT;
         break;
 
         case(css::drawing::LineCap_ROUND):
-            nId = RID_SVXSTR_LINECAP_ROUND;
+            pId = RID_SVXSTR_LINECAP_ROUND;
         break;
 
         case(css::drawing::LineCap_SQUARE):
-            nId = RID_SVXSTR_LINECAP_SQUARE;
+            pId = RID_SVXSTR_LINECAP_SQUARE;
         break;
     }
 
-    if( nId )
-        rText = SvxResId( nId );
+    if (pId)
+        rText = SvxResId(pId);
 
     return true;
 }
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index bba8961f8b28..9185378d5a24 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -26,7 +26,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <svl/style.hxx>
 #include <editeng/memberids.hrc>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include "svx/xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/xdef.hxx>
diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx
index 856d52a0f406..735009e07e48 100644
--- a/svx/source/xoutdev/xtabbtmp.cxx
+++ b/svx/source/xoutdev/xtabbtmp.cxx
@@ -22,7 +22,7 @@
 #include <vcl/virdev.hxx>
 #include <svl/itemset.hxx>
 #include <sfx2/docfile.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/xtable.hxx>
 #include <svx/xpool.hxx>
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index cb83d76a9dbe..e1c001dab4de 100644
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -21,7 +21,7 @@
 #include "svx/XPropertyTable.hxx"
 #include <unotools/pathoptions.hxx>
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/xtable.hxx>
 #include <svx/xpool.hxx>
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index 19c7cce2b1e0..eaa36a6cae82 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -23,7 +23,7 @@
 #include <vcl/settings.hxx>
 
 #include <vcl/virdev.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/xtable.hxx>
 
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index fc5518f4a3bc..33d02eb45aa6 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -20,7 +20,7 @@
 #include "svx/XPropertyTable.hxx"
 
 #include <vcl/virdev.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/xtable.hxx>
 
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index 3979c8ce8ebb..c336e46e33d9 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -22,7 +22,7 @@
 
 #include <vcl/virdev.hxx>
 #include <vcl/settings.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/xpool.hxx>
 
diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx
index f14cc81b565f..04ad8fff02eb 100644
--- a/svx/source/xoutdev/xtablend.cxx
+++ b/svx/source/xoutdev/xtablend.cxx
@@ -23,7 +23,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 
 #include <svx/xtable.hxx>
diff --git a/svx/source/xoutdev/xtabptrn.cxx b/svx/source/xoutdev/xtabptrn.cxx
index 12cb480e4f7c..5fcc3afebef0 100644
--- a/svx/source/xoutdev/xtabptrn.cxx
+++ b/svx/source/xoutdev/xtabptrn.cxx
@@ -22,7 +22,7 @@
 #include <vcl/virdev.hxx>
 #include <svl/itemset.hxx>
 #include <sfx2/docfile.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/xtable.hxx>
 #include <svx/xpool.hxx>
author	Caolán McNamara <caolanm@redhat.com>	2017-06-11 20:56:30 +0100
committer	Caolán McNamara <caolanm@redhat.com>	2017-07-21 08:20:50 +0100
commit	00657aef09d854c74fb426a935a3e8b1fc390bb0 (patch)
tree	fd1a9bb264fe15dcc129498e62060ecd256b1ee7 /svx/source
parent	fa987cbb813cfd729fe490f2f1258b7c8d7fb174 (diff)