From 7397dbb9b9b08fc0187889b1346fb6c7c8fc0f17 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 11 Nov 2015 16:52:20 +0100 Subject: svx: rename static variable Change-Id: I98246395bb0de7444864ce35d1cbdd4711b5bfeb --- svx/source/gallery2/gallery1.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'svx') 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 ) -- cgit