commit f0969f0de927e4f63ef4e111a1ffaa841f2a81ea
author Michael Meeks <michael.meeks@collabora.com> Thu Feb 26 16:36:38 2015 +0000
committer Michael Meeks <michael.meeks@collabora.com> Thu Apr 09 22:23:15 2015 +0100
tree 77d208842c7e2cb361bc0f84c22be86fdb81f5b8
parent 532dccdc02137540dcecc5b9dd48dfd72947bd48

more double dispose protection.

Change-Id: I61ecf1561393959bc9a3647d515c4c9ce5119752

dbaccess/source/ui/app/AppView.cxx

diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 237fc3a..2e67c18 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -214,10 +214,17 @@ OApplicationView::~OApplicationView()

void OApplicationView::dispose()
{
    stopComponentListening(m_xObject);
    m_pWin->Hide();
    boost::scoped_ptr<vcl::Window> aTemp(m_pWin);
    m_pWin = NULL;
    if (m_xObject.is())
    {
        stopComponentListening(m_xObject);
        m_xObject.clear();
    }
    if (m_pWin)
    {
        m_pWin->Hide();
        boost::scoped_ptr<vcl::Window> aTemp(m_pWin);
        m_pWin = NULL;
    }
    ODataView::dispose();
}

dbaccess/source/ui/browser/dataview.cxx

diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx
index ba8968f..ab23fb2 100644
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@ -86,6 +86,7 @@ namespace dbaui
    {
        m_rController.release();
        m_aSeparator.disposeAndClear();
        m_pAccel.reset();
        vcl::Window::dispose();
    }

svtools/source/contnr/imivctl1.cxx

diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 2f9c39c..9f26c98 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -173,7 +173,6 @@ SvxIconChoiceCtrl_Impl::~SvxIconChoiceCtrl_Impl()
    aVerSBar.disposeAndClear();
    aHorSBar.disposeAndClear();
    aScrBarBox.disposeAndClear();

}

void SvxIconChoiceCtrl_Impl::Clear( bool bInCtor )

svtools/source/contnr/ivctrl.cxx

diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index 3e8db3b..d79b2a3 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -216,7 +216,8 @@ void SvtIconChoiceCtrl::GetFocus()

void SvtIconChoiceCtrl::LoseFocus()
{
    _pImp->LoseFocus();
    if (_pImp)
        _pImp->LoseFocus();
    Control::LoseFocus();
}