From c54bb4a9f76a11561a7f4010382dbe46c0d2ef2a Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Thu, 9 Mar 2017 03:20:19 +0100 Subject: tdf#99352: create editeng::SharedVclRessources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - instead of keeping vcl resources in a rtl::Static - these are shared owned by all EditEngines - they let go of them when disposed - thus, this should prevent VclPtrs to leak beyond dispose() Change-Id: Ic6198c19d0ff9c09ecdea377d07807f08711d6a0 Reviewed-on: https://gerrit.libreoffice.org/34986 Tested-by: Jenkins Reviewed-by: Björn Michaelsen --- include/editeng/eerdll.hxx | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include/editeng/eerdll.hxx') diff --git a/include/editeng/eerdll.hxx b/include/editeng/eerdll.hxx index 74034f249bd3..928f5603f96a 100644 --- a/include/editeng/eerdll.hxx +++ b/include/editeng/eerdll.hxx @@ -21,6 +21,10 @@ #define INCLUDED_EDITENG_EERDLL_HXX class GlobalEditData; +namespace editeng +{ + class SharedVclResources; +} #include #include @@ -35,6 +39,7 @@ public: class EditDLL { std::unique_ptr pGlobalData; + std::weak_ptr pSharedVcl; public: EditDLL(); @@ -42,6 +47,7 @@ public: static ResMgr* GetResMgr(); GlobalEditData* GetGlobalData() const { return pGlobalData.get(); } + std::shared_ptr GetSharedVclResources(); static EditDLL& Get(); }; -- cgit