Audit and correct misc. clears -> disposeAndClears.

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

10 files changed, 15 insertions, 15 deletions

diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 958e194831a4..44f6969e0c2e 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -80,7 +80,7 @@ public:                                             \
 Class::~Class()                                     \
 {                                                   \
 }                                                   \
-short Class::Execute()                             \
+short Class::Execute()                              \
 {                                                   \
     return pDlg->Execute();                         \
 }
diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx
index 2669dd5ddf66..de5749adac73 100644
--- a/sc/source/ui/condformat/condformatmgr.cxx
+++ b/sc/source/ui/condformat/condformatmgr.cxx
@@ -142,7 +142,7 @@ void ScCondFormatManagerDlg::dispose()
     m_pBtnAdd.clear();
     m_pBtnRemove.clear();
     m_pBtnEdit.clear();
-    m_pCtrlManager.clear();
+    m_pCtrlManager.disposeAndClear();
     ModalDialog::dispose();
 }
 
diff --git a/sc/source/ui/dialogs/searchresults.cxx b/sc/source/ui/dialogs/searchresults.cxx
index 984f19307213..218f3258110f 100644
--- a/sc/source/ui/dialogs/searchresults.cxx
+++ b/sc/source/ui/dialogs/searchresults.cxx
@@ -46,7 +46,7 @@ SearchResultsDlg::~SearchResultsDlg()
 
 void SearchResultsDlg::dispose()
 {
-    mpList.clear();
+    mpList.disposeAndClear();
     ModelessDialog::dispose();
 }
 
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 2b5d035276c1..7c0b4f3c8f92 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -168,7 +168,7 @@ void ScAcceptChgDlg::dispose()
         pChanges->SetModifiedLink(aLink);
     }
 
-    m_pAcceptChgCtr.clear();
+    m_pAcceptChgCtr.disposeAndClear();
     pTPFilter.clear();
     pTPView.clear();
     pTheView.clear();
diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx
index 05a194f808ab..abe3d1df74e4 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -75,7 +75,7 @@ ScHighlightChgDlg::~ScHighlightChgDlg()
 void ScHighlightChgDlg::dispose()
 {
     SetDispatcherLock( false );
-    m_pFilterCtr.clear();
+    m_pFilterCtr.disposeAndClear();
     m_pHighlightBox.clear();
     m_pCbAccept.clear();
     m_pCbReject.clear();
diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx
index 5b04a227cdf8..4a2fd3ab248c 100644
--- a/sc/source/ui/miscdlgs/sharedocdlg.cxx
+++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx
@@ -113,7 +113,7 @@ ScShareDocumentDlg::~ScShareDocumentDlg()
 
 void ScShareDocumentDlg::dispose()
 {
-    m_pLbUsers.clear();
+    m_pLbUsers.disposeAndClear();
     m_pCbShare.clear();
     m_pFtWarning.clear();
     ModalDialog::dispose();
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 33e4cbd79a57..71a3e38dbf5b 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -107,7 +107,7 @@ ScNameDlg::~ScNameDlg()
 
 void ScNameDlg::dispose()
 {
-    m_pRangeManagerTable.clear();
+    m_pRangeManagerTable.disposeAndClear();
     m_pEdName.clear();
     m_pEdAssign.clear();
     m_pRbAssign.clear();
diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx
index daf2b8e1d60e..13cef6ac18b9 100644
--- a/sc/source/ui/namedlg/namepast.cxx
+++ b/sc/source/ui/namedlg/namepast.cxx
@@ -70,10 +70,10 @@ ScNamePasteDlg::~ScNamePasteDlg()
 
 void ScNamePasteDlg::dispose()
 {
+    mpTable.disposeAndClear();
     m_pBtnPasteAll.clear();
     m_pBtnPaste.clear();
     m_pBtnClose.clear();
-    mpTable.clear();
     ModalDialog::dispose();
 }
 
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index d94b6f506c23..3ec7b481b88b 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -196,10 +196,10 @@ ScPreviewShell::~ScPreviewShell()
     EndListening(*pDocShell);
 
     SetWindow(0);
-    pPreview.clear();
-    pHorScroll.clear();
-    pVerScroll.clear();
-    pCorner.clear();
+    pPreview.disposeAndClear();
+    pHorScroll.disposeAndClear();
+    pVerScroll.disposeAndClear();
+    pCorner.disposeAndClear();
 
     //  normal mode of operation is switching back to default view in the same frame,
     //  so there's no need to activate any other window here anymore
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index fd6a6c62f454..e651d9afa4b8 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -190,9 +190,9 @@ ScTabView::~ScTabView()
         delete pRowOutline[i];
     }
 
-    pHSplitter.clear();
-    pVSplitter.clear();
-    pTabControl.clear();
+    pHSplitter.disposeAndClear();
+    pVSplitter.disposeAndClear();
+    pTabControl.disposeAndClear();
 }
 
 void ScTabView::MakeDrawView( sal_uInt8 nForceDesignMode )