diff options
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 |