summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-10-07 17:13:59 +0100
committerAndras Timar <andras.timar@collabora.com>2015-10-17 23:23:08 +0200
commit73a30a30ae41ebc78f90166ccbf80885875e2e95 (patch)
tree3d7cb5482bc40ce2cea0ebd2dcb7e16dd5bf5683 /dbaccess
parent009507659ff60ba8ce3b2d7f58f14dcfbd52e35d (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)
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/querydesign/TableWindowTitle.cxx6
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);
}