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 /dbaccess/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 'dbaccess/inc')
-rw-r--r-- | dbaccess/inc/core_resource.hxx | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/dbaccess/inc/core_resource.hxx b/dbaccess/inc/core_resource.hxx index ecbdcdde5bf4..91ddb2df347c 100644 --- a/dbaccess/inc/core_resource.hxx +++ b/dbaccess/inc/core_resource.hxx @@ -32,22 +32,11 @@ namespace dbaccess // handling resources within the DBA-Core library class OOO_DLLPUBLIC_DBA ResourceManager { - friend class OModuleClient; - static sal_Int32 s_nClients; /// number of registered clients - static std::locale* m_pImpl; - private: // no instantiation allowed ResourceManager() = delete; ~ResourceManager() { } - protected: - static void ensureImplExists(); - /// register a client for the module - static void registerClient(); - /// revoke a client for the module - static void revokeClient(); - public: /** loads the string with the specified resource id */ @@ -89,16 +78,6 @@ namespace dbaccess const OUString& _rReplace2 ); }; - - // OModuleClient - /** base class for objects which uses any global module-specific resources - */ - class OModuleClient - { - public: - OModuleClient() { ResourceManager::registerClient(); } - ~OModuleClient() { ResourceManager::revokeClient(); } - }; } #endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HXX |