From 13fac4894f752e922727c6f22c6303712e06ba12 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 1 Aug 2017 13:50:45 +0100 Subject: normalize resource locale ctor construction mechanisms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit make them all the same and share std::locales more various OModuleClient, etc, classes go away Change-Id: I7e3ff01a69332eeacd22e3078f66a60318de62d5 Reviewed-on: https://gerrit.libreoffice.org/40634 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- accessibility/inc/helper/accresmgr.hxx | 36 +--------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) (limited to 'accessibility/inc') diff --git a/accessibility/inc/helper/accresmgr.hxx b/accessibility/inc/helper/accresmgr.hxx index 24fa1cfa4721..a9aac50a141b 100644 --- a/accessibility/inc/helper/accresmgr.hxx +++ b/accessibility/inc/helper/accresmgr.hxx @@ -22,41 +22,7 @@ #include -#define TK_RES_STRING(id) ::accessibility::TkResMgr::loadString(id) - -// TkResMgr - -namespace accessibility -{ - -class TkResMgr -{ - static std::locale* m_pImpl; - -private: - // no instantiation allowed - TkResMgr() = delete; - ~TkResMgr() { } - - // we'll instantiate one static member of the following class, - // which in its dtor ensures that m_pImpl will be deleted - class EnsureDelete - { - public: - EnsureDelete() { } - ~EnsureDelete(); - }; - friend class EnsureDelete; - -protected: - static void ensureImplExists(); - -public: - // loads the string with the specified resource id - static OUString loadString(const char *pResId); -}; - -} +OUString AccResId(const char* pId); #endif // INCLUDED_ACCESSIBILITY_INC_HELPER_ACCRESMGR_HXX -- cgit