diff options
author | Jan Holesovsky <kendy@collabora.com> | 2018-01-03 14:08:55 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2018-01-05 09:51:23 +0100 |
commit | 028fd03cdf4d3d8072289a5c4d476435c18f90d0 (patch) | |
tree | ee455db401fc6a9cfca565c9496bfe49dfa3d780 /include/sfx2 | |
parent | f1d1854ffe2c1bc456855573b3ed4ad9852f4571 (diff) |
lokdialog: Allow language switching in SfxModule(s).
Change-Id: Icef0b3610c3bfa858cdd61de6ef3f5edc1e3c96b
Reviewed-on: https://gerrit.libreoffice.org/47385
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'include/sfx2')
-rw-r--r-- | include/sfx2/module.hxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index de487dafaa3f..352d1e46ba6f 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.hxx @@ -52,13 +52,11 @@ namespace com { namespace sun { namespace star { namespace frame { class SFX2_DLLPUBLIC SfxModule : public SfxShell { private: - std::locale m_aResLocale; - // Warning this cannot be turned into a unique_ptr. // SfxInterface destruction in the SfxSlotPool refers again to pImpl after deletion of pImpl has commenced. See tdf#100270 SfxModule_Impl* pImpl; - SAL_DLLPRIVATE void Construct_Impl(); + SAL_DLLPRIVATE void Construct_Impl(const OString& rResName); public: SFX_DECL_INTERFACE(SFX_INTERFACE_SFXMODULE) @@ -69,10 +67,10 @@ private: public: - SfxModule(const std::locale& rResLocale, std::initializer_list<SfxObjectFactory*> pFactoryList); + SfxModule(const OString& rResName, std::initializer_list<SfxObjectFactory*> pFactoryList); virtual ~SfxModule() override; - const std::locale& GetResLocale() const { return m_aResLocale; } + std::locale GetResLocale() const; SfxSlotPool* GetSlotPool() const; void RegisterToolBoxControl(const SfxTbxCtrlFactory&); |