1 files changed, 10 insertions, 7 deletions
diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx
index 4dc9d7fffb52..917e8870c43a 100644
--- a/dbaccess/source/ui/control/curledit.cxx
+++ b/dbaccess/source/ui/control/curledit.cxx
@@ -40,11 +40,14 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeConnectionURLEdit(vcl:
 
 OConnectionURLEdit::~OConnectionURLEdit()
 {
-    // delete my sub controls
-    Edit* pSubEdit = GetSubEdit();
-    SetSubEdit(NULL);
-    delete pSubEdit;
-    delete m_pForcedPrefix;
+    disposeOnce();
+}
+
+void OConnectionURLEdit::dispose()
+{
+    SetSubEdit(nullptr);
+    m_pForcedPrefix.disposeAndClear();
+    Edit::dispose();
 }
 
 void OConnectionURLEdit::SetTextNoPrefix(const OUString& _rText)
@@ -86,10 +89,10 @@ void OConnectionURLEdit::SetText(const OUString& _rStr, const Selection& /*_rNew
 {
     // create new sub controls, if necessary
     if (!GetSubEdit())
-        SetSubEdit(new Edit(this, 0));
+        SetSubEdit(VclPtr<Edit>::Create(this, 0));
     if ( !m_pForcedPrefix )
     {
-        m_pForcedPrefix = new FixedText(this, WB_VCENTER);
+        m_pForcedPrefix = VclPtr<FixedText>::Create(this, WB_VCENTER);
 
         // we use a gray background for the fixed text
         StyleSettings aSystemStyle = Application::GetSettings().GetStyleSettings();