[Libreoffice-commits] .: Branch 'feature/gsoc2011_wizards' - wizards/com

[Xisco Fauli]

 wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py       |    3 ++-
 wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py |   10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit ea7fb6603108689044f5700cffce76a1fc328ced
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Mon Jul 25 19:03:28 2011 +0200

    Fix problem with listboxes

diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index 3c4d6fa..071d4cf 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
@@ -84,11 +84,12 @@ class FaxWizardDialogImpl(FaxWizardDialog):
             #special Control fFrameor setting the save Path:
             self.insertPathSelectionControl()
 
+            self.initializeTemplates(xMSF)
+
             #load the last used settings
             #from the registry and apply listeners to the controls:
             self.initConfiguration()
 
-            self.initializeTemplates(xMSF)
 
             if self.myPathSelection.xSaveTextBox.Text.lower() == "":
                 self.myPathSelection.initializePath()
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
index aec7ef2..060b73f 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
@@ -86,15 +86,18 @@ class LetterWizardDialogImpl(LetterWizardDialog):
             #special Control fFrameor setting the save Path:
             self.insertPathSelectionControl()
 
-            #load the last used settings
-            #from the registry and apply listeners to the controls:
-            self.initConfiguration()
+            self.myConfig = CGLetterWizard()
 
             oL = self.getOfficeLinguistic()
             self.myConfig.cp_BusinessLetter.cp_Norm = oL
             self.myConfig.cp_PrivateOfficialLetter.cp_Norm = oL
             self.myConfig.cp_PrivateLetter.cp_Norm = oL
             self.initializeTemplates(xMSF)
+
+            #load the last used settings
+            #from the registry and apply listeners to the controls:
+            self.initConfiguration()
+
             if self.myConfig.cp_BusinessLetter.cp_Greeting == "":
                 self.myConfig.cp_BusinessLetter.cp_Greeting = \
                     self.resources.GreetingLabels[0]
@@ -1094,7 +1097,6 @@ class LetterWizardDialogImpl(LetterWizardDialog):
 
     def initConfiguration(self):
         try:
-            self.myConfig = CGLetterWizard()
             root = Configuration.getConfigurationRoot(
                 self.xMSF, "/org.openoffice.Office.Writer/Wizards/Letter",
                 False)