Audit and correct misc. clears -> disposeAndClears.

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

17 files changed, 32 insertions, 39 deletions

diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 535133608bb0..2d528fdff1e7 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -491,11 +491,11 @@ SvxBmpMask::~SvxBmpMask()
 
 void SvxBmpMask::dispose()
 {
-    m_pQSet1.clear();
-    m_pQSet2.clear();
-    m_pQSet3.clear();
-    m_pQSet4.clear();
-    m_pCtlPipette.clear();
+    m_pQSet1.disposeAndClear();
+    m_pQSet2.disposeAndClear();
+    m_pQSet3.disposeAndClear();
+    m_pQSet4.disposeAndClear();
+    m_pCtlPipette.disposeAndClear();
     delete pData;
     m_pTbxPipette.clear();
     m_pBtnExec.clear();
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index b3e041eeed30..2ed20dfb2d9a 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -301,7 +301,7 @@ void SvxSuperContourDlg::dispose()
 {
     SvtMiscOptions aMiscOptions;
     aMiscOptions.RemoveListenerLink( LINK(this, SvxSuperContourDlg, MiscHdl) );
-    m_pContourWnd.clear();
+    m_pContourWnd.disposeAndClear();
     m_pTbx1.clear();
     m_pMtfTolerance.clear();
     m_pStbStatus.clear();
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index ac7957d8061c..81551a1ab095 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -423,7 +423,7 @@ SvxTPView::~SvxTPView()
 
 void SvxTPView::dispose()
 {
-    m_pViewData.clear();
+    m_pViewData.disposeAndClear();
     m_pAccept.clear();
     m_pReject.clear();
     m_pAcceptAll.clear();
@@ -1119,8 +1119,8 @@ SvxAcceptChgCtr::~SvxAcceptChgCtr()
 void SvxAcceptChgCtr::dispose()
 {
     disposeBuilder();
-    pTPFilter.clear();
-    pTPView.clear();
+    pTPView.disposeAndClear();
+    pTPFilter.disposeAndClear();
     TabControl::dispose();
 }
 
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index a2e705e144f0..3ddca61f7196 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -163,14 +163,7 @@ SvxFontWorkChildWindow::SvxFontWorkChildWindow
 
     SfxChildWindow( _pParent, nId )
 {
-<<<<<<< HEAD
-    SvxFontWorkDialog* pDlg = new SvxFontWorkDialog(pBindings, this, _pParent);
-    pWindow = pDlg;
-=======
-    pWindow = new SvxFontWorkDialog( pBindings, this, _pParent,
-                                     SVX_RES( RID_SVXDLG_FONTWORK ) );
-    SvxFontWorkDialog* pDlg = static_cast<SvxFontWorkDialog*>(pWindow.get());
->>>>>>> 765a16f... vclwidget: change all vcl::window fields to be wrapped in VclPtr
+    pWindow = VclPtrInstance<SvxFontWorkDialog>(pBindings, this, _pParent);
 
     eChildAlignment = SfxChildAlignment::NOALIGNMENT;
 
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index b7a9c2e256d9..2e545e0914bf 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -223,7 +223,7 @@ SvxIMapDlg::~SvxIMapDlg()
 void SvxIMapDlg::dispose()
 {
     // Delete URL-List
-    pIMapWnd.clear();
+    pIMapWnd.disposeAndClear();
     delete pOwnData;
     m_pTbxIMapDlg1.clear();
     m_pFtURL.clear();
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index b6823a2e0ae5..06d105eaafda 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -2948,7 +2948,7 @@ namespace svxform
 
     void NamespaceItemDialog::dispose()
     {
-        m_pNamespacesList.clear();
+        m_pNamespacesList.disposeAndClear();
         m_pAddNamespaceBtn.clear();
         m_pEditNamespaceBtn.clear();
         m_pDeleteNamespaceBtn.clear();
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index ccfce934dbb2..ec5bd20a506f 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1872,7 +1872,7 @@ FmFilterNavigatorWin::~FmFilterNavigatorWin()
 
 void FmFilterNavigatorWin::dispose()
 {
-    m_pNavigator.clear();
+    m_pNavigator.disposeAndClear();
     SfxDockingWindow::dispose();
 }
 
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 635d53f1e94f..e69a7b55590b 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -519,7 +519,7 @@ namespace svxform
 
     void NavigatorFrame::dispose()
     {
-        m_pNavigatorTree.clear();
+        m_pNavigatorTree.disposeAndClear();
         SfxDockingWindow::dispose();
     }
 
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index e64bd9a96ded..55c8009f42db 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -152,7 +152,7 @@ GalleryBrowser1::~GalleryBrowser1()
 void GalleryBrowser1::dispose()
 {
     EndListening( *mpGallery );
-    mpThemes.clear();
+    mpThemes.disposeAndClear();
     delete mpExchangeData;
     mpExchangeData = NULL;
     maNewTheme.disposeAndClear();
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 15bfd3646a2f..3aae480832b1 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -481,9 +481,9 @@ void GalleryBrowser2::dispose()
 {
     maMiscOptions.RemoveListenerLink( LINK( this, GalleryBrowser2, MiscHdl ) );
 
-    mpPreview.clear();
-    mpListView.clear();
-    mpIconView.clear();
+    mpPreview.disposeAndClear();
+    mpListView.disposeAndClear();
+    mpIconView.disposeAndClear();
 
     if( mpCurTheme )
         mpGallery->ReleaseTheme( mpCurTheme, *this );
@@ -740,9 +740,9 @@ bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow )
 
 void GalleryBrowser2::SelectTheme( const OUString& rThemeName )
 {
-    mpIconView.clear();
-    mpListView.clear();
-    mpPreview.clear();
+    mpIconView.disposeAndClear();
+    mpListView.disposeAndClear();
+    mpPreview.disposeAndClear();
 
     if( mpCurTheme )
         mpGallery->ReleaseTheme( mpCurTheme, *this );
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index cc0b28dd59eb..42a990477c5c 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -218,7 +218,7 @@ _SdrItemBrowserControl::~_SdrItemBrowserControl()
 
 void _SdrItemBrowserControl::dispose()
 {
-    pEditControl.clear();
+    pEditControl.disposeAndClear();
 
     delete pAktChangeEntry;
 
@@ -532,7 +532,7 @@ bool _SdrItemBrowserControl::EndChangeEntry()
     bool bRet = false;
     if (pEditControl!=nullptr) {
         aEntryChangedHdl.Call(this);
-        pEditControl.clear();
+        pEditControl.disposeAndClear();
         delete pAktChangeEntry;
         pAktChangeEntry=NULL;
         vcl::Window* pParent=GetParent();
@@ -546,7 +546,7 @@ bool _SdrItemBrowserControl::EndChangeEntry()
 void _SdrItemBrowserControl::BrkChangeEntry()
 {
     if (pEditControl!=nullptr) {
-        pEditControl.clear();
+        pEditControl.disposeAndClear();
         delete pAktChangeEntry;
         pAktChangeEntry=NULL;
         vcl::Window* pParent=GetParent();
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index a30737b72f9a..7ee54bfd1370 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -235,7 +235,7 @@ SdrPaintView::~SdrPaintView()
     ClearPageView();
 
 #ifdef DBG_UTIL
-    pItemBrowser.clear();
+    pItemBrowser.disposeAndClear();
 #endif
 
     // delete existing SdrPaintWindows
@@ -1132,7 +1132,7 @@ void SdrPaintView::ShowItemBrowser(bool bShow)
     } else {
         if (pItemBrowser!=nullptr) {
             pItemBrowser->Hide();
-            pItemBrowser.clear();
+            pItemBrowser.disposeAndClear();
         }
     }
 }
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index eb677739acf1..775fc0184b0e 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -567,8 +567,8 @@ FillControl::~FillControl()
 
 void FillControl::dispose()
 {
-    mpLbFillType.clear();
-    mpLbFillAttr.clear();
+    mpLbFillType.disposeAndClear();
+    mpLbFillAttr.disposeAndClear();
     vcl::Window::dispose();
 }
 
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index 18bb2ba05bc9..27611b06831f 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -343,7 +343,7 @@ throw (uno::RuntimeException, std::exception)
     svt::ToolboxController::dispose();
 
     SolarMutexGuard aSolarMutexGuard;
-    m_pBox.clear();
+    m_pBox.disposeAndClear();
 }
 
 // XStatusListener
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 1d175ff54704..d10d5b53326f 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -660,7 +660,7 @@ void SAL_CALL MatchCaseToolboxController::dispose() throw ( css::uno::RuntimeExc
 
     svt::ToolboxController::dispose();
 
-    m_pMatchCaseControl.clear();
+    m_pMatchCaseControl.disposeAndClear();
 }
 
 // XInitialization
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
index 7cdf4a98f9ef..5a2f76e5013b 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
@@ -58,7 +58,7 @@ void ChineseTranslation_UnoDialog::impl_DeleteDialog()
     {
         if(m_pDialog->IsInExecute())
             m_pDialog->EndDialog(RET_CANCEL);
-        m_pDialog.clear();
+        m_pDialog.disposeAndClear();
     }
 }
 
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
index feaaf3bbc392..6c0f0401e1ec 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
@@ -73,7 +73,7 @@ void ChineseTranslationDialog::dispose()
         if(m_pDictionaryDialog->IsInExecute())
             m_pDictionaryDialog->EndDialog();
     }
-    m_pDictionaryDialog.clear();
+    m_pDictionaryDialog.disposeAndClear();
     m_pRB_To_Simplified.clear();
     m_pRB_To_Traditional.clear();
     m_pCB_Translate_Commonterms.clear();