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

[Michael Meeks]

 dbaccess/source/ui/querydesign/TableWindowTitle.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit af956b879cf7cda1da878a36a9feb9223298248a
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Wed Oct 7 17:13:59 2015 +0100

    tdf#94709 - protect TableWindowTitle Command execution.
    
    Change-Id: I202a154e18c1fbffc31abcc7ccd7f500b67a4c13
    Reviewed-on: https://gerrit.libreoffice.org/19233
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit f7e8fe2a4b0c2554200b1191cf4497c0ece8dbeb)
    Reviewed-on: https://gerrit.libreoffice.org/19251

diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
index 8adf24f..c029b85 100644
--- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
@@ -110,7 +110,11 @@ void OTableWindowTitle::Command( const CommandEvent& rEvt )
     {
         GrabFocus();
         if ( m_pTabWin )
-            m_pTabWin->Command( rEvt );
+        {
+            // tdf#94709 - protect shutdown code-path.
+            VclPtr<OTableWindow> xTabWin(m_pTabWin);
+            xTabWin->Command( rEvt );
+        }
         else
             Control::Command(rEvt);
     }