[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - svx/source

[Szymon KÅ‚os (via logerrit)]

 svx/source/sidebar/fontwork/FontworkPropertyPanel.cxx |   10 ++++++++++
 svx/source/sidebar/fontwork/FontworkPropertyPanel.hxx |    2 ++
 2 files changed, 12 insertions(+)

New commits:
commit 649c0de61d1d16135ea573a343e8bc249986315b
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Apr 21 14:19:27 2021 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed Apr 21 15:46:00 2021 +0200

    Destroy properly FontworkPropertyPanel
    
    Change-Id: Ie320bd1a37ab352e9fc981cb87c8dc56cf659081
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114405
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/svx/source/sidebar/fontwork/FontworkPropertyPanel.cxx b/svx/source/sidebar/fontwork/FontworkPropertyPanel.cxx
index 7d1b853d2ea8..286f65109698 100644
--- a/svx/source/sidebar/fontwork/FontworkPropertyPanel.cxx
+++ b/svx/source/sidebar/fontwork/FontworkPropertyPanel.cxx
@@ -49,6 +49,16 @@ FontworkPropertyPanel::FontworkPropertyPanel(vcl::Window* pParent,
         m_pToolbar->set_item_visible(".uno:ExtrusionToggle", false);
 }
 
+FontworkPropertyPanel::~FontworkPropertyPanel() { disposeOnce(); }
+
+void FontworkPropertyPanel::dispose()
+{
+    m_xToolbar.reset(nullptr);
+    m_pToolbar.reset(nullptr);
+
+    PanelLayout::dispose();
+}
+
 VclPtr<vcl::Window>
 FontworkPropertyPanel::Create(vcl::Window* pParent,
                               const css::uno::Reference<css::frame::XFrame>& rxFrame)
diff --git a/svx/source/sidebar/fontwork/FontworkPropertyPanel.hxx b/svx/source/sidebar/fontwork/FontworkPropertyPanel.hxx
index 92447863b316..7c8c3a2a84bb 100644
--- a/svx/source/sidebar/fontwork/FontworkPropertyPanel.hxx
+++ b/svx/source/sidebar/fontwork/FontworkPropertyPanel.hxx
@@ -36,6 +36,8 @@ public:
     // constructor/destructor
     FontworkPropertyPanel(vcl::Window* pParent,
                           const css::uno::Reference<css::frame::XFrame>& rxFrame);
+    ~FontworkPropertyPanel();
+    void dispose() override;
 
 private:
     std::unique_ptr<weld::Toolbar> m_pToolbar;