mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#89329: use shared_ptr for pImpl in syslocale

Browse Source 
Change-Id: I646495e3538cb438a06765fe8cde252bad667bea
Reviewed-on: https://gerrit.libreoffice.org/25969
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Xisco Fauli
2016-06-06 13:23:35 +02:00
committed by Noel Grandin
parent 60e57960f2
commit 3db4830c41
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/unotools/syslocale.hxx
View File

@@ -45,8 +45,7 @@ class UNOTOOLS_DLLPUBLIC SvtSysLocale
{ {
friend class SvtSysLocale_Impl; // access to mutex friend class SvtSysLocale_Impl; // access to mutex
static SvtSysLocale_Impl* pImpl; std::shared_ptr<SvtSysLocale_Impl> pImpl;
static sal_Int32 nRefCount;
UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetMutex(); UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetMutex();

16
unotools/source/misc/syslocale.cxx
View File

@@ -34,8 +34,7 @@
using namespace osl; using namespace osl;
using namespace com::sun::star; using namespace com::sun::star;
SvtSysLocale_Impl* SvtSysLocale::pImpl = nullptr; std::weak_ptr<SvtSysLocale_Impl> pSysLocale;
sal_Int32 SvtSysLocale::nRefCount = 0;
class SvtSysLocale_Impl : public utl::ConfigurationListener class SvtSysLocale_Impl : public utl::ConfigurationListener
{ {
@@ -114,19 +113,18 @@ void SvtSysLocale_Impl::setDateAcceptancePatternsConfig()
SvtSysLocale::SvtSysLocale() SvtSysLocale::SvtSysLocale()
{ {
MutexGuard aGuard( GetMutex() ); MutexGuard aGuard( GetMutex() );
pImpl = pSysLocale.lock();
if ( !pImpl ) if ( !pImpl )
pImpl = new SvtSysLocale_Impl; {
++nRefCount; pImpl = std::make_shared<SvtSysLocale_Impl>();
pSysLocale = pImpl;
}
} }
SvtSysLocale::~SvtSysLocale() SvtSysLocale::~SvtSysLocale()
{ {
MutexGuard aGuard( GetMutex() ); MutexGuard aGuard( GetMutex() );
if ( !--nRefCount ) pImpl.reset();
{
delete pImpl;
pImpl = nullptr;
}
} }
// static // static