sfx2/source/view/ipclient.cxx | 3 ++-
vcl/source/window/window.cxx | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 9e88172d28edf315676f52ed9a99077e95cd9628
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Wed Mar 24 11:45:51 2021 +0100
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Thu Apr 8 15:45:53 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 <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113786
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 1d3c375b6eb4..3c40c7bdf4a6 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -308,7 +308,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();
}
commit 3889d15537ad1cc3db9dce6f410dc42265d873b9
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Wed Mar 24 11:10:18 2021 +0100
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Thu Apr 8 15:45:41 2021 +0200
ImplNewInputContext: check pointer before use
Change-Id: Id98cc2037f6cfb9c5468d67b00595d940aa88946
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113030
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113785
Tested-by: Szymon Kłos <szymon.k...@collabora.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 4c1b8c72d699..08b07aadbd17 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1729,7 +1729,7 @@ void Window::ImplNewInputContext()
{
ImplSVData* pSVData = ImplGetSVData();
vcl::Window* pFocusWin = pSVData->mpWinData->mpFocusWin;
- if ( !pFocusWin || pFocusWin->IsDisposed() )
+ if ( !pFocusWin || !pFocusWin->mpWindowImpl || pFocusWin->IsDisposed() )
return;
// Is InputContext changed?
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
