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 /unotools | |
| 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 'unotools')
| -rw-r--r-- | unotools/source/i18n/resmgr.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx index 71303b211cec..2cf013d161d8 100644 --- a/unotools/source/i18n/resmgr.cxx +++ b/unotools/source/i18n/resmgr.cxx @@ -210,17 +210,17 @@ namespace Translate OUString get(TranslateId sContextAndId, const std::locale &loc) { - assert(!strchr(sContextAndId.mpId, '\004') && "should be using nget, not get"); + assert(!strchr(sContextAndId.getId(), '\004') && "should be using nget, not get"); //if it's a key id locale, generate it here if (std::use_facet<boost::locale::info>(loc).language() == "qtz") { - OString sKeyId(genKeyId(OString::Concat(sContextAndId.mpContext) + "|" + std::string_view(sContextAndId.mpId))); - return OUString::fromUtf8(sKeyId) + u"\u2016" + createFromUtf8(sContextAndId.mpId, strlen(sContextAndId.mpId)); + OString sKeyId(genKeyId(OString::Concat(sContextAndId.mpContext) + "|" + std::string_view(sContextAndId.getId()))); + return OUString::fromUtf8(sKeyId) + u"\u2016" + createFromUtf8(sContextAndId.getId(), strlen(sContextAndId.getId())); } //otherwise translate it - const std::string ret = boost::locale::pgettext(sContextAndId.mpContext, sContextAndId.mpId, loc); + const std::string ret = boost::locale::pgettext(sContextAndId.mpContext, sContextAndId.getId(), loc); OUString result(ExpandVariables(createFromUtf8(ret.data(), ret.size()))); if (comphelper::LibreOfficeKit::isActive()) @@ -290,7 +290,7 @@ bool TranslateId::operator==(const TranslateId& other) const { return mpId == other.mpId; } - return strcmp(mpId,other.mpId) == 0; + return strcmp(getId(),other.getId()) == 0; } bool TranslateNId::operator==(const TranslateNId& other) const |