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 /xmlsecurity | |
| 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 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/inc/certificatechooser.hxx | 3 | ||||
| -rw-r--r-- | xmlsecurity/inc/resourcemanager.hxx | 5 | ||||
| -rw-r--r-- | xmlsecurity/inc/strings.hrc | 2 | ||||
| -rw-r--r-- | xmlsecurity/source/dialogs/certificatechooser.cxx | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/xmlsecurity/inc/certificatechooser.hxx b/xmlsecurity/inc/certificatechooser.hxx index fd943fbd4a81..9ced0ac39a64 100644 --- a/xmlsecurity/inc/certificatechooser.hxx +++ b/xmlsecurity/inc/certificatechooser.hxx @@ -21,6 +21,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <vcl/weld.hxx> +#include <unotools/resmgr.hxx> namespace com::sun::star { namespace security { class XCertificate; } @@ -71,7 +72,7 @@ private: void ImplShowCertificateDetails(); void ImplInitialize(); - static void HandleOneUsageBit(OUString& string, int& bits, int bit, const char *name); + static void HandleOneUsageBit(OUString& string, int& bits, int bit, TranslateId name); public: CertificateChooser(weld::Window* pParent, diff --git a/xmlsecurity/inc/resourcemanager.hxx b/xmlsecurity/inc/resourcemanager.hxx index 2999d5fd44ff..1dc5b2987484 100644 --- a/xmlsecurity/inc/resourcemanager.hxx +++ b/xmlsecurity/inc/resourcemanager.hxx @@ -21,9 +21,6 @@ #include <unotools/resmgr.hxx> -inline OUString XsResId(std::string_view aId) -{ - return Translate::get(aId, Translate::Create("xsc")); -} +inline OUString XsResId(TranslateId aId) { return Translate::get(aId, Translate::Create("xsc")); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/inc/strings.hrc b/xmlsecurity/inc/strings.hrc index 648758825054..8cf89b211773 100644 --- a/xmlsecurity/inc/strings.hrc +++ b/xmlsecurity/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_CERTIFICATE_NOT_VALIDATED NC_("STR_CERTIFICATE_NOT_VALIDATED", "The certificate could not be validated.") #define STR_VERSION NC_("STR_VERSION", "Version") diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index 1483b9bda0f8..fb2f7a578254 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -95,7 +95,7 @@ short CertificateChooser::run() return GenericDialogController::run(); } -void CertificateChooser::HandleOneUsageBit(OUString& string, int& bits, int bit, const char *pResId) +void CertificateChooser::HandleOneUsageBit(OUString& string, int& bits, int bit, TranslateId pResId) { if (bits & bit) { |