diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-10-08 19:14:35 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-10-09 20:42:11 +0200 |
| commit | 33972dea7d8849842929060be8f970e090077e4c (patch) | |
| tree | b491d8ff51cf52b26177778a161142d61764426b /chart2 | |
| parent | c129a415ad0998b1544aed756316ed869148ef7b (diff) | |
correctly dispose the chart sidebar when leaving chart, tdf#94292
This is a much better approach than my old one that tried to use the
correct XModel with the chart sidebar. Now everytime we leave the chart
edit mdoe we destroy the chart sidebar panels and recreate them when we
go back to chart edit mode.
As a result we no longer need to have worry that much about using the
correct ChartModel and about the lifecycle of the ChartModel.
Change-Id: Ie85ad82968e20a81f059d4bd930a83a70da35fc9
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/main/ChartController.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 8b1654393023..754bc07596ad 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -807,8 +807,6 @@ void SAL_CALL ChartController::dispose() throw(uno::RuntimeException, std::exception) { m_bDisposed = true; - mpSelectionChangeHandler->selectionChanged(css::lang::EventObject()); - mpSelectionChangeHandler->Disconnect(); if (getModel().is()) { @@ -819,6 +817,8 @@ void SAL_CALL ChartController::dispose() sfx2::sidebar::SidebarController::unregisterSidebarForFrame(pSidebar, this); } } + mpSelectionChangeHandler->selectionChanged(css::lang::EventObject()); + mpSelectionChangeHandler->Disconnect(); try { |