chart2/source/controller/main/ChartController.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit a4d4ed86991e2901ac86189e95966d4e99be4944
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Tue Oct 6 16:59:52 2020 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Oct 27 23:00:22 2020 +0100
Fire selection change event before sidebar is unregistered
Prevent us from crash in online using mobile phone
when leaving chart edit mode with chart type modified.
Change-Id: I8da70612786141a2c92b55a45822ef8ff5713e5b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104606
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/chart2/source/controller/main/ChartController.cxx
b/chart2/source/controller/main/ChartController.cxx
index df58f924189a..5e280c94b7c0 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -746,6 +746,9 @@ void SAL_CALL ChartController::dispose()
{
m_bDisposed = true;
+ mpSelectionChangeHandler->selectionChanged(css::lang::EventObject());
+ mpSelectionChangeHandler->Disconnect();
+
if (getModel().is())
{
uno::Reference<ui::XSidebar> xSidebar =
getSidebarFromModel(getModel());
@@ -754,8 +757,6 @@ void SAL_CALL ChartController::dispose()
sfx2::sidebar::SidebarController::unregisterSidebarForFrame(pSidebar, this);
}
}
- mpSelectionChangeHandler->selectionChanged(css::lang::EventObject());
- mpSelectionChangeHandler->Disconnect();
try
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
