diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2016-11-11 23:38:17 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-12 06:38:34 +0000 |
| commit | 73679ee0a31e3f70ace5136a8e41cbeb1f00c238 (patch) | |
| tree | 4fbecf9f667b619f4e8a413592d0e61a191062b9 /include | |
| parent | 545f5f8abd1df1f9818fbc62c95006149bcc18ef (diff) | |
Copycat SvtSysLocale_Impl for SvtSysLocaleOptions_Impl
and so avoid warn:unotools.config:6728:1:unotools/source/config/configmgr.cxx:167:
ConfigManager not empty when exiting LO
See http://nabble.documentfoundation.org/OSL-ASSERT-items-empty-because-of-Setup-L10N-td4199284.html
Thank you Eike for the hint!
Change-Id: I4b374a075ad8f1ef10a71f3a9424986154613aef
Reviewed-on: https://gerrit.libreoffice.org/30787
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/unotools/syslocaleoptions.hxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/unotools/syslocaleoptions.hxx b/include/unotools/syslocaleoptions.hxx index d9e08287f772..f5cb835b2617 100644 --- a/include/unotools/syslocaleoptions.hxx +++ b/include/unotools/syslocaleoptions.hxx @@ -43,8 +43,7 @@ namespace osl { class Mutex; } class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtSysLocaleOptions : public utl::detail::Options { - static SvtSysLocaleOptions_Impl* pOptions; - static sal_Int32 nRefCount; + std::shared_ptr<SvtSysLocaleOptions_Impl> pImpl; UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetMutex(); virtual void ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt32 nHint ) override; |