diff options
Diffstat (limited to 'cui/source')
| -rw-r--r-- | cui/source/factory/cuiresmgr.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cui/source/factory/cuiresmgr.cxx b/cui/source/factory/cuiresmgr.cxx index e61da43b6710..48e942a90685 100644 --- a/cui/source/factory/cuiresmgr.cxx +++ b/cui/source/factory/cuiresmgr.cxx @@ -21,15 +21,16 @@ #include <svl/solar.hrc> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> +#include <vcl/lazydelete.hxx> // struct DialogsResMgr -------------------------------------------------- ResMgr* CuiResMgr::GetResMgr() { - static std::unique_ptr<ResMgr> pResMgr; + static vcl::DeleteOnDeinit<ResMgr> pResMgr(nullptr); const LanguageTag& rLocale = Application::GetSettings().GetUILanguageTag(); - if (!pResMgr || pResMgr->GetLocale() != rLocale) + if (!pResMgr.get() || pResMgr.get()->GetLocale() != rLocale) { pResMgr.reset(ResMgr::CreateResMgr("cui", rLocale)); } |