vcl: VclPtr conversion in forms

Change-Id: I141cbe218fec31f2e6428b1d8c56c00557134a36

11 files changed, 52 insertions, 10 deletions

diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
index da831ad9b38f..ca6eb1b4ce03 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
@@ -50,6 +50,4 @@ DependencyDialog::DependencyDialog(
     }
 }
 
-DependencyDialog::~DependencyDialog() {}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
index 1175470c33d5..eec14539869a 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
@@ -38,8 +38,6 @@ public:
     DependencyDialog(
         vcl::Window * parent, std::vector< OUString > const & dependencies);
 
-    virtual ~DependencyDialog();
-
 private:
     DependencyDialog(DependencyDialog &) SAL_DELETED_FUNCTION;
     void operator =(DependencyDialog &) SAL_DELETED_FUNCTION;
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index bd2392093047..75b7803ced88 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -137,6 +137,7 @@ class ExtBoxWithBtns_Impl : public ExtensionBox_Impl
 public:
                     ExtBoxWithBtns_Impl(vcl::Window* pParent);
                    virtual ~ExtBoxWithBtns_Impl();
+    virtual void dispose() SAL_OVERRIDE;
 
     void InitFromDialog(ExtMgrDialog *pParentDialog);
 
@@ -202,9 +203,15 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeExtBoxWithBtns(vcl::Wi
 
 ExtBoxWithBtns_Impl::~ExtBoxWithBtns_Impl()
 {
+    dispose();
+}
+
+void ExtBoxWithBtns_Impl::dispose()
+{
     delete m_pOptionsBtn;
     delete m_pEnableBtn;
     delete m_pRemoveBtn;
+    ExtensionBox_Impl::dispose();
 }
 
 
@@ -716,7 +723,13 @@ ExtMgrDialog::ExtMgrDialog(vcl::Window *pParent, TheExtensionManager *pManager)
 
 ExtMgrDialog::~ExtMgrDialog()
 {
+    dispose();
+}
+
+void ExtMgrDialog::dispose()
+{
     m_aIdle.Stop();
+    ModelessDialog::dispose();
 }
 
 
@@ -1197,7 +1210,13 @@ UpdateRequiredDialog::UpdateRequiredDialog(vcl::Window *pParent, TheExtensionMan
 
 UpdateRequiredDialog::~UpdateRequiredDialog()
 {
+    dispose();
+}
+
+void UpdateRequiredDialog::dispose()
+{
     m_aIdle.Stop();
+    ModalDialog::dispose();
 }
 
 long UpdateRequiredDialog::addPackageToList( const uno::Reference< deployment::XPackage > &xPackage,
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 0db6be025f18..c5e7c38b16f8 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -141,6 +141,7 @@ class ExtMgrDialog : public ModelessDialog,
 public:
                     ExtMgrDialog( vcl::Window * pParent, TheExtensionManager *pManager );
     virtual        ~ExtMgrDialog();
+    virtual void    dispose() SAL_OVERRIDE;
 
     virtual bool    Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
     virtual bool    Close() SAL_OVERRIDE;
@@ -212,6 +213,7 @@ class UpdateRequiredDialog : public ModalDialog,
 public:
                     UpdateRequiredDialog( vcl::Window * pParent, TheExtensionManager *pManager );
     virtual        ~UpdateRequiredDialog();
+    virtual void    dispose() SAL_OVERRIDE;
 
     virtual short   Execute() SAL_OVERRIDE;
     virtual bool    Close() SAL_OVERRIDE;
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 260100f3ca03..8eaf3f71e1a6 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -239,6 +239,11 @@ void ExtensionBox_Impl::Init()
 
 ExtensionBox_Impl::~ExtensionBox_Impl()
 {
+    dispose();
+}
+
+void ExtensionBox_Impl::dispose()
+{
     if ( ! m_bInDelete )
         DeleteRemoved();
 
@@ -264,6 +269,7 @@ ExtensionBox_Impl::~ExtensionBox_Impl()
 
     delete m_pLocale;
     delete m_pCollator;
+    ::svt::IExtensionListBox::dispose();
 }
 
 
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index 1590f82500a5..c2635edd9f51 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -182,6 +182,7 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox
 public:
     ExtensionBox_Impl(vcl::Window* pParent);
     virtual ~ExtensionBox_Impl();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual void    MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
     virtual void    Paint( const Rectangle &rPaintRect ) SAL_OVERRIDE;
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 5a66653d400e..0aa7c2f0da20 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -564,6 +564,11 @@ UpdateDialog::UpdateDialog(
 
 UpdateDialog::~UpdateDialog()
 {
+    dispose();
+}
+
+void UpdateDialog::dispose()
+{
     storeIgnoredUpdates();
 
     for ( std::vector< UpdateDialog::Index* >::iterator i( m_ListboxEntries.begin() ); i != m_ListboxEntries.end(); ++i )
@@ -575,6 +580,7 @@ UpdateDialog::~UpdateDialog()
         delete (*i);
     }
     delete m_pUpdates;
+    ModalDialog::dispose();
 }
 
 
@@ -599,9 +605,6 @@ UpdateDialog::CheckListBox::CheckListBox( vcl::Window* pParent, UpdateDialog & d
     SetNormalStaticImage(Image(DpGuiResId(RID_DLG_UPDATE_NORMALALERT)));
 }
 
-UpdateDialog::CheckListBox::~CheckListBox() {}
-
-
 sal_uInt16 UpdateDialog::CheckListBox::getItemCount() const {
     sal_uLong i = GetEntryCount();
     OSL_ASSERT(i <= std::numeric_limits< sal_uInt16 >::max());
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index c2eedcbba4b2..8420aacc9bf5 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -85,6 +85,7 @@ public:
         std::vector< dp_gui::UpdateData > * updateData);
 
     virtual ~UpdateDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual bool Close() SAL_OVERRIDE;
 
@@ -111,8 +112,6 @@ private:
         CheckListBox(
             vcl::Window* pParent, UpdateDialog & dialog);
 
-        virtual ~CheckListBox();
-
         sal_uInt16 getItemCount() const;
 
     private:
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 0dd3e5a97c5e..b67c026c7284 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -237,7 +237,15 @@ UpdateInstallDialog::UpdateInstallDialog(
         m_pHelp->Disable();
 }
 
-UpdateInstallDialog::~UpdateInstallDialog() {}
+UpdateInstallDialog::~UpdateInstallDialog()
+{
+    dispose();
+}
+
+void UpdateInstallDialog::dispose()
+{
+    ModalDialog::dispose();
+}
 
 bool UpdateInstallDialog::Close()
 {
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
index bff71e788820..d9a343790193 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
@@ -60,6 +60,7 @@ public:
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xCtx);
 
     virtual ~UpdateInstallDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     bool Close() SAL_OVERRIDE;
     virtual short Execute() SAL_OVERRIDE;
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index c9aab531d127..916525a6b7fb 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -57,6 +57,7 @@ class LicenseView : public MultiLineEdit, public SfxListener
 public:
     LicenseView( vcl::Window* pParent, WinBits nStyle );
     virtual ~LicenseView();
+    virtual void dispose() SAL_OVERRIDE;
 
     void ScrollDown( ScrollType eScroll );
 
@@ -122,9 +123,15 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLicenseView(vcl::Windo
 
 LicenseView::~LicenseView()
 {
+    dispose();
+}
+
+void LicenseView::dispose()
+{
     maEndReachedHdl = Link();
     maScrolledHdl   = Link();
     EndListeningAll();
+    MultiLineEdit::dispose();
 }
 
 void LicenseView::ScrollDown( ScrollType eScroll )