diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2015-10-07 17:13:59 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-10-12 12:20:56 +0000 |
commit | af956b879cf7cda1da878a36a9feb9223298248a (patch) | |
tree | 87645ede9d4719d397811f2e5e9d6f04c88644c8 | |
parent | 299bca2a9fbb871291cc803ef8c1b90450fb5090 (diff) |
tdf#94709 - protect TableWindowTitle Command execution.
Change-Id: I202a154e18c1fbffc31abcc7ccd7f500b67a4c13
Reviewed-on: https://gerrit.libreoffice.org/19233
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit f7e8fe2a4b0c2554200b1191cf4497c0ece8dbeb)
Reviewed-on: https://gerrit.libreoffice.org/19251
-rw-r--r-- | dbaccess/source/ui/querydesign/TableWindowTitle.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx index 8adf24f934d2..c029b85d88cd 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); } |