1 files changed, 14 insertions, 2 deletions
diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx
index bddfdef57fc0..8141ca08aa03 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -46,7 +46,7 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl:
     , pDoc(ptrViewData->GetDocument())
     , aLocalRangeName(*(pDoc->GetRangeName()))
 {
-    m_pFilterCtr = new SvxTPFilter(get<VclContainer>("box"));
+    m_pFilterCtr = VclPtr<SvxTPFilter>::Create(get<VclContainer>("box"));
     get(m_pHighlightBox, "showchanges");
     get(m_pCbAccept, "showaccepted");
     get(m_pCbReject, "showrejected");
@@ -69,8 +69,20 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl:
 
 ScHighlightChgDlg::~ScHighlightChgDlg()
 {
+    disposeOnce();
+}
+
+void ScHighlightChgDlg::dispose()
+{
     SetDispatcherLock( false );
-    delete m_pFilterCtr;
+    m_pFilterCtr.disposeAndClear();
+    m_pHighlightBox.clear();
+    m_pCbAccept.clear();
+    m_pCbReject.clear();
+    m_pOkButton.clear();
+    m_pEdAssign.clear();
+    m_pRbAssign.clear();
+    ScAnyRefDlg::dispose();
 }
 
 void ScHighlightChgDlg::Init()