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>
---
 include/svl/svl.hrc      | 2 +-
 include/svl/svlresid.hxx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'include/svl')

diff --git a/include/svl/svl.hrc b/include/svl/svl.hrc
index 231d26c0f3b5..f1f60756c301 100644
--- a/include/svl/svl.hrc
+++ b/include/svl/svl.hrc
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SVL_SVL_HRC
 #define INCLUDED_SVL_SVL_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))
 
 //  Internet Media Type Presentations
 
diff --git a/include/svl/svlresid.hxx b/include/svl/svlresid.hxx
index 5e6f271ea7a1..5b57aa2c0c52 100644
--- a/include/svl/svlresid.hxx
+++ b/include/svl/svlresid.hxx
@@ -12,9 +12,9 @@
 
 #include <svl/svldllapi.h>
 #include <rtl/ustring.hxx>
-#include <string_view>
+#include <unotools/resmgr.hxx>
 
-SVL_DLLPUBLIC OUString SvlResId(std::string_view aId);
+SVL_DLLPUBLIC OUString SvlResId(TranslateId sContextAndId);
 
 #endif // INCLUDED_SVL_SVTRESID_HXX
 
-- 
cgit