Audit and correct misc. clears -> disposeAndClears.

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

11 files changed, 29 insertions, 21 deletions

diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 7bc162e4c3f8..6d5d3a9c5ef3 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -114,13 +114,15 @@ void SvxHyperlinkTabPageBase::dispose()
 {
     maTimer.Stop();
 
+    mpMarkWnd.disposeAndClear();
+
     mpCbbFrame.clear();
     mpLbForm.clear();
     mpEdIndication.clear();
     mpEdText.clear();
     mpBtScript.clear();
     mpDialog.clear();
-    mpMarkWnd.clear();
+
     IconChoicePage::dispose();
 }
 
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 9cbbef5f2160..72979c4464f6 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -239,7 +239,7 @@ void SvxMultiPathDialog::dispose()
         }
     }
 
-    m_pRadioLB.clear();
+    m_pRadioLB.disposeAndClear();
     m_pAddBtn.clear();
     m_pDelBtn.clear();
     ModalDialog::dispose();
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 55b85df456fa..d8137095b829 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -156,8 +156,8 @@ void CertPathDialog::dispose()
         delete pCertPath;
         pEntry = m_pCertPathList->Next( pEntry );
     }
+    m_pCertPathList.disposeAndClear();
     m_pCertPathListContainer.clear();
-    m_pCertPathList.clear();
     m_pAddBtn.clear();
     m_pOKBtn.clear();
     ModalDialog::dispose();
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index f149629776b8..d9822ac51f10 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -170,7 +170,7 @@ void DbRegistrationOptionsPage::dispose()
 {
     for ( sal_uInt16 i = 0; i < pPathBox->GetEntryCount(); ++i )
         delete static_cast< DatabaseRegistration* >( pPathBox->GetEntry(i)->GetUserData() );
-    pPathBox.clear();
+    pPathBox.disposeAndClear();
     m_pPathCtrl.clear();
     m_pNew.clear();
     m_pEdit.clear();
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 6dfd19f52a2a..a19a8898e124 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -147,7 +147,7 @@ void SvxFontSubstTabPage::dispose()
     pCheckButtonData = NULL;
     delete pConfig;
     pConfig = NULL;
-    m_pCheckLB.clear();
+    m_pCheckLB.disposeAndClear();
     m_pUseTableCB.clear();
     m_pReplacements.clear();
     m_pFont1CB.clear();
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 6bdf8a1340e7..08d7d9059b61 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -302,6 +302,8 @@ ColorConfigWindow_Impl::Chapter::Chapter(vcl::Window *pGrid,
 
 ColorConfigWindow_Impl::Chapter::~Chapter()
 {
+    // FIXME: we had an horrible m_bOwnsWidget const
+    m_pText.disposeAndClear();
 }
 
 void ColorConfigWindow_Impl::Chapter::Show(Wallpaper const& rBackWall)
@@ -368,9 +370,9 @@ ColorConfigWindow_Impl::Entry::~Entry()
 {
     if (m_bOwnsWidgets)
     {
-        m_pText.clear();
-        m_pColorList.clear();
-        m_pPreview.clear();
+        m_pText.disposeAndClear();
+        m_pColorList.disposeAndClear();
+        m_pPreview.disposeAndClear();
     }
 }
 
@@ -508,9 +510,9 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(vcl::Window* pParent)
 void ColorConfigWindow_Impl::dispose()
 {
     disposeBuilder();
-        m_pGrid.clear();
-        m_pVScroll.clear();
-        m_pHeaderHB.clear();
+    m_pGrid.clear();
+    m_pVScroll.clear();
+    m_pHeaderHB.clear();
     VclContainer::dispose();
 }
 
@@ -918,10 +920,10 @@ ColorConfigCtrl_Impl::~ColorConfigCtrl_Impl()
 
 void ColorConfigCtrl_Impl::dispose()
 {
-    m_pVScroll.clear();
-    m_pScrollWindow.clear();
-    m_pBody.clear();
-    m_pHeaderHB.clear();
+    m_pVScroll.disposeAndClear();
+    m_pScrollWindow.disposeAndClear();
+    m_pBody.disposeAndClear();
+    m_pHeaderHB.disposeAndClear();
     VclVBox::dispose();
 }
 
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 5dc7a284e51f..490b41c2ae4b 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -222,6 +222,7 @@ SvxProxyTabPage::~SvxProxyTabPage()
 
 void SvxProxyTabPage::dispose()
 {
+    mpCertPathDlg.disposeAndClear();
     m_pProxyModeLB.clear();
     m_pHttpProxyFT.clear();
     m_pHttpProxyED.clear();
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 98853d58b743..7cd9977e3913 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -207,7 +207,9 @@ SvxJavaOptionsPage::~SvxJavaOptionsPage()
 
 void SvxJavaOptionsPage::dispose()
 {
-    m_pJavaList.clear();
+    m_pJavaList.disposeAndClear();
+    m_pParamDlg.disposeAndClear();
+    m_pPathDlg.disposeAndClear();
     ClearJavaInfo();
 #if HAVE_FEATURE_JAVA
     std::vector< JavaInfo* >::iterator pIter;
@@ -229,8 +231,6 @@ void SvxJavaOptionsPage::dispose()
     m_pExpertConfigBtn.clear();
     m_pExperimentalCB.clear();
     m_pMacroCB.clear();
-    m_pParamDlg.clear();
-    m_pPathDlg.clear();
     SfxTabPage::dispose();
 }
 
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 7d2d48c9baca..39e94a02efe5 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -256,7 +256,7 @@ void SvxPathTabPage::dispose()
     {
         for ( sal_uInt16 i = 0; i < pPathBox->GetEntryCount(); ++i )
             delete static_cast<PathUserData_Impl*>(pPathBox->GetEntry(i)->GetUserData());
-        pPathBox.clear();
+        pPathBox.disposeAndClear();
     }
     delete pImpl;
     pImpl = NULL;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index f37c797d3f66..e45cbc823974 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -575,6 +575,7 @@ void OfaTreeOptionsDialog::dispose()
                     SvtViewOptions aTabPageOpt( E_TABPAGE, OUString::number( pPageInfo->m_nPageId) );
                     SetViewOptUserItem( aTabPageOpt, aPageData );
                 }
+                pPageInfo->m_pPage.disposeAndClear();
             }
 
             if (pPageInfo->m_nPageId == RID_SFXPAGE_LINGU)
@@ -587,6 +588,8 @@ void OfaTreeOptionsDialog::dispose()
                 }
             }
 
+            pPageInfo->m_pExtPage.disposeAndClear();
+
             delete pPageInfo;
         }
         pEntry = pTreeLB->Next(pEntry);
@@ -600,7 +603,7 @@ void OfaTreeOptionsDialog::dispose()
         {
             OptionsGroupInfo* pGroupInfo = static_cast<OptionsGroupInfo*>(pEntry->GetUserData());
             if ( pGroupInfo )
-                pGroupInfo->m_pExtPage.clear();
+                pGroupInfo->m_pExtPage.disposeAndClear();
             delete pGroupInfo;
         }
         pEntry = pTreeLB->Next(pEntry);
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 16fcd75a6de6..d114fe9eace5 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -147,7 +147,7 @@ WebConnectionInfoDialog::~WebConnectionInfoDialog()
 
 void WebConnectionInfoDialog::dispose()
 {
-    m_pPasswordsLB.clear();
+    m_pPasswordsLB.disposeAndClear();
     m_pRemoveBtn.clear();
     m_pRemoveAllBtn.clear();
     m_pChangeBtn.clear();