pyletter: get rid of import *

Change-Id: Ice6299ebae3ff9a477f272fff3473c446f927f7f

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

@@ -36,7 +36,6 @@ from ..common.TextElement import TextElement
 from ..document.OfficeDocument import OfficeDocument
 
 from com.sun.star.awt.VclWindowPeerAttribute import YES_NO, DEF_NO
-from com.sun.star.uno import RuntimeException
 from com.sun.star.util import CloseVetoException
 from com.sun.star.view.DocumentZoomType import OPTIMAL
 from com.sun.star.document.UpdateDocMode import FULL_UPDATE

wizards/com/sun/star/wizards/letter/CGLetter.py

@@ -15,9 +15,8 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-from wizards.common.ConfigGroup import *
-from wizards.common.ConfigGroup import *
-from CGPaperElementLocation import CGPaperElementLocation
+from .CGPaperElementLocation import CGPaperElementLocation
+from ..common.ConfigGroup import ConfigGroup
 
 class CGLetter(ConfigGroup):
 

wizards/com/sun/star/wizards/letter/CGLetterWizard.py

@@ -15,9 +15,8 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-from wizards.common.ConfigGroup import *
-from wizards.common.ConfigGroup import *
-from CGLetter import CGLetter
+from ..common.ConfigGroup import ConfigGroup
+from .CGLetter import CGLetter
 
 class CGLetterWizard (ConfigGroup):
 

wizards/com/sun/star/wizards/letter/CGPaperElementLocation.py

@@ -15,8 +15,7 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-from wizards.common.ConfigGroup import *
-from wizards.common.ConfigGroup import *
+from ..common.ConfigGroup import ConfigGroup
 
 class CGPaperElementLocation(ConfigGroup):
 

wizards/com/sun/star/wizards/letter/LetterDocument.py

@@ -15,10 +15,10 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-from wizards.text.TextDocument import *
-from wizards.text.TextDocument import *
-from wizards.text.TextSectionHandler import TextSectionHandler
-from wizards.common.PropertyNames import PropertyNames
+from ..text.TextDocument import TextDocument, traceback, Helper, \
+    TextFieldHandler, Configuration
+from ..text.TextSectionHandler import TextSectionHandler
+from ..common.PropertyNames import PropertyNames
 
 from com.sun.star.table import BorderLine
 from com.sun.star.text.ControlCharacter import PARAGRAPH_BREAK

wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py

@@ -15,64 +15,62 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-OPTBUSINESSLETTER_ITEM_CHANGED = "optBusinessLetterItemChanged"
-OPTBUSINESSLETTER_ITEM_CHANGED = "optBusinessLetterItemChanged"
-OPTPRIVOFFICIALLETTER_ITEM_CHANGED = "optPrivOfficialLetterItemChanged"
-OPTPRIVATELETTER_ITEM_CHANGED = "optPrivateLetterItemChanged"
-LSTBUSINESSSTYLE_ACTION_PERFORMED = None
-LSTBUSINESSSTYLE_ITEM_CHANGED = "lstBusinessStyleItemChanged"
-LSTPRIVOFFICIALSTYLE_ACTION_PERFORMED = None
-LSTPRIVOFFICIALSTYLE_ITEM_CHANGED = "lstPrivOfficialStyleItemChanged"
-CHKBUSINESSPAPER_ITEM_CHANGED = "chkBusinessPaperItemChanged"
-LSTPRIVATESTYLE_ACTION_PERFORMED = None
-LSTPRIVATESTYLE_ITEM_CHANGED = "lstPrivateStyleItemChanged"
-CHKPAPERCOMPANYLOGO_ITEM_CHANGED = "chkPaperCompanyLogoItemChanged"
-NUMLOGOHEIGHT_TEXT_CHANGED = "numLogoHeightTextChanged"
-NUMLOGOX_TEXT_CHANGED = "numLogoXTextChanged"
-NUMLOGOWIDTH_TEXT_CHANGED = "numLogoWidthTextChanged"
-NUMLOGOY_TEXT_CHANGED = "numLogoYTextChanged"
-CHKCOMPANYRECEIVER_ITEM_CHANGED = "chkCompanyReceiverItemChanged"
-CHKPAPERFOOTER_ITEM_CHANGED = "chkPaperFooterItemChanged"
-NUMFOOTERHEIGHT_TEXT_CHANGED = "numFooterHeightTextChanged"
-CHKPAPERCOMPANYADDRESS_ITEM_CHANGED = "chkPaperCompanyAddressItemChanged"
-NUMADDRESSHEIGHT_TEXT_CHANGED = "numAddressHeightTextChanged"
-NUMADDRESSX_TEXT_CHANGED = "numAddressXTextChanged"
-NUMADDRESSWIDTH_TEXT_CHANGED = "numAddressWidthTextChanged"
-NUMADDRESSY_TEXT_CHANGED = "numAddressYTextChanged"
-LSTLETTERNORM_ACTION_PERFORMED = None
-LSTLETTERNORM_ITEM_CHANGED = "lstLetterNormItemChanged"
-CHKUSELOGO_ITEM_CHANGED = "chkUseLogoItemChanged"
-CHKUSEADDRESSRECEIVER_ITEM_CHANGED = "chkUseAddressReceiverItemChanged"
-CHKUSESIGNS_ITEM_CHANGED = "chkUseSignsItemChanged"
-CHKUSESUBJECT_ITEM_CHANGED = "chkUseSubjectItemChanged"
-CHKUSEBENDMARKS_ITEM_CHANGED = "chkUseBendMarksItemChanged"
-CHKUSEFOOTER_ITEM_CHANGED = "chkUseFooterItemChanged"
-CHKUSESALUTATION_ITEM_CHANGED = "chkUseSalutationItemChanged"
-CHKUSEGREETING_ITEM_CHANGED = "chkUseGreetingItemChanged"
-LSTSALUTATION_ACTION_PERFORMED = None
-LSTSALUTATION_ITEM_CHANGED = "lstSalutationItemChanged"
-LSTSALUTATION_TEXT_CHANGED = "lstSalutationItemChanged"
-LSTGREETING_ACTION_PERFORMED = None
-LSTGREETING_ITEM_CHANGED = "lstGreetingItemChanged"
-LSTGREETING_TEXT_CHANGED = "lstGreetingItemChanged"
-OPTSENDERPLACEHOLDER_ITEM_CHANGED = "optSenderPlaceholderItemChanged"
-OPTSENDERDEFINE_ITEM_CHANGED = "optSenderDefineItemChanged"
-OPTRECEIVERPLACEHOLDER_ITEM_CHANGED = "optReceiverPlaceholderItemChanged"
-OPTRECEIVERDATABASE_ITEM_CHANGED = "optReceiverDatabaseItemChanged"
-TXTSENDERNAME_TEXT_CHANGED = "txtSenderNameTextChanged"
-TXTSENDERSTREET_TEXT_CHANGED = "txtSenderStreetTextChanged"
-TXTSENDERCITY_TEXT_CHANGED = "txtSenderCityTextChanged"
-TXTSENDERPOSTCODE_TEXT_CHANGED = "txtSenderPostCodeTextChanged"
-TXTSENDERSTATE_TEXT_CHANGED = "txtSenderStateTextChanged"
-TXTFOOTER_TEXT_CHANGED = "txtFooterTextChanged"
-CHKFOOTERNEXTPAGES_ITEM_CHANGED = "chkFooterNextPagesItemChanged"
-CHKFOOTERPAGENUMBERS_ITEM_CHANGED = "chkFooterPageNumbersItemChanged"
-TXTTEMPLATENAME_TEXT_CHANGED = "txtTemplateNameTextChanged"
-OPTCREATELETTER_ITEM_CHANGED = "optCreateFromTemplateItemChanged"
-OPTMAKECHANGES_ITEM_CHANGED = "optMakeChangesItemChanged"
-FILETEMPLATEPATH_TEXT_CHANGED = None
-imageURLImageControl1 = None
-imageURLImageControl2 = None
-imageURLImageControl3 = None
+
 HID = 40768
 HIDMAIN = 40820
+
+class LetterWizardDialogConst:
+    OPTBUSINESSLETTER_ITEM_CHANGED = "optBusinessLetterItemChanged"
+    OPTBUSINESSLETTER_ITEM_CHANGED = "optBusinessLetterItemChanged"
+    OPTPRIVOFFICIALLETTER_ITEM_CHANGED = "optPrivOfficialLetterItemChanged"
+    OPTPRIVATELETTER_ITEM_CHANGED = "optPrivateLetterItemChanged"
+    LSTBUSINESSSTYLE_ACTION_PERFORMED = None
+    LSTBUSINESSSTYLE_ITEM_CHANGED = "lstBusinessStyleItemChanged"
+    LSTPRIVOFFICIALSTYLE_ACTION_PERFORMED = None
+    LSTPRIVOFFICIALSTYLE_ITEM_CHANGED = "lstPrivOfficialStyleItemChanged"
+    CHKBUSINESSPAPER_ITEM_CHANGED = "chkBusinessPaperItemChanged"
+    LSTPRIVATESTYLE_ACTION_PERFORMED = None
+    LSTPRIVATESTYLE_ITEM_CHANGED = "lstPrivateStyleItemChanged"
+    CHKPAPERCOMPANYLOGO_ITEM_CHANGED = "chkPaperCompanyLogoItemChanged"
+    NUMLOGOHEIGHT_TEXT_CHANGED = "numLogoHeightTextChanged"
+    NUMLOGOX_TEXT_CHANGED = "numLogoXTextChanged"
+    NUMLOGOWIDTH_TEXT_CHANGED = "numLogoWidthTextChanged"
+    NUMLOGOY_TEXT_CHANGED = "numLogoYTextChanged"
+    CHKCOMPANYRECEIVER_ITEM_CHANGED = "chkCompanyReceiverItemChanged"
+    CHKPAPERFOOTER_ITEM_CHANGED = "chkPaperFooterItemChanged"
+    NUMFOOTERHEIGHT_TEXT_CHANGED = "numFooterHeightTextChanged"
+    CHKPAPERCOMPANYADDRESS_ITEM_CHANGED = "chkPaperCompanyAddressItemChanged"
+    NUMADDRESSHEIGHT_TEXT_CHANGED = "numAddressHeightTextChanged"
+    NUMADDRESSX_TEXT_CHANGED = "numAddressXTextChanged"
+    NUMADDRESSWIDTH_TEXT_CHANGED = "numAddressWidthTextChanged"
+    NUMADDRESSY_TEXT_CHANGED = "numAddressYTextChanged"
+    CHKUSELOGO_ITEM_CHANGED = "chkUseLogoItemChanged"
+    CHKUSEADDRESSRECEIVER_ITEM_CHANGED = "chkUseAddressReceiverItemChanged"
+    CHKUSESIGNS_ITEM_CHANGED = "chkUseSignsItemChanged"
+    CHKUSESUBJECT_ITEM_CHANGED = "chkUseSubjectItemChanged"
+    CHKUSEBENDMARKS_ITEM_CHANGED = "chkUseBendMarksItemChanged"
+    CHKUSEFOOTER_ITEM_CHANGED = "chkUseFooterItemChanged"
+    CHKUSESALUTATION_ITEM_CHANGED = "chkUseSalutationItemChanged"
+    CHKUSEGREETING_ITEM_CHANGED = "chkUseGreetingItemChanged"
+    LSTSALUTATION_ACTION_PERFORMED = None
+    LSTSALUTATION_ITEM_CHANGED = "lstSalutationItemChanged"
+    LSTSALUTATION_TEXT_CHANGED = "lstSalutationItemChanged"
+    LSTGREETING_ACTION_PERFORMED = None
+    LSTGREETING_ITEM_CHANGED = "lstGreetingItemChanged"
+    LSTGREETING_TEXT_CHANGED = "lstGreetingItemChanged"
+    OPTSENDERPLACEHOLDER_ITEM_CHANGED = "optSenderPlaceholderItemChanged"
+    OPTSENDERDEFINE_ITEM_CHANGED = "optSenderDefineItemChanged"
+    OPTRECEIVERPLACEHOLDER_ITEM_CHANGED = "optReceiverPlaceholderItemChanged"
+    OPTRECEIVERDATABASE_ITEM_CHANGED = "optReceiverDatabaseItemChanged"
+    TXTSENDERNAME_TEXT_CHANGED = "txtSenderNameTextChanged"
+    TXTSENDERSTREET_TEXT_CHANGED = "txtSenderStreetTextChanged"
+    TXTSENDERCITY_TEXT_CHANGED = "txtSenderCityTextChanged"
+    TXTSENDERPOSTCODE_TEXT_CHANGED = "txtSenderPostCodeTextChanged"
+    TXTSENDERSTATE_TEXT_CHANGED = "txtSenderStateTextChanged"
+    TXTFOOTER_TEXT_CHANGED = "txtFooterTextChanged"
+    CHKFOOTERNEXTPAGES_ITEM_CHANGED = "chkFooterNextPagesItemChanged"
+    CHKFOOTERPAGENUMBERS_ITEM_CHANGED = "chkFooterPageNumbersItemChanged"
+    TXTTEMPLATENAME_TEXT_CHANGED = "txtTemplateNameTextChanged"
+    OPTCREATELETTER_ITEM_CHANGED = "optCreateFromTemplateItemChanged"
+    OPTMAKECHANGES_ITEM_CHANGED = "optMakeChangesItemChanged"
+    FILETEMPLATEPATH_TEXT_CHANGED = None

wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py

@@ -15,25 +15,31 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-from LetterWizardDialog import *
-from LetterWizardDialog import *
-from LetterDocument import *
-from wizards.common.NoValidPathException import NoValidPathException
-from wizards.common.FileAccess import FileAccess
-from LocaleCodes import LocaleCodes
-from wizards.ui.PathSelection import PathSelection
-from wizards.common.Configuration import Configuration
-from CGLetterWizard import CGLetterWizard
-from wizards.ui.event.UnoDataAware import UnoDataAware
-from wizards.ui.event.RadioDataAware import RadioDataAware
-from wizards.text.TextFieldHandler import TextFieldHandler
-from wizards.common.SystemDialog import SystemDialog
+import traceback
+from .LetterWizardDialog import LetterWizardDialog, Helper, \
+    PropertyNames, uno, HelpIds, HID
+from .LetterDocument import LetterDocument
+from .CGLetterWizard import CGLetterWizard
+from ..common.NoValidPathException import NoValidPathException
+from ..common.FileAccess import FileAccess
+from ..common.Configuration import Configuration
+from ..common.SystemDialog import SystemDialog
+from ..common.Desktop import Desktop
+from ..ui.PathSelection import PathSelection
+from ..ui.event.UnoDataAware import UnoDataAware
+from ..ui.event.RadioDataAware import RadioDataAware
+from ..text.TextDocument import TextDocument
+from ..text.ViewHandler import ViewHandler
+from ..text.TextFieldHandler import TextFieldHandler
 
 from com.sun.star.awt.VclWindowPeerAttribute import YES_NO, DEF_NO
+from com.sun.star.uno import RuntimeException
+from com.sun.star.util import CloseVetoException
 from com.sun.star.view.DocumentZoomType import OPTIMAL
 from com.sun.star.document.UpdateDocMode import FULL_UPDATE
 from com.sun.star.document.MacroExecMode import ALWAYS_EXECUTE
 
+
 class LetterWizardDialogImpl(LetterWizardDialog):
 
     RM_TYPESTYLE = 1

wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py

@@ -15,7 +15,7 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-from wizards.common.Resource import Resource
+from ..common.Resource import Resource
 
 class LetterWizardDialogResources(Resource):