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, 6 deletions

diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 73495b56dcab..9de7ee291de9 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -83,8 +83,8 @@ namespace
             --_nPos;
             _pControl->Hide();
             _pControlText->Hide();
-            _pControl.clear();
-            _pControlText.clear();
+            _pControl.disposeAndClear();
+            _pControlText.disposeAndClear();
         }
     }
 
@@ -1049,7 +1049,7 @@ void OFieldDescControl::DeactivateAggregate( EControlType eType )
         if ( pFormatSample )
         {
             pFormatSample->Hide();
-            pFormatSample.clear();
+            pFormatSample.disposeAndClear();
         }
         break;
     case tpBoolDefault:
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index 6f86962649c1..77ac1b685c39 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -82,8 +82,8 @@ void OTableGrantControl::dispose()
         m_nDeactivateEvent = 0;
     }
 
-    m_pCheckCell.clear();
-    m_pEdit.clear();
+    m_pCheckCell.disposeAndClear();
+    m_pEdit.disposeAndClear();
 
     m_xTables       = NULL;
     ::svt::EditBrowseBox::dispose();
diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx
index e30ab1314b3c..4fd8c0236e91 100644
--- a/dbaccess/source/ui/control/curledit.cxx
+++ b/dbaccess/source/ui/control/curledit.cxx
@@ -46,7 +46,7 @@ OConnectionURLEdit::~OConnectionURLEdit()
 void OConnectionURLEdit::dispose()
 {
     SetSubEdit(nullptr);
-    m_pForcedPrefix.clear();
+    m_pForcedPrefix.disposeAndClear();
     Edit::dispose();
 }