[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - dbaccess/source

[Caolán McNamara]

 dbaccess/source/ui/querydesign/JoinController.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 06c57058178fa28c79d002cf2794ebd4ec2a2db4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu May 28 15:20:48 2015 +0100

    VclPtr: assert with query dialog open on closing query design
    
    Change-Id: I40d196462ff2e37d86ca367d3a150c94872715f1
    (cherry picked from commit 2ecf0ced9d2e55881033786fe95d45ceaeb73d37)

diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index ac48303..3852ef9 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -170,7 +170,7 @@ OJoinDesignView* OJoinController::getJoinView()
 
 void OJoinController::disposing()
 {
-    m_pAddTableDialog   = NULL;
+    m_pAddTableDialog.disposeAndClear();
 
     OJoinController_BASE::disposing();