dbaccess/source/ui/control/dbtreelistbox.cxx | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 89eb22881c40545d6e4cbea96a8cf607c8ea6722
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Dec 20 21:37:20 2018 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Dec 21 13:27:37 2018 +0100
undo the band-aid
I think 27995e638e1582b443befa93bc5dfd5970a38ef2
tdf#122020 - avoid nullptr deref
is unnecessary with the other fix for tdf#122020
Change-Id: Ibc6773c9e3a0cb234331aa988ce009967123f1da
Reviewed-on: https://gerrit.libreoffice.org/65515
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx
b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 2edbd0f6195a..2ad783072f18 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -183,9 +183,7 @@ void DBTreeListBox::EnableExpandHandler(SvTreeListEntry*
pEntry)
// set the flag which allows if the entry can be expanded
pEntry->SetFlags( (pEntry->GetFlags() &
~SvTLEntryFlags(SvTLEntryFlags::NO_NODEBMP | SvTLEntryFlags::HAD_CHILDREN)) |
SvTLEntryFlags::CHILDREN_ON_DEMAND );
// redraw the entry
- SvTreeList* myModel = GetModel();
- if (myModel)
- myModel->InvalidateEntry( pEntry );
+ GetModel()->InvalidateEntry(pEntry);
}
IMPL_LINK(DBTreeListBox, OnResetEntryHdl, void*, p, void)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
