sw/source/uibase/utlui/navipi.cxx | 3 +++ vcl/source/window/window.cxx | 15 ++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-)
New commits: commit f4082279078b59f0960d6683d0d039756354eccd Author: Michael Meeks <[email protected]> Date: Thu Mar 29 17:18:42 2018 +0100 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 <[email protected]> Reviewed-by: Michael Meeks <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/52516 Reviewed-by: Markus Mohrhard <[email protected]> diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index 47d261547c6e..d45454b5bec3 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -938,6 +938,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 4a6cab270591..135372d9a2c9 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -2983,15 +2983,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() _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
