diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-10-12 11:17:11 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-10-12 18:17:49 +0200 |
| commit | dcea29c283680c8e75e4890f46b1624d0a55846f (patch) | |
| tree | 1ca0e41d8d00f27d3b8d3dec5d99a6c2e5aebb91 /starmath | |
| parent | 6056a0e320f0aabbde7adb28c42e00ed72ef2e5b (diff) | |
Make NC_ constexpr-friendly
...by moving the char8_t -> char reinterpret_cast out of any potential constexpr
paths into a new TranslateId::getId. And demonstrate constexpr'ability by
making the aCategories var in OApplicationIconControl::Fill
(dbaccess/source/ui/app/AppIconControl.cxx) constexpr. (And there might be more
such cases that could now be made constexpr.)
Change-Id: I0b4e3292faf8f6b901f9b9e934e1aa6bf0f583ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157862
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/inc/smmod.hrc | 2 | ||||
| -rw-r--r-- | starmath/inc/strings.hrc | 2 | ||||
| -rw-r--r-- | starmath/source/smmod.cxx | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/starmath/inc/smmod.hrc b/starmath/inc/smmod.hrc index 885af214742e..effdcdcba3bc 100644 --- a/starmath/inc/smmod.hrc +++ b/starmath/inc/smmod.hrc @@ -11,7 +11,7 @@ #include <unotools/resmgr.hxx> -#define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) +#define NC_(Context, String) TranslateId(Context, u8##String) const TranslateId RID_UI_SYMBOLSET_NAMES[] = { diff --git a/starmath/inc/strings.hrc b/starmath/inc/strings.hrc index b6eeff196633..4afb0d2598e6 100644 --- a/starmath/inc/strings.hrc +++ b/starmath/inc/strings.hrc @@ -26,7 +26,7 @@ #pragma once -#define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) +#define NC_(Context, String) TranslateId(Context, u8##String) // clang-format off #define RID_PLUSX_HELP NC_("RID_PLUSX_HELP", "+ Sign" ) diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index 5e8886ebdc3c..d116316798f7 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -50,7 +50,7 @@ OUString SmLocalizedSymbolData::GetUiSymbolName( std::u16string_view rExportName for (size_t i = 0; i < SAL_N_ELEMENTS(RID_UI_SYMBOL_NAMES); ++i) { - if (o3tl::equalsAscii(rExportName, RID_UI_SYMBOL_NAMES[i].mpId)) + if (o3tl::equalsAscii(rExportName, RID_UI_SYMBOL_NAMES[i].getId())) { aRes = SmResId(RID_UI_SYMBOL_NAMES[i]); break; @@ -68,7 +68,7 @@ OUString SmLocalizedSymbolData::GetExportSymbolName( std::u16string_view rUiName { if (rUiName == SmResId(RID_UI_SYMBOL_NAMES[i])) { - const char *pKey = RID_UI_SYMBOL_NAMES[i].mpId; + const char *pKey = RID_UI_SYMBOL_NAMES[i].getId(); aRes = OUString(pKey, strlen(pKey), RTL_TEXTENCODING_UTF8); break; } @@ -83,7 +83,7 @@ OUString SmLocalizedSymbolData::GetUiSymbolSetName( std::u16string_view rExportN for (size_t i = 0; i < SAL_N_ELEMENTS(RID_UI_SYMBOLSET_NAMES); ++i) { - if (o3tl::equalsAscii(rExportName, RID_UI_SYMBOLSET_NAMES[i].mpId)) + if (o3tl::equalsAscii(rExportName, RID_UI_SYMBOLSET_NAMES[i].getId())) { aRes = SmResId(RID_UI_SYMBOLSET_NAMES[i]); break; @@ -101,7 +101,7 @@ OUString SmLocalizedSymbolData::GetExportSymbolSetName( std::u16string_view rUiN { if (rUiName == SmResId(RID_UI_SYMBOLSET_NAMES[i])) { - const char *pKey = RID_UI_SYMBOLSET_NAMES[i].mpId; + const char *pKey = RID_UI_SYMBOLSET_NAMES[i].getId(); aRes = OUString(pKey, strlen(pKey), RTL_TEXTENCODING_UTF8); break; } |