diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2018-05-22 15:52:50 +0100 |
|---|---|---|
| committer | Aron Budea <aron.budea@collabora.com> | 2018-05-22 18:03:36 +0200 |
| commit | eac3d5cb7ec2369bd5409e79ce4b96552651dbaf (patch) | |
| tree | eedecf2ad1265832f024db1770677f6394e865e3 /sw | |
| parent | 23109bc47daf037b76b3188c3ac3030873cb8529 (diff) | |
Use vcl::DeleteOnDeinit for resource managers.
Change-Id: I305c2dfd407f2606331a5950a3b36ee58e1d74d6
Reviewed-on: https://gerrit.libreoffice.org/54676
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Tested-by: Aron Budea <aron.budea@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/app/swmodule.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index 2edfc5bd25ed..ff703050bf85 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -128,7 +128,7 @@ bool g_bNoInterrupt = false; #include <sfx2/app.hxx> - +#include <vcl/lazydelete.hxx> #include <svx/svxerr.hxx> #include <unomid.h> @@ -140,11 +140,11 @@ using namespace com::sun::star; ResMgr & GetSwResMgr() { // not threadsafe - static std::unique_ptr<ResMgr> pResourceManager; + static vcl::DeleteOnDeinit<ResMgr> pResourceManager(nullptr); const LanguageTag& rLocale = Application::GetSettings().GetUILanguageTag(); - if( ! pResourceManager || pResourceManager->GetLocale() != rLocale ) + if( ! pResourceManager.get() || pResourceManager.get()->GetLocale() != rLocale ) pResourceManager.reset( ResMgr::CreateResMgr("sw", rLocale) ); - OSL_ASSERT( pResourceManager ); + OSL_ASSERT( pResourceManager.get() ); return *pResourceManager.get(); } |