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

[Michael Meeks]

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

New commits:
commit 8791cff003afc323601dd43289e642471ac26863
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Thu Jul 9 16:07:49 2015 +0100

    tdf#92434 - dispose the table contents.
    
    fix issue from: 6d0c89123f353aed80d3a8a08ef5cd1ffaa1eea9
    
    Change-Id: Ia5b7bb91c366ecbbb3111d6f5239d5360640ca2d
    Reviewed-on: https://gerrit.libreoffice.org/16893
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/16895
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 7beabaf..a1dbb2d 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -1537,7 +1537,7 @@ void OJoinTableView::clearLayoutInformation()
     {
         if ( aIter->second )
             aIter->second->clearListBox();
-        aIter->second = NULL;
+        aIter->second.disposeAndClear();
     }
 
     m_aTableMap.clear();