diff options
-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 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() |