[Libreoffice-commits] core.git: dbaccess/source

Michael Meeks michael.meeks at collabora.com
Wed Oct 7 09:07:48 PDT 2015


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

New commits:
commit c8a795c9a0cc542f008166109528d4257afe2851
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

diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
index c661ee0..9db6d52 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);
     }


More information about the Libreoffice-commits mailing list