From 34513f90abf15d7b5670fe3732e854d60f7358c5 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 30 Jun 2016 12:48:06 +0100 Subject: Resolves: tdf#100692 crash in sidebar on deleting image from writer stumbled on this in passing and it has the same bt as http://crashreport.libreoffice.org/stats/signature/vcl::Window::setPosSizePixel(long,long,long,long,PosSizeFlags) Change-Id: I1f19275029b05f353dfa823a2ff435e5045250a6 (cherry picked from commit 675c8faefd8756f7c43312f23eb341797bcbca4d) Reviewed-on: https://gerrit.libreoffice.org/26805 Tested-by: Jenkins Reviewed-by: David Tardon --- sfx2/source/sidebar/SidebarController.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 07882edf8091..74973d11b1cc 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -313,7 +313,7 @@ void SAL_CALL SidebarController::requestLayout() throw(css::uno::RuntimeException, std::exception) { sal_Int32 nMinimalWidth = 0; - if (mpCurrentDeck) + if (mpCurrentDeck && !mpCurrentDeck->isDisposed()) { mpCurrentDeck->RequestLayout(); nMinimalWidth = mpCurrentDeck->GetMinimalWidth(); @@ -361,7 +361,7 @@ void SidebarController::NotifyResize() else bIsDeckVisible = false; - if (mpCurrentDeck) + if (mpCurrentDeck && !mpCurrentDeck->isDisposed()) { SfxSplitWindow* pSplitWindow = GetSplitWindow(); WindowAlign eAlign = pSplitWindow ? pSplitWindow->GetAlign() : WindowAlign::Right; @@ -395,7 +395,7 @@ void SidebarController::NotifyResize() // Determine if the closer of the deck can be shown. sal_Int32 nMinimalWidth = 0; - if (mpCurrentDeck) + if (mpCurrentDeck && !mpCurrentDeck->isDisposed()) { DeckTitleBar* pTitleBar = mpCurrentDeck->GetTitleBar(); if (pTitleBar != nullptr && pTitleBar->IsVisible()) -- cgit