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.
---
 fpicker/source/office/PlacesListBox.cxx | 8 ++++----
 fpicker/source/office/commonpicker.cxx  | 2 +-
 fpicker/source/office/iodlg.cxx         | 8 ++++----
 fpicker/source/office/iodlgimp.cxx      | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'fpicker')

diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx
index eef7e27a6be8..e6099522efcf 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -48,7 +48,7 @@ PlacesListBox_Impl::~PlacesListBox_Impl( )
 
 void PlacesListBox_Impl::dispose()
 {
-    mpHeaderBar.clear();
+    mpHeaderBar.disposeAndClear();
     mpParent.clear();
     SvHeaderTabListBox::dispose();
 }
@@ -93,9 +93,9 @@ PlacesListBox::~PlacesListBox( )
 
 void PlacesListBox::dispose()
 {
-    mpImpl.clear();
-    mpAddBtn.clear();
-    mpDelBtn.clear();
+    mpImpl.disposeAndClear();
+    mpAddBtn.disposeAndClear();
+    mpDelBtn.disposeAndClear();
     mpDlg.clear();
     Control::dispose();
 }
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index 8243d5159223..95ee24b14db8 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -123,7 +123,7 @@ namespace svt
                 m_pDlg->EndDialog( RET_CANCEL );
         }
 
-        m_pDlg.clear();
+        m_pDlg.disposeAndClear();
         m_xWindow = NULL;
         m_xDialogParent = NULL;
     }
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 5d93cb1087d5..6c275e7b4010 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -449,10 +449,10 @@ void SvtFileDialog::dispose()
     }
 
     delete _pImp;
-    _pFileView.clear();
-    _pSplitter.clear();
-    _pContainer.clear();
-    _pPrevBmp.clear();
+    _pFileView.disposeAndClear();
+    _pSplitter.disposeAndClear();
+    _pContainer.disposeAndClear();
+    _pPrevBmp.disposeAndClear();
     _pCbReadOnly.clear();
     _pCbLinkBox.clear();
     _pCbPreviewBox.clear();
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index c06d1bf693ff..4a99899cb292 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -251,10 +251,10 @@ SvtExpFileDlg_Impl::SvtExpFileDlg_Impl( WinBits )   :
 
 SvtExpFileDlg_Impl::~SvtExpFileDlg_Impl()
 {
-    _pBtnUp.clear();
+    _pBtnUp.disposeAndClear();
     delete _pUserFilter;
     delete _pFilter;
-    _pPlaces.clear();
+    _pPlaces.disposeAndClear();
 }
 
 
-- 
cgit