From 14cfff500e93f0d6cbf8412065feea85c01ea81d Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Mon, 19 Jul 2021 13:18:49 +0200
Subject: 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>
---
 basctl/inc/strings.hrc             | 2 +-
 basctl/source/basicide/iderdll.cxx | 2 +-
 basctl/source/inc/iderid.hxx       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'basctl')

diff --git a/basctl/inc/strings.hrc b/basctl/inc/strings.hrc
index a5a0a4660b59..63f68ba0fcf9 100644
--- a/basctl/inc/strings.hrc
+++ b/basctl/inc/strings.hrc
@@ -20,7 +20,7 @@
 #ifndef BASCTL_INC_BASIDESH_HRC
 #define BASCTL_INC_BASIDESH_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_FILTER_ALLFILES             NC_("RID_STR_FILTER_ALLFILES", "<All>")
 #define RID_STR_NOMODULE                    NC_("RID_STR_NOMODULE", "< No Module >")
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index a6f3abd68edb..022045050e9a 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -105,7 +105,7 @@ ExtraData* GetExtraData()
     return nullptr;
 }
 
-OUString IDEResId(std::string_view aId)
+OUString IDEResId(TranslateId aId)
 {
     return Translate::get(aId, SfxApplication::GetModule(SfxToolsModule::Basic)->GetResLocale());
 }
diff --git a/basctl/source/inc/iderid.hxx b/basctl/source/inc/iderid.hxx
index 254d481ad614..83cbc3d0c4aa 100644
--- a/basctl/source/inc/iderid.hxx
+++ b/basctl/source/inc/iderid.hxx
@@ -20,11 +20,11 @@
 #pragma once
 
 #include <rtl/ustring.hxx>
-#include <string_view>
+#include <unotools/resmgr.hxx>
 
 namespace basctl
 {
-OUString IDEResId(std::string_view aId);
+OUString IDEResId(TranslateId aId);
 
 } // namespace basctl
 
-- 
cgit