[Libreoffice-commits] core.git: sfx2/source

[Caolán McNamara]

 sfx2/source/sidebar/SidebarController.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 675c8faefd8756f7c43312f23eb341797bcbca4d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jun 30 12:48:06 2016 +0100

    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

diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 4685bf6..80afec5 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();
@@ -356,7 +356,7 @@ void SidebarController::NotifyResize()
     mbIsDeckRequestedOpen = bIsDeckVisible;
     UpdateCloseIndicator(!bIsDeckVisible);
 
-    if (mpCurrentDeck)
+    if (mpCurrentDeck && !mpCurrentDeck->isDisposed())
     {
         SfxSplitWindow* pSplitWindow = GetSplitWindow();
         WindowAlign eAlign = pSplitWindow ? pSplitWindow->GetAlign() : WindowAlign::Right;
@@ -390,7 +390,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())