From 2811d0a20e038f6fd573f31eff8d485bd16c81ce Mon Sep 17 00:00:00 2001
From: Noel Grandin <noelgrandin@gmail.com>
Date: Mon, 8 Nov 2021 21:24:32 +0200
Subject: rtl::Static to thread-safe static

Change-Id: I6390d1811bad59c09a074039c635710d25a660d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124886
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 desktop/inc/dp_shared.hxx | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'desktop/inc')

diff --git a/desktop/inc/dp_shared.hxx b/desktop/inc/dp_shared.hxx
index 0ce0bc401d65..dbd695c31b9b 100644
--- a/desktop/inc/dp_shared.hxx
+++ b/desktop/inc/dp_shared.hxx
@@ -19,23 +19,9 @@
 
 #pragma once
 
-#include <rtl/instance.hxx>
 #include <unotools/resmgr.hxx>
+#include <dp_misc_api.hxx>
 
-namespace dp {
-
-struct DeploymentLocale :
-    public ::rtl::StaticWithInit<std::locale, DeploymentLocale > {
-        std::locale operator () () {
-            return Translate::Create("dkt");
-    }
-};
-
-} // namespace dp
-
-inline OUString DpResId(TranslateId aId)
-{
-    return Translate::get(aId, dp::DeploymentLocale::get());
-}
+DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString DpResId(TranslateId aId);
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
cgit