diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-05-11 09:31:02 +0100 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-10-29 14:01:08 +0100 |
commit | bc2f32b8a564f14515ec1e1ffbd463379d94c36e (patch) | |
tree | e1f1c692ad2ed31044c83ad7390ce5ec2676daea | |
parent | 24ccbc35e8857cc8de784154d0648800d39ab20b (diff) |
tdf#117549 crash with focus setting during disposing
Change-Id: I1ab492a4c6fab89debac90224a5f78102d33d664
Reviewed-on: https://gerrit.libreoffice.org/54122
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 3aa01898e58c4a3bea64fea33778ac455f1f5253)
-rw-r--r-- | vcl/source/control/tabctrl.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index b94acb97f6dc..a4f062ca9bc6 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -2349,6 +2349,8 @@ bool NotebookbarTabControlBase::ImplPlaceTabs( long nWidth ) return false; if ( mpTabCtrlData->maItemList.empty() ) return false; + if (!m_pOpenMenu || m_pOpenMenu->isDisposed()) + return false; long nMaxWidth = nWidth - HAMBURGER_DIM; long nShortcutsWidth = m_pShortcuts != nullptr ? m_pShortcuts->GetSizePixel().getWidth() + 1 : 0; @@ -2445,7 +2447,8 @@ bool NotebookbarTabControlBase::ImplPlaceTabs( long nWidth ) } // position the shortcutbox - m_pShortcuts->SetPosPixel(Point(0, 0)); + if (m_pShortcuts) + m_pShortcuts->SetPosPixel(Point(0, 0)); // position the menu m_pOpenMenu->SetPosPixel(Point(nWidth - HAMBURGER_DIM, 0)); |