From 2c7a102df90bd051d34fa9100979d1a0d6341576 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 25 Mar 2019 09:43:13 +0000
Subject: ubsan detect null deref
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I78a8c91f2c7493a12f5acb325c3f79efbbfbffcc
Reviewed-on: https://gerrit.libreoffice.org/69650
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 svx/source/dialog/srchdlg.cxx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'svx')

diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index f5a809ed3c5c..a3b74d15dfe7 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -340,13 +340,18 @@ SvxSearchDialog::SvxSearchDialog(weld::Window* pParent, SfxChildWindow* pChildWi
     Construct_Impl();
 }
 
-SvxSearchDialog::~SvxSearchDialog()
+void SvxSearchDialog::ChildWinDispose()
 {
     rBindings.EnterRegistrations();
     pSearchController.reset();
     pOptionsController.reset();
     pFamilyController.reset();
     rBindings.LeaveRegistrations();
+    SfxModelessDialogController::ChildWinDispose();
+}
+
+SvxSearchDialog::~SvxSearchDialog()
+{
 }
 
 void SvxSearchDialog::Construct_Impl()
-- 
cgit