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 /framework | |
| 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 'framework')
| -rw-r--r-- | framework/inc/classes/fwkresid.hxx | 4 | ||||
| -rw-r--r-- | framework/inc/strings.hrc | 2 | ||||
| -rw-r--r-- | framework/source/fwe/classes/fwkresid.cxx | 3 | ||||
| -rw-r--r-- | framework/source/uielement/controlmenucontroller.cxx | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/framework/inc/classes/fwkresid.hxx b/framework/inc/classes/fwkresid.hxx index 4aacac961019..5023f34a238b 100644 --- a/framework/inc/classes/fwkresid.hxx +++ b/framework/inc/classes/fwkresid.hxx @@ -20,8 +20,8 @@ #pragma once #include <rtl/ustring.hxx> -#include <string_view> +#include <unotools/resmgr.hxx> -OUString FwkResId(std::string_view aId); +OUString FwkResId(TranslateId aId); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/strings.hrc b/framework/inc/strings.hrc index 796517bdc130..18b372915b9b 100644 --- a/framework/inc/strings.hrc +++ b/framework/inc/strings.hrc @@ -19,7 +19,7 @@ #pragma once -#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 STR_MENU_HEADFOOTALL NC_("STR_MENU_HEADFOOTALL", "All" ) #define STR_UPDATEDOC NC_("STR_UPDATEDOC", "~Update" ) diff --git a/framework/source/fwe/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx index 9acac0728885..e9a1d639d386 100644 --- a/framework/source/fwe/classes/fwkresid.cxx +++ b/framework/source/fwe/classes/fwkresid.cxx @@ -18,8 +18,7 @@ */ #include <classes/fwkresid.hxx> -#include <unotools/resmgr.hxx> -OUString FwkResId(std::string_view aId) { return Translate::get(aId, Translate::Create("fwk")); } +OUString FwkResId(TranslateId aId) { return Translate::get(aId, Translate::Create("fwk")); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 6af67e7a30a9..14c372a55688 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -64,7 +64,7 @@ static const char* aCommands[] = ".uno:ConvertToNavigationBar" }; -static const char* aLabels[] = +static TranslateId aLabels[] = { RID_STR_PROPTITLE_EDIT, RID_STR_PROPTITLE_PUSHBUTTON, |