From c0a802b59e1edddeb0b621e15137f5058299efd7 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@collabora.com>
Date: Fri, 10 Apr 2015 10:44:13 +0100
Subject: Audit and correct misc. clears -> disposeAndClears.

Anything that used to be 'delete'd should be disposeAndCleared()
in the new world.
---
 filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 2 +-
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx  | 6 +++---
 filter/source/xsltdialog/xmlfiltertabdialog.cxx       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'filter')

diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index 11e6f7171597..9ff555c8ea0b 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -266,7 +266,7 @@ void SAL_CALL XMLFilterDialogComponent::disposing()
 {
     ::SolarMutexGuard aGuard;
 
-    mpDialog.clear();
+    mpDialog.disposeAndClear();
 
     if (pXSLTResMgr)
     {
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 5e88100b2823..a6761a5c9822 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -1421,9 +1421,9 @@ SvxPathControl::~SvxPathControl()
 
 void SvxPathControl::dispose()
 {
-    m_pVBox.clear();
-    m_pFocusCtrl.clear();
-    m_pHeaderBar.clear();
+    m_pFocusCtrl.disposeAndClear();
+    m_pHeaderBar.disposeAndClear();
+    m_pVBox.disposeAndClear();
     vcl::Window::dispose();
 }
 
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
index ea5a5022a738..2b351e297dca 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
@@ -80,8 +80,8 @@ XMLFilterTabDialog::~XMLFilterTabDialog()
 
 void XMLFilterTabDialog::dispose()
 {
-    mpBasicPage.clear();
-    mpXSLTPage.clear();
+    mpBasicPage.disposeAndClear();
+    mpXSLTPage.disposeAndClear();
     delete mpNewInfo;
     m_pTabCtrl.clear();
     m_pOKBtn.clear();
-- 
cgit