Audit and correct misc. clears -> disposeAndClears.

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

2 files changed, 4 insertions, 11 deletions

diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index 0174189c2cb4..87abe11e61f2 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -217,17 +217,10 @@ namespace bib
         if ( pToolBar )
         {
             pDatMan->SetToolbar(0);
+            pToolBar.disposeAndClear();
         }
 
-        if( pGridWin )
-        {
-            BibGridwin* pDel = pGridWin;
-            pGridWin.clear();
-            pDel->disposeGridWin();
-            delete pDel;
-        }
-        pToolBar.clear();
-        pGridWin.clear();
+        pGridWin.disposeAndClear();
         BibSplitWindow::dispose();
     }
 
diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index b6e65e1665d8..34af38efa5b0 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -181,7 +181,7 @@ void BibBookContainer::createTopFrame( BibShortCutHandler* pWin )
     if(pTopWin)
     {
         RemoveItem(TOP_WINDOW);
-        pTopWin.clear();
+        pTopWin.disposeAndClear();
     }
     pTopWin=new BibWindowContainer(this,pWin);
     pTopWin->Show();
@@ -198,7 +198,7 @@ void BibBookContainer::createBottomFrame( BibShortCutHandler* pWin )
     if(pBottomWin)
     {
         RemoveItem(BOTTOM_WINDOW);
-        pBottomWin.clear();
+        pBottomWin.disposeAndClear();
     }
 
     pBottomWin=new BibWindowContainer(this,pWin);