From cb654aed2506b31e047f53715f419a7f1e08702d Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 21 Apr 2016 16:09:37 +0100
Subject: Resolves: tdf#99425 crash when closing dialog editor

with undocked "Object Catalog" toolbar

Change-Id: I70d51cec699333c5cfc1461d61734c1bbb5323da
(cherry picked from commit 4f92eb777ab17e0a2ee478572a46d060742902e1)
Reviewed-on: https://gerrit.libreoffice.org/24281
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
---
 basctl/source/basicide/objdlg.cxx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'basctl')

diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx
index d8b9538aff3d..2371c3facad3 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -98,8 +98,11 @@ void ObjectCatalog::ToggleFloatingMode ()
 }
 
 // ArrangeWindows() -- arranges the controls to the size of the ObjectCatalog
-void ObjectCatalog::ArrangeWindows ()
+void ObjectCatalog::ArrangeWindows()
 {
+    if (!aTitle || !aTree)
+        return;
+
     Size const aSize = GetOutputSizePixel();
     bool const bFloating = IsFloatingMode();
 
-- 
cgit v1.2.3