Bugfix for listbox master objects on multiple sheets. (#450)

* replace ID for extended ID if exists

session/idmap.go

@@ -47,6 +47,15 @@ func (idm *IDMap) IsDuplicateKey(key string) error {
 
 // Add new key to id map
 func (idm *IDMap) Add(key, id string, logEntry *logger.LogEntry) error {
+	return idm.add(key, id, logEntry, false)
+}
+
+// Replace key in id map
+func (idm *IDMap) Replace(key, id string, logEntry *logger.LogEntry) error {
+	return idm.add(key, id, logEntry, true)
+}
+
+func (idm *IDMap) add(key, id string, logEntry *logger.LogEntry, overwrite bool) error {
 	if idm == nil {
 		return errors.New("IDMap is nil")
 	}
@@ -57,9 +66,11 @@ func (idm *IDMap) Add(key, id string, logEntry *logger.LogEntry) error {
 
 	idm.newIfNil()
 
-	// First check if key already exists
-	if err := idm.IsDuplicateKey(key); err != nil {
-		return errors.WithStack(err)
+	if !overwrite {
+		// First check if key already exists
+		if err := idm.IsDuplicateKey(key); err != nil {
+			return errors.WithStack(err)
+		}
 	}
 
 	idm.m.Store(key, id)

session/objecthandling.go

@@ -238,10 +238,8 @@ func DefaultSetObjectDataAndEvents(sessionState *State, actionState *action.Stat
 	properties := obj.Properties()
 	if properties != nil && properties.ExtendsId != "" && properties.Info != nil && properties.Info.Type == "listbox" {
 		// Special handling of objects wrapping listbox objects due to changes for listboxes belonging to filterpanes
-		if err := sessionState.IDMap.IsDuplicateKey(properties.ExtendsId); err == nil {
-			if err := sessionState.IDMap.Add(properties.ExtendsId, obj.ID, sessionState.LogEntry); err != nil {
-				sessionState.LogEntry.LogDetail(logger.WarningLevel, fmt.Sprintf("error adding id<%s> to IDMap", properties.ExtendsId), err.Error())
-			}
+		if err := sessionState.IDMap.Replace(properties.ExtendsId, obj.ID, sessionState.LogEntry); err != nil {
+			sessionState.LogEntry.LogDetail(logger.WarningLevel, fmt.Sprintf("error adding id<%s> to IDMap", properties.ExtendsId), err.Error())
 		}
 	}