Fix merge conflicts

wizards/com/sun/star/wizards/fax/FaxDocument.py

+from text.TextDocument import *
+from text.TextSectionHandler import TextSectionHandler
+from common.PropertyNames import PropertyNames
+
+from com.sun.star.text.ControlCharacter import PARAGRAPH_BREAK
+from com.sun.star.style.ParagraphAdjust import CENTER
+from com.sun.star.text.PageNumberType import CURRENT
+from com.sun.star.style.NumberingType import ARABIC
+
+class FaxDocument(TextDocument):
+
+    def __init__(self, xMSF, listener):
+        super(FaxDocument,self).__init__(xMSF, listener, None,
+            "WIZARD_LIVE_PREVIEW")
+        self.keepLogoFrame = True
+        self.keepTypeFrame = True
+
+    def switchElement(self, sElement, bState):
+        try:
+            mySectionHandler = TextSectionHandler(self.xMSF,
+                TextDocument.xTextDocument)
+            oSection = \
+                mySectionHandler.xTextDocument.TextSections.getByName(sElement)
+            Helper.setUnoPropertyValue(oSection,"IsVisible",bState)
+        except Exception:
+            traceback.print_exc()
+
+    def updateDateFields(self):
+        FH = TextFieldHandler(
+            TextDocument.xTextDocument, TextDocument.xTextDocument)
+        FH.updateDateFields()
+
+    def switchFooter(self, sPageStyle, bState, bPageNumber, sText):
+        if TextDocument.xTextDocument is not None:
+            TextDocument.xTextDocument.lockControllers()
+            try:
+                xPageStyleCollection = \
+                    TextDocument.xTextDocument.StyleFamilies.getByName("PageStyles")
+                xPageStyle = xPageStyleCollection.getByName(sPageStyle)
+
+                if bState:
+                    xPageStyle.setPropertyValue("FooterIsOn", True)
+                    xFooterText = \
+                        Helper.getUnoPropertyValue(xPageStyle, "FooterText")
+                    xFooterText.String = sText
+
+                    if bPageNumber:
+                        #Adding the Page Number
+                        myCursor = xFooterText.Text.createTextCursor()
+                        myCursor.gotoEnd(False)
+                        xFooterText.insertControlCharacter(myCursor,
+                            PARAGRAPH_BREAK, False)
+                        myCursor.setPropertyValue("ParaAdjust", CENTER )
+
+                        xPageNumberField = \
+                            TextDocument.xTextDocument.createInstance(
+                                "com.sun.star.text.TextField.PageNumber")
+                        xPageNumberField.setPropertyValue("SubType", CURRENT)
+                        xPageNumberField.NumberingType = ARABIC
+                        xFooterText.insertTextContent(xFooterText.End,
+                            xPageNumberField, False)
+                else:
+                    Helper.setUnoPropertyValue(xPageStyle, "FooterIsOn",
+                        False)
+
+                TextDocument.xTextDocument.unlockControllers()
+            except Exception:
+                traceback.print_exc()
+
+    def hasElement(self, sElement):
+        if TextDocument.xTextDocument is not None:
+            mySectionHandler = TextSectionHandler(self.xMSF,
+                TextDocument.xTextDocument)
+            return mySectionHandler.hasTextSectionByName(sElement)
+        else:
+            return False
+
+    def switchUserField(self, sFieldName, sNewContent, bState):
+        myFieldHandler = TextFieldHandler(
+            self.xMSF, TextDocument.xTextDocument)
+        if bState:
+            myFieldHandler.changeUserFieldContent(sFieldName, sNewContent)
+        else:
+            myFieldHandler.changeUserFieldContent(sFieldName, "")
+
+    def fillSenderWithUserData(self):
+        try:
+            myFieldHandler = TextFieldHandler(TextDocument.xTextDocument,
+                TextDocument.xTextDocument)
+            oUserDataAccess = Configuration.getConfigurationRoot(
+                self.xMSF, "org.openoffice.UserProfile/Data", False)
+            myFieldHandler.changeUserFieldContent("Company",
+                Helper.getUnoObjectbyName(oUserDataAccess, "o"))
+            myFieldHandler.changeUserFieldContent("Street",
+                Helper.getUnoObjectbyName(oUserDataAccess, "street"))
+            myFieldHandler.changeUserFieldContent("PostCode",
+                Helper.getUnoObjectbyName(oUserDataAccess, "postalcode"))
+            myFieldHandler.changeUserFieldContent(
+                PropertyNames.PROPERTY_STATE,
+                Helper.getUnoObjectbyName(oUserDataAccess, "st"))
+            myFieldHandler.changeUserFieldContent("City",
+                Helper.getUnoObjectbyName(oUserDataAccess, "l"))
+            myFieldHandler.changeUserFieldContent("Fax",
+                Helper.getUnoObjectbyName(oUserDataAccess,
+                "facsimiletelephonenumber"))
+        except Exception:
+            traceback.print_exc()
+
+    def killEmptyUserFields(self):
+        myFieldHandler = TextFieldHandler(
+            self.xMSF, TextDocument.xTextDocument)
+        myFieldHandler.removeUserFieldByContent("")
+
+    def killEmptyFrames(self):
+        try:
+            if not self.keepLogoFrame:
+                xTF = self.getFrameByName("Company Logo",
+                TextDocument.xTextDocument)
+                if xTF is not None:
+                    xTF.dispose()
+
+            if not self.keepTypeFrame:
+                xTF = self.getFrameByName("Communication Type",
+                TextDocument.xTextDocument)
+                if xTF is not None:
+                    xTF.dispose()
+
+        except Exception:
+            traceback.print_exc()

wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py

+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"
+
+#Help IDs
+
+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)
+

wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py

+from common.Resource import Resource
+
+class FaxWizardDialogResources(Resource):
+    MODULE_NAME = "dbw"
+    RID_FAXWIZARDDIALOG_START = 3200
+    RID_FAXWIZARDCOMMUNICATION_START = 3270
+    RID_FAXWIZARDGREETING_START = 3280
+    RID_FAXWIZARDSALUTATION_START = 3290
+    RID_FAXWIZARDROADMAP_START = 3300
+    RID_RID_COMMON_START = 500
+
+
+    def __init__(self, xmsf):
+        super(FaxWizardDialogResources,self).__init__(xmsf,
+            FaxWizardDialogResources.MODULE_NAME)
+        self.RoadmapLabels = ()
+        self.SalutationLabels = ()
+        self.GreetingLabels = ()
+        self.CommunicationLabels = ()
+
+        #Delete the String, uncomment the self.getResText method
+
+
+        self.resFaxWizardDialog_title = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 1)
+        self.resLabel9_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 2)
+        self.resoptBusinessFax_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 3)
+        self.resoptPrivateFax_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 4)
+        self.reschkUseLogo_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 5)
+        self.reschkUseSubject_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 6)
+        self.reschkUseSalutation_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 7)
+        self.reschkUseGreeting_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 8)
+        self.reschkUseFooter_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 9)
+        self.resoptSenderPlaceholder_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 10)
+        self.resoptSenderDefine_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 11)
+        self.restxtTemplateName_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 12)
+        self.resoptCreateFax_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 13)
+        self.resoptMakeChanges_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 14)
+        self.reslblBusinessStyle_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 15)
+        self.reslblPrivateStyle_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 16)
+        self.reslblIntroduction_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 17)
+        self.reslblSenderAddress_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 18)
+        self.reslblSenderName_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 19)
+        self.reslblSenderStreet_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 20)
+        self.reslblPostCodeCity_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 21)
+        self.reslblFooter_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 22)
+        self.reslblFinalExplanation1_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 23)
+        self.reslblFinalExplanation2_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 24)
+        self.reslblTemplateName_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 25)
+        self.reslblTemplatePath_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 26)
+        self.reslblProceed_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 27)
+        self.reslblTitle1_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 28)
+        self.reslblTitle3_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 29)
+        self.reslblTitle4_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 30)
+        self.reslblTitle5_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 31)
+        self.reslblTitle6_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 32)
+        self.reschkFooterNextPages_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 33)
+        self.reschkFooterPageNumbers_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 34)
+        self.reschkUseDate_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 35)
+        self.reschkUseCommunicationType_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 36)
+        self.resLabel1_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 37)
+        self.resoptReceiverPlaceholder_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 38)
+        self.resoptReceiverDatabase_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 39)
+        self.resLabel2_value = self.getResText(
+            FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 40)
+        self.loadRoadmapResources()
+        self.loadSalutationResources()
+        self.loadGreetingResources()
+        self.loadCommunicationResources()
+        self.loadCommonResources()
+
+    def loadCommonResources(self):
+        self.resOverwriteWarning = self.getResText(
+            FaxWizardDialogResources.RID_RID_COMMON_START + 19)
+        self.resTemplateDescription = self.getResText(
+            FaxWizardDialogResources.RID_RID_COMMON_START + 20)
+
+    def loadRoadmapResources(self):
+        for i in xrange(5):
+            self.RoadmapLabels = self.RoadmapLabels + ((self.getResText(
+                FaxWizardDialogResources.RID_FAXWIZARDROADMAP_START + \
+                + i + 1)),)
+
+    def loadSalutationResources(self):
+        i = 1
+        for i in xrange(4):
+            self.SalutationLabels = self.SalutationLabels + ((self.getResText(
+                FaxWizardDialogResources.RID_FAXWIZARDSALUTATION_START + \
+                i + 1)),)
+
+    def loadGreetingResources(self):
+        for i in xrange(4):
+            self.GreetingLabels = self.GreetingLabels + ((self.getResText(
+                FaxWizardDialogResources.RID_FAXWIZARDGREETING_START + \
+                i +1 )),)
+
+    def loadCommunicationResources(self):
+        for i in xrange(3):
+            self.CommunicationLabels = \
+            self.CommunicationLabels + ((self.getResText(
+                FaxWizardDialogResources.RID_FAXWIZARDCOMMUNICATION_START + \
+                i + 1)),)