diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-07-01 21:22:34 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-07-02 16:36:43 +0000 |
| commit | 88b06253359dfa91242757ceb39d7276786a0587 (patch) | |
| tree | cb580e3e85075a433866e582d6fd03daec39b9fc | |
| parent | f5721a9de60f614519be383fec2c97b2dd19b289 (diff) | |
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.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/16686
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | dbaccess/source/ui/querydesign/TableWindowAccess.cxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/relationdesign/RelationDesignView.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/contnr/treelistbox.cxx | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx index 82580fc83f02..eb1941aa9c19 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 72e75deb07b9..5e7f370b8600 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 8346639398ea..c418956ab643 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 ) |