pyagenda: load the proper data for each topic

Change-Id: Ia7d8d65a868b86c81feb489328cbcb6bbd4f75f6

2 files changed, 6 insertions, 10 deletions

diff --git a/wizards/com/sun/star/wizards/agenda/CGAgenda.py b/wizards/com/sun/star/wizards/agenda/CGAgenda.py
index a50dbd9b4770..335f6edfb470 100644
--- a/wizards/com/sun/star/wizards/agenda/CGAgenda.py
+++ b/wizards/com/sun/star/wizards/agenda/CGAgenda.py
@@ -17,7 +17,6 @@
 #
 from ..common.ConfigGroup import ConfigGroup
 from ..common.ConfigSet import ConfigSet
-from .CGTopic import CGTopic
 
 class CGAgenda(ConfigGroup):
 
@@ -43,4 +42,4 @@ class CGAgenda(ConfigGroup):
         self.cp_TemplatePath = str()
         self.cp_ProceedMethod = int()
 
-        self.cp_Topics = ConfigSet(CGTopic())
+        self.cp_Topics = ConfigSet()
diff --git a/wizards/com/sun/star/wizards/common/ConfigSet.py b/wizards/com/sun/star/wizards/common/ConfigSet.py
index ba7ea690f688..e69ed13bd6ff 100644
--- a/wizards/com/sun/star/wizards/common/ConfigSet.py
+++ b/wizards/com/sun/star/wizards/common/ConfigSet.py
@@ -16,9 +16,9 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 import traceback
-import inspect
 from .ConfigGroup import ConfigGroup
 from .Configuration import Configuration
+from ..agenda.CGTopic import CGTopic
 
 class ConfigSet(ConfigGroup):
     '''
@@ -30,13 +30,9 @@ class ConfigSet(ConfigGroup):
     to avoid this "deletion" of nulls.
     '''
 
-    def __init__(self, topic):
-        self.topic = topic
+    def __init__(self):
         self.childrenList = []
 
-    def add(self, name, o):
-        self.childrenList.append(o)
-
     def writeConfiguration(self, configView, param):
         names = self.childrenMap.keys()
         if isinstance(self.childClass, ConfigNode):
@@ -68,8 +64,9 @@ class ConfigSet(ConfigGroup):
         if names:
             for i in names:
                 try:
-                    self.topic.readConfiguration(
+                    topic = CGTopic()
+                    topic.readConfiguration(
                         configurationView.getByName(i), param)
-                    self.add(i, self.topic)
+                    self.childrenList.append(topic)
                 except Exception:
                     traceback.print_exc()