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

[Michael Meeks]

 dbaccess/source/ui/querydesign/TableWindowAccess.cxx     |    4 ++--
 dbaccess/source/ui/relationdesign/RelationDesignView.cxx |    2 +-
 svtools/source/contnr/treelistbox.cxx                    |    3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 88b06253359dfa91242757ceb39d7276786a0587
Author: Michael Meeks <michael.me...@collabora.com>
Date:   Wed Jul 1 21:22:34 2015 +0100

    tdf#92434 - A series of hideous knock-on dbaccess crasher fixes.
    
    Focus events during dispose, unfortunate incoming a11y events, etc.
    
    Change-Id: Iee296b767839904f5f330786891bc2513ca06c0c
    Reviewed-on: https://gerrit.libreoffice.org/16672
    Reviewed-by: Michael Meeks <michael.me...@collabora.com>
    Tested-by: Michael Meeks <michael.me...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/16686
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx 
b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
index 82580fc..eb1941a 100644
--- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
@@ -105,7 +105,7 @@ namespace dbaui
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         Reference< XAccessible > aRet;
-        if(m_pTable)
+        if(m_pTable && !m_pTable->IsDisposed())
         {
             switch(i)
             {
@@ -151,7 +151,7 @@ namespace dbaui
     {
         ::osl::MutexGuard aGuard( m_aMutex  );
         Reference< XAccessible > aRet;
-        if( m_pTable )
+        if(m_pTable && !m_pTable->IsDisposed())
         {
             Point aPoint(_aPoint.X,_aPoint.Y);
             Rectangle aRect(m_pTable->GetDesktopRectPixel());
diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx 
b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
index 72e75de..5e7f370 100644
--- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
@@ -69,7 +69,7 @@ bool ORelationDesignView::PreNotify( NotifyEvent& rNEvt )
     bool nDone = false;
     if(rNEvt.GetType() == MouseNotifyEvent::GETFOCUS)
     {
-        if(!m_pTableView->HasChildPathFocus())
+        if(m_pTableView && !m_pTableView->HasChildPathFocus())
         {
             m_pTableView->GrabTabWinFocus();
             nDone = true;
diff --git a/svtools/source/contnr/treelistbox.cxx 
b/svtools/source/contnr/treelistbox.cxx
index 8346639..c418956 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -444,7 +444,8 @@ VCL_BUILDER_DECL_FACTORY(SvTreeListBox)
 
 void SvTreeListBox::Clear()
 {
-    pModel->Clear();  // Model calls SvTreeListBox::ModelHasCleared()
+    if (pModel)
+        pModel->Clear();  // Model calls SvTreeListBox::ModelHasCleared()
 }
 
 void SvTreeListBox::EnableEntryMnemonics( bool _bEnable )

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits