diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-01-26 18:16:37 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-01-26 18:16:37 +0100 |
commit | ac95e905a12ee6ad49af3814a248d0ddb7700559 (patch) | |
tree | d3f2d97a1c9293d6180bc0fb03d63e9be41bd879 /framework/source/inc | |
parent | vcl: replace boost::shared_array with std::shared_ptr (diff) | |
download | core-ac95e905a12ee6ad49af3814a248d0ddb7700559.tar.gz core-ac95e905a12ee6ad49af3814a248d0ddb7700559.zip |
Replace salhelper::SingletonRef with rtl::Static
Change-Id: I2ff6462472292de7cdeb5c7ed748299e58399bdb
Diffstat (limited to 'framework/source/inc')
-rw-r--r-- | framework/source/inc/accelerators/presethandler.hxx | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index 79d0ff84a1ce..4f005d6ce0e9 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -29,7 +29,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> -#include <salhelper/singletonref.hxx> #include <i18nlangtag/languagetag.hxx> namespace framework @@ -68,34 +67,6 @@ class PresetHandler private: - /** @short because a concurrent access to the same storage from different implementations - isn't supported, we have to share it with others. - - @descr This struct makes it possible to use any shared storage - in combination with a SingletonRef<> template ... - - This struct is allegedly shared and must be used within a - synchronized section. But it isn't. - */ - struct TSharedStorages - { - public: - - StorageHolder m_lStoragesShare; - StorageHolder m_lStoragesUser; - - TSharedStorages() - : m_lStoragesShare() - , m_lStoragesUser () - {}; - - virtual ~TSharedStorages() {}; - }; - - // member - - private: - /** @short can be used to create on needed uno resources. */ css::uno::Reference< css::uno::XComponentContext > m_xContext; @@ -121,12 +92,6 @@ class PresetHandler */ OUString m_sModule; - /** @short provides access to the: - a) shared root storages - b) shared "inbetween" storages - of the share and user layer. */ - ::salhelper::SingletonRef< TSharedStorages > m_aSharedStorages; - /** @short if we run in document mode, we can't use the global root storages! We have to use a special document storage explicitly. */ StorageHolder m_lDocumentStorages; |