dbaccess/source/ui/querydesign/JoinDesignView.cxx | 2 +- dbaccess/source/ui/querydesign/QueryViewSwitch.cxx | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)
New commits: commit 82f15336cfbcb766c060c4936d11ff33c54558e4 Author: Caolán McNamara <[email protected]> Date: Thu May 28 15:06:40 2015 +0100 VclPtr: undisposed things and dispose order on query design window close Change-Id: I3070d52e15febe2f5981ffdf5d665e28fa4f799b diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx index 39a86c4..a5701f9 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 4baf6079..a527afd 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()
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
