diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-11-17 23:43:26 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-11-17 23:49:50 +0100 |
| commit | 526bfba0a0ef5cfa213b2c978eed83e43bb3cd9a (patch) | |
| tree | 5c139ce2e55709351fe540af93ffaf7249fb10ad /sd | |
| parent | f324e507acf2875ac12d6ab1c1fca4fe95ba1817 (diff) | |
vcl, sd: rename some overly generic static variables
Change-Id: I89159df36361f9ceff3401ef379c8230465617b7
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/tools/IconCache.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/tools/IconCache.cxx b/sd/source/ui/tools/IconCache.cxx index 6c46806bd1b5..ecc15e15e1a1 100644 --- a/sd/source/ui/tools/IconCache.cxx +++ b/sd/source/ui/tools/IconCache.cxx @@ -37,7 +37,7 @@ private: IconCache::Instance() is called to the end of the sd module when the cache is destroyed from SdGlobalResourceContainer. */ - static IconCache* mpInstance; + static IconCache* s_pIconCache; typedef std::unordered_map<sal_uInt16,Image> ImageContainer; ImageContainer maContainer; @@ -45,7 +45,7 @@ private: Image GetIcon (sal_uInt16 nResourceId); }; -IconCache* IconCache::Implementation::mpInstance = nullptr; +IconCache* IconCache::Implementation::s_pIconCache = nullptr; Image IconCache::Implementation::GetIcon (sal_uInt16 nResourceId) { @@ -67,17 +67,17 @@ Image IconCache::Implementation::GetIcon (sal_uInt16 nResourceId) //static IconCache& IconCache::Instance() { - if (Implementation::mpInstance == nullptr) + if (Implementation::s_pIconCache == nullptr) { ::osl::GetGlobalMutex aMutexFunctor; ::osl::MutexGuard aGuard (aMutexFunctor()); - if (Implementation::mpInstance == nullptr) + if (Implementation::s_pIconCache == nullptr) { IconCache* pCache = new IconCache (); SdGlobalResourceContainer::Instance().AddResource ( ::std::unique_ptr<SdGlobalResource>(pCache)); OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER(); - Implementation::mpInstance = pCache; + Implementation::s_pIconCache = pCache; } } else @@ -85,9 +85,9 @@ IconCache& IconCache::Instance() OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER(); } - DBG_ASSERT(Implementation::mpInstance!=nullptr, + DBG_ASSERT(Implementation::s_pIconCache != nullptr, "IconCache::Instance(): instance is NULL"); - return *Implementation::mpInstance; + return *Implementation::s_pIconCache; } Image IconCache::GetIcon (sal_uInt16 nResourceId) |