vcl: VclPtr conversion in fpicker

Change-Id: I1510b67ee2d2019b65d5248c3ee36c5ec3def13f

6 files changed, 28 insertions, 0 deletions

diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx
index 4e4bbb363f75..bed0b1a4eda7 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -43,8 +43,14 @@ PlacesListBox_Impl::PlacesListBox_Impl( PlacesListBox* pParent, const OUString&
 
 PlacesListBox_Impl::~PlacesListBox_Impl( )
 {
+    dispose();
+}
+
+void PlacesListBox_Impl::dispose()
+{
     delete mpHeaderBar;
     mpParent = NULL;
+    SvHeaderTabListBox::dispose();
 }
 
 void PlacesListBox_Impl::MouseButtonUp( const MouseEvent& rMEvt )
@@ -82,9 +88,15 @@ PlacesListBox::PlacesListBox( vcl::Window* pParent, SvtFileDialog* pFileDlg, con
 
 PlacesListBox::~PlacesListBox( )
 {
+    dispose();
+}
+
+void PlacesListBox::dispose()
+{
     delete mpImpl;
     delete mpAddBtn;
     delete mpDelBtn;
+    Control::dispose();
 }
 
 void PlacesListBox::AppendPlace( PlacePtr pPlace )
diff --git a/fpicker/source/office/PlacesListBox.hxx b/fpicker/source/office/PlacesListBox.hxx
index 8fa24beb2907..9b2443649ebf 100644
--- a/fpicker/source/office/PlacesListBox.hxx
+++ b/fpicker/source/office/PlacesListBox.hxx
@@ -29,6 +29,7 @@ class PlacesListBox_Impl : public SvHeaderTabListBox
     public:
         PlacesListBox_Impl( PlacesListBox* pParent, const OUString& rTitle );
         virtual ~PlacesListBox_Impl( );
+        virtual void dispose() SAL_OVERRIDE;
 
         virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
 };
@@ -50,6 +51,7 @@ class PlacesListBox : public Control
     public:
         PlacesListBox( vcl::Window* pParent, SvtFileDialog* pFileDlg, const OUString& rTitle, WinBits nBits );
         virtual ~PlacesListBox( );
+        virtual void dispose() SAL_OVERRIDE;
 
         void AppendPlace( PlacePtr pPlace );
         void RemovePlace( sal_uInt16 nPos );
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 2a4b1fa7b7d4..01d7e6cbfce2 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -404,6 +404,11 @@ public:
 
 SvtFileDialog::~SvtFileDialog()
 {
+    dispose();
+}
+
+void SvtFileDialog::dispose()
+{
     if ( !_pImp->_aIniKey.isEmpty() )
     {
         // save window state
@@ -441,6 +446,7 @@ SvtFileDialog::~SvtFileDialog()
     delete _pSplitter;
     delete _pContainer;
     delete _pPrevBmp;
+    ModalDialog::dispose();
 }
 
 void SvtFileDialog::Init_Impl
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index 1bb88689b353..4a9395778237 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -194,6 +194,7 @@ public:
                                 SvtFileDialog( vcl::Window* _pParent, WinBits nBits, WinBits nExtraBits );
                                 SvtFileDialog( vcl::Window* _pParent, WinBits nBits );
                                 virtual ~SvtFileDialog();
+    virtual void                dispose() SAL_OVERRIDE;
 
     virtual short               Execute() SAL_OVERRIDE;
     virtual void                StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE;
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 8994f9a2c027..f648d78a4c3d 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -106,7 +106,13 @@ SvtFileDialogURLSelector::SvtFileDialogURLSelector( vcl::Window* _pParent, SvtFi
 
 SvtFileDialogURLSelector::~SvtFileDialogURLSelector()
 {
+    dispose();
+}
+
+void SvtFileDialogURLSelector::dispose()
+{
     delete m_pMenu;
+    MenuButton::dispose();
 }
 
 
diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index 2af75e6cb7b1..d62479a65f51 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -92,6 +92,7 @@ protected:
 protected:
     SvtFileDialogURLSelector( vcl::Window* _pParent, SvtFileDialog* _pDlg, WinBits nBits, sal_uInt16 _nButtonId );
     virtual ~SvtFileDialogURLSelector();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual void        Activate() SAL_OVERRIDE;
 };