Merge remote-tracking branch 'origin/feature/vclptrmerge2'

1 files changed, 14 insertions, 2 deletions

diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index a7041604683b..bff4d1a74c8e 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -54,12 +54,24 @@ SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(vcl::Window *pParent,
 {
     // pPage will be implicitly destroyed by the
     // SfxSingleTabDialog destructor
-    pPage = static_cast<SvxJSearchOptionsPage *>(
-        SvxJSearchOptionsPage::Create(get_content_area(), &rOptionsSet ));
+    pPage.reset( static_cast<SvxJSearchOptionsPage *>(
+                        SvxJSearchOptionsPage::Create(
+                                get_content_area(), &rOptionsSet ).get() ) );
     SetTabPage( pPage );    //! implicitly calls pPage->Reset(...)!
     pPage->EnableSaveOptions(false);
 }
 
+SvxJSearchOptionsDialog::~SvxJSearchOptionsDialog()
+{
+    disposeOnce();
+}
+
+void SvxJSearchOptionsDialog::dispose()
+{
+    pPage.clear();
+    SfxSingleTabDialog::dispose();
+}
+
 void SvxJSearchOptionsDialog::Activate()
 {
     pPage->SetTransliterationFlags( nInitialTlFlags );