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

[Szymon KÅ‚os (via logerrit)]

 sfx2/source/view/ipclient.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f3ede41837dfaafe3ca9c4aa2e84c31b79aafe8f
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Mar 24 11:45:51 2021 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Mon Mar 29 14:16:34 2021 +0200

    SfxInPlaceClient: avoid crash when chart deleted by other view
    
    Be sure m_pClient still is valid. In case when one view
    was in the chart editing mode and other view deleted the
    slide, m_pClient was cleared in the meantime what caused
    a crash
    
    Change-Id: Ie433946799abef4c75af7b96f3e5cf9ba0e7ec47
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113032
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index cefe1586ab9e..e178e5338eb7 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -313,7 +313,8 @@ void SAL_CALL SfxInPlaceClient_Impl::visibilityChanged( sal_Bool bVisible )
         throw uno::RuntimeException();
 
     m_pClient->GetViewShell()->OutplaceActivated( bVisible );
-    m_pClient->Invalidate();
+    if (m_pClient) // it can change in the above code
+        m_pClient->Invalidate();
 }