[Libreoffice-commits] core.git: basctl/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Tue Feb 11 13:55:21 UTC 2020


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

New commits:
commit b97af2719c739649d86a8ec1cc1d0c2d38b26697
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Feb 11 12:12:05 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Feb 11 14:54:44 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/+/88442
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index cb1b44f0dfa1..673a3daeabe9 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -984,7 +984,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