pywizards: Don't need to instantiate Resource twice

Change-Id: I3b0c0218b6b019788316d09a1e1fef9b6a47c6e7

1 files changed, 63 insertions, 66 deletions

diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
index 57302ddf63a1..c9a176cc6bdf 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
@@ -15,10 +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 ..common.Resource import Resource
 
-class FaxWizardDialogResources(Resource):
-    MODULE_NAME = "dbw"
+class FaxWizardDialogResources(object):
+
     RID_FAXWIZARDDIALOG_START = 3200
     RID_FAXWIZARDCOMMUNICATION_START = 3270
     RID_FAXWIZARDGREETING_START = 3280
@@ -26,139 +25,137 @@ class FaxWizardDialogResources(Resource):
     RID_FAXWIZARDROADMAP_START = 3300
     RID_RID_COMMON_START = 500
 
-    def __init__(self, xmsf):
-        super(FaxWizardDialogResources,self).__init__(xmsf,
-            FaxWizardDialogResources.MODULE_NAME)
+    def __init__(self, oWizardResource):
 
-        self.resFaxWizardDialog_title = self.getResText(
+        self.resFaxWizardDialog_title = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 1)
-        self.resoptBusinessFax_value = self.getResText(
+        self.resoptBusinessFax_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 3)
-        self.resoptPrivateFax_value = self.getResText(
+        self.resoptPrivateFax_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 4)
-        self.reschkUseLogo_value = self.getResText(
+        self.reschkUseLogo_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 5)
-        self.reschkUseSubject_value = self.getResText(
+        self.reschkUseSubject_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 6)
-        self.reschkUseSalutation_value = self.getResText(
+        self.reschkUseSalutation_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 7)
-        self.reschkUseGreeting_value = self.getResText(
+        self.reschkUseGreeting_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 8)
-        self.reschkUseFooter_value = self.getResText(
+        self.reschkUseFooter_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 9)
-        self.resoptSenderPlaceholder_value = self.getResText(
+        self.resoptSenderPlaceholder_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 10)
-        self.resoptSenderDefine_value = self.getResText(
+        self.resoptSenderDefine_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 11)
-        self.restxtTemplateName_value = self.getResText(
+        self.restxtTemplateName_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 12)
-        self.resoptCreateFax_value = self.getResText(
+        self.resoptCreateFax_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 13)
-        self.resoptMakeChanges_value = self.getResText(
+        self.resoptMakeChanges_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 14)
-        self.reslblBusinessStyle_value = self.getResText(
+        self.reslblBusinessStyle_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 15)
-        self.reslblPrivateStyle_value = self.getResText(
+        self.reslblPrivateStyle_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 16)
-        self.reslblIntroduction_value = self.getResText(
+        self.reslblIntroduction_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 17)
-        self.reslblSenderAddress_value = self.getResText(
+        self.reslblSenderAddress_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 18)
-        self.reslblSenderName_value = self.getResText(
+        self.reslblSenderName_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 19)
-        self.reslblSenderStreet_value = self.getResText(
+        self.reslblSenderStreet_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 20)
-        self.reslblPostCodeCity_value = self.getResText(
+        self.reslblPostCodeCity_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 21)
-        self.reslblFooter_value = self.getResText(
+        self.reslblFooter_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 22)
-        self.reslblFinalExplanation1_value = self.getResText(
+        self.reslblFinalExplanation1_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 23)
-        self.reslblFinalExplanation2_value = self.getResText(
+        self.reslblFinalExplanation2_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 24)
-        self.reslblTemplateName_value = self.getResText(
+        self.reslblTemplateName_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 25)
-        self.reslblTemplatePath_value = self.getResText(
+        self.reslblTemplatePath_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 26)
-        self.reslblProceed_value = self.getResText(
+        self.reslblProceed_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 27)
-        self.reslblTitle1_value = self.getResText(
+        self.reslblTitle1_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 28)
-        self.reslblTitle3_value = self.getResText(
+        self.reslblTitle3_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 29)
-        self.reslblTitle4_value = self.getResText(
+        self.reslblTitle4_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 30)
-        self.reslblTitle5_value = self.getResText(
+        self.reslblTitle5_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 31)
-        self.reslblTitle6_value = self.getResText(
+        self.reslblTitle6_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 32)
-        self.reschkFooterNextPages_value = self.getResText(
+        self.reschkFooterNextPages_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 33)
-        self.reschkFooterPageNumbers_value = self.getResText(
+        self.reschkFooterPageNumbers_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 34)
-        self.reschkUseDate_value = self.getResText(
+        self.reschkUseDate_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 35)
-        self.reschkUseCommunicationType_value = self.getResText(
+        self.reschkUseCommunicationType_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 36)
-        self.resLabel1_value = self.getResText(
+        self.resLabel1_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 37)
-        self.resoptReceiverPlaceholder_value = self.getResText(
+        self.resoptReceiverPlaceholder_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 38)
-        self.resoptReceiverDatabase_value = self.getResText(
+        self.resoptReceiverDatabase_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 39)
-        self.resLabel2_value = self.getResText(
+        self.resLabel2_value = oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 40)
     
         #Create a Dictionary for the constants values.
         self.dictConstants = {
-        "#to#" : self.getResText(
+        "#to#" : oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 41),
-        "#from#" : self.getResText(
+        "#from#" : oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 42),
-        "#faxconst#" : self.getResText(
+        "#faxconst#" : oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 43),
-        "#telconst#" : self.getResText(
+        "#telconst#" : oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 44),
-        "#emailconst#" : self.getResText(
+        "#emailconst#" : oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 45),
-        "#consist1#" : self.getResText(
+        "#consist1#" : oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 46),
-        "#consist2#" : self.getResText(
+        "#consist2#" : oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 47),
-        "#consist3#" : self.getResText(
+        "#consist3#" : oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 48)}
 
         #Create a dictionary for localising the private template
         self.dictPrivateTemplate = {
-        "Bottle" : self.getResText(
+        "Bottle" : oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 49),
-        "Lines" : self.getResText(
+        "Lines" : oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 50),
-        "Marine" : self.getResText(
+        "Marine" : oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 51)}
 
         #Create a dictionary for localising the business template
         self.dictBusinessTemplate = {
-        "Classic Fax" : self.getResText(
+        "Classic Fax" : oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 52),
-        "Classic Fax from Private" : self.getResText(
+        "Classic Fax from Private" : oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 53),
-        "Modern Fax" : self.getResText(
+        "Modern Fax" : oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 54),
-        "Modern Fax from Private" : self.getResText(
+        "Modern Fax from Private" : oWizardResource.getResText(
             FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 55)}
         
         #Common Resources
-        self.resOverwriteWarning = self.getResText(
+        self.resOverwriteWarning = oWizardResource.getResText(
             FaxWizardDialogResources.RID_RID_COMMON_START + 19)
-        self.resTemplateDescription = self.getResText(
+        self.resTemplateDescription = oWizardResource.getResText(
             FaxWizardDialogResources.RID_RID_COMMON_START + 20)
 
-        self.RoadmapLabels = self.getResArray(
+        self.RoadmapLabels = oWizardResource.getResArray(
             FaxWizardDialogResources.RID_FAXWIZARDROADMAP_START + 1 , 5)
-        self.SalutationLabels = self.getResArray(
+        self.SalutationLabels = oWizardResource.getResArray(
             FaxWizardDialogResources.RID_FAXWIZARDSALUTATION_START + 1 , 4)
-        self.GreetingLabels = self.getResArray(
+        self.GreetingLabels = oWizardResource.getResArray(
             FaxWizardDialogResources.RID_FAXWIZARDGREETING_START + 1 , 4)
-        self.CommunicationLabels = self.getResArray(
+        self.CommunicationLabels = oWizardResource.getResArray(
             FaxWizardDialogResources.RID_FAXWIZARDCOMMUNICATION_START + 1 , 3)