diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-03-25 10:43:49 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2021-03-25 12:45:20 +0100 |
commit | 82f473c87da72a3d7aac80249d408a02caa25afa (patch) | |
tree | e4c96ab9e5e791896b539c74f537f8a79b99a448 /svx | |
parent | 34d6ad3df09ff7a68d00ae69cc03796b1566dfa1 (diff) |
fix crash on pressing esc in search/replace dialog
activate can be called during tear down as focus is transferred between
widgets as they die
Change-Id: Ia8d65b4d3c2e0ea4b8238e598ace0cc0d0e7d738
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113080
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/dialog/srchdlg.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 06836388a33c..2045730344d4 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -373,6 +373,8 @@ void SvxSearchDialog::ChildWinDispose() SvxSearchDialog::~SvxSearchDialog() { m_aPresentIdle.Stop(); + pSearchItem.reset(); + pImpl.reset(); } void SvxSearchDialog::Construct_Impl() @@ -598,7 +600,6 @@ bool SvxSearchDialog::IsOtherOptionsExpanded() const void SvxSearchDialog::Activate() { // apply possible transliteration changes of the SvxSearchItem member - DBG_ASSERT( pSearchItem, "SearchItem missing" ); if (pSearchItem) { m_xMatchCaseCB->set_active( pSearchItem->GetExact() ); |