diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-05-28 15:06:40 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-05-28 15:08:08 +0100 |
| commit | 6f66aab4b757d02a5f9955d825cd142bd353b765 (patch) | |
| tree | 60d36b6983fccce326b1f2c16bb0ecbaf315d9d1 /dbaccess | |
| parent | cc755ad11687947cbb52ab7624503a8abefbe259 (diff) | |
VclPtr: undisposed things and dispose order on query design window close
Change-Id: I3070d52e15febe2f5981ffdf5d665e28fa4f799b
(cherry picked from commit 82f15336cfbcb766c060c4936d11ff33c54558e4)
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/querydesign/JoinDesignView.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/QueryViewSwitch.cxx | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx index 39a86c4b4dab..a5701f9311cc 100644 --- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx +++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx @@ -66,8 +66,8 @@ OJoinDesignView::~OJoinDesignView() void OJoinDesignView::dispose() { - m_pScrollWindow.disposeAndClear(); m_pTableView.disposeAndClear(); + m_pScrollWindow.disposeAndClear(); ODataView::dispose(); } diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx index 4baf60797154..a527afd2c1fa 100644 --- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx +++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx @@ -42,6 +42,9 @@ OQueryViewSwitch::OQueryViewSwitch(OQueryContainerWindow* _pParent, OQueryContro OQueryViewSwitch::~OQueryViewSwitch() { + // destroy children + m_pDesignView.disposeAndClear(); + m_pTextView.disposeAndClear(); } void OQueryViewSwitch::Construct() |