diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2018-03-29 17:18:42 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2018-03-30 14:21:55 +0200 |
| commit | 2d3a5e81e9730c1190f8592f85f5b99b6d4587ef (patch) | |
| tree | 02c37d80242e34c1316507efd392d999b486429f | |
| parent | f657ab7bbb36219f6270236ae0e6b8238b7dd9b5 (diff) | |
Avoid crash-reporter crash.
http://crashreport.libreoffice.org/stats/crash_details/f5086a7d-3c67-46e4-945e-e0882a604eee
Change-Id: Ic9ceed2e736a4ad1c155a31d3b2dc453e6a562aa
Reviewed-on: https://gerrit.libreoffice.org/52119
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
| -rw-r--r-- | sw/source/uibase/utlui/navipi.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 15 |
2 files changed, 13 insertions, 5 deletions
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index 69d0f82981b0..fe6f3dddafa9 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -945,6 +945,9 @@ IMPL_LINK( SwNavigationPI, MenuSelectHdl, Menu *, pMenu, bool ) void SwNavigationPI::UpdateListBox() { + if (isDisposed()) + return; + m_aDocListBox->SetUpdateMode(false); m_aDocListBox->Clear(); SwView *pActView = GetCreateView(); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 73f14f2dafb3..2c2ba81da62a 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -2992,15 +2992,20 @@ void Window::Scroll( long nHorzScroll, long nVertScroll, void Window::Flush() { - - const tools::Rectangle aWinRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ); - mpWindowImpl->mpFrame->Flush( aWinRect ); + if (mpWindowImpl) + { + const tools::Rectangle aWinRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ); + mpWindowImpl->mpFrame->Flush( aWinRect ); + } } void Window::SetUpdateMode( bool bUpdate ) { - mpWindowImpl->mbNoUpdate = !bUpdate; - CompatStateChanged( StateChangedType::UpdateMode ); + if (mpWindowImpl) + { + mpWindowImpl->mbNoUpdate = !bUpdate; + CompatStateChanged( StateChangedType::UpdateMode ); + } } void Window::GrabFocus() |