1 files changed, 12 insertions, 15 deletions
diff --git a/framework/source/fwe/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx
index e9a2998629fd..8ed6c1dbb5e5 100644
--- a/framework/source/fwe/classes/fwkresid.cxx
+++ b/framework/source/fwe/classes/fwkresid.cxx
@@ -24,27 +24,24 @@
 
 #include <rtl/strbuf.hxx>
 
-namespace framework
+namespace
 {
-
-ResMgr* FwkResId::GetResManager()
-{
-    static ResMgr*  pResMgr = nullptr;
-
-    if ( !pResMgr )
+    const std::locale& GetResLocale()
     {
-        SolarMutexGuard aSolarGuard;
-        pResMgr = ResMgr::CreateResMgr("fwe", Application::GetSettings().GetUILanguageTag());
+        static std::locale* pResLocale = nullptr;
+        if (!pResLocale)
+        {
+            SolarMutexGuard aSolarGuard;
+            static std::locale loc(Translate::Create("fwe", Application::GetSettings().GetUILanguageTag()));
+            pResLocale = &loc;
+        }
+        return *pResLocale;
     }
-
-    return pResMgr;
 }
 
-FwkResId::FwkResId( sal_uInt16 nId ) :
-    ResId( nId, *FwkResId::GetResManager() )
+OUString FwkResId(const char* pId)
 {
-}
-
+    return Translate::get(pId, GetResLocale());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */