[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - chart2/source

[Szymon KÅ‚os (via logerrit)]

 chart2/source/controller/main/ChartController.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit bf56549ee3f7daa31ac1a4f4c2b3c6a2b9904eb8
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Oct 6 16:59:52 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Oct 27 23:00:06 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/+/104605
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 8fedb472ca04..cf45674304a8 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
     {