Kaydet (Commit) 3830a17e authored tarafından Michael Meeks's avatar Michael Meeks Kaydeden (comit) Andras Timar

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/16672Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
Tested-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/16686Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 21aee98e
......@@ -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());
......
......@@ -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;
......
......@@ -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 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment