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

[Noel Grandin]

 dbaccess/source/ui/querydesign/TableWindow.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 63bd3beb23e1d8975cea209501c63d4c84396e26
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Fri Mar 2 15:13:09 2018 +0200

    tdf#115998 base: crash on delete relationship
    
    Change-Id: Ida8cc9ef0b812254990ac808f78ae183ae28a1c0
    Reviewed-on: https://gerrit.libreoffice.org/50633
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 46b32a022ee3679721e410e470c57b6a0b91ecb0)
    Reviewed-on: https://gerrit.libreoffice.org/50769
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 7e372a0c848a..1ee977f3cb1b 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -490,6 +490,7 @@ void OTableWindow::Remove()
 {
     // Delete the window
     OJoinTableView* pTabWinCont = getTableView();
+    VclPtr<OTableWindow> aHoldSelf(this); // keep ourselves alive during the RemoveTabWin process
     pTabWinCont->RemoveTabWin( this );
     pTabWinCont->Invalidate();
 }