commit a3cc3ce5a412112500606827fc99275e28898fff
author Noel Grandin <noel@peralex.com> Mon Jan 26 13:11:58 2015 +0200
committer Michael Meeks <michael.meeks@collabora.com> Thu Apr 09 21:37:36 2015 +0100
tree b54a07dd42cdc2cebba030daef72634d306682d7
parent 78626422af9ae7f8d7ab66b4cf9eb7551b322c8e

vcl: VclPtr conversion in fpicker

Change-Id: I1510b67ee2d2019b65d5248c3ee36c5ec3def13f

fpicker/source/office/PlacesListBox.cxx

diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx
index 4e4bbb3..bed0b1a 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 )

fpicker/source/office/PlacesListBox.hxx

diff --git a/fpicker/source/office/PlacesListBox.hxx b/fpicker/source/office/PlacesListBox.hxx
index 8fa24beb..9b24436 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 );

fpicker/source/office/iodlg.cxx

diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 2a4b1fa..01d7e6c 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

fpicker/source/office/iodlg.hxx

diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index 1bb8868..4a93957 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;

fpicker/source/office/iodlgimp.cxx

diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 8994f9a..f648d78 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();
}

fpicker/source/office/iodlgimp.hxx

diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index 2af75e6..d62479a 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;
};