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 /dbaccess/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 'dbaccess/inc')
| -rw-r--r-- | dbaccess/inc/query.hrc | 2 | ||||
| -rw-r--r-- | dbaccess/inc/strings.hrc | 2 | ||||
| -rw-r--r-- | dbaccess/inc/templwin.hrc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/dbaccess/inc/query.hrc b/dbaccess/inc/query.hrc index e183f777ca5f..abb8bef8d1e8 100644 --- a/dbaccess/inc/query.hrc +++ b/dbaccess/inc/query.hrc @@ -21,7 +21,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 RSC_QUERY_OBJECT_TYPE[] = { diff --git a/dbaccess/inc/strings.hrc b/dbaccess/inc/strings.hrc index 2db9ce75c467..0c6226ea8fee 100644 --- a/dbaccess/inc/strings.hrc +++ b/dbaccess/inc/strings.hrc @@ -21,7 +21,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) #define RID_STR_CONNECTION_INVALID NC_("RID_STR_CONNECTION_INVALID", "No connection could be established.") #define RID_STR_TABLE_IS_FILTERED NC_("RID_STR_TABLE_IS_FILTERED", "The table $name$ already exists. It is not visible because it has been filtered out.") diff --git a/dbaccess/inc/templwin.hrc b/dbaccess/inc/templwin.hrc index 052883d37926..2cc76e395245 100644 --- a/dbaccess/inc/templwin.hrc +++ b/dbaccess/inc/templwin.hrc @@ -22,7 +22,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) #define DI_TITLE 1 #define DI_FROM 2 |