summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-04-21 16:09:37 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-04-21 16:10:23 +0100
commit4f92eb777ab17e0a2ee478572a46d060742902e1 (patch)
treeec9f3c10ec5cf17764f3320efc308e9ace265161
parenta1236528795739ce7eb8ac1206f33a1f1ad2c209 (diff)
Resolves: tdf#99425 crash when closing dialog editor
with undocked "Object Catalog" toolbar Change-Id: I70d51cec699333c5cfc1461d61734c1bbb5323da
-rw-r--r--basctl/source/basicide/objdlg.cxx5
1 files changed, 4 insertions, 1 deletions
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();