commit 020ee2fcc1a40415dca8e974cf30834667f55036
author Caolán McNamara <caolanm@redhat.com> Tue Feb 11 12:12:05 2020 +0000
committer Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tue Feb 11 15:27:13 2020 +0100
tree 9d91da9a9c81757ec9c7cc5834109f02c58875fb
parent 818598e609ad9160af52ae8b02d772ca29f9ad7b

Related: tdf#130161 invalid iterator used in BrowseMode::Subs case

xTreeIter is invalid here before AddEntry, afterwards it will remain
invalid unless it was passed in to AddEntry to be updated to the
newly inserted location, and we need it to be valid in the
BrowseMode::Subs case

Change-Id: I4831b7713bdb67889604fd4f8a7cd1644fd81a10
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88394
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

basctl/source/basicide/bastype2.cxx

diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index feb45f3..80ed26a 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -983,7 +983,7 @@ void SbTreeListBox::ImpCreateLibSubEntries(const weld::TreeIter& rLibRootEntry, 
                        bool bModuleEntry = FindEntry(aModName, OBJ_TYPE_MODULE, *xTreeIter);
                        if (!bModuleEntry)
                        {
                            AddEntry(aModName, RID_BMP_MODULE, &rLibRootEntry, false, std::make_unique<Entry>(OBJ_TYPE_MODULE));
                            AddEntry(aModName, RID_BMP_MODULE, &rLibRootEntry, false, std::make_unique<Entry>(OBJ_TYPE_MODULE), xTreeIter.get());
                        }

                        // methods