Audit and correct misc. clears -> disposeAndClears.

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

3 files changed, 6 insertions, 7 deletions

diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index 0b472e2efae9..0170bd744d0c 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -676,7 +676,7 @@ SmElementsDockingWindow::~SmElementsDockingWindow ()
 
 void SmElementsDockingWindow::dispose()
 {
-    mpElementsControl.clear();
+    mpElementsControl.disposeAndClear();
     mpElementListBox.clear();
     SfxDockingWindow::dispose();
 }
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index dfd1595bdf1b..18f8696db25e 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -156,9 +156,9 @@ void SmEditWindow::dispose()
         pEditView = NULL;
     }
 
-    pHScrollBar.clear();
-    pVScrollBar.clear();
-    pScrollBox.clear();
+    pHScrollBar.disposeAndClear();
+    pVScrollBar.disposeAndClear();
+    pScrollBox.disposeAndClear();
 
     vcl::Window::dispose();
 }
diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx
index 0b514fdf2c06..7d14a1e0db2c 100644
--- a/starmath/source/toolbox.cxx
+++ b/starmath/source/toolbox.cxx
@@ -146,9 +146,8 @@ void SmToolBoxWindow::dispose()
 {
     int i;
     for (i = 0;  i < NUM_TBX_CATEGORIES;  ++i)
-    {
-        vToolBoxCategories[i].clear();
-    }
+        vToolBoxCategories[i].disposeAndClear();
+
     pToolBoxCmd = 0;
     for (i = 0;  i < NUM_TBX_CATEGORIES + 1;  ++i)
     {