diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2019-12-11 18:19:43 -0500 |
|---|---|---|
| committer | Ashod Nakashian <ashnakash@gmail.com> | 2019-12-12 01:12:45 +0100 |
| commit | d4c52ebce80e6ea9dbfa0ca47b50272fab71c546 (patch) | |
| tree | 7ec3d0fab044a8032c308089fd9a4343c1ec790b /chart2 | |
| parent | 52bfa7294ce18456c6285ed4897e0ed318dbb98e (diff) | |
chart2: clear listener parents in dispose
Change-Id: Icdab125589ab0f55255f683a1ea39e036de661b1
Reviewed-on: https://gerrit.libreoffice.org/84997
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Diffstat (limited to 'chart2')
3 files changed, 14 insertions, 1 deletions
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index 57f245fe8db4..41e2664d1e9d 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -75,6 +75,7 @@ ChartWindow::~ChartWindow() void ChartWindow::dispose() { + m_pWindowController = nullptr; m_pViewShellWindow.clear(); vcl::Window::dispose(); } diff --git a/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx b/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx index b000e55c5aa6..0fa0b793b5b6 100644 --- a/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx +++ b/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx @@ -27,12 +27,17 @@ ChartSidebarModifyListener::~ChartSidebarModifyListener() void ChartSidebarModifyListener::modified(const css::lang::EventObject& /*rEvent*/) { - mpParent->updateData(); + if (mpParent) + mpParent->updateData(); } void ChartSidebarModifyListener::disposing(const css::lang::EventObject& /*rEvent*/) { + if (!mpParent) + return; + mpParent->modelInvalid(); + mpParent = nullptr; } } } diff --git a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx index 19f4335e0b49..65d7bc9ce350 100644 --- a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx +++ b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx @@ -41,6 +41,9 @@ ChartSidebarSelectionListener::~ChartSidebarSelectionListener() void ChartSidebarSelectionListener::selectionChanged(const css::lang::EventObject& rEvent) { + if (!mpParent) + return; + bool bCorrectObjectSelected = false; css::uno::Reference<css::frame::XController> xController(rEvent.Source, css::uno::UNO_QUERY); @@ -66,7 +69,11 @@ void ChartSidebarSelectionListener::selectionChanged(const css::lang::EventObjec void ChartSidebarSelectionListener::disposing(const css::lang::EventObject& /*rEvent*/) { + if (!mpParent) + return; + mpParent->SelectionInvalid(); + mpParent = nullptr; } void ChartSidebarSelectionListener::setAcceptedTypes(const std::vector<ObjectType>& aTypes) |