diff options
| author | Andras Timar <andras.timar@collabora.com> | 2017-12-28 15:55:44 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-01-02 15:32:37 +0100 |
| commit | 5022038726af951bf6ec06d94219c1d387349e28 (patch) | |
| tree | 010d68a0c6ec94e1433f16e02d221157bbbf22a4 /svx | |
| parent | 34372e6e849519c30461f70d94748295412dcb2b (diff) | |
lokdialog: Allow switching language of svx ResMgr
Change-Id: I4409abcaa592fd4ac7bb69e8f70d5b2c227c087d
Reviewed-on: https://gerrit.libreoffice.org/47142
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/dialmgr.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/svx/source/dialog/dialmgr.cxx b/svx/source/dialog/dialmgr.cxx index e683a72fab3c..150022b6ecce 100644 --- a/svx/source/dialog/dialmgr.cxx +++ b/svx/source/dialog/dialmgr.cxx @@ -22,13 +22,15 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -static ResMgr* pResMgr=nullptr; +static std::unique_ptr<ResMgr> pResMgr; ResMgr* DialogsResMgr::GetResMgr() { - if (!pResMgr) - pResMgr = ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag()); - return pResMgr; + const LanguageTag& rLocale = Application::GetSettings().GetUILanguageTag(); + + if (!pResMgr || pResMgr->GetLocale() != rLocale) + pResMgr.reset(ResMgr::CreateResMgr("svx", rLocale)); + return pResMgr.get(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |