diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-03-10 14:18:52 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-03-11 16:47:24 +0100 |
| commit | 8a025d3f86bdc51013df27d8290ddf7cfcf1b36f (patch) | |
| tree | c1740cf49d1d4c2f6c303013dc3bd7d26b2eb8ec | |
| parent | 051edbc396f665e84e54ab82de1f683c221925e0 (diff) | |
Resolves: tdf#131248 a11y crash when closing SQL Edit Query
Change-Id: I39db7b352dd460f46092a054bfa89f5acdda54c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90273
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
(cherry picked from commit 156f14c6632df104186feeba250abdf7de4a2e30)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90280
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Miklos Vajna <vmiklos@collabora.com>
| -rw-r--r-- | vcl/source/edit/vclmedit.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index e21d5c4c8f57..49b63e9ae3e9 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -1087,6 +1087,9 @@ void VclMultiLineEdit::SetReadOnly( bool bReadOnly ) bool VclMultiLineEdit::IsReadOnly() const { + if (!pImpVclMEdit) // might be called from within the dtor, when pImpVclMEdit == NULL is a valid state + return true; + return pImpVclMEdit->IsReadOnly(); } |