diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-08-01 13:50:45 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-08-02 10:36:07 +0200 |
commit | 13fac4894f752e922727c6f22c6303712e06ba12 (patch) | |
tree | 5689829e917927bb13461d91988ec99e461f1831 /accessibility/inc | |
parent | If we are going to warn about an "invalid" URL, at least tell what it is (diff) | |
download | core-13fac4894f752e922727c6f22c6303712e06ba12.tar.gz core-13fac4894f752e922727c6f22c6303712e06ba12.zip |
normalize resource locale ctor construction mechanisms
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 <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'accessibility/inc')
-rw-r--r-- | accessibility/inc/helper/accresmgr.hxx | 36 |
1 files changed, 1 insertions, 35 deletions
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 <rtl/ustring.hxx> -#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 |