wizards/com/sun/star/wizards/common/Configuration.py | 175
----------
wizards/com/sun/star/wizards/common/Desktop.py | 37 --
wizards/com/sun/star/wizards/common/Resource.py | 7
wizards/com/sun/star/wizards/common/SystemDialog.py | 22 -
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py | 1
wizards/com/sun/star/wizards/letter/CGLetter.py | 5
wizards/com/sun/star/wizards/letter/CGLetterWizard.py | 5
wizards/com/sun/star/wizards/letter/CGPaperElementLocation.py | 3
wizards/com/sun/star/wizards/letter/LetterDocument.py | 8
wizards/com/sun/star/wizards/letter/LetterWizardDialog.py | 152
+++++---
wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py | 116
+++---
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py | 32 +
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py | 2
13 files changed, 190 insertions(+), 375 deletions(-)
New commits:
commit 09f2d543df57ba049a9968292576f6315a51888d
Author: Xisco Fauli <aniste...@gmail.com>
Date: Tue Oct 16 23:39:14 2012 +0200
pywizards: cleanup common code
Change-Id: I6e64ec407326b5759664ace286eb67b2c6cd3b04
diff --git a/wizards/com/sun/star/wizards/common/Configuration.py
b/wizards/com/sun/star/wizards/common/Configuration.py
index 1b6db1f..69e150c 100644
--- a/wizards/com/sun/star/wizards/common/Configuration.py
+++ b/wizards/com/sun/star/wizards/common/Configuration.py
@@ -20,21 +20,8 @@ import traceback
from .PropertyNames import PropertyNames
from .Helper import Helper
-'''
-This class gives access to the OO configuration api.
-It contains 4 get and 4 set convenience methods for getting and settings
-properties in the configuration. <br/>
-For the get methods, two parameters must be given: name and parent, where
-name is the name of the property, parent is a HierarchyElement
-(::com::sun::star::configuration::HierarchyElement)<br/>
-The get and set methods support hieryrchical property names like
-"options/gridX". <br/>
-NOTE: not yet supported, but sometime later,
-If you will ommit the "parent" parameter, then the "name" parameter must be
-in hierarchy form from the root of the registry.
-'''
-
class Configuration(object):
+ '''This class gives access to the OO configuration api.'''
@classmethod
def getConfigurationRoot(self, xmsf, sPath, updateable):
@@ -59,163 +46,3 @@ class Configuration(object):
sView = "com.sun.star.configuration.ConfigurationAccess"
return oConfigProvider.createInstanceWithArguments(sView, tuple(args))
-
- @classmethod
- def getProductName(self, xMSF):
- try:
- oProdNameAccess = self.getConfigurationRoot(xMSF,
- "org.openoffice.Setup/Product", False)
- ProductName = Helper.getUnoObjectbyName(oProdNameAccess, "ooName")
- return ProductName
- except Exception:
- traceback.print_exc()
- return None
-
- @classmethod
- def getOfficeLocaleString(self, xMSF):
- sLocale = ""
- try:
- aLocLocale = Locale.Locale()
- oMasterKey = self.getConfigurationRoot(xMSF,
- "org.openoffice.Setup/L10N/", False)
- sLocale = (String)
- Helper.getUnoObjectbyName(oMasterKey, "ooLocale")
- except Exception, exception:
- traceback.print_exc()
-
- return sLocale
-
- @classmethod
- def getOfficeLocale(self, xMSF):
- aLocLocale = Locale.Locale()
- sLocale = getOfficeLocaleString(xMSF)
- sLocaleList = JavaTools.ArrayoutofString(sLocale, "-")
- aLocLocale.Language = sLocaleList[0]
- if sLocaleList.length > 1:
- aLocLocale.Country = sLocaleList[1]
-
- return aLocLocale
-
- @classmethod
- def removeNode(self, configView, name, xmsf=None):
- commitChanges = False
- if xmsf is not None:
- configView = self.getConfigurationRoot(xmsf, path, True)
- commit = True
-
- if configView.hasByName(name):
- configView.removeByName(name)
-
- if commitChanges:
- configView.commitChanges()
-
- @classmethod
- def updateConfiguration(self, xmsf, path, name, node, param):
- view = self.getConfigurationRoot(xmsf, path, True)
- addConfigNode(path, name)
- node.writeConfiguration(view, param)
- view.commitChanges()
-
- @classmethod
- def getNodeDisplayNames(self, _xNameAccessNode):
- snames = None
- return getNodeChildNames(_xNameAccessNode,
- PropertyNames.PROPERTY_NAME)
-
- @classmethod
- def getNodeChildNames(self, xNameAccessNode, _schildname):
- snames = None
- try:
- snames = xNameAccessNode.getElementNames()
- sdisplaynames = range(snames.length)
- i = 0
- while i < snames.length:
- oContent = Helper.getUnoPropertyValue(
- xNameAccessNode.getByName(snames[i]), _schildname)
- if not AnyConverter.isVoid(oContent):
- sdisplaynames[i] = (String)
- Helper.getUnoPropertyValue(xNameAccessNode.getByName(
- snames[i]), _schildname)
- else:
- sdisplaynames[i] = snames[i]
-
- i += 1
- return sdisplaynames
- except Exception, e:
- traceback.print_exc()
- return snames
-
- @classmethod
- def getChildNodebyIndex(self, _xNameAccess, _index):
- try:
- snames = _xNameAccess.getElementNames()
- oNode = _xNameAccess.getByName(snames[_index])
- return oNode
- except Exception, e:
- traceback.print_exc()
- return None
-
- @classmethod
- def getChildNodebyName(self, _xNameAccessNode, _SubNodeName):
- try:
- if _xNameAccessNode.hasByName(_SubNodeName):
- return _xNameAccessNode.getByName(_SubNodeName)
-
- except Exception, e:
- traceback.print_exc()
-
- return None
-
- @classmethod
- def getChildNodebyDisplayName(self, _xNameAccessNode, _displayname):
- snames = None
- return getChildNodebyDisplayName(_xNameAccessNode, _displayname,
- PropertyNames.PROPERTY_NAME)
-
- @classmethod
- def getChildNodebyDisplayName(self, _xNameAccessNode, _displayname,
- _nodename):
-
- snames = None
- try:
- snames = _xNameAccessNode.getElementNames()
- sdisplaynames = range(snames.length)
- i = 0
- while i < snames.length:
- curdisplayname = Helper.getUnoPropertyValue(
- _xNameAccessNode.getByName(snames[i]), _nodename)
- if curdisplayname.equals(_displayname):
- return _xNameAccessNode.getByName(snames[i])
-
- i += 1
- except Exception, e:
- traceback.print_exc()
-
- return None
-
- @classmethod
- def getChildNodebyDisplayName(self, _xMSF, _aLocale, _xNameAccessNode,
- _displayname, _nodename, _nmaxcharcount):
-
- snames = None
- try:
- snames = _xNameAccessNode.getElementNames()
- sdisplaynames = range(snames.length)
- i = 0
- while i < snames.length:
- curdisplayname = Helper.getUnoPropertyValue(
- _xNameAccessNode.getByName(snames[i]), _nodename)
- if (_nmaxcharcount > 0) and (_nmaxcharcount < \
- curdisplayname.length()):
- curdisplayname = curdisplayname.substring(0,
- _nmaxcharcount)
-
- curdisplayname = Desktop.removeSpecialCharacters(_xMSF,
- _aLocale, curdisplayname)
- if curdisplayname.equals(_displayname):
- return _xNameAccessNode.getByName(snames[i])
-
- i += 1
- except Exception, e:
- traceback.print_exc()
- return None
diff --git a/wizards/com/sun/star/wizards/common/Desktop.py
b/wizards/com/sun/star/wizards/common/Desktop.py
index 914be17..1876bfd 100644
--- a/wizards/com/sun/star/wizards/common/Desktop.py
+++ b/wizards/com/sun/star/wizards/common/Desktop.py
@@ -17,7 +17,6 @@
#
import uno
import traceback
-from .NoValidPathException import NoValidPathException
from com.sun.star.frame.FrameSearchFlag import ALL, PARENT
from com.sun.star.util import URL
@@ -130,39 +129,3 @@ class Desktop(object):
def getUniqueName(self, xElementContainer, sElementName):
sIncSuffix = self.getIncrementSuffix(xElementContainer, sElementName)
return sElementName + sIncSuffix
-
-class OfficePathRetriever:
-
- def OfficePathRetriever(self, xMSF):
- try:
- TemplatePath = FileAccess.getOfficePath(xMSF,
- "Template", "share", "/wizard")
- UserTemplatePath = FileAccess.getOfficePath(xMSF,
- "Template", "user", "")
- BitmapPath = FileAccess.combinePaths(xMSF, TemplatePath,
- "/../wizard/bitmap")
- WorkPath = FileAccess.getOfficePath(xMSF,
- "Work", "", "")
- except NoValidPathException, nopathexception:
- pass
-
- @classmethod
- def getTemplatePath(self, _xMSF):
- sTemplatePath = ""
- try:
- sTemplatePath = FileAccess.getOfficePath(_xMSF,
- "Template", "share", "/wizard")
- except NoValidPathException, nopathexception:
- pass
- return sTemplatePath
-
- @classmethod
- def getBitmapPath(self, _xMSF):
- sBitmapPath = ""
- try:
- sBitmapPath = FileAccess.combinePaths(_xMSF,
- getTemplatePath(_xMSF), "/../wizard/bitmap")
- except NoValidPathException, nopathexception:
- pass
-
- return sBitmapPath
diff --git a/wizards/com/sun/star/wizards/common/Resource.py
b/wizards/com/sun/star/wizards/common/Resource.py
index 2e5b142..fc607ea 100644
--- a/wizards/com/sun/star/wizards/common/Resource.py
+++ b/wizards/com/sun/star/wizards/common/Resource.py
@@ -17,7 +17,6 @@
#
import traceback
from .Configuration import Configuration
-from .SystemDialog import SystemDialog
from com.sun.star.awt.VclWindowPeerAttribute import OK
@@ -63,9 +62,7 @@ class Resource(object):
@classmethod
def showCommonResourceError(self, xMSF):
- ProductName = Configuration.getProductName(xMSF)
+ from .SystemDialog import SystemDialog
sError = "The files required could not be found.\n" + \
- "Please start the %PRODUCTNAME Setup and choose 'Repair'."
- sError = sError.replace("%PRODUCTNAME", ProductName)
+ "Please start the LibreOffice Setup and choose 'Repair'."
SystemDialog.showMessageBox(xMSF, "ErrorBox", OK, sError)
-
diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.py
b/wizards/com/sun/star/wizards/common/SystemDialog.py
index c0b7673..6030d57 100644
--- a/wizards/com/sun/star/wizards/common/SystemDialog.py
+++ b/wizards/com/sun/star/wizards/common/SystemDialog.py
@@ -16,7 +16,6 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
import traceback
-from .Configuration import Configuration
from .Desktop import Desktop
from .Helper import Helper
@@ -141,25 +140,12 @@ class SystemDialog(object):
traceback.print_exc()
'''
- converts the name returned from getFilterUIName_(...) so the
- product name is correct.
- @param filterName
- @return
- '''
-
- def getFilterUIName(self, filterName):
- prodName = Configuration.getProductName(self.xMSF)
- s = [[self.getFilterUIName_(filterName)]]
- s[0][0] = s[0][0].replace("%productname%", prodName)
- return s[0][0]
-
- '''
note the result should go through conversion of the product name.
@param filterName
@return the UI localized name of the given filter name.
'''
- def getFilterUIName_(self, filterName):
+ def getFilterUIName(self, filterName):
try:
oFactory = self.xMSF.createInstance(
"com.sun.star.document.FilterFactory")
@@ -167,7 +153,7 @@ class SystemDialog(object):
xPropertyValue = list(oObject)
for i in xPropertyValue:
if i is not None and i.Name == "UIName":
- return str(i.Value)
+ return str(i.Value).replace("%productname%", "LibreOffice")
raise NullPointerException(
"UIName property not found for Filter " + filterName);
@@ -178,10 +164,10 @@ class SystemDialog(object):
@classmethod
def showErrorBox(self, xMSF, ResName, ResPrefix,
ResID, AddTag=None, AddString=None):
- ProductName = Configuration.getProductName(xMSF)
+ from .Resource import Resource
oResource = Resource(xMSF, ResPrefix)
sErrorMessage = oResource.getResText(ResID)
- sErrorMessage = sErrorMessage.replace( ProductName, "%PRODUCTNAME")
+ sErrorMessage = sErrorMessage.replace("%PRODUCTNAME", "LibreOffice" )
sErrorMessage = sErrorMessage.replace(str(13), "<BR>")
if AddTag and AddString:
sErrorMessage = sErrorMessage.replace( AddString, AddTag)
commit 0d8e34f6f6287d61a7381987baafaa3166264a4e
Author: Xisco Fauli <aniste...@gmail.com>
Date: Tue Oct 16 22:18:13 2012 +0200
pyletter: get rid of import *
Change-Id: Ice6299ebae3ff9a477f272fff3473c446f927f7f
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index b33ded0..3c82a56 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/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
diff --git a/wizards/com/sun/star/wizards/letter/CGLetter.py
b/wizards/com/sun/star/wizards/letter/CGLetter.py
index 0a464cb..abed250 100644
--- a/wizards/com/sun/star/wizards/letter/CGLetter.py
+++ b/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):
diff --git a/wizards/com/sun/star/wizards/letter/CGLetterWizard.py
b/wizards/com/sun/star/wizards/letter/CGLetterWizard.py
index 508ee51..eb1051c 100644
--- a/wizards/com/sun/star/wizards/letter/CGLetterWizard.py
+++ b/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):
diff --git a/wizards/com/sun/star/wizards/letter/CGPaperElementLocation.py
b/wizards/com/sun/star/wizards/letter/CGPaperElementLocation.py
index 3b30f0d..c57dde9 100644
--- a/wizards/com/sun/star/wizards/letter/CGPaperElementLocation.py
+++ b/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):
diff --git a/wizards/com/sun/star/wizards/letter/LetterDocument.py
b/wizards/com/sun/star/wizards/letter/LetterDocument.py
index 0502b7d..61baa5b 100644
--- a/wizards/com/sun/star/wizards/letter/LetterDocument.py
+++ b/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
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
index b53a32c..76c74a4 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.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.ui.WizardDialog import *
-from wizards.ui.WizardDialog import *
-from LetterWizardDialogConst import *
-from LetterWizardDialogResources import LetterWizardDialogResources
+from .LetterWizardDialogConst import LetterWizardDialogConst, HIDMAIN, HID
+from .LetterWizardDialogResources import LetterWizardDialogResources
+from ..common.HelpIds import HelpIds
+from ..ui.WizardDialog import WizardDialog, uno, Helper, PropertyNames
from com.sun.star.awt.FontUnderline import SINGLE
@@ -59,7 +59,8 @@ class LetterWizardDialog(WizardDialog):
def buildStep1(self):
self.optBusinessLetter = self.insertRadioButton(
- "optBusinessLetter", OPTBUSINESSLETTER_ITEM_CHANGED,
+ "optBusinessLetter",
+ LetterWizardDialogConst.OPTBUSINESSLETTER_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -73,7 +74,8 @@ class LetterWizardDialog(WizardDialog):
self.resources.resoptBusinessLetter_value,
"optBusinessLetter", 97, 28, 1, 1, 184), self)
self.optPrivOfficialLetter = self.insertRadioButton(
- "optPrivOfficialLetter", OPTPRIVOFFICIALLETTER_ITEM_CHANGED,
+ "optPrivOfficialLetter",
+ LetterWizardDialogConst.OPTPRIVOFFICIALLETTER_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -87,7 +89,8 @@ class LetterWizardDialog(WizardDialog):
self.resources.resoptPrivOfficialLetter_value,
"optPrivOfficialLetter", 97, 74, 1, 2, 184), self)
self.optPrivateLetter = self.insertRadioButton(
- "optPrivateLetter", OPTPRIVATELETTER_ITEM_CHANGED,
+ "optPrivateLetter",
+ LetterWizardDialogConst.OPTPRIVATELETTER_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -101,8 +104,9 @@ class LetterWizardDialog(WizardDialog):
self.resources.resoptPrivateLetter_value,
"optPrivateLetter", 97, 106, 1, 3, 184), self)
self.lstBusinessStyle = self.insertListBox(
- "lstBusinessStyle", LSTBUSINESSSTYLE_ACTION_PERFORMED,
- LSTBUSINESSSTYLE_ITEM_CHANGED,
+ "lstBusinessStyle",
+ LetterWizardDialogConst.LSTBUSINESSSTYLE_ACTION_PERFORMED,
+ LetterWizardDialogConst.LSTBUSINESSSTYLE_ITEM_CHANGED,
("Dropdown",
PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
@@ -116,7 +120,8 @@ class LetterWizardDialog(WizardDialog):
"lstBusinessStyle",
180, 40, 1, 4, 74), self)
self.chkBusinessPaper = self.insertCheckBox(
- "chkBusinessPaper", CHKBUSINESSPAPER_ITEM_CHANGED,
+ "chkBusinessPaper",
+ LetterWizardDialogConst.CHKBUSINESSPAPER_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -131,8 +136,9 @@ class LetterWizardDialog(WizardDialog):
self.resources.reschkBusinessPaper_value,
"chkBusinessPaper", 110, 56, 0, 1, 5, 168), self)
self.lstPrivOfficialStyle = self.insertListBox(
- "lstPrivOfficialStyle", LSTPRIVOFFICIALSTYLE_ACTION_PERFORMED,
- LSTPRIVOFFICIALSTYLE_ITEM_CHANGED,
+ "lstPrivOfficialStyle",
+ LetterWizardDialogConst.LSTPRIVOFFICIALSTYLE_ACTION_PERFORMED,
+ LetterWizardDialogConst.LSTPRIVOFFICIALSTYLE_ITEM_CHANGED,
("Dropdown",
PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
@@ -145,8 +151,9 @@ class LetterWizardDialog(WizardDialog):
(True, 12, HelpIds.getHelpIdString(HID + 6),
"lstPrivOfficialStyle", 180, 86, 1, 6, 74), self)
self.lstPrivateStyle = self.insertListBox(
- "lstPrivateStyle", LSTPRIVATESTYLE_ACTION_PERFORMED,
- LSTPRIVATESTYLE_ITEM_CHANGED,
+ "lstPrivateStyle",
+ LetterWizardDialogConst.LSTPRIVATESTYLE_ACTION_PERFORMED,
+ LetterWizardDialogConst.LSTPRIVATESTYLE_ITEM_CHANGED,
("Dropdown",
PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
@@ -223,7 +230,7 @@ class LetterWizardDialog(WizardDialog):
def buildStep2(self):
self.chkPaperCompanyLogo = self.insertCheckBox(
"chkPaperCompanyLogo",
- CHKPAPERCOMPANYLOGO_ITEM_CHANGED,
+ LetterWizardDialogConst.CHKPAPERCOMPANYLOGO_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -239,7 +246,7 @@ class LetterWizardDialog(WizardDialog):
"chkPaperCompanyLogo", 97, 28, 0, 2, 8, 68), self)
self.numLogoHeight = self.insertNumericField(
"numLogoHeight",
- NUMLOGOHEIGHT_TEXT_CHANGED,
+ LetterWizardDialogConst.NUMLOGOHEIGHT_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -254,7 +261,8 @@ class LetterWizardDialog(WizardDialog):
(12, HelpIds.getHelpIdString(HID + 9),
"numLogoHeight", 138, 40, True, 2, True, 9, 3, 30), self)
self.numLogoX = self.insertNumericField(
- "numLogoX", NUMLOGOX_TEXT_CHANGED,
+ "numLogoX",
+ LetterWizardDialogConst.NUMLOGOX_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -268,7 +276,8 @@ class LetterWizardDialog(WizardDialog):
(12, HelpIds.getHelpIdString(HID + 10),
"numLogoX", 266, 40, True, 2, 10, 0, 30), self)
self.numLogoWidth = self.insertNumericField(
- "numLogoWidth", NUMLOGOWIDTH_TEXT_CHANGED,
+ "numLogoWidth",
+ LetterWizardDialogConst.NUMLOGOWIDTH_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -282,7 +291,8 @@ class LetterWizardDialog(WizardDialog):
(12, HelpIds.getHelpIdString(HID + 11),
"numLogoWidth", 138, 56, True, 2, 11, 3.8, 30), self)
self.numLogoY = self.insertNumericField(
- "numLogoY", NUMLOGOY_TEXT_CHANGED,
+ "numLogoY",
+ LetterWizardDialogConst.NUMLOGOY_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -296,7 +306,8 @@ class LetterWizardDialog(WizardDialog):
(12, HelpIds.getHelpIdString(HID + 12),
"numLogoY", 266, 56, True, 2, 12, -3.4, 30), self)
self.chkPaperCompanyAddress = self.insertCheckBox(
- "chkPaperCompanyAddress", CHKPAPERCOMPANYADDRESS_ITEM_CHANGED,
+ "chkPaperCompanyAddress",
+ LetterWizardDialogConst.CHKPAPERCOMPANYADDRESS_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -311,7 +322,8 @@ class LetterWizardDialog(WizardDialog):
self.resources.reschkPaperCompanyAddress_value,
"chkPaperCompanyAddress", 98, 84, 0, 2, 13, 68), self)
self.numAddressHeight = self.insertNumericField(
- "numAddressHeight", NUMADDRESSHEIGHT_TEXT_CHANGED,
+ "numAddressHeight",
+ LetterWizardDialogConst.NUMADDRESSHEIGHT_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -326,7 +338,8 @@ class LetterWizardDialog(WizardDialog):
(12, HelpIds.getHelpIdString(HID + 14),
"numAddressHeight", 138, 96, True, 2, True, 14, 3, 30), self)
self.numAddressX = self.insertNumericField(
- "numAddressX", NUMADDRESSX_TEXT_CHANGED,
+ "numAddressX",
+ LetterWizardDialogConst.NUMADDRESSX_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -340,7 +353,8 @@ class LetterWizardDialog(WizardDialog):
(12, HelpIds.getHelpIdString(HID + 15),
"numAddressX", 266, 96, True, 2, 15, 3.8, 30), self)
self.numAddressWidth = self.insertNumericField(
- "numAddressWidth", NUMADDRESSWIDTH_TEXT_CHANGED,
+ "numAddressWidth",
+ LetterWizardDialogConst.NUMADDRESSWIDTH_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -354,7 +368,8 @@ class LetterWizardDialog(WizardDialog):
(12, HelpIds.getHelpIdString(HID + 16),
"numAddressWidth", 138, 112, True, 2, 16, 13.8, 30), self)
self.numAddressY = self.insertNumericField(
- "numAddressY", NUMADDRESSY_TEXT_CHANGED,
+ "numAddressY",
+ LetterWizardDialogConst.NUMADDRESSY_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -368,7 +383,8 @@ class LetterWizardDialog(WizardDialog):
(12, HelpIds.getHelpIdString(HID + 17),
"numAddressY", 266, 112, True, 2, 17, -3.4, 30), self)
self.chkCompanyReceiver = self.insertCheckBox(
- "chkCompanyReceiver", CHKCOMPANYRECEIVER_ITEM_CHANGED,
+ "chkCompanyReceiver",
+ LetterWizardDialogConst.CHKCOMPANYRECEIVER_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -382,7 +398,8 @@ class LetterWizardDialog(WizardDialog):
self.resources.reschkCompanyReceiver_value,
"chkCompanyReceiver", 103, 131, 0, 2, 18, 185), self)
self.chkPaperFooter = self.insertCheckBox(
- "chkPaperFooter", CHKPAPERFOOTER_ITEM_CHANGED,
+ "chkPaperFooter",
+ LetterWizardDialogConst.CHKPAPERFOOTER_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -397,7 +414,8 @@ class LetterWizardDialog(WizardDialog):
self.resources.reschkPaperFooter_value,
"chkPaperFooter", 97, 158, 0, 2, 19, 68), self)
self.numFooterHeight = self.insertNumericField(
- "numFooterHeight", NUMFOOTERHEIGHT_TEXT_CHANGED,
+ "numFooterHeight",
+ LetterWizardDialogConst.NUMFOOTERHEIGHT_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -548,7 +566,8 @@ class LetterWizardDialog(WizardDialog):
def buildStep3(self):
self.chkUseLogo = self.insertCheckBox(
- "chkUseLogo", CHKUSELOGO_ITEM_CHANGED,
+ "chkUseLogo",
+ LetterWizardDialogConst.CHKUSELOGO_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -564,7 +583,7 @@ class LetterWizardDialog(WizardDialog):
"chkUseLogo", 97, 54, 0, 3, 22, 212), self)
self.chkUseAddressReceiver = self.insertCheckBox(
"chkUseAddressReceiver",
- CHKUSEADDRESSRECEIVER_ITEM_CHANGED,
+ LetterWizardDialogConst.CHKUSEADDRESSRECEIVER_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -579,7 +598,8 @@ class LetterWizardDialog(WizardDialog):
self.resources.reschkUseAddressReceiver_value,
"chkUseAddressReceiver", 97, 69, 0, 3, 23, 212), self)
self.chkUseSigns = self.insertCheckBox(
- "chkUseSigns", CHKUSESIGNS_ITEM_CHANGED,
+ "chkUseSigns",
+ LetterWizardDialogConst.CHKUSESIGNS_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -594,7 +614,8 @@ class LetterWizardDialog(WizardDialog):
self.resources.reschkUseSigns_value,
"chkUseSigns", 97, 82, 0, 3, 24, 212), self)
self.chkUseSubject = self.insertCheckBox(
- "chkUseSubject", CHKUSESUBJECT_ITEM_CHANGED,
+ "chkUseSubject",
+ LetterWizardDialogConst.CHKUSESUBJECT_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -609,7 +630,8 @@ class LetterWizardDialog(WizardDialog):
self.resources.reschkUseSubject_value,
"chkUseSubject", 97, 98, 0, 3, 25, 212), self)
self.chkUseSalutation = self.insertCheckBox(
- "chkUseSalutation", CHKUSESALUTATION_ITEM_CHANGED,
+ "chkUseSalutation",
+ LetterWizardDialogConst.CHKUSESALUTATION_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -625,9 +647,9 @@ class LetterWizardDialog(WizardDialog):
"chkUseSalutation", 97, 113, 0, 3, 26, 66), self)
self.lstSalutation = self.insertComboBox(
"lstSalutation",
- LSTSALUTATION_ACTION_PERFORMED,
- LSTSALUTATION_ITEM_CHANGED,
- LSTSALUTATION_TEXT_CHANGED,
+ LetterWizardDialogConst.LSTSALUTATION_ACTION_PERFORMED,
+ LetterWizardDialogConst.LSTSALUTATION_ITEM_CHANGED,
+ LetterWizardDialogConst.LSTSALUTATION_TEXT_CHANGED,
("Dropdown",
PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
@@ -640,7 +662,8 @@ class LetterWizardDialog(WizardDialog):
(True, 12, HelpIds.getHelpIdString(HID + 27),
"lstSalutation", 210, 110, 3, 27, 74), self)
self.chkUseBendMarks = self.insertCheckBox(
- "chkUseBendMarks", CHKUSEBENDMARKS_ITEM_CHANGED,
+ "chkUseBendMarks",
+ LetterWizardDialogConst.CHKUSEBENDMARKS_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -655,7 +678,8 @@ class LetterWizardDialog(WizardDialog):
self.resources.reschkUseBendMarks_value,
"chkUseBendMarks", 97, 127, 0, 3, 28, 212), self)
self.chkUseGreeting = self.insertCheckBox(
- "chkUseGreeting", CHKUSEGREETING_ITEM_CHANGED,
+ "chkUseGreeting",
+ LetterWizardDialogConst.CHKUSEGREETING_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -670,8 +694,10 @@ class LetterWizardDialog(WizardDialog):
self.resources.reschkUseGreeting_value,
"chkUseGreeting", 97, 142, 0, 3, 29, 66), self)
self.lstGreeting = self.insertComboBox(
- "lstGreeting", LSTGREETING_ACTION_PERFORMED,
- LSTGREETING_ITEM_CHANGED, LSTGREETING_TEXT_CHANGED,
+ "lstGreeting",
+ LetterWizardDialogConst.LSTGREETING_ACTION_PERFORMED,
+ LetterWizardDialogConst.LSTGREETING_ITEM_CHANGED,
+ LetterWizardDialogConst.LSTGREETING_TEXT_CHANGED,
("Dropdown",
PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
@@ -684,7 +710,8 @@ class LetterWizardDialog(WizardDialog):
(True, 12, HelpIds.getHelpIdString(HID + 30),
"lstGreeting", 210, 141, 3, 30, 74), self)
self.chkUseFooter = self.insertCheckBox(
- "chkUseFooter", CHKUSEFOOTER_ITEM_CHANGED,
+ "chkUseFooter",
+ LetterWizardDialogConst.CHKUSEFOOTER_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -727,7 +754,8 @@ class LetterWizardDialog(WizardDialog):
def buildStep4(self):
self.optSenderPlaceholder = self.insertRadioButton(
- "optSenderPlaceholder", OPTSENDERPLACEHOLDER_ITEM_CHANGED,
+ "optSenderPlaceholder",
+ LetterWizardDialogConst.OPTSENDERPLACEHOLDER_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -741,7 +769,8 @@ class LetterWizardDialog(WizardDialog):
self.resources.resoptSenderPlaceholder_value,
"optSenderPlaceholder", 104, 42, 4, 32, 149), self)
self.optSenderDefine = self.insertRadioButton(
- "optSenderDefine", OPTSENDERDEFINE_ITEM_CHANGED,
+ "optSenderDefine",
+ LetterWizardDialogConst.OPTSENDERDEFINE_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -755,7 +784,8 @@ class LetterWizardDialog(WizardDialog):
self.resources.resoptSenderDefine_value,
"optSenderDefine", 104, 54, 4, 33, 149), self)
self.txtSenderName = self.insertTextField(
- "txtSenderName", TXTSENDERNAME_TEXT_CHANGED,
+ "txtSenderName",
+ LetterWizardDialogConst.TXTSENDERNAME_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -767,7 +797,8 @@ class LetterWizardDialog(WizardDialog):
(12, HelpIds.getHelpIdString(HID + 34),
"txtSenderName", 182, 67, 4, 34, 119), self)
self.txtSenderStreet = self.insertTextField(
- "txtSenderStreet", TXTSENDERSTREET_TEXT_CHANGED,
+ "txtSenderStreet",
+ LetterWizardDialogConst.TXTSENDERSTREET_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -779,7 +810,8 @@ class LetterWizardDialog(WizardDialog):
(12, HelpIds.getHelpIdString(HID + 35),
"txtSenderStreet", 182, 81, 4, 35, 119), self)
self.txtSenderPostCode = self.insertTextField(
- "txtSenderPostCode", TXTSENDERPOSTCODE_TEXT_CHANGED,
+ "txtSenderPostCode",
+ LetterWizardDialogConst.TXTSENDERPOSTCODE_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -791,7 +823,8 @@ class LetterWizardDialog(WizardDialog):
(12, HelpIds.getHelpIdString(HID + 36),
"txtSenderPostCode", 182, 95, 4, 36, 25), self)
self.txtSenderState = self.insertTextField(
- "txtSenderState", TXTSENDERSTATE_TEXT_CHANGED,
+ "txtSenderState",
+ LetterWizardDialogConst.TXTSENDERSTATE_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -803,7 +836,8 @@ class LetterWizardDialog(WizardDialog):
(12, HelpIds.getHelpIdString(HID + 37),
"txtSenderState", 211, 95, 4, 37, 21), self)
self.txtSenderCity = self.insertTextField(
- "txtSenderCity", TXTSENDERCITY_TEXT_CHANGED,
+ "txtSenderCity",
+ LetterWizardDialogConst.TXTSENDERCITY_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -815,7 +849,8 @@ class LetterWizardDialog(WizardDialog):
(12, HelpIds.getHelpIdString(HID + 38),
"txtSenderCity", 236, 95, 4, 38, 65), self)
self.optReceiverPlaceholder = self.insertRadioButton(
- "optReceiverPlaceholder", OPTRECEIVERPLACEHOLDER_ITEM_CHANGED,
+ "optReceiverPlaceholder",
+ LetterWizardDialogConst.OPTRECEIVERPLACEHOLDER_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -829,7 +864,8 @@ class LetterWizardDialog(WizardDialog):
self.resources.resoptReceiverPlaceholder_value,
"optReceiverPlaceholder", 104, 145, 4, 39, 200), self)
self.optReceiverDatabase = self.insertRadioButton(
- "optReceiverDatabase", OPTRECEIVERDATABASE_ITEM_CHANGED,
+ "optReceiverDatabase",
+ LetterWizardDialogConst.OPTRECEIVERDATABASE_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -923,7 +959,8 @@ class LetterWizardDialog(WizardDialog):
def buildStep5(self):
self.txtFooter = self.insertTextField(
- "txtFooter", TXTFOOTER_TEXT_CHANGED,
+ "txtFooter",
+ LetterWizardDialogConst.TXTFOOTER_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_MULTILINE,
@@ -936,7 +973,8 @@ class LetterWizardDialog(WizardDialog):
(47, HelpIds.getHelpIdString(HID + 41), True,
"txtFooter", 97, 40, 5, 41, 203), self)
self.chkFooterNextPages = self.insertCheckBox(
- "chkFooterNextPages", CHKFOOTERNEXTPAGES_ITEM_CHANGED,
+ "chkFooterNextPages",
+ LetterWizardDialogConst.CHKFOOTERNEXTPAGES_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -951,7 +989,8 @@ class LetterWizardDialog(WizardDialog):
self.resources.reschkFooterNextPages_value,
"chkFooterNextPages", 97, 92, 0, 5, 42, 202), self)
self.chkFooterPageNumbers = self.insertCheckBox(
- "chkFooterPageNumbers", CHKFOOTERPAGENUMBERS_ITEM_CHANGED,
+ "chkFooterPageNumbers",
+ LetterWizardDialogConst.CHKFOOTERPAGENUMBERS_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -992,7 +1031,8 @@ class LetterWizardDialog(WizardDialog):
def buildStep6(self):
self.txtTemplateName = self.insertTextField(
- "txtTemplateName", TXTTEMPLATENAME_TEXT_CHANGED,
+ "txtTemplateName",
+ LetterWizardDialogConst.TXTTEMPLATENAME_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_NAME,
@@ -1006,7 +1046,8 @@ class LetterWizardDialog(WizardDialog):
"txtTemplateName", 202, 56, 6, 44,
self.resources.restxtTemplateName_value, 100), self)
self.optCreateLetter = self.insertRadioButton(
- "optCreateLetter", OPTCREATELETTER_ITEM_CHANGED,
+ "optCreateLetter",
+ LetterWizardDialogConst.OPTCREATELETTER_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -1020,7 +1061,8 @@ class LetterWizardDialog(WizardDialog):
self.resources.resoptCreateLetter_value,
"optCreateLetter", 104, 111, 6, 50, 198), self)
self.optMakeChanges = self.insertRadioButton(
- "optMakeChanges", OPTMAKECHANGES_ITEM_CHANGED,
+ "optMakeChanges",
+ LetterWizardDialogConst.OPTMAKECHANGES_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py
b/wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py
index acfb7d1..8517b70 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py
+++ b/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
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
index f977132..eb29988 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
+++ b/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
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
index 58bef59..8e0a016 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
+++ b/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):
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
