pywizards: don't set attribute when it's None

Change-Id: Ic80b77f90635f58ab7e90da8b1c5e7d34a43d0f6

6 files changed, 8 insertions, 5 deletions

diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.py b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.py
index 6b539b2658b9..e4370a416b70 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.py
@@ -15,7 +15,7 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-from wizards.common.HelpIds import HelpIds
+from ..common.HelpIds import HelpIds
 
 HID = 41051
 
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
index 30d516555e89..2dbcea7e098b 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
@@ -73,6 +73,7 @@ class AgendaWizardDialogImpl(AgendaWizardDialog):
 
             # initialize the agenda template
             self.agenda = CGAgenda()
+            
             self.templateConsts = TemplateConsts
             self.agendaTemplate = AgendaTemplate(
                 self.xMSF, self.agenda, self.resources,
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py
index ccff49d3f953..a88b7f4c2ca6 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py
@@ -15,7 +15,7 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-from wizards.common.Resource import Resource
+from ..common.Resource import Resource
 
 class AgendaWizardDialogResources(Resource):
     
diff --git a/wizards/com/sun/star/wizards/agenda/CGAgenda.py b/wizards/com/sun/star/wizards/agenda/CGAgenda.py
index 571e70a08a57..32d033ed3803 100644
--- a/wizards/com/sun/star/wizards/agenda/CGAgenda.py
+++ b/wizards/com/sun/star/wizards/agenda/CGAgenda.py
@@ -15,9 +15,9 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-from .CGTopic import CGTopic
 from ..common.ConfigGroup import ConfigGroup
 from ..common.ConfigSet import ConfigSet
+from .CGTopic import CGTopic
 
 class CGAgenda(ConfigGroup):
     cp_AgendaType = int()
diff --git a/wizards/com/sun/star/wizards/agenda/CGTopic.py b/wizards/com/sun/star/wizards/agenda/CGTopic.py
index 8e60561d43f8..50ebc4d1d03a 100644
--- a/wizards/com/sun/star/wizards/agenda/CGTopic.py
+++ b/wizards/com/sun/star/wizards/agenda/CGTopic.py
@@ -15,7 +15,7 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-from wizards.common.ConfigGroup import *
+from ..common.ConfigGroup import ConfigGroup
 
 '''
 CGTopic means: Configuration Group Topic.
diff --git a/wizards/com/sun/star/wizards/common/ConfigGroup.py b/wizards/com/sun/star/wizards/common/ConfigGroup.py
index 44fc675bc2a9..ae15e85a766e 100644
--- a/wizards/com/sun/star/wizards/common/ConfigGroup.py
+++ b/wizards/com/sun/star/wizards/common/ConfigGroup.py
@@ -48,4 +48,6 @@ class ConfigGroup(ConfigNode):
             child.readConfiguration(configView.getByName(propertyName),
                 prefix)
         else:
-            setattr(self,field,configView.getByName(propertyName))
+            value = configView.getByName(propertyName)
+            if value is not None:
+                setattr(self,field, value)