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 /include/sfx2 | |
| 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 'include/sfx2')
| -rw-r--r-- | include/sfx2/sfxresid.hxx | 4 | ||||
| -rw-r--r-- | include/sfx2/strings.hrc | 2 | ||||
| -rw-r--r-- | include/sfx2/styfitem.hxx | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/include/sfx2/sfxresid.hxx b/include/sfx2/sfxresid.hxx index 62bbc99e92bc..f5cd1aca4cf3 100644 --- a/include/sfx2/sfxresid.hxx +++ b/include/sfx2/sfxresid.hxx @@ -21,9 +21,9 @@ #include <sfx2/dllapi.h> #include <rtl/ustring.hxx> -#include <string_view> +#include <unotools/resmgr.hxx> -SFX2_DLLPUBLIC OUString SfxResId(std::string_view aId); +SFX2_DLLPUBLIC OUString SfxResId(TranslateId aId); #endif diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc index ce05fa4dce27..3367d368b2fa 100644 --- a/include/sfx2/strings.hrc +++ b/include/sfx2/strings.hrc @@ -20,7 +20,7 @@ #ifndef INCLUDED_SFX2_INC_STRINGS_HRC #define INCLUDED_SFX2_INC_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 STR_TEMPLATE_FILTER NC_("STR_TEMPLATE_FILTER", "Templates") #define STR_SAVEDOC NC_("STR_SAVEDOC", "~Save") diff --git a/include/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx index dc939342689f..dc2efd88cf85 100644 --- a/include/sfx2/styfitem.hxx +++ b/include/sfx2/styfitem.hxx @@ -23,6 +23,7 @@ #include <sal/config.h> #include <sfx2/dllapi.h> #include <svl/style.hxx> +#include <unotools/resmgr.hxx> #include <vector> struct SFX2_DLLPUBLIC SfxFilterTuple @@ -46,7 +47,7 @@ class SFX2_DLLPUBLIC SfxStyleFamilyItem SfxStyleFilter aFilterList; public: - SfxStyleFamilyItem(SfxStyleFamily nFamily, const OUString &rName, const OUString& rImage, const std::pair<const char*, SfxStyleSearchBits>* pStringArray, const std::locale& rLocale); + SfxStyleFamilyItem(SfxStyleFamily nFamily, const OUString &rName, const OUString& rImage, const std::pair<TranslateId, SfxStyleSearchBits>* pStringArray, const std::locale& rLocale); const OUString& GetText() const { return aText; } SfxStyleFamily GetFamily() const { return nFamily; } |