Pyfax: Get rid of import * (1)

Change-Id: Ifeb2fca16ef572a7cb1d1aabb651b3cea87ecbea
Reviewed-on: https://gerrit.libreoffice.org/685
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

3 files changed, 203 insertions, 174 deletions

diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
index 4da2c4cfb79c..c28d1e876326 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
@@ -15,9 +15,13 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
+import uno
 from .FaxWizardDialogResources import FaxWizardDialogResources
-from .FaxWizardDialogConst import *
-from ..ui.WizardDialog import *
+from .FaxWizardDialogConst import FaxWizardDialogConst, HIDMAIN
+from ..ui.WizardDialog import WizardDialog
+from ..ui.UIConsts import UIConsts
+from ..common.Helper import Helper
+from ..common.PropertyNames import PropertyNames
 
 from com.sun.star.awt.FontUnderline import SINGLE
 
@@ -59,7 +63,7 @@ class FaxWizardDialog(WizardDialog):
     '''
     def buildStep1(self):
         self.optBusinessFax = self.insertRadioButton("optBusinessFax",
-            OPTBUSINESSFAX_ITEM_CHANGED,
+            FaxWizardDialogConst.OPTBUSINESSFAX_ITEM_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_LABEL,
@@ -68,10 +72,12 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (8, OPTBUSINESSFAX_HID, self.resources.resoptBusinessFax_value,
-                97, 28, 1, 1, 184), self)
+            (8, FaxWizardDialogConst.OPTBUSINESSFAX_HID, 
+				self.resources.resoptBusinessFax_value, 97, 28, 1, 1, 184),
+			self)
         self.lstBusinessStyle = self.insertListBox("lstBusinessStyle",
-            LSTBUSINESSSTYLE_ACTION_PERFORMED, LSTBUSINESSSTYLE_ITEM_CHANGED,
+            FaxWizardDialogConst.LSTBUSINESSSTYLE_ACTION_PERFORMED, 
+            FaxWizardDialogConst.LSTBUSINESSSTYLE_ITEM_CHANGED,
             ("Dropdown", PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -79,9 +85,10 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (True, 12, LSTBUSINESSSTYLE_HID, 180, 40, 1, 3, 74), self)
+            (True, 12, FaxWizardDialogConst.LSTBUSINESSSTYLE_HID,
+				180, 40, 1, 3, 74), self)
         self.optPrivateFax = self.insertRadioButton("optPrivateFax",
-            OPTPRIVATEFAX_ITEM_CHANGED,
+            FaxWizardDialogConst.OPTPRIVATEFAX_ITEM_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_LABEL,
@@ -90,11 +97,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (8, OPTPRIVATEFAX_HID, self.resources.resoptPrivateFax_value,
-                97, 81, 1, 2, 184), self)
+            (8, FaxWizardDialogConst.OPTPRIVATEFAX_HID, 
+				self.resources.resoptPrivateFax_value,97, 81, 1, 2, 184), self)
         self.lstPrivateStyle = self.insertListBox("lstPrivateStyle",
-            LSTPRIVATESTYLE_ACTION_PERFORMED,
-            LSTPRIVATESTYLE_ITEM_CHANGED,
+            FaxWizardDialogConst.LSTPRIVATESTYLE_ACTION_PERFORMED,
+            FaxWizardDialogConst.LSTPRIVATESTYLE_ITEM_CHANGED,
             ("Dropdown", PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -102,8 +109,8 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (True, 12, LSTPRIVATESTYLE_HID, 180, 95, 1,
-                4, 74), self)
+            (True, 12, FaxWizardDialogConst.LSTPRIVATESTYLE_HID,
+				180, 95, 1, 4, 74), self)
         self.insertLabel("lblBusinessStyle",
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
@@ -144,11 +151,13 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (39, self.resources.reslblIntroduction_value, True, 104, 145, 1, 55, 199))
+            (39, self.resources.reslblIntroduction_value, 
+				True, 104, 145, 1, 55, 199))
         self.ImageControl3 = self.insertInfoImage(92, 145, 1)
+        
     def buildStep2(self):
         self.chkUseLogo = self.insertCheckBox("chkUseLogo",
-            CHKUSELOGO_ITEM_CHANGED,
+            FaxWizardDialogConst.CHKUSELOGO_ITEM_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_LABEL,
@@ -158,10 +167,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (8, CHKUSELOGO_HID, self.resources.reschkUseLogo_value, 97, 28,
-                0, 2, 5, 212), self)
+            (8, FaxWizardDialogConst.CHKUSELOGO_HID,
+				self.resources.reschkUseLogo_value, 97, 28, 0, 2, 5, 212),
+			self)
         self.chkUseDate = self.insertCheckBox("chkUseDate",
-            CHKUSEDATE_ITEM_CHANGED,
+            FaxWizardDialogConst.CHKUSEDATE_ITEM_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_LABEL,
@@ -171,11 +181,12 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (8, CHKUSEDATE_HID, self.resources.reschkUseDate_value, 97, 43,
-                0, 2, 6, 212), self)
+            (8, FaxWizardDialogConst.CHKUSEDATE_HID,
+				self.resources.reschkUseDate_value, 97, 43, 0, 2, 6, 212),
+			self)
         self.chkUseCommunicationType = self.insertCheckBox(
             "chkUseCommunicationType",
-            CHKUSECOMMUNICATIONTYPE_ITEM_CHANGED,
+            FaxWizardDialogConst.CHKUSECOMMUNICATIONTYPE_ITEM_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_LABEL,
@@ -185,14 +196,14 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (8, CHKUSECOMMUNICATIONTYPE_HID,
-                self.resources.reschkUseCommunicationType_value, 97, 57,
-                0, 2, 7, 100), self)
+            (8, FaxWizardDialogConst.CHKUSECOMMUNICATIONTYPE_HID,
+                self.resources.reschkUseCommunicationType_value,
+				97, 57, 0, 2, 7, 100), self)
         self.lstCommunicationType = self.insertComboBox(
             "lstCommunicationType",
-            LSTCOMMUNICATIONTYPE_ACTION_PERFORMED,
-            LSTCOMMUNICATIONTYPE_ITEM_CHANGED,
-            LSTCOMMUNICATIONTYPE_TEXT_CHANGED,
+            FaxWizardDialogConst.LSTCOMMUNICATIONTYPE_ACTION_PERFORMED,
+            FaxWizardDialogConst.LSTCOMMUNICATIONTYPE_ITEM_CHANGED,
+            FaxWizardDialogConst.LSTCOMMUNICATIONTYPE_TEXT_CHANGED,
             ("Dropdown", PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -200,10 +211,10 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-                (True, 12, LSTCOMMUNICATIONTYPE_HID, 105, 68, 2,
-                    8, 174), self)
+                (True, 12, FaxWizardDialogConst.LSTCOMMUNICATIONTYPE_HID,
+					105, 68, 2, 8, 174), self)
         self.chkUseSubject = self.insertCheckBox("chkUseSubject",
-            CHKUSESUBJECT_ITEM_CHANGED,
+            FaxWizardDialogConst.CHKUSESUBJECT_ITEM_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_LABEL,
@@ -213,10 +224,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (8, CHKUSESUBJECT_HID, self.resources.reschkUseSubject_value,
-                97, 87, 0, 2, 9, 212), self)
+            (8, FaxWizardDialogConst.CHKUSESUBJECT_HID,
+				self.resources.reschkUseSubject_value, 97, 87, 0, 2, 9, 212),
+			self)
         self.chkUseSalutation = self.insertCheckBox("chkUseSalutation",
-            CHKUSESALUTATION_ITEM_CHANGED,
+            FaxWizardDialogConst.CHKUSESALUTATION_ITEM_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_LABEL,
@@ -226,13 +238,13 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (8, CHKUSESALUTATION_HID,
-                self.resources.reschkUseSalutation_value, 97, 102,
-                0, 2, 10, 100), self)
+            (8, FaxWizardDialogConst.CHKUSESALUTATION_HID,
+                self.resources.reschkUseSalutation_value,
+				97, 102, 0, 2, 10, 100), self)
         self.lstSalutation = self.insertComboBox("lstSalutation",
-            LSTSALUTATION_ACTION_PERFORMED,
-            LSTSALUTATION_ITEM_CHANGED,
-            LSTSALUTATION_TEXT_CHANGED,
+            FaxWizardDialogConst.LSTSALUTATION_ACTION_PERFORMED,
+            FaxWizardDialogConst.LSTSALUTATION_ITEM_CHANGED,
+            FaxWizardDialogConst.LSTSALUTATION_TEXT_CHANGED,
             ("Dropdown", PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -240,10 +252,10 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (True, 12, LSTSALUTATION_HID, 105, 113, 2,
-                11, 174), self)
+            (True, 12, FaxWizardDialogConst.LSTSALUTATION_HID,
+				105, 113, 2, 11, 174), self)
         self.chkUseGreeting = self.insertCheckBox("chkUseGreeting",
-            CHKUSEGREETING_ITEM_CHANGED,
+            FaxWizardDialogConst.CHKUSEGREETING_ITEM_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_LABEL,
@@ -253,13 +265,13 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (8, CHKUSEGREETING_HID,
-                self.resources.reschkUseGreeting_value, 97, 132,
-                0, 2, 12, 100), self)
+            (8, FaxWizardDialogConst.CHKUSEGREETING_HID,
+                self.resources.reschkUseGreeting_value,
+                97, 132, 0, 2, 12, 100), self)
         self.lstGreeting = self.insertComboBox("lstGreeting",
-            LSTGREETING_ACTION_PERFORMED,
-            LSTGREETING_ITEM_CHANGED,
-            LSTGREETING_TEXT_CHANGED,
+            FaxWizardDialogConst.LSTGREETING_ACTION_PERFORMED,
+            FaxWizardDialogConst.LSTGREETING_ITEM_CHANGED,
+            FaxWizardDialogConst.LSTGREETING_TEXT_CHANGED,
             ("Dropdown", PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -267,9 +279,10 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (True, 12, LSTGREETING_HID, 105, 143, 2, 13, 174), self)
+            (True, 12, FaxWizardDialogConst.LSTGREETING_HID,
+				105, 143, 2, 13, 174), self)
         self.chkUseFooter = self.insertCheckBox("chkUseFooter",
-            CHKUSEFOOTER_ITEM_CHANGED,
+            FaxWizardDialogConst.CHKUSEFOOTER_ITEM_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_LABEL,
@@ -279,7 +292,7 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (8, CHKUSEFOOTER_HID,
+            (8, FaxWizardDialogConst.CHKUSEFOOTER_HID,
                 self.resources.reschkUseFooter_value, 97, 163,
                 0, 2, 14, 212), self)
         self.insertLabel("lblTitle3",
@@ -297,7 +310,7 @@ class FaxWizardDialog(WizardDialog):
     def buildStep3(self):
         self.optSenderPlaceholder = self.insertRadioButton(
             "optSenderPlaceholder",
-            OPTSENDERPLACEHOLDER_ITEM_CHANGED,
+            FaxWizardDialogConst.OPTSENDERPLACEHOLDER_ITEM_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_LABEL,
@@ -306,11 +319,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (8, OPTSENDERPLACEHOLDER_HID,
+            (8, FaxWizardDialogConst.OPTSENDERPLACEHOLDER_HID,
                 self.resources.resoptSenderPlaceholder_value,
                 104, 42, 3, 15, 149), self)
         self.optSenderDefine = self.insertRadioButton("optSenderDefine",
-            OPTSENDERDEFINE_ITEM_CHANGED,
+            FaxWizardDialogConst.OPTSENDERDEFINE_ITEM_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_LABEL,
@@ -319,10 +332,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (8, OPTSENDERDEFINE_HID, self.resources.resoptSenderDefine_value,
+            (8, FaxWizardDialogConst.OPTSENDERDEFINE_HID,
+				self.resources.resoptSenderDefine_value,
                 104, 54, 3, 16, 149), self)
         self.txtSenderName = self.insertTextField("txtSenderName",
-            TXTSENDERNAME_TEXT_CHANGED,
+            FaxWizardDialogConst.TXTSENDERNAME_TEXT_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -330,9 +344,10 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (12, TXTSENDERNAME_HID, 182, 67, 3, 17, 119), self)
+            (12, FaxWizardDialogConst.TXTSENDERNAME_HID,
+				182, 67, 3, 17, 119), self)
         self.txtSenderStreet = self.insertTextField("txtSenderStreet",
-            TXTSENDERSTREET_TEXT_CHANGED,
+            FaxWizardDialogConst.TXTSENDERSTREET_TEXT_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -340,9 +355,10 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (12, TXTSENDERSTREET_HID, 182, 81, 3, 18, 119), self)
+            (12, FaxWizardDialogConst.TXTSENDERSTREET_HID,
+				182, 81, 3, 18, 119), self)
         self.txtSenderPostCode = self.insertTextField("txtSenderPostCode",
-            TXTSENDERPOSTCODE_TEXT_CHANGED,
+            FaxWizardDialogConst.TXTSENDERPOSTCODE_TEXT_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -350,9 +366,10 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (12, TXTSENDERPOSTCODE_HID, 182, 95, 3, 19, 25), self)
+            (12, FaxWizardDialogConst.TXTSENDERPOSTCODE_HID,
+				182, 95, 3, 19, 25), self)
         self.txtSenderState = self.insertTextField("txtSenderState",
-            TXTSENDERSTATE_TEXT_CHANGED,
+            FaxWizardDialogConst.TXTSENDERSTATE_TEXT_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -360,9 +377,10 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (12, TXTSENDERSTATE_HID, 211, 95, 3, 20, 21), self)
+            (12, FaxWizardDialogConst.TXTSENDERSTATE_HID,
+				211, 95, 3, 20, 21), self)
         self.txtSenderCity = self.insertTextField("txtSenderCity",
-            TXTSENDERCITY_TEXT_CHANGED,
+            FaxWizardDialogConst.TXTSENDERCITY_TEXT_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -370,9 +388,10 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (12, TXTSENDERCITY_HID, 236, 95, 3, 21, 65), self)
+            (12, FaxWizardDialogConst.TXTSENDERCITY_HID,
+				236, 95, 3, 21, 65), self)
         self.txtSenderFax = self.insertTextField("txtSenderFax",
-            TXTSENDERFAX_TEXT_CHANGED,
+            FaxWizardDialogConst.TXTSENDERFAX_TEXT_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -380,10 +399,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (12, TXTSENDERFAX_HID, 182, 109, 3, 22, 119), self)
+            (12, FaxWizardDialogConst.TXTSENDERFAX_HID,
+				182, 109, 3, 22, 119), self)
         self.optReceiverPlaceholder = self.insertRadioButton(
             "optReceiverPlaceholder",
-            OPTRECEIVERPLACEHOLDER_ITEM_CHANGED,
+            FaxWizardDialogConst.OPTRECEIVERPLACEHOLDER_ITEM_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_LABEL,
@@ -392,12 +412,12 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (8, OPTRECEIVERPLACEHOLDER_HID,
+            (8, FaxWizardDialogConst.OPTRECEIVERPLACEHOLDER_HID,
                 self.resources.resoptReceiverPlaceholder_value,
                 104, 148, 3, 23, 200), self)
         self.optReceiverDatabase = self.insertRadioButton(
             "optReceiverDatabase",
-            OPTRECEIVERDATABASE_ITEM_CHANGED,
+            FaxWizardDialogConst.OPTRECEIVERDATABASE_ITEM_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_LABEL,
@@ -406,9 +426,9 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (8, OPTRECEIVERDATABASE_HID,
-                self.resources.resoptReceiverDatabase_value, 104, 160, 3,
-                24, 200), self)
+            (8, FaxWizardDialogConst.OPTRECEIVERDATABASE_HID,
+                self.resources.resoptReceiverDatabase_value,
+				104, 160, 3, 24, 200), self)
         self.insertLabel("lblSenderAddress",
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
@@ -417,7 +437,8 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (8, self.resources.reslblSenderAddress_value, 97, 28, 3, 46, 136))
+            (8, self.resources.reslblSenderAddress_value,
+				97, 28, 3, 46, 136))
         self.insertFixedLine("FixedLine2", (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_POSITION_X,
                 PropertyNames.PROPERTY_POSITION_Y,
@@ -433,7 +454,8 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (8, self.resources.reslblSenderName_value, 113, 69, 3, 52, 68))
+            (8, self.resources.reslblSenderName_value,
+				113, 69, 3, 52, 68))
         self.insertLabel("lblSenderStreet",
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
@@ -442,7 +464,8 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (8, self.resources.reslblSenderStreet_value, 113, 82, 3, 53, 68))
+            (8, self.resources.reslblSenderStreet_value,
+				113, 82, 3, 53, 68))
         self.insertLabel("lblPostCodeCity",
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
@@ -451,7 +474,8 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (8, self.resources.reslblPostCodeCity_value, 113, 97, 3, 54, 68))
+            (8, self.resources.reslblPostCodeCity_value,
+				113, 97, 3, 54, 68))
         self.insertLabel("lblTitle4",
             ("FontDescriptor",
                 PropertyNames.PROPERTY_HEIGHT,
@@ -485,7 +509,7 @@ class FaxWizardDialog(WizardDialog):
 
     def buildStep4(self):
         self.txtFooter = self.insertTextField("txtFooter",
-            TXTFOOTER_TEXT_CHANGED,
+            FaxWizardDialogConst.TXTFOOTER_TEXT_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_MULTILINE,
@@ -494,9 +518,10 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (47, TXTFOOTER_HID, True, 97, 40, 4, 25, 203), self)
+            (47, FaxWizardDialogConst.TXTFOOTER_HID,
+				True, 97, 40, 4, 25, 203), self)
         self.chkFooterNextPages = self.insertCheckBox("chkFooterNextPages",
-            CHKFOOTERNEXTPAGES_ITEM_CHANGED,
+            FaxWizardDialogConst.CHKFOOTERNEXTPAGES_ITEM_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_LABEL,
@@ -506,11 +531,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (8, CHKFOOTERNEXTPAGES_HID,
-                self.resources.reschkFooterNextPages_value, 97, 92,
-                0, 4, 26, 202), self)
+            (8, FaxWizardDialogConst.CHKFOOTERNEXTPAGES_HID,
+                self.resources.reschkFooterNextPages_value,
+				97, 92, 0, 4, 26, 202), self)
         self.chkFooterPageNumbers = self.insertCheckBox("chkFooterPageNumbers",
-            CHKFOOTERPAGENUMBERS_ITEM_CHANGED,
+            FaxWizardDialogConst.CHKFOOTERPAGENUMBERS_ITEM_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_LABEL,
@@ -520,9 +545,9 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (8, CHKFOOTERPAGENUMBERS_HID,
-                self.resources.reschkFooterPageNumbers_value, 97, 106,
-                0, 4, 27, 201), self)
+            (8, FaxWizardDialogConst.CHKFOOTERPAGENUMBERS_HID,
+                self.resources.reschkFooterPageNumbers_value,
+				97, 106, 0, 4, 27, 201), self)
         self.insertLabel("lblFooter",
             ("FontDescriptor",
                 PropertyNames.PROPERTY_HEIGHT,
@@ -549,7 +574,7 @@ class FaxWizardDialog(WizardDialog):
 
     def buildStep5(self):
         self.txtTemplateName = self.insertTextField("txtTemplateName",
-            TXTTEMPLATENAME_TEXT_CHANGED,
+            FaxWizardDialogConst.TXTTEMPLATENAME_TEXT_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -558,11 +583,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_TABINDEX,
                 "Text",
                 PropertyNames.PROPERTY_WIDTH),
-            (12, TXTTEMPLATENAME_HID, 202, 56, 5, 28,
+            (12, FaxWizardDialogConst.TXTTEMPLATENAME_HID, 202, 56, 5, 28,
                 self.resources.restxtTemplateName_value, 100), self)
 
         self.optCreateFax = self.insertRadioButton("optCreateFax",
-            OPTCREATEFAX_ITEM_CHANGED,
+            FaxWizardDialogConst.OPTCREATEFAX_ITEM_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_LABEL,
@@ -571,10 +596,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (8, OPTCREATEFAX_HID, self.resources.resoptCreateFax_value,
+            (8, FaxWizardDialogConst.OPTCREATEFAX_HID,
+				self.resources.resoptCreateFax_value,
                 104, 111, 5, 30, 198), self)
         self.optMakeChanges = self.insertRadioButton("optMakeChanges",
-            OPTMAKECHANGES_ITEM_CHANGED,
+            FaxWizardDialogConst.OPTMAKECHANGES_ITEM_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_HELPURL,
                 PropertyNames.PROPERTY_LABEL,
@@ -583,7 +609,8 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (8, OPTMAKECHANGES_HID, self.resources.resoptMakeChanges_value,
+            (8, FaxWizardDialogConst.OPTMAKECHANGES_HID,
+				self.resources.resoptMakeChanges_value,
                 104, 123, 5, 31, 198), self)
         self.insertLabel("lblFinalExplanation1",
             (PropertyNames.PROPERTY_HEIGHT,
@@ -615,8 +642,8 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
-            (33, self.resources.reslblFinalExplanation2_value, True, 104, 145, 5,
-                36, 199))
+            (33, self.resources.reslblFinalExplanation2_value,
+				True, 104, 145, 5, 36, 199))
         self.insertImage("ImageControl2",
             ("Border",
                 PropertyNames.PROPERTY_HEIGHT,
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
index 1f1de57beb07..95c952c59b2a 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
@@ -17,83 +17,83 @@
 #
 from ..common.HelpIds import HelpIds
 
-OPTBUSINESSFAX_ITEM_CHANGED = "optBusinessFaxItemChanged"
-LSTBUSINESSSTYLE_ACTION_PERFORMED = None # "lstBusinessStyleActionPerformed"
-LSTBUSINESSSTYLE_ITEM_CHANGED = "lstBusinessStyleItemChanged"
-OPTPRIVATEFAX_ITEM_CHANGED = "optPrivateFaxItemChanged"
-LSTPRIVATESTYLE_ACTION_PERFORMED = None # "lstPrivateStyleActionPerformed"
-LSTPRIVATESTYLE_ITEM_CHANGED = "lstPrivateStyleItemChanged"
-CHKUSELOGO_ITEM_CHANGED = "chkUseLogoItemChanged"
-CHKUSEDATE_ITEM_CHANGED = "chkUseDateItemChanged"
-CHKUSECOMMUNICATIONTYPE_ITEM_CHANGED = "chkUseCommunicationItemChanged"
-LSTCOMMUNICATIONTYPE_ACTION_PERFORMED = None # "lstCommunicationActionPerformed"
-LSTCOMMUNICATIONTYPE_ITEM_CHANGED = "lstCommunicationItemChanged"
-LSTCOMMUNICATIONTYPE_TEXT_CHANGED = "lstCommunicationItemChanged"
-CHKUSESUBJECT_ITEM_CHANGED = "chkUseSubjectItemChanged"
-CHKUSESALUTATION_ITEM_CHANGED = "chkUseSalutationItemChanged"
-LSTSALUTATION_ACTION_PERFORMED = None # "lstSalutationActionPerformed"
-LSTSALUTATION_ITEM_CHANGED = "lstSalutationItemChanged"
-LSTSALUTATION_TEXT_CHANGED = "lstSalutationItemChanged"
-CHKUSEGREETING_ITEM_CHANGED = "chkUseGreetingItemChanged"
-LSTGREETING_ACTION_PERFORMED = None # "lstGreetingActionPerformed"
-LSTGREETING_ITEM_CHANGED = "lstGreetingItemChanged"
-LSTGREETING_TEXT_CHANGED = "lstGreetingItemChanged"
-CHKUSEFOOTER_ITEM_CHANGED = "chkUseFooterItemChanged"
-OPTSENDERPLACEHOLDER_ITEM_CHANGED = "optSenderPlaceholderItemChanged"
-OPTSENDERDEFINE_ITEM_CHANGED = "optSenderDefineItemChanged"
-TXTSENDERNAME_TEXT_CHANGED = "txtSenderNameTextChanged"
-TXTSENDERSTREET_TEXT_CHANGED = "txtSenderStreetTextChanged"
-TXTSENDERPOSTCODE_TEXT_CHANGED = "txtSenderPostCodeTextChanged"
-TXTSENDERSTATE_TEXT_CHANGED = "txtSenderStateTextChanged"
-TXTSENDERCITY_TEXT_CHANGED = "txtSenderCityTextChanged"
-TXTSENDERFAX_TEXT_CHANGED = "txtSenderFaxTextChanged"
-OPTRECEIVERPLACEHOLDER_ITEM_CHANGED = "optReceiverPlaceholderItemChanged"
-OPTRECEIVERDATABASE_ITEM_CHANGED = "optReceiverDatabaseItemChanged"
-TXTFOOTER_TEXT_CHANGED = "txtFooterTextChanged"
-CHKFOOTERNEXTPAGES_ITEM_CHANGED = "chkFooterNextPagesItemChanged"
-CHKFOOTERPAGENUMBERS_ITEM_CHANGED = "chkFooterPageNumbersItemChanged"
-TXTTEMPLATENAME_TEXT_CHANGED = "txtTemplateNameTextChanged"
-FILETEMPLATEPATH_TEXT_CHANGED = None # "fileTemplatePathTextChanged"
-OPTCREATEFAX_ITEM_CHANGED = "optCreateFromTemplateItemChanged"
-OPTMAKECHANGES_ITEM_CHANGED = "optMakeChangesItemChanged"
-imageURLImageControl2 = None #"images/ImageControl2"
-imageURLImageControl3 = None #"images/ImageControl3"
+HID = 41119 #enter first hid here
+HIDMAIN = 41180
 
-#Help IDs
+class FaxWizardDialogConst:
 
-HID = 41119 #TODO enter first hid here
-HIDMAIN = 41180
-OPTBUSINESSFAX_HID = HelpIds.getHelpIdString(HID + 1)
-LSTBUSINESSSTYLE_HID = HelpIds.getHelpIdString(HID + 2)
-OPTPRIVATEFAX_HID = HelpIds.getHelpIdString(HID + 3)
-LSTPRIVATESTYLE_HID = HelpIds.getHelpIdString(HID + 4)
-IMAGECONTROL3_HID = HelpIds.getHelpIdString(HID + 5)
-CHKUSELOGO_HID = HelpIds.getHelpIdString(HID + 6)
-CHKUSEDATE_HID = HelpIds.getHelpIdString(HID + 7)
-CHKUSECOMMUNICATIONTYPE_HID = HelpIds.getHelpIdString(HID + 8)
-LSTCOMMUNICATIONTYPE_HID = HelpIds.getHelpIdString(HID + 9)
-CHKUSESUBJECT_HID = HelpIds.getHelpIdString(HID + 10)
-CHKUSESALUTATION_HID = HelpIds.getHelpIdString(HID + 11)
-LSTSALUTATION_HID = HelpIds.getHelpIdString(HID + 12)
-CHKUSEGREETING_HID = HelpIds.getHelpIdString(HID + 13)
-LSTGREETING_HID = HelpIds.getHelpIdString(HID + 14)
-CHKUSEFOOTER_HID = HelpIds.getHelpIdString(HID + 15)
-OPTSENDERPLACEHOLDER_HID = HelpIds.getHelpIdString(HID + 16)
-OPTSENDERDEFINE_HID = HelpIds.getHelpIdString(HID + 17)
-TXTSENDERNAME_HID = HelpIds.getHelpIdString(HID + 18)
-TXTSENDERSTREET_HID = HelpIds.getHelpIdString(HID + 19)
-TXTSENDERPOSTCODE_HID = HelpIds.getHelpIdString(HID + 20)
-TXTSENDERSTATE_HID = HelpIds.getHelpIdString(HID + 21)
-TXTSENDERCITY_HID = HelpIds.getHelpIdString(HID + 22)
-TXTSENDERFAX_HID = HelpIds.getHelpIdString(HID + 23)
-OPTRECEIVERPLACEHOLDER_HID = HelpIds.getHelpIdString(HID + 24)
-OPTRECEIVERDATABASE_HID = HelpIds.getHelpIdString(HID + 25)
-TXTFOOTER_HID = HelpIds.getHelpIdString(HID + 26)
-CHKFOOTERNEXTPAGES_HID = HelpIds.getHelpIdString(HID + 27)
-CHKFOOTERPAGENUMBERS_HID = HelpIds.getHelpIdString(HID + 28)
-TXTTEMPLATENAME_HID = HelpIds.getHelpIdString(HID + 29)
-FILETEMPLATEPATH_HID = HelpIds.getHelpIdString(HID + 30)
-OPTCREATEFAX_HID = HelpIds.getHelpIdString(HID + 31)
-OPTMAKECHANGES_HID = HelpIds.getHelpIdString(HID + 32)
-IMAGECONTROL2_HID = HelpIds.getHelpIdString(HID + 33)
+	OPTBUSINESSFAX_ITEM_CHANGED = "optBusinessFaxItemChanged"
+	LSTBUSINESSSTYLE_ACTION_PERFORMED = None
+	LSTBUSINESSSTYLE_ITEM_CHANGED = "lstBusinessStyleItemChanged"
+	OPTPRIVATEFAX_ITEM_CHANGED = "optPrivateFaxItemChanged"
+	LSTPRIVATESTYLE_ACTION_PERFORMED = None
+	LSTPRIVATESTYLE_ITEM_CHANGED = "lstPrivateStyleItemChanged"
+	CHKUSELOGO_ITEM_CHANGED = "chkUseLogoItemChanged"
+	CHKUSEDATE_ITEM_CHANGED = "chkUseDateItemChanged"
+	CHKUSECOMMUNICATIONTYPE_ITEM_CHANGED = "chkUseCommunicationItemChanged"
+	LSTCOMMUNICATIONTYPE_ACTION_PERFORMED = None
+	LSTCOMMUNICATIONTYPE_ITEM_CHANGED = "lstCommunicationItemChanged"
+	LSTCOMMUNICATIONTYPE_TEXT_CHANGED = "lstCommunicationItemChanged"
+	CHKUSESUBJECT_ITEM_CHANGED = "chkUseSubjectItemChanged"
+	CHKUSESALUTATION_ITEM_CHANGED = "chkUseSalutationItemChanged"
+	LSTSALUTATION_ACTION_PERFORMED = None
+	LSTSALUTATION_ITEM_CHANGED = "lstSalutationItemChanged"
+	LSTSALUTATION_TEXT_CHANGED = "lstSalutationItemChanged"
+	CHKUSEGREETING_ITEM_CHANGED = "chkUseGreetingItemChanged"
+	LSTGREETING_ACTION_PERFORMED = None
+	LSTGREETING_ITEM_CHANGED = "lstGreetingItemChanged"
+	LSTGREETING_TEXT_CHANGED = "lstGreetingItemChanged"
+	CHKUSEFOOTER_ITEM_CHANGED = "chkUseFooterItemChanged"
+	OPTSENDERPLACEHOLDER_ITEM_CHANGED = "optSenderPlaceholderItemChanged"
+	OPTSENDERDEFINE_ITEM_CHANGED = "optSenderDefineItemChanged"
+	TXTSENDERNAME_TEXT_CHANGED = "txtSenderNameTextChanged"
+	TXTSENDERSTREET_TEXT_CHANGED = "txtSenderStreetTextChanged"
+	TXTSENDERPOSTCODE_TEXT_CHANGED = "txtSenderPostCodeTextChanged"
+	TXTSENDERSTATE_TEXT_CHANGED = "txtSenderStateTextChanged"
+	TXTSENDERCITY_TEXT_CHANGED = "txtSenderCityTextChanged"
+	TXTSENDERFAX_TEXT_CHANGED = "txtSenderFaxTextChanged"
+	OPTRECEIVERPLACEHOLDER_ITEM_CHANGED = "optReceiverPlaceholderItemChanged"
+	OPTRECEIVERDATABASE_ITEM_CHANGED = "optReceiverDatabaseItemChanged"
+	TXTFOOTER_TEXT_CHANGED = "txtFooterTextChanged"
+	CHKFOOTERNEXTPAGES_ITEM_CHANGED = "chkFooterNextPagesItemChanged"
+	CHKFOOTERPAGENUMBERS_ITEM_CHANGED = "chkFooterPageNumbersItemChanged"
+	TXTTEMPLATENAME_TEXT_CHANGED = "txtTemplateNameTextChanged"
+	FILETEMPLATEPATH_TEXT_CHANGED = None
+	OPTCREATEFAX_ITEM_CHANGED = "optCreateFromTemplateItemChanged"
+	OPTMAKECHANGES_ITEM_CHANGED = "optMakeChangesItemChanged"
+
+	#Help IDs
 
+	OPTBUSINESSFAX_HID = HelpIds.getHelpIdString(HID + 1)
+	LSTBUSINESSSTYLE_HID = HelpIds.getHelpIdString(HID + 2)
+	OPTPRIVATEFAX_HID = HelpIds.getHelpIdString(HID + 3)
+	LSTPRIVATESTYLE_HID = HelpIds.getHelpIdString(HID + 4)
+	IMAGECONTROL3_HID = HelpIds.getHelpIdString(HID + 5)
+	CHKUSELOGO_HID = HelpIds.getHelpIdString(HID + 6)
+	CHKUSEDATE_HID = HelpIds.getHelpIdString(HID + 7)
+	CHKUSECOMMUNICATIONTYPE_HID = HelpIds.getHelpIdString(HID + 8)
+	LSTCOMMUNICATIONTYPE_HID = HelpIds.getHelpIdString(HID + 9)
+	CHKUSESUBJECT_HID = HelpIds.getHelpIdString(HID + 10)
+	CHKUSESALUTATION_HID = HelpIds.getHelpIdString(HID + 11)
+	LSTSALUTATION_HID = HelpIds.getHelpIdString(HID + 12)
+	CHKUSEGREETING_HID = HelpIds.getHelpIdString(HID + 13)
+	LSTGREETING_HID = HelpIds.getHelpIdString(HID + 14)
+	CHKUSEFOOTER_HID = HelpIds.getHelpIdString(HID + 15)
+	OPTSENDERPLACEHOLDER_HID = HelpIds.getHelpIdString(HID + 16)
+	OPTSENDERDEFINE_HID = HelpIds.getHelpIdString(HID + 17)
+	TXTSENDERNAME_HID = HelpIds.getHelpIdString(HID + 18)
+	TXTSENDERSTREET_HID = HelpIds.getHelpIdString(HID + 19)
+	TXTSENDERPOSTCODE_HID = HelpIds.getHelpIdString(HID + 20)
+	TXTSENDERSTATE_HID = HelpIds.getHelpIdString(HID + 21)
+	TXTSENDERCITY_HID = HelpIds.getHelpIdString(HID + 22)
+	TXTSENDERFAX_HID = HelpIds.getHelpIdString(HID + 23)
+	OPTRECEIVERPLACEHOLDER_HID = HelpIds.getHelpIdString(HID + 24)
+	OPTRECEIVERDATABASE_HID = HelpIds.getHelpIdString(HID + 25)
+	TXTFOOTER_HID = HelpIds.getHelpIdString(HID + 26)
+	CHKFOOTERNEXTPAGES_HID = HelpIds.getHelpIdString(HID + 27)
+	CHKFOOTERPAGENUMBERS_HID = HelpIds.getHelpIdString(HID + 28)
+	TXTTEMPLATENAME_HID = HelpIds.getHelpIdString(HID + 29)
+	FILETEMPLATEPATH_HID = HelpIds.getHelpIdString(HID + 30)
+	OPTCREATEFAX_HID = HelpIds.getHelpIdString(HID + 31)
+	OPTMAKECHANGES_HID = HelpIds.getHelpIdString(HID + 32)
+	IMAGECONTROL2_HID = HelpIds.getHelpIdString(HID + 33)
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index a475fa5f1c7b..59b8bf279e42 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
@@ -18,13 +18,15 @@
 from .FaxWizardDialog import *
 from .CGFaxWizard import *
 from .FaxDocument import *
+from .FaxWizardDialogConst import HID
 from ..ui.PathSelection import PathSelection
-from ..common.FileAccess import FileAccess
 from ..ui.event.UnoDataAware import UnoDataAware
 from ..ui.event.RadioDataAware import RadioDataAware
 from ..text.TextFieldHandler import TextFieldHandler
 from ..common.SystemDialog import SystemDialog
 from ..common.NoValidPathException import NoValidPathException
+from ..common.HelpIds import HelpIds
+from ..common.FileAccess import FileAccess
 
 from com.sun.star.awt.VclWindowPeerAttribute import YES_NO, DEF_NO
 from com.sun.star.uno import RuntimeException