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 /sfx2/inc | |
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 'sfx2/inc')
-rw-r--r-- | sfx2/inc/dinfdlg.hrc | 6 | ||||
-rw-r--r-- | sfx2/inc/doctempl.hrc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/inc/dinfdlg.hrc b/sfx2/inc/dinfdlg.hrc index a99ead5b6b91..5b838ce56652 100644 --- a/sfx2/inc/dinfdlg.hrc +++ b/sfx2/inc/dinfdlg.hrc @@ -20,9 +20,9 @@ #ifndef INCLUDED_SFX2_INC_DINFDLG_HRC #define INCLUDED_SFX2_INC_DINFDLG_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)) -const char* SFX_CB_PROPERTY_STRINGARRAY[] = +const TranslateId SFX_CB_PROPERTY_STRINGARRAY[] = { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Checked by"), NC_("SFX_CB_PROPERTY_STRINGARRAY", "Client"), @@ -64,7 +64,7 @@ const char* SFX_CB_PROPERTY_STRINGARRAY[] = #define CUSTOM_TYPE_DURATION 5 #define CUSTOM_TYPE_DATETIME 6 -const std::pair<const char*, int> SFX_LB_PROPERTY_STRINGARRAY[] = +const std::pair<TranslateId, int> SFX_LB_PROPERTY_STRINGARRAY[] = { { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Text") , CUSTOM_TYPE_TEXT }, { NC_("SFX_CB_PROPERTY_STRINGARRAY", "DateTime") , CUSTOM_TYPE_DATETIME }, diff --git a/sfx2/inc/doctempl.hrc b/sfx2/inc/doctempl.hrc index 46773035e9b7..ef2310d860de 100644 --- a/sfx2/inc/doctempl.hrc +++ b/sfx2/inc/doctempl.hrc @@ -20,9 +20,9 @@ #ifndef INCLUDED_SFX2_INC_DOCTEMPL_HRC #define INCLUDED_SFX2_INC_DOCTEMPL_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)) -const char* TEMPLATE_LONG_NAMES_ARY[] = +const TranslateId TEMPLATE_LONG_NAMES_ARY[] = { NC_("TEMPLATE_LONG_NAMES_ARY", "My Templates"), NC_("TEMPLATE_LONG_NAMES_ARY", "Styles"), |