[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - basctl/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Tue Feb 11 14:28:19 UTC 2020


 basctl/source/basicide/bastype2.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 185915aabde2418d99d16d6b7d9efc39f5cc0fe6
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Feb 11 12:12:05 2020 +0000
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Tue Feb 11 15:27:50 2020 +0100

    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/+/88395
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 2141278861b2..5530c128348a 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -1009,7 +1009,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


More information about the Libreoffice-commits mailing list