diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-19 13:18:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-05 09:39:11 +0200 |
| commit | 14cfff500e93f0d6cbf8412065feea85c01ea81d (patch) | |
| tree | 76e3fb8fbf2b0d8a12c8406d8cf994ea6a37aaff /shell | |
| parent | d924ce30e0ca260682bd2aed192b8b1b2ca3e7c0 (diff) | |
Pass context and resource string down to boost::locale separately
because this is often on a hot path, and we can avoid the splitting and
joining of strings like this.
Change-Id: Ia36047209368ca53431178c2e8723a18cfe8260a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119220
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/inc/spsupp/spsuppStrings.hrc | 2 | ||||
| -rw-r--r-- | shell/source/win32/spsupp/spsuppHelper.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/shell/inc/spsupp/spsuppStrings.hrc b/shell/inc/spsupp/spsuppStrings.hrc index dc96fbb89459..a6ad2933c5fa 100644 --- a/shell/inc/spsupp/spsuppStrings.hrc +++ b/shell/inc/spsupp/spsuppStrings.hrc @@ -10,7 +10,7 @@ #ifndef INCLUDED_SHELL_INC_SPSUPP_STRINGS_HRC #define INCLUDED_SHELL_INC_SPSUPP_STRINGS_HRC -#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) +#define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) #define RID_STR_SP_VIEW_OR_EDIT_TITLE NC_("RID_STR_SP_VIEW_OR_EDIT_TITLE", "Open Document") #define RID_STR_SP_VIEW_OR_EDIT_MESSAGE NC_("RID_STR_SP_VIEW_OR_EDIT_MESSAGE", "You are opening document\n\n %DOCNAME\n\nDo you want to open it to view or to edit?") diff --git a/shell/source/win32/spsupp/spsuppHelper.cxx b/shell/source/win32/spsupp/spsuppHelper.cxx index 3f6c9f787961..595128ca7479 100644 --- a/shell/source/win32/spsupp/spsuppHelper.cxx +++ b/shell/source/win32/spsupp/spsuppHelper.cxx @@ -43,7 +43,7 @@ const OUString& GetSofficeExe() return s_sPath; } -OUString GetString(const char* pResId) +OUString GetString(TranslateId pResId) { static const std::locale s_pLocale = [] { // Initialize soffice bootstrap: see getIniFileName_Impl for reference |