Pass context and resource string down to boost::locale separately

because this is often on a hot path, and we can avoid the splitting and
joining of strings like this.

Change-Id: Ia36047209368ca53431178c2e8723a18cfe8260a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119220
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

10 files changed, 60 insertions, 59 deletions

diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx
index 249af40b1461..9f8849da4b82 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -22,6 +22,7 @@
 #include <sfx2/dockwin.hxx>
 #include <vcl/customweld.hxx>
 #include <vcl/weld.hxx>
+#include <unotools/resmgr.hxx>
 
 #include "parse.hxx"
 #include "AccessibleSmElementsControl.hxx"
@@ -56,7 +57,7 @@ public:
     bool isSeparator() const override { return true; }
 };
 
-typedef std::pair<const char*, const char*> SmElementDescr;
+typedef std::pair<const char*, TranslateId> SmElementDescr;
 
 class SmElementsControl : public weld::CustomWidgetController
 {
@@ -74,7 +75,7 @@ class SmElementsControl : public weld::CustomWidgetController
     static const SmElementDescr m_a5FormatsList[];
     static const SmElementDescr m_a5OthersList[];
     static const SmElementDescr m_a5ExamplesList[];
-    static const std::tuple<const char*, const SmElementDescr*, size_t> m_a5Categories[];
+    static const std::tuple<TranslateId, const SmElementDescr*, size_t> m_a5Categories[];
     static const size_t m_a5CategoriesSize;
 
     // SmParser 6 elements
@@ -96,7 +97,7 @@ class SmElementsControl : public weld::CustomWidgetController
 
     SmDocShell*   mpDocShell;
     SmFormat      maFormat;
-    OString       msCurrentSetId;
+    TranslateId   msCurrentSetId;
     sal_uInt16    m_nCurrentElement;
     sal_uInt16    m_nCurrentRolloverElement;
     sal_uInt16    m_nCurrentOffset;
@@ -133,8 +134,8 @@ public:
 
     static const auto& categories() { return m_a5Categories; }
     static size_t categoriesSize() { return m_a5CategoriesSize; }
-    const OString& elementSetId() const { return msCurrentSetId; }
-    void setElementSetId(const char* pSetId);
+    const TranslateId& elementSetId() const { return msCurrentSetId; }
+    void setElementSetId(TranslateId pSetId);
 
     void setVerticalMode(bool bVertical);
 
diff --git a/starmath/inc/parsebase.hxx b/starmath/inc/parsebase.hxx
index c8507db1dbbb..d655e7615096 100644
--- a/starmath/inc/parsebase.hxx
+++ b/starmath/inc/parsebase.hxx
@@ -24,6 +24,7 @@
 #pragma once
 
 #include <unotools/charclass.hxx>
+#include <unotools/resmgr.hxx>
 
 #include "node.hxx"
 
@@ -83,7 +84,7 @@ public:
 namespace starmathdatabase
 {
 // Must be in sync with SmParseError list
-extern const char* SmParseErrorDesc[16];
+extern const TranslateId SmParseErrorDesc[16];
 
 OUString getParseErrorDesc(SmParseError err);
 }
diff --git a/starmath/inc/smmod.hrc b/starmath/inc/smmod.hrc
index d581961ce2b4..69c7affb7acd 100644
--- a/starmath/inc/smmod.hrc
+++ b/starmath/inc/smmod.hrc
@@ -9,15 +9,15 @@
 
 #pragma once
 
-#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
+#define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String))
 
-const char* RID_UI_SYMBOLSET_NAMES[] =
+const TranslateId RID_UI_SYMBOLSET_NAMES[] =
 {
     NC_("RID_UI_SYMBOLSET_NAMES", "Greek"),
     NC_("RID_UI_SYMBOLSET_NAMES", "Special")
 };
 
-const char* RID_UI_SYMBOL_NAMES[] =
+const TranslateId RID_UI_SYMBOL_NAMES[] =
 {
     NC_("RID_UI_SYMBOL_NAMES", "alpha"),
     NC_("RID_UI_SYMBOL_NAMES", "ALPHA"),
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index ca1fbb7c93e2..b968f9092124 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -46,7 +46,7 @@ class SvtSysLocale;
 class VirtualDevice;
 
 
-OUString SmResId(std::string_view aId);
+OUString SmResId(TranslateId aId);
 
 class SmLocalizedSymbolData
 {
diff --git a/starmath/inc/strings.hrc b/starmath/inc/strings.hrc
index 85451b612aa3..963b182c211c 100644
--- a/starmath/inc/strings.hrc
+++ b/starmath/inc/strings.hrc
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
+#define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String))
 
 // clang-format off
 #define RID_PLUSX_HELP                      NC_("RID_PLUSX_HELP", "+ Sign" )
diff --git a/starmath/source/AccessibleSmElementsControl.cxx b/starmath/source/AccessibleSmElementsControl.cxx
index 922c8097fd6a..1017d8468686 100644
--- a/starmath/source/AccessibleSmElementsControl.cxx
+++ b/starmath/source/AccessibleSmElementsControl.cxx
@@ -235,8 +235,8 @@ OUString AccessibleSmElementsControl::getAccessibleName()
 {
     SolarMutexGuard aGuard;
     OUString aName;
-    if (m_pControl)
-        aName = SmResId(m_pControl->elementSetId().getStr());
+    if (m_pControl && m_pControl->elementSetId())
+        aName = SmResId(m_pControl->elementSetId());
     return aName;
 }
 
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index cd03a7f7d338..278b2287b40b 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -56,7 +56,7 @@ const SmElementDescr SmElementsControl::m_a5UnaryBinaryOperatorsList[] =
 {
     {RID_PLUSX, RID_PLUSX_HELP}, {RID_MINUSX, RID_MINUSX_HELP},
     {RID_PLUSMINUSX, RID_PLUSMINUSX_HELP}, {RID_MINUSPLUSX, RID_MINUSPLUSX_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_XPLUSY, RID_XPLUSY_HELP}, {RID_XMINUSY, RID_XMINUSY_HELP},
     {RID_XCDOTY, RID_XCDOTY_HELP}, {RID_XTIMESY, RID_XTIMESY_HELP},
     {RID_XSYMTIMESY, RID_XSYMTIMESY_HELP}, {RID_XOVERY, RID_XOVERY_HELP},
@@ -66,7 +66,7 @@ const SmElementDescr SmElementsControl::m_a5UnaryBinaryOperatorsList[] =
     {RID_XODOTY, RID_XODOTY_HELP}, {RID_XOTIMESY, RID_XOTIMESY_HELP},
     {RID_XODIVIDEY, RID_XODIVIDEY_HELP}, {RID_XCIRCY, RID_XCIRCY_HELP},
     {RID_XWIDESLASHY, RID_XWIDESLASHY_HELP}, {RID_XWIDEBSLASHY, RID_XWIDEBSLASHY_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_NEGX, RID_NEGX_HELP}, {RID_XANDY, RID_XANDY_HELP}, {RID_XORY, RID_XORY_HELP}
 };
 
@@ -76,15 +76,15 @@ const SmElementDescr SmElementsControl::m_a5RelationsList[] =
     {RID_XLEY, RID_XLEY_HELP}, {RID_XLESLANTY, RID_XLESLANTY_HELP}, {RID_XGTY, RID_XGTY_HELP},
     {RID_XGEY, RID_XGEY_HELP}, {RID_XGESLANTY, RID_XGESLANTY_HELP},
     {RID_XLLY, RID_XLLY_HELP}, {RID_XGGY, RID_XGGY_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_XAPPROXY, RID_XAPPROXY_HELP}, {RID_XSIMY, RID_XSIMY_HELP}, {RID_XSIMEQY, RID_XSIMEQY_HELP},
     {RID_XEQUIVY, RID_XEQUIVY_HELP}, {RID_XPROPY, RID_XPROPY_HELP}, {RID_XPARALLELY, RID_XPARALLELY_HELP},
     {RID_XORTHOY, RID_XORTHOY_HELP}, {RID_XDIVIDESY, RID_XDIVIDESY_HELP}, {RID_XNDIVIDESY, RID_XNDIVIDESY_HELP},
     {RID_XTOWARDY, RID_XTOWARDY_HELP}, {RID_XTRANSLY, RID_XTRANSLY_HELP}, {RID_XTRANSRY, RID_XTRANSRY_HELP},
     {RID_XDEFY, RID_XDEFY_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_DLARROW, RID_DLARROW_HELP}, {RID_DLRARROW, RID_DLRARROW_HELP}, {RID_DRARROW, RID_DRARROW_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_XPRECEDESY, RID_XPRECEDESY_HELP}, {RID_XSUCCEEDSY, RID_XSUCCEEDSY_HELP},
     {RID_XPRECEDESEQUALY, RID_XPRECEDESEQUALY_HELP}, {RID_XSUCCEEDSEQUALY, RID_XSUCCEEDSEQUALY_HELP},
     {RID_XPRECEDESEQUIVY, RID_XPRECEDESEQUIVY_HELP}, {RID_XSUCCEEDSEQUIVY, RID_XSUCCEEDSEQUIVY_HELP},
@@ -94,14 +94,14 @@ const SmElementDescr SmElementsControl::m_a5RelationsList[] =
 const SmElementDescr SmElementsControl::m_a5SetOperationsList[] =
 {
     {RID_XINY, RID_XINY_HELP}, {RID_XNOTINY, RID_XNOTINY_HELP}, {RID_XOWNSY, RID_XOWNSY_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_XINTERSECTIONY, RID_XINTERSECTIONY_HELP}, {RID_XUNIONY, RID_XUNIONY_HELP},
     {RID_XSETMINUSY, RID_XSETMINUSY_HELP}, {RID_XSETQUOTIENTY, RID_XSETQUOTIENTY_HELP},
     {RID_XSUBSETY, RID_XSUBSETY_HELP}, {RID_XSUBSETEQY, RID_XSUBSETEQY_HELP},
     {RID_XSUPSETY, RID_XSUPSETY_HELP}, {RID_XSUPSETEQY, RID_XSUPSETEQY_HELP},
     {RID_XNSUBSETY, RID_XNSUBSETY_HELP}, {RID_XNSUBSETEQY, RID_XNSUBSETEQY_HELP},
     {RID_XNSUPSETY, RID_XNSUPSETY_HELP}, {RID_XNSUPSETEQY, RID_XNSUPSETEQY_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_EMPTYSET, RID_EMPTYSET_HELP}, {RID_ALEPH, RID_ALEPH_HELP}, {RID_SETN, RID_SETN_HELP},
     {RID_SETZ, RID_SETZ_HELP}, {RID_SETQ, RID_SETQ_HELP}, {RID_SETR, RID_SETR_HELP}, {RID_SETC, RID_SETC_HELP}
 };
@@ -111,15 +111,15 @@ const SmElementDescr SmElementsControl::m_a5FunctionsList[] =
     {RID_ABSX, RID_ABSX_HELP}, {RID_FACTX, RID_FACTX_HELP}, {RID_SQRTX, RID_SQRTX_HELP},
     {RID_NROOTXY, RID_NROOTXY_HELP}, {RID_RSUPX, RID_RSUPX_HELP}, {RID_EX, RID_EX_HELP},
     {RID_LNX, RID_LNX_HELP}, {RID_EXPX, RID_EXPX_HELP}, {RID_LOGX, RID_LOGX_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_SINX, RID_SINX_HELP}, {RID_COSX, RID_COSX_HELP}, {RID_TANX, RID_TANX_HELP}, {RID_COTX, RID_COTX_HELP},
     {RID_SINHX, RID_SINHX_HELP}, {RID_COSHX, RID_COSHX_HELP}, {RID_TANHX, RID_TANHX_HELP},
     {RID_COTHX, RID_COTHX_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_ARCSINX, RID_ARCSINX_HELP}, {RID_ARCCOSX, RID_ARCCOSX_HELP}, {RID_ARCTANX, RID_ARCTANX_HELP},
     {RID_ARCCOTX, RID_ARCCOTX_HELP}, {RID_ARSINHX, RID_ARSINHX_HELP}, {RID_ARCOSHX, RID_ARCOSHX_HELP},
     {RID_ARTANHX, RID_ARTANHX_HELP}, {RID_ARCOTHX, RID_ARCOTHX_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_FUNCX, RID_FUNCX_HELP}
 };
 
@@ -127,40 +127,40 @@ const SmElementDescr SmElementsControl::m_a5OperatorsList[] =
 {
     {RID_LIMX, RID_LIMX_HELP}, {RID_LIM_FROMX, RID_LIM_FROMX_HELP},
     {RID_LIM_TOX, RID_LIM_TOX_HELP}, {RID_LIM_FROMTOX, RID_LIM_FROMTOX_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_LIMINFX, RID_LIMINFX_HELP}, {RID_LIMINF_FROMX, RID_LIMINF_FROMX_HELP},
     {RID_LIMINF_TOX, RID_LIMINF_TOX_HELP}, {RID_LIMINF_FROMTOX, RID_LIMINF_FROMTOX_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_LIMSUPX, RID_LIMSUPX_HELP}, {RID_LIMSUP_FROMX, RID_LIMSUP_FROMX_HELP},
     {RID_LIMSUP_TOX, RID_LIMSUP_TOX_HELP}, {RID_LIMSUP_FROMTOX, RID_LIMSUP_FROMTOX_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_SUMX, RID_SUMX_HELP}, {RID_SUM_FROMX, RID_SUM_FROMX_HELP},
     {RID_SUM_TOX, RID_SUM_TOX_HELP}, {RID_SUM_FROMTOX, RID_SUM_FROMTOX_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_PRODX, RID_PRODX_HELP}, {RID_PROD_FROMX, RID_PROD_FROMX_HELP},
     {RID_PROD_TOX, RID_PROD_TOX_HELP}, {RID_PROD_FROMTOX, RID_PROD_FROMTOX_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_COPRODX, RID_COPRODX_HELP}, {RID_COPROD_FROMX, RID_COPROD_FROMX_HELP},
     {RID_COPROD_TOX, RID_COPROD_TOX_HELP}, {RID_COPROD_FROMTOX, RID_COPROD_FROMTOX_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_INTX, RID_INTX_HELP}, {RID_INT_FROMX, RID_INT_FROMX_HELP},
     {RID_INT_TOX, RID_INT_TOX_HELP}, {RID_INT_FROMTOX, RID_INT_FROMTOX_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_IINTX, RID_IINTX_HELP}, {RID_IINT_FROMX, RID_IINT_FROMX_HELP},
     {RID_IINT_TOX, RID_IINT_TOX_HELP}, {RID_IINT_FROMTOX, RID_IINT_FROMTOX_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_IIINTX, RID_IIINTX_HELP}, {RID_IIINT_FROMX, RID_IIINT_FROMX_HELP},
     {RID_IIINT_TOX, RID_IIINT_TOX_HELP}, {RID_IIINT_FROMTOX, RID_IIINT_FROMTOX_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_LINTX, RID_LINTX_HELP}, {RID_LINT_FROMX, RID_LINT_FROMX_HELP},
     {RID_LINT_TOX, RID_LINT_TOX_HELP}, {RID_LINT_FROMTOX, RID_LINT_FROMTOX_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_LLINTX, RID_LLINTX_HELP}, {RID_LLINT_FROMX, RID_LLINT_FROMX_HELP},
     {RID_LLINT_TOX, RID_LLINT_TOX_HELP}, {RID_LLINT_FROMTOX, RID_LLINT_FROMTOX_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_LLLINTX, RID_LLLINTX_HELP}, {RID_LLLINT_FROMX, RID_LLLINT_FROMX_HELP},
     {RID_LLLINT_TOX, RID_LLLINT_TOX_HELP}, {RID_LLLINT_FROMTOX, RID_LLLINT_FROMTOX_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_OPERX, RID_OPERX_HELP}, {RID_OPER_FROMX, RID_OPER_FROMX_HELP},
     {RID_OPER_TOX, RID_OPER_TOX_HELP}, {RID_OPER_FROMTOX, RID_OPER_FROMTOX_HELP}
 };
@@ -172,14 +172,14 @@ const SmElementDescr SmElementsControl::m_a5AttributesList[] =
     {RID_DDDOTX, RID_DDDOTX_HELP}, {RID_BARX, RID_BARX_HELP}, {RID_VECX, RID_VECX_HELP},
     {RID_HARPOONX, RID_HARPOONX_HELP},
     {RID_TILDEX, RID_TILDEX_HELP}, {RID_HATX, RID_HATX_HELP}, {RID_CHECKX, RID_CHECKX_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_WIDEVECX, RID_WIDEVECX_HELP}, {RID_WIDEHARPOONX, RID_WIDEHARPOONX_HELP},
     {RID_WIDETILDEX, RID_WIDETILDEX_HELP}, {RID_WIDEHATX, RID_WIDEHATX_HELP},
     {RID_OVERLINEX, RID_OVERLINEX_HELP}, {RID_UNDERLINEX, RID_UNDERLINEX_HELP}, {RID_OVERSTRIKEX, RID_OVERSTRIKEX_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_PHANTOMX, RID_PHANTOMX_HELP}, {RID_BOLDX, RID_BOLDX_HELP}, {RID_ITALX, RID_ITALX_HELP},
     {RID_SIZEXY, RID_SIZEXY_HELP}, {RID_FONTXY, RID_FONTXY_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_COLORX_BLACK, RID_COLORX_BLACK_HELP}, {RID_COLORX_BLUE, RID_COLORX_BLUE_HELP},
     {RID_COLORX_GREEN, RID_COLORX_GREEN_HELP}, {RID_COLORX_RED, RID_COLORX_RED_HELP},
     {RID_COLORX_AQUA, RID_COLORX_AQUA_HELP}, {RID_COLORX_FUCHSIA, RID_COLORX_FUCHSIA_HELP},
@@ -189,7 +189,7 @@ const SmElementDescr SmElementsControl::m_a5AttributesList[] =
     {RID_COLORX_PURPLE, RID_COLORX_PURPLE_HELP}, {RID_COLORX_SILVER, RID_COLORX_SILVER_HELP},
     {RID_COLORX_TEAL, RID_COLORX_TEAL_HELP},{RID_COLORX_RGB, RID_COLORX_RGB_HELP},
     {RID_COLORX_HEX, RID_COLORX_HEX_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_COLORX_CORAL, RID_COLORX_CORAL_HELP}, {RID_COLORX_MIDNIGHT, RID_COLORX_MIDNIGHT_HELP},
     {RID_COLORX_CRIMSON, RID_COLORX_CRIMSON_HELP}, {RID_COLORX_VIOLET, RID_COLORX_VIOLET_HELP},
     {RID_COLORX_ORANGE, RID_COLORX_ORANGE_HELP}, {RID_COLORX_ORANGERED, RID_COLORX_ORANGERED_HELP},
@@ -201,21 +201,21 @@ const SmElementDescr SmElementsControl::m_a5AttributesList[] =
 const SmElementDescr SmElementsControl::m_a5BracketsList[] =
 {
     {RID_LRGROUPX, RID_LRGROUPX_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_LRPARENTX, RID_LRPARENTX_HELP}, {RID_LRBRACKETX, RID_LRBRACKETX_HELP},
     {RID_LRDBRACKETX, RID_LRDBRACKETX_HELP}, {RID_LRBRACEX, RID_LRBRACEX_HELP},
     {RID_LRANGLEX, RID_LRANGLEX_HELP}, {RID_LMRANGLEXY, RID_LMRANGLEXY_HELP},
     {RID_LRCEILX, RID_LRCEILX_HELP}, {RID_LRFLOORX, RID_LRFLOORX_HELP},
     {RID_LRLINEX, RID_LRLINEX_HELP}, {RID_LRDLINEX, RID_LRDLINEX_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_SLRPARENTX, RID_SLRPARENTX_HELP}, {RID_SLRBRACKETX, RID_SLRBRACKETX_HELP},
     {RID_SLRDBRACKETX, RID_SLRDBRACKETX_HELP}, {RID_SLRBRACEX, RID_SLRBRACEX_HELP},
     {RID_SLRANGLEX, RID_SLRANGLEX_HELP}, {RID_SLMRANGLEXY, RID_SLMRANGLEXY_HELP},
     {RID_SLRCEILX, RID_SLRCEILX_HELP}, {RID_SLRFLOORX, RID_SLRFLOORX_HELP},
     {RID_SLRLINEX, RID_SLRLINEX_HELP}, {RID_SLRDLINEX, RID_SLRDLINEX_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_XOVERBRACEY, RID_XOVERBRACEY_HELP}, {RID_XUNDERBRACEY, RID_XUNDERBRACEY_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_EVALX, RID_EVALUATEX_HELP}, {RID_EVAL_FROMX, RID_EVALUATE_FROMX_HELP},
     {RID_EVAL_TOX, RID_EVALUATE_TOX_HELP}, {RID_EVAL_FROMTOX, RID_EVALUATE_FROMTOX_HELP},
 };
@@ -224,11 +224,11 @@ const SmElementDescr SmElementsControl::m_a5FormatsList[] =
 {
     {RID_RSUPX, RID_RSUPX_HELP}, {RID_RSUBX, RID_RSUBX_HELP}, {RID_LSUPX, RID_LSUPX_HELP},
     {RID_LSUBX, RID_LSUBX_HELP}, {RID_CSUPX, RID_CSUPX_HELP}, {RID_CSUBX, RID_CSUBX_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_NEWLINE, RID_NEWLINE_HELP}, {RID_SBLANK, RID_SBLANK_HELP}, {RID_BLANK, RID_BLANK_HELP},
     {RID_NOSPACE, RID_NOSPACE_HELP},
     {RID_ALIGNLX, RID_ALIGNLX_HELP}, {RID_ALIGNCX, RID_ALIGNCX_HELP}, {RID_ALIGNRX, RID_ALIGNRX_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_BINOMXY, RID_BINOMXY_HELP}, {RID_STACK, RID_STACK_HELP},
     {RID_MATRIX, RID_MATRIX_HELP},
 };
@@ -240,10 +240,10 @@ const SmElementDescr SmElementsControl::m_a5OthersList[] =
     {RID_HBAR, RID_HBAR_HELP}, {RID_LAMBDABAR, RID_LAMBDABAR_HELP}, {RID_RE, RID_RE_HELP},
     {RID_IM, RID_IM_HELP}, {RID_WP, RID_WP_HELP}, {RID_LAPLACE, RID_LAPLACE_HELP},
     {RID_FOURIER, RID_FOURIER_HELP}, {RID_BACKEPSILON, RID_BACKEPSILON_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_LEFTARROW, RID_LEFTARROW_HELP}, {RID_RIGHTARROW, RID_RIGHTARROW_HELP}, {RID_UPARROW, RID_UPARROW_HELP},
     {RID_DOWNARROW, RID_DOWNARROW_HELP},
-    {nullptr, nullptr},
+    {nullptr, {}},
     {RID_DOTSLOW, RID_DOTSLOW_HELP}, {RID_DOTSAXIS, RID_DOTSAXIS_HELP}, {RID_DOTSVERT, RID_DOTSVERT_HELP},
     {RID_DOTSUP, RID_DOTSUP_HELP}, {RID_DOTSDOWN, RID_DOTSDOWN_HELP}
 };
@@ -265,7 +265,7 @@ const SmElementDescr SmElementsControl::m_a5ExamplesList[] =
 };
 
 #define AS_PAIR(a) a, SAL_N_ELEMENTS(a)
-const std::tuple<const char*, const SmElementDescr*, size_t> SmElementsControl::m_a5Categories[] =
+const std::tuple<TranslateId, const SmElementDescr*, size_t> SmElementsControl::m_a5Categories[] =
 {
     {RID_CATEGORY_UNARY_BINARY_OPERATORS, AS_PAIR(m_a5UnaryBinaryOperatorsList)},
     {RID_CATEGORY_RELATIONS, AS_PAIR(m_a5RelationsList)},
@@ -875,7 +875,7 @@ void SmElementsControl::addElement(const OUString& aElementVisual, const OUStrin
     rDevice.Pop();
 }
 
-void SmElementsControl::setElementSetId(const char* pSetId)
+void SmElementsControl::setElementSetId(TranslateId pSetId)
 {
     if (msCurrentSetId == pSetId)
         return;
@@ -889,7 +889,7 @@ void SmElementsControl::addElements(const SmElementDescr aElementsArray[], sal_u
     for (sal_uInt16 i = 0; i < aElementsArraySize ; i++)
     {
         const char* pElement = aElementsArray[i].first;
-        const char* pElementHelp = aElementsArray[i].second;
+        TranslateId pElementHelp = aElementsArray[i].second;
         if (!pElement) {
             maElementList.push_back(std::make_unique<SmElementSeparator>());
         } else {
@@ -1270,7 +1270,7 @@ IMPL_LINK( SmElementsDockingWindow, ElementSelectedHandle, weld::ComboBox&, rLis
 {
     for (size_t i = 0; i < SmElementsControl::categoriesSize(); ++i)
     {
-        const char *pCurrentCategory = std::get<0>(SmElementsControl::categories()[i]);
+        TranslateId pCurrentCategory = std::get<0>(SmElementsControl::categories()[i]);
         OUString aCurrentCategoryString = SmResId(pCurrentCategory);
         if (aCurrentCategoryString == rList.get_active_text())
         {
diff --git a/starmath/source/parsebase.cxx b/starmath/source/parsebase.cxx
index 2e6d92694db5..31c1e40c9c5a 100644
--- a/starmath/source/parsebase.cxx
+++ b/starmath/source/parsebase.cxx
@@ -21,7 +21,7 @@
 #include <strings.hrc>
 #include <smmod.hxx>
 
-const char* starmathdatabase::SmParseErrorDesc[] = {
+const TranslateId starmathdatabase::SmParseErrorDesc[] = {
     // clang-format off
     RID_ERR_NONE,
     RID_ERR_UNEXPECTEDCHARACTER,
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index 776a25657088..2365e877e992 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -23,7 +23,6 @@
 #include <svl/whiter.hxx>
 #include <sfx2/viewsh.hxx>
 #include <svx/svxids.hrc>
-#include <unotools/resmgr.hxx>
 #include <vcl/virdev.hxx>
 #include <unotools/syslocale.hxx>
 #include <smmod.hxx>
@@ -39,7 +38,7 @@
 #define ShellClass_SmModule
 #include <smslots.hxx>
 
-OUString SmResId(std::string_view aId)
+OUString SmResId(TranslateId aId)
 {
     return Translate::get(aId, SM_MOD()->GetResLocale());
 }
@@ -50,7 +49,7 @@ OUString SmLocalizedSymbolData::GetUiSymbolName( const OUString &rExportName )
 
     for (size_t i = 0; i < SAL_N_ELEMENTS(RID_UI_SYMBOL_NAMES); ++i)
     {
-        if (rExportName.equalsAscii(strchr(RID_UI_SYMBOL_NAMES[i], '\004') + 1))
+        if (rExportName.equalsAscii(RID_UI_SYMBOL_NAMES[i].mpId))
         {
             aRes = SmResId(RID_UI_SYMBOL_NAMES[i]);
             break;
@@ -68,7 +67,7 @@ OUString SmLocalizedSymbolData::GetExportSymbolName( std::u16string_view rUiName
     {
         if (rUiName == SmResId(RID_UI_SYMBOL_NAMES[i]))
         {
-            const char *pKey = strchr(RID_UI_SYMBOL_NAMES[i], '\004') + 1;
+            const char *pKey = RID_UI_SYMBOL_NAMES[i].mpId;
             aRes = OUString(pKey, strlen(pKey), RTL_TEXTENCODING_UTF8);
             break;
         }
@@ -83,7 +82,7 @@ OUString SmLocalizedSymbolData::GetUiSymbolSetName( const OUString &rExportName
 
     for (size_t i = 0; i < SAL_N_ELEMENTS(RID_UI_SYMBOLSET_NAMES); ++i)
     {
-        if (rExportName.equalsAscii(strchr(RID_UI_SYMBOLSET_NAMES[i], '\004') + 1))
+        if (rExportName.equalsAscii(RID_UI_SYMBOLSET_NAMES[i].mpId))
         {
             aRes = SmResId(RID_UI_SYMBOLSET_NAMES[i]);
             break;
@@ -101,7 +100,7 @@ OUString SmLocalizedSymbolData::GetExportSymbolSetName( std::u16string_view rUiN
     {
         if (rUiName == SmResId(RID_UI_SYMBOLSET_NAMES[i]))
         {
-            const char *pKey = strchr(RID_UI_SYMBOLSET_NAMES[i], '\004') + 1;
+            const char *pKey = RID_UI_SYMBOLSET_NAMES[i].mpId;
             aRes = OUString(pKey, strlen(pKey), RTL_TEXTENCODING_UTF8);
             break;
         }
diff --git a/starmath/source/uiobject.cxx b/starmath/source/uiobject.cxx
index 5d7519816e52..e39de3cc6bbe 100644
--- a/starmath/source/uiobject.cxx
+++ b/starmath/source/uiobject.cxx
@@ -65,7 +65,7 @@ StringMap ElementSelectorUIObject::get_state()
     if (pElement)
         aMap["CurrentEntry"] = pElement->getText();
 
-    aMap["CurrentSelection"] = OUString::fromUtf8(mpElementsSelector->msCurrentSetId);
+    aMap["CurrentSelection"] = OUString::fromUtf8(mpElementsSelector->msCurrentSetId.mpId);
 
     return aMap;
 }