Audit and correct misc. clears -> disposeAndClears.

Anything that used to be 'delete'd should be disposeAndCleared()
in the new world.

9 files changed, 24 insertions, 24 deletions

diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index 6650cbd44e52..6c09611863f6 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -153,10 +153,10 @@ void BrowseBox::dispose()
     }
 
     Hide();
-    getDataWindow()->pHeaderBar.clear();
-    getDataWindow()->pCornerWin.clear();
+    getDataWindow()->pHeaderBar.disposeAndClear();
+    getDataWindow()->pCornerWin.disposeAndClear();
     pDataWin.clear();
-    pVScroll.clear();
+    pVScroll.disposeAndClear();
     aHScroll.disposeAndClear();
 
     // free columns-space
@@ -2255,7 +2255,7 @@ void BrowseBox::SetMode( BrowserMode nMode )
     MultiSelection *pOldRowSel = bMultiSelection ? uRow.pSel : 0;
     MultiSelection *pOldColSel = pColSel;
 
-    pVScroll.clear();
+    pVScroll.disposeAndClear();
 
     bThumbDragging = ( nMode & BROWSER_THUMBDRAGGING ) == BROWSER_THUMBDRAGGING;
     bMultiSelection = ( nMode & BROWSER_MULTISELECTION ) == BROWSER_MULTISELECTION;
@@ -2408,7 +2408,7 @@ BrowserHeader* BrowseBox::CreateHeaderBar( BrowseBox* pParent )
 
 void BrowseBox::SetHeaderBar( BrowserHeader* pHeaderBar )
 {
-    static_cast<BrowserDataWin*>( pDataWin.get() )->pHeaderBar.clear();
+    static_cast<BrowserDataWin*>( pDataWin.get() )->pHeaderBar.disposeAndClear();
     static_cast<BrowserDataWin*>( pDataWin.get() )->pHeaderBar = pHeaderBar;
     static_cast<BrowserDataWin*>( pDataWin.get() )->pHeaderBar->SetStartDragHdl( LINK( this, BrowseBox, StartDragHdl ) );
 }
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index 532e3409dba4..9e008600925e 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -254,7 +254,7 @@ namespace svt
 
     void CheckBoxControl::dispose()
     {
-        pBox.clear();
+        pBox.disposeAndClear();
         Control::dispose();
     }
 
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index 1dc9adf8f4ac..c376113b6d53 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -195,7 +195,7 @@ namespace svt
         if (nCellModifiedEvent)
             Application::RemoveUserEvent(nCellModifiedEvent);
 
-        pCheckBoxPaint.clear();
+        pCheckBoxPaint.disposeAndClear();
         m_pFocusWhileRequest.clear();
         pHeader.clear();
         BrowseBox::dispose();
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index accd044b9e50..23a3172a8a49 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -642,7 +642,7 @@ void ViewTabListBox_Impl::dispose()
 {
     maResetQuickSearch.Stop();
 
-    mpHeaderBar.clear();
+    mpHeaderBar.disposeAndClear();
     SvHeaderTabListBox::dispose();
 }
 
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index ae35ee1fd6a5..25551159f227 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -166,7 +166,7 @@ SvInplaceEdit2::~SvInplaceEdit2()
         Application::RemoveAccel( &aAccReturn );
         Application::RemoveAccel( &aAccEscape );
     }
-    pEdit.clear();
+    pEdit.disposeAndClear();
 }
 
 OUString SvInplaceEdit2::GetSavedValue() const
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 02a8e135cf13..86271a9444fc 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -2229,9 +2229,9 @@ ImplCFieldFloatWin::~ImplCFieldFloatWin()
 
 void ImplCFieldFloatWin::dispose()
 {
-    mpTodayBtn.clear();
-    mpNoneBtn.clear();
-    mpFixedLine.clear();
+    mpTodayBtn.disposeAndClear();
+    mpNoneBtn.disposeAndClear();
+    mpFixedLine.disposeAndClear();
     mpCalendar.clear();
     FloatingWindow::dispose();
 }
@@ -2258,7 +2258,7 @@ PushButton* ImplCFieldFloatWin::EnableTodayBtn( bool bEnable )
     }
     else
     {
-        mpTodayBtn.clear();
+        mpTodayBtn.disposeAndClear();
     }
 
     return mpTodayBtn;
@@ -2286,7 +2286,7 @@ PushButton* ImplCFieldFloatWin::EnableNoneBtn( bool bEnable )
     }
     else
     {
-        mpNoneBtn.clear();
+        mpNoneBtn.disposeAndClear();
     }
 
     return mpNoneBtn;
@@ -2350,7 +2350,7 @@ void ImplCFieldFloatWin::ArrangeButtons()
     }
     else
     {
-        mpFixedLine.clear();
+        mpFixedLine.disposeAndClear();
     }
 }
 
@@ -2388,8 +2388,8 @@ CalendarField::~CalendarField()
 
 void CalendarField::dispose()
 {
-    mpCalendar.clear();
-    mpFloatWin.clear();
+    mpCalendar.disposeAndClear();
+    mpFloatWin.disposeAndClear();
     mpTodayBtn.clear();
     mpNoneBtn.clear();
     DateField::dispose();
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index 1cf6fc5b1100..5f83f15061fd 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -129,7 +129,7 @@ ToolbarMenuEntry::~ToolbarMenuEntry()
             xComponent->dispose();
         mxAccContext.clear();
     }
-    mpControl.clear();
+    mpControl.disposeAndClear();
 }
 
 
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index 6cf4a62e5301..e0cf0f994310 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -207,11 +207,11 @@ namespace svt
 
     void OWizardMachine::dispose()
     {
-        m_pFinish.clear();
-        m_pCancel.clear();
-        m_pNextPage.clear();
-        m_pPrevPage.clear();
-        m_pHelp.clear();
+        m_pFinish.disposeAndClear();
+        m_pCancel.disposeAndClear();
+        m_pNextPage.disposeAndClear();
+        m_pPrevPage.disposeAndClear();
+        m_pHelp.disposeAndClear();
 
         for (WizardState i=0; i<m_pImpl->nFirstUnknownPage; ++i)
             delete GetPage(i);
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index 4026b669386e..8c70e93f1184 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -313,7 +313,7 @@ void SAL_CALL OGenericUnoDialog::initialize( const Sequence< Any >& aArguments )
 
 void OGenericUnoDialog::destroyDialog()
 {
-    m_pDialog.clear();
+    m_pDialog.disposeAndClear();
 }