summaryrefslogtreecommitdiff
path: root/dbaccess/source
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source')
-rw-r--r--dbaccess/source/ui/app/AppView.cxx15
-rw-r--r--dbaccess/source/ui/browser/dataview.cxx1
2 files changed, 12 insertions, 4 deletions
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 237fc3a11976..2e67c18acd89 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();
}
diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx
index ba8968f1fcb8..ab23fb28f627 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();
}