diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-11-11 16:52:20 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-11-13 11:03:04 +0100 |
| commit | 7397dbb9b9b08fc0187889b1346fb6c7c8fc0f17 (patch) | |
| tree | 68772131457770e8c43949c35c673b9bf63b505f /svx | |
| parent | e0cdf0c53bfddea0ced075cc0ada10ef638c1795 (diff) | |
svx: rename static variable
Change-Id: I98246395bb0de7444864ce35d1cbdd4711b5bfeb
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/gallery2/gallery1.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 4f5d371262b1..eb847b8e2bde 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -182,18 +182,18 @@ Gallery::~Gallery() Gallery* Gallery::GetGalleryInstance() { - static Gallery* pGallery = nullptr; + static Gallery* s_pGallery = nullptr; - if( !pGallery ) + if (!s_pGallery) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if( !pGallery ) + if (!s_pGallery) { - pGallery = new Gallery( SvtPathOptions().GetGalleryPath() ); + s_pGallery = new Gallery( SvtPathOptions().GetGalleryPath() ); } } - return pGallery; + return s_pGallery; } void Gallery::ImplLoad( const OUString& rMultiPath ) |