[Libreoffice-commits] .: 2 commits - wizards/com

[Libreoffice Gerrit user]

 wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py       |   17 ++---
 wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py |   31 ++++------
 2 files changed, 23 insertions(+), 25 deletions(-)

New commits:
commit b4b5376afc9d8bb9299ed267db2c4177e4b10969
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Fri Oct 26 17:07:27 2012 +0200

    pyletter: Fix a crash when trying to load the wizard again
    
    Remove tabs too
    
    Change-Id: I8f7b2148f95e5694ad17d1a1b98001f1c803ce7e

diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index 7cccdc3..7bfbfba 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
@@ -57,8 +57,8 @@ class FaxWizardDialogImpl(FaxWizardDialog):
 
     def __init__(self, xmsf):
         super(FaxWizardDialogImpl, self).__init__(xmsf)
-		self.lstBusinessStylePos = None
-		self.lstPrivateStylePos = None
+        self.lstBusinessStylePos = None
+        self.lstPrivateStylePos = None
         self.bSaveSuccess = False
         self.filenameChanged = False
         self.UserTemplatePath = ""
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
index d8df8b6..4f91d37 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
@@ -50,10 +50,6 @@ class LetterWizardDialogImpl(LetterWizardDialog):
     RM_FOOTER = 5
     RM_FINALSETTINGS = 6
 
-    lstBusinessStylePos = None
-    lstPrivateStylePos = None
-    lstPrivOfficialStylePos = None
-
     def enterStep(self, OldStep, NewStep):
         pass
 
@@ -62,6 +58,9 @@ class LetterWizardDialogImpl(LetterWizardDialog):
 
     def __init__(self, xmsf):
         super(LetterWizardDialogImpl, self).__init__(xmsf)
+        self.lstBusinessStylePos = None
+        self.lstPrivateStylePos = None
+        self.lstPrivOfficialStylePos = None
         self.xmsf = xmsf
         self.bSaveSuccess = False
         self.filenameChanged = False
@@ -265,8 +264,8 @@ class LetterWizardDialogImpl(LetterWizardDialog):
             traceback.print_exc()
 
     def optBusinessLetterItemChanged(self):
-        LetterWizardDialogImpl.lstPrivateStylePos = None
-        LetterWizardDialogImpl.lstPrivOfficialStylePos = None
+        self.lstPrivateStylePos = None
+        self.lstPrivOfficialStylePos = None
         self.setControlProperty(
             "lblBusinessStyle", PropertyNames.PROPERTY_ENABLED, True)
         self.setControlProperty(
@@ -288,8 +287,8 @@ class LetterWizardDialogImpl(LetterWizardDialog):
             self.myPathSelection.initializePath()
 
     def optPrivOfficialLetterItemChanged(self):
-        LetterWizardDialogImpl.lstBusinessStylePos = None
-        LetterWizardDialogImpl.lstPrivateStylePos = None
+        self.lstBusinessStylePos = None
+        self.lstPrivateStylePos = None
         self.setControlProperty(
             "lblBusinessStyle", PropertyNames.PROPERTY_ENABLED, False)
         self.setControlProperty(
@@ -312,8 +311,8 @@ class LetterWizardDialogImpl(LetterWizardDialog):
             self.myPathSelection.initializePath()
 
     def optPrivateLetterItemChanged(self):
-        LetterWizardDialogImpl.lstBusinessStylePos = None
-        LetterWizardDialogImpl.lstPrivOfficialStylePos = None
+        self.lstBusinessStylePos = None
+        self.lstPrivOfficialStylePos = None
         self.setControlProperty(
             "lblBusinessStyle", PropertyNames.PROPERTY_ENABLED, False)
         self.setControlProperty(
@@ -379,8 +378,8 @@ class LetterWizardDialogImpl(LetterWizardDialog):
 
     def lstBusinessStyleItemChanged(self):
         selectedItemPos = self.lstBusinessStyle.SelectedItemPos
-        if LetterWizardDialogImpl.lstBusinessStylePos != selectedItemPos:
-            LetterWizardDialogImpl.lstBusinessStylePos = selectedItemPos
+        if self.lstBusinessStylePos != selectedItemPos:
+            self.lstBusinessStylePos = selectedItemPos
             TextDocument.xTextDocument = \
                 self.myLetterDoc.loadAsPreview(
                     self.BusinessFiles.values()[selectedItemPos], False)
@@ -390,8 +389,8 @@ class LetterWizardDialogImpl(LetterWizardDialog):
             
     def lstPrivOfficialStyleItemChanged(self):
         selectedItemPos = self.lstPrivOfficialStyle.SelectedItemPos
-        if LetterWizardDialogImpl.lstPrivOfficialStylePos != selectedItemPos:
-            LetterWizardDialogImpl.lstPrivOfficialStylePos = selectedItemPos
+        if self.lstPrivOfficialStylePos != selectedItemPos:
+            self.lstPrivOfficialStylePos = selectedItemPos
             TextDocument.xTextDocument = \
                 self.myLetterDoc.loadAsPreview(
                     self.OfficialFiles.values()[selectedItemPos], False)
@@ -401,8 +400,8 @@ class LetterWizardDialogImpl(LetterWizardDialog):
 
     def lstPrivateStyleItemChanged(self):
         selectedItemPos = self.lstPrivateStyle.SelectedItemPos
-        if LetterWizardDialogImpl.lstPrivateStylePos != selectedItemPos:
-            LetterWizardDialogImpl.lstPrivateStylePos = selectedItemPos
+        if self.lstPrivateStylePos != selectedItemPos:
+            self.lstPrivateStylePos = selectedItemPos
             TextDocument.xTextDocument = \
                 self.myLetterDoc.loadAsPreview(
                     self.PrivateFiles.values()[selectedItemPos], False)
commit 0ab32951d55ed6c42c36234d5075d25b1b086860
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Fri Oct 26 17:01:17 2012 +0200

    pyfax: Fix a chash when trying to load the wizard again
    
    Change-Id: I1c571327f977a95fc4193567142e3897cbfc3e14

diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index 04767c9..7cccdc3 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
@@ -55,11 +55,10 @@ class FaxWizardDialogImpl(FaxWizardDialog):
     RM_FOOTER = 4
     RM_FINALSETTINGS = 5
 
-    lstBusinessStylePos = None
-    lstPrivateStylePos = None
-
     def __init__(self, xmsf):
         super(FaxWizardDialogImpl, self).__init__(xmsf)
+		self.lstBusinessStylePos = None
+		self.lstPrivateStylePos = None
         self.bSaveSuccess = False
         self.filenameChanged = False
         self.UserTemplatePath = ""
@@ -433,7 +432,7 @@ class FaxWizardDialogImpl(FaxWizardDialog):
             self.optPrivateFaxItemChanged()
 
     def optBusinessFaxItemChanged(self):
-        FaxWizardDialogImpl.lstPrivateStylePos = None
+        self.lstPrivateStylePos = None
         self.setControlProperty("lblBusinessStyle",
             PropertyNames.PROPERTY_ENABLED, True)
         self.setControlProperty("lstBusinessStyle",
@@ -449,8 +448,8 @@ class FaxWizardDialogImpl(FaxWizardDialog):
     def lstBusinessStyleItemChanged(self):
         selectedItemPos = self.lstBusinessStyle.SelectedItemPos
         #avoid to load the same item again
-        if FaxWizardDialogImpl.lstBusinessStylePos != selectedItemPos:
-            FaxWizardDialogImpl.lstBusinessStylePos = selectedItemPos
+        if self.lstBusinessStylePos != selectedItemPos:
+            self.lstBusinessStylePos = selectedItemPos
             TextDocument.xTextDocument = self.myFaxDoc.loadAsPreview(
                 self.BusinessFiles.values()[selectedItemPos], False)
             self.initializeElements()
@@ -458,7 +457,7 @@ class FaxWizardDialogImpl(FaxWizardDialog):
             self.drawConstants()
 
     def optPrivateFaxItemChanged(self):
-        FaxWizardDialogImpl.lstBusinessStylePos = None
+        self.lstBusinessStylePos = None
         self.setControlProperty("lblBusinessStyle",
             PropertyNames.PROPERTY_ENABLED, False)
         self.setControlProperty("lstBusinessStyle",
@@ -474,8 +473,8 @@ class FaxWizardDialogImpl(FaxWizardDialog):
     def lstPrivateStyleItemChanged(self):
         selectedItemPos = self.lstPrivateStyle.SelectedItemPos
         #avoid to load the same item again
-        if FaxWizardDialogImpl.lstPrivateStylePos != selectedItemPos:
-            FaxWizardDialogImpl.lstPrivateStylePos = selectedItemPos
+        if self.lstPrivateStylePos != selectedItemPos:
+            self.lstPrivateStylePos = selectedItemPos
             TextDocument.xTextDocument = self.myFaxDoc.loadAsPreview(
                 self.PrivateFiles.values()[selectedItemPos], False)
             self.initializeElements()