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 /formula/inc | |
| 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 'formula/inc')
| -rw-r--r-- | formula/inc/core_resource.hrc | 2 | ||||
| -rw-r--r-- | formula/inc/strings.hrc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/formula/inc/core_resource.hrc b/formula/inc/core_resource.hrc index 111fafdedc88..baed318f586e 100644 --- a/formula/inc/core_resource.hrc +++ b/formula/inc/core_resource.hrc @@ -23,7 +23,7 @@ #include <utility> #include <unotools/resmgr.hxx> -#define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) +#define NC_(Context, String) TranslateId(Context, u8##String) /** These English names are used to store/load ODFF as of ODF v1.2. */ // NAMES CAN ONLY BE CHANGED WHEN PROVIDING BACKWARD AND FORWARD COMPATIBILITY diff --git a/formula/inc/strings.hrc b/formula/inc/strings.hrc index 7bdc7139799a..63551e6deb25 100644 --- a/formula/inc/strings.hrc +++ b/formula/inc/strings.hrc @@ -19,7 +19,7 @@ #pragma once -#define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) +#define NC_(Context, String) TranslateId(Context, u8##String) #define STR_OPTIONAL NC_("STR_OPTIONAL", "(optional)") #define STR_REQUIRED NC_("STR_REQUIRED", "(required)") |