Kaydet (Commit) 101fdd94 authored tarafından Jochen Nitschke's avatar Jochen Nitschke

fix regression, some mutexes need to live longer

commit 6149da20
    replace misc double checked locking patterns
    ... with thread safe local statics

reintroduced bug #i77768# despite big comment

Change-Id: Ic6e204a277c8aa4f43c5fd15a42066c6f8a69dad
Reviewed-on: https://gerrit.libreoffice.org/38959Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
Tested-by: 's avatarJenkins <ci@libreoffice.org>
üst 0a9e5778
......@@ -353,9 +353,9 @@ void SvNumberFormatter::ChangeIntl(LanguageType eLnge)
// #i77768# Due to a static reference in the toolkit lib
// we need a mutex that lives longer than the svl library.
// Otherwise the dtor would use a destructed mutex!!
static ::osl::Mutex persistantMutex;
static osl::Mutex* persistentMutex(new osl::Mutex);
return persistantMutex;
return *persistentMutex;
}
......
......@@ -526,9 +526,9 @@ Mutex& SvtSysLocaleOptions::GetMutex()
// #i77768# Due to a static reference in the toolkit lib
// we need a mutex that lives longer than the svl library.
// Otherwise the dtor would use a destructed mutex!!
static Mutex persistentMutex;
static Mutex* persistentMutex(new Mutex);
return persistentMutex;
return *persistentMutex;
}
bool SvtSysLocaleOptions::IsModified()
......
......@@ -137,9 +137,9 @@ Mutex& SvtSysLocale::GetMutex()
// #i77768# Due to a static reference in the toolkit lib
// we need a mutex that lives longer than the svl library.
// Otherwise the dtor would use a destructed mutex!!
static Mutex persistentMutex;
static Mutex* persistentMutex(new Mutex);
return persistentMutex;
return *persistentMutex;
}
const LocaleDataWrapper& SvtSysLocale::GetLocaleData() const
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment