diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-06-30 12:48:06 +0100 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2016-07-08 20:29:26 +0000 |
| commit | 797946a17a8c6bf7135a8adb60824e28f0176351 (patch) | |
| tree | bedfead3befc0ab93b4b25c8e17ff18038004e44 | |
| parent | ea1e585eeb8625bdfd4e161c7c50006de5759043 (diff) | |
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/26804
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit 18a7d6423db379ce9b4ba146aea20c55f1bda32f)
Reviewed-on: https://gerrit.libreoffice.org/27038
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
| -rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 1dc3ffbb8013..011030947e08 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -314,7 +314,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(); @@ -362,7 +362,7 @@ void SidebarController::NotifyResize() else bIsDeckVisible = false; - if (mpCurrentDeck) + if (mpCurrentDeck && !mpCurrentDeck->isDisposed()) { SfxSplitWindow* pSplitWindow = GetSplitWindow(); WindowAlign eAlign = pSplitWindow ? pSplitWindow->GetAlign() : WindowAlign::Right; @@ -396,7 +396,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()) |