Revert "clean up"

This reverts commit 2c266efe9d82ebb46370b5a72d55f6c2d61c1763.

wizards/com/sun/star/wizards/common/FileAccess.py

@@ -715,10 +715,10 @@ class FileAccess(object):
     def connectURLs(self, urlFolder, urlFilename):
         stringFolder = ""
         stringFileName = urlFilename
-        if not urlFolder.endswith("/"):
+        if not urlFolder.endsWith("/"):
             stringFolder = "/"
-        if urlFilename.startswith("/"):
-            stringFileName = urlFilename[1:]
+        if urlFilename.startsWith("/"):
+            stringFileName = urlFilename.substring(1)
         return urlFolder + stringFolder + stringFileName
 
     @classmethod

wizards/com/sun/star/wizards/common/Helper.py

@@ -157,7 +157,7 @@ class Helper(object):
     class DateUtils(object):
 
         def __init__(self, xmsf, document):
-            defaults = xmsf.createInstance("com.sun.star.text.Defaults")
+            defaults = document.createInstance("com.sun.star.text.Defaults")
             l = Helper.getUnoStructValue(defaults, "CharLocale")
             self.formatSupplier = document
             formatSettings = self.formatSupplier.getNumberFormatSettings()

wizards/com/sun/star/wizards/document/OfficeDocument.py

@@ -270,8 +270,24 @@ class OfficeDocument(object):
     def getSlideCount(self, model):
         return model.getDrawPages().getCount()
 
+    def getDocumentProperties(self, document):
+        return document.getDocumentProperties()
+
     def showMessageBox(
         self, xMSF, windowServiceName, windowAttribute, MessageText):
 
         return SystemDialog.showMessageBox(
             xMSF, windowServiceName, windowAttribute, MessageText)
+
+    def getWindowPeer(self):
+        return self.xWindowPeer
+
+    '''
+    @param windowPeer The xWindowPeer to set.
+    Should be called as soon as a Windowpeer of a wizard dialog is available
+    The windowpeer is needed to call a Messagebox
+    '''
+
+    def setWindowPeer(self, windowPeer):
+        self.xWindowPeer = windowPeer
+

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

@@ -86,7 +86,7 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (True, 12, LSTPRIVATESTYLE_HID, 180, 95, 1,
                 4, 74), self)
-        self.insertLabel("lblBusinessStyle",
+        self.lblBusinessStyle = self.insertLabel("lblBusinessStyle",
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -97,7 +97,7 @@ class FaxWizardDialog(WizardDialog):
             (8, self.resources.reslblBusinessStyle_value,
                 110, 42, 1, 32, 60))
 
-        self.insertLabel("lblTitle1",
+        self.lblTitle1 = self.insertLabel("lblTitle1",
             ("FontDescriptor", PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_MULTILINE,
@@ -108,7 +108,7 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (self.fontDescriptor5, 16, self.resources.reslblTitle1_value,
                 True, 91, 8, 1, 37, 212))
-        self.insertLabel("lblPrivateStyle",
+        self.lblPrivateStyle = self.insertLabel("lblPrivateStyle",
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -117,7 +117,7 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
             (8, self.resources.reslblPrivateStyle_value, 110, 95, 1, 50, 60))
-        self.insertLabel("lblIntroduction",
+        self.lblIntroduction = self.insertLabel("lblIntroduction",
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_MULTILINE,
@@ -264,7 +264,7 @@ class FaxWizardDialog(WizardDialog):
             (8, CHKUSEFOOTER_HID,
                 self.resources.reschkUseFooter_value, 97, 163,
                 0, 2, 14, 212), self)
-        self.insertLabel("lblTitle3",
+        self.lblTitle3 = self.insertLabel("lblTitle3",
             ("FontDescriptor", PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_MULTILINE,
@@ -397,7 +397,7 @@ class FaxWizardDialog(WizardDialog):
             (8, OPTRECEIVERDATABASE_HID,
                 self.resources.resoptReceiverDatabase_value, 104, 160, 3,
                 24, 200), self)
-        self.insertLabel("lblSenderAddress",
+        self.lblSenderAddress = self.insertLabel("lblSenderAddress",
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -406,14 +406,14 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
             (8, self.resources.reslblSenderAddress_value, 97, 28, 3, 46, 136))
-        self.insertFixedLine("FixedLine2", (PropertyNames.PROPERTY_HEIGHT,
+        self.FixedLine2 = self.insertFixedLine("FixedLine2", (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_POSITION_X,
                 PropertyNames.PROPERTY_POSITION_Y,
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
             (5, 90, 126, 3, 51, 212))
-        self.insertLabel("lblSenderName",
+        self.lblSenderName = self.insertLabel("lblSenderName",
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -423,7 +423,7 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (8, self.resources.reslblSenderName_value, 113, 69, 3,
                 52, 68))
-        self.insertLabel("lblSenderStreet",
+        self.lblSenderStreet = self.insertLabel("lblSenderStreet",
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -433,7 +433,7 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (8, self.resources.reslblSenderStreet_value, 113, 82, 3,
                 53, 68))
-        self.insertLabel("lblPostCodeCity",
+        self.lblPostCodeCity = self.insertLabel("lblPostCodeCity",
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -443,7 +443,7 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (8, self.resources.reslblPostCodeCity_value,
                 113, 97, 3, 54, 68))
-        self.insertLabel("lblTitle4",
+        self.lblTitle4 = self.insertLabel("lblTitle4",
             ("FontDescriptor",
                 PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
@@ -455,7 +455,7 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (self.fontDescriptor5, 16, self.resources.reslblTitle4_value,
                  True, 91, 8, 3, 60, 212))
-        self.insertLabel("lblSenderFax",
+        self.Label1 = self.insertLabel("lblSenderFax",
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -464,7 +464,7 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
             (8, self.resources.resLabel1_value, 113, 111, 3, 68, 68))
-        self.insertLabel("Label2",
+        self.Label2 = self.insertLabel("Label2",
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -514,7 +514,7 @@ class FaxWizardDialog(WizardDialog):
             (8, CHKFOOTERPAGENUMBERS_HID,
                 self.resources.reschkFooterPageNumbers_value, 97, 106,
                 0, 4, 27, 201), self)
-        self.insertLabel("lblFooter",
+        self.lblFooter = self.insertLabel("lblFooter",
             ("FontDescriptor",
                 PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
@@ -525,7 +525,7 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (self.fontDescriptor4, 8, self.resources.reslblFooter_value,
                 97, 28, 4, 33, 116))
-        self.insertLabel("lblTitle5",
+        self.lblTitle5 = self.insertLabel("lblTitle5",
             ("FontDescriptor",
                 PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
@@ -576,7 +576,7 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (8, OPTMAKECHANGES_HID, self.resources.resoptMakeChanges_value,
                 104, 123, 5, 31, 198), self)
-        self.insertLabel("lblFinalExplanation1",
+        self.lblFinalExplanation1 = self.insertLabel("lblFinalExplanation1",
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_MULTILINE,
@@ -587,7 +587,7 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (28, self.resources.reslblFinalExplanation1_value,
                 True, 97, 28, 5, 34, 205))
-        self.insertLabel("lblProceed",
+        self.lblProceed = self.insertLabel("lblProceed",
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -597,7 +597,7 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (8, self.resources.reslblProceed_value, 97, 100, 5,
                 35, 204))
-        self.insertLabel("lblFinalExplanation2",
+        self.lblFinalExplanation2 = self.insertLabel("lblFinalExplanation2",
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_MULTILINE,
@@ -608,7 +608,7 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (33, self.resources.reslblFinalExplanation2_value, True, 104, 145, 5,
                 36, 199))
-        self.insertImage("ImageControl2",
+        self.ImageControl2 = self.insertImage("ImageControl2",
             ("Border",
                 PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_IMAGEURL,
@@ -620,7 +620,7 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (0, 10, UIConsts.INFOIMAGEURL, 92, 145,
                 False, 5, 47, 10))
-        self.insertLabel("lblTemplateName",
+        self.lblTemplateName = self.insertLabel("lblTemplateName",
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -631,7 +631,7 @@ class FaxWizardDialog(WizardDialog):
             (8, self.resources.reslblTemplateName_value, 97, 58, 5,
                 57, 101))
 
-        self.insertLabel("lblTitle6",
+        self.lblTitle6 = self.insertLabel("lblTitle6",
             ("FontDescriptor",
                 PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,

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

 from common.Resource import Resource
 
 class FaxWizardDialogResources(Resource):
+    UNIT_NAME = "dbwizres"
     MODULE_NAME = "dbw"
     RID_FAXWIZARDDIALOG_START = 3200
     RID_FAXWIZARDCOMMUNICATION_START = 3270

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

 from common.Resource import Resource
 
 class LetterWizardDialogResources(Resource):
+    UNIT_NAME = "dbwizres"
     MODULE_NAME = "dbw"
     RID_LETTERWIZARDDIALOG_START = 3000
     RID_LETTERWIZARDGREETING_START = 3080

wizards/com/sun/star/wizards/text/TextDocument.py

@@ -92,7 +92,7 @@ class TextDocument(object):
 
     def init(self):
         self.xWindowPeer = self.xFrame.getComponentWindow()
-        self.m_xDocProps = TextDocument.xTextDocument.DocumentProperties
+        self.m_xDocProps = TextDocument.xTextDocument.getDocumentProperties()
         self.CharLocale = Helper.getUnoStructValue(
             TextDocument.xTextDocument, "CharLocale")
         self.xText = TextDocument.xTextDocument.Text

wizards/com/sun/star/wizards/text/TextFieldHandler.py

@@ -89,24 +89,32 @@ class TextFieldHandler(object):
             traceback.print_exc()
 
     def __getTextFieldsByProperty(
-            self, _PropertyName, _aPropertyValue):
+            self, _PropertyName, _aPropertyValue, _TypeName):
         try:
             xProperty = TextFieldHandler.dictTextFields[_aPropertyValue]
             xPropertySet = xProperty.TextFieldMaster
             if xPropertySet.PropertySetInfo.hasPropertyByName(
                     _PropertyName):
                 oValue = xPropertySet.getPropertyValue(_PropertyName)
-                sValue = unicodedata.normalize(
-                    'NFKD', oValue).encode('ascii','ignore')
-                if sValue == _aPropertyValue:
-                    return xProperty
+                if _TypeName == "String":
+                    sValue = unicodedata.normalize(
+                        'NFKD', oValue).encode('ascii','ignore')
+                    if sValue == _aPropertyValue:
+                        return xProperty
+            #COMMENTED
+            '''elif AnyConverter.isShort(oValue):
+                        if _TypeName.equals("Short"):
+                            iShortParam = (_aPropertyValue).shortValue()
+                            ishortValue = AnyConverter.toShort(oValue)
+                            if ishortValue == iShortParam:
+                                xDependentVector.append(oTextField) '''
             return None
         except KeyError, e:
             return None
 
     def changeUserFieldContent(self, _FieldName, _FieldContent):
         DependentTextFields = self.__getTextFieldsByProperty(
-                PropertyNames.PROPERTY_NAME, _FieldName)
+                PropertyNames.PROPERTY_NAME, _FieldName, "String")
         if DependentTextFields is not None:
             DependentTextFields.TextFieldMaster.setPropertyValue("Content", _FieldContent)
             self.refreshTextFields()
@@ -155,7 +163,7 @@ class TextFieldHandler(object):
     def removeUserFieldByContent(self, _FieldContent):
         try:
             xDependentTextFields = self.__getTextFieldsByProperty(
-                "Content", _FieldContent)
+                "Content", _FieldContent, "String")
             if xDependentTextFields != None:
                 i = 0
                 while i < xDependentTextFields.length:
@@ -164,3 +172,19 @@ class TextFieldHandler(object):
 
         except Exception, e:
             traceback.print_exc()
+
+    def changeExtendedUserFieldContent(self, UserDataPart, _FieldContent):
+        try:
+            xDependentTextFields = self.__getTextFieldsByProperty(
+                "UserDataType", UserDataPart, "Short")
+            if xDependentTextFields != None:
+                i = 0
+                while i < xDependentTextFields.length:
+                    xDependentTextFields[i].getTextFieldMaster().setPropertyValue(
+                        "Content", _FieldContent)
+                    i += 1
+
+            self.refreshTextFields()
+        except Exception, e:
+            traceback.print_exc()
+

wizards/com/sun/star/wizards/ui/UnoDialog.py

@@ -124,6 +124,206 @@ class UnoDialog(object):
         if iSelIndex != -1:
             xListBox.selectItemPos(iSelIndex, True)
 
+    def insertLabel(self, sName, sPropNames, oPropValues):
+        try:
+            oFixedText = self.insertControlModel(
+                "com.sun.star.awt.UnoControlFixedTextModel",
+                sName, sPropNames, oPropValues)
+            oFixedText.setPropertyValue(PropertyNames.PROPERTY_NAME, sName)
+            oLabel = self.xUnoDialog.getControl(sName)
+            return oLabel
+        except Exception, ex:
+            traceback.print_exc()
+            return None
+
+    def insertButton(
+            self, sName, iControlKey, xActionListener, sProperties, sValues):
+        oButtonModel = self.insertControlModel(
+            "com.sun.star.awt.UnoControlButtonModel",
+            sName, sProperties, sValues)
+        xPSet.setPropertyValue(PropertyNames.PROPERTY_NAME, sName)
+        xButton = self.xUnoDialog.getControl(sName)
+        if xActionListener != None:
+            xButton.addActionListener(
+                ActionListenerProcAdapter(xActionListener))
+
+        ControlKey = iControlKey
+        if self.ControlList != None:
+            self.ControlList.put(sName, ControlKey)
+
+        return xButton
+
+    def insertCheckBox(
+            self, sName, iControlKey, xItemListener, sProperties, sValues):
+        oButtonModel = self.insertControlModel(
+            "com.sun.star.awt.UnoControlCheckBoxModel",
+            sName, sProperties, sValues)
+        oButtonModel.setPropertyValue(PropertyNames.PROPERTY_NAME, sName)
+        xCheckBox = self.xUnoDialog.getControl(sName)
+        if xItemListener != None:
+            xCheckBox.addItemListener(
+                ItemListenerProcAdapter(xItemListener))
+
+        ControlKey = iControlKey
+        if self.ControlList != None:
+            self.ControlList.put(sName, ControlKey)
+
+    def insertNumericField(
+            self, sName, iControlKey, xTextListener, sProperties, sValues):
+        oNumericFieldModel = self.insertControlModel(
+            "com.sun.star.awt.UnoControlNumericFieldModel",
+            sName, sProperties, sValues)
+        oNumericFieldModel.setPropertyValue(
+            PropertyNames.PROPERTY_NAME, sName)
+        xNumericField = self.xUnoDialog.getControl(sName)
+        if xTextListener != None:
+            xNumericField.addTextListener(
+                TextListenerProcAdapter(xTextListener))
+
+        ControlKey = iControlKey
+        if self.ControlList != None:
+            self.ControlList.put(sName, ControlKey)
+
+    def insertScrollBar(
+        self, sName, iControlKey, xAdjustmentListener, sProperties, sValues):
+        try:
+            oScrollModel = self.insertControlModel(
+                "com.sun.star.awt.UnoControlScrollBarModel",
+                sName, sProperties, sValues)
+            oScrollModel.setPropertyValue(PropertyNames.PROPERTY_NAME, sName)
+            xScrollBar = self.xUnoDialog.getControl(sName)
+            if xAdjustmentListener != None:
+                xScrollBar.addAdjustmentListener(xAdjustmentListener)
+
+            ControlKey = iControlKey
+            if self.ControlList != None:
+                self.ControlList.put(sName, ControlKey)
+
+            return xScrollBar
+        except com.sun.star.uno.Exception, exception:
+            traceback.print_exc()
+            return None
+
+    def insertTextField(
+        self, sName, iControlKey, xTextListener, sProperties, sValues):
+        xTextBox = insertEditField(
+            "com.sun.star.awt.UnoControlEditModel", sName, iControlKey,
+            xTextListener, sProperties, sValues)
+        return xTextBox
+
+    def insertFormattedField(
+        self, sName, iControlKey, xTextListener, sProperties, sValues):
+        xTextBox = insertEditField(
+            "com.sun.star.awt.UnoControlFormattedFieldModel", sName,
+            iControlKey, xTextListener, sProperties, sValues)
+        return xTextBox
+
+    def insertEditField(
+        self, ServiceName, sName, iControlKey,
+        xTextListener, sProperties, sValues):
+
+        try:
+            xTextModel = self.insertControlModel(
+                ServiceName, sName, sProperties, sValues)
+            xTextModel.setPropertyValue(PropertyNames.PROPERTY_NAME, sName)
+            xTextBox = self.xUnoDialog.getControl(sName)
+            if xTextListener != None:
+                xTextBox.addTextListener(TextListenerProcAdapter(xTextListener))
+
+            ControlKey = iControlKey
+            self.ControlList.put(sName, ControlKey)
+            return xTextBox
+        except com.sun.star.uno.Exception, exception:
+            traceback.print_exc()
+            return None
+
+    def insertListBox(
+        self, sName, iControlKey, xActionListener,
+        xItemListener, sProperties, sValues):
+        xListBoxModel = self.insertControlModel(
+            "com.sun.star.awt.UnoControlListBoxModel",
+            sName, sProperties, sValues)
+        xListBoxModel.setPropertyValue(PropertyNames.PROPERTY_NAME, sName)
+        xListBox = self.xUnoDialog.getControl(sName)
+        if xItemListener != None:
+            xListBox.addItemListener(ItemListenerProcAdapter(xItemListener))
+
+        if xActionListener != None:
+            xListBox.addActionListener(
+                ActionListenerProcAdapter(xActionListener))
+
+        ControlKey = iControlKey
+        self.ControlList.put(sName, ControlKey)
+        return xListBox
+
+    def insertComboBox(
+        self, sName, iControlKey, xActionListener, xTextListener,
+        xItemListener, sProperties, sValues):
+        xComboBoxModel = self.insertControlModel(
+            "com.sun.star.awt.UnoControlComboBoxModel",
+            sName, sProperties, sValues)
+        xComboBoxModel.setPropertyValue(PropertyNames.PROPERTY_NAME, sName)
+        xComboBox = self.xUnoDialog.getControl(sName)
+        if xItemListener != None:
+            xComboBox.addItemListener(ItemListenerProcAdapter(xItemListener))
+
+        if xTextListener != None:
+            xComboBox.addTextListener(TextListenerProcAdapter(xTextListener))
+
+        if xActionListener != None:
+            xComboBox.addActionListener(
+                ActionListenerProcAdapter(xActionListener))
+
+        ControlKey = iControlKey
+        self.ControlList.put(sName, ControlKey)
+        return xComboBox
+
+    def insertRadioButton(
+            self, sName, iControlKey, xItemListener, sProperties, sValues):
+        try:
+            xRadioButton = insertRadioButton(
+                sName, iControlKey, sProperties, sValues)
+            if xItemListener != None:
+                xRadioButton.addItemListener(
+                    ItemListenerProcAdapter(xItemListener))
+
+            return xRadioButton
+        except com.sun.star.uno.Exception, exception:
+            traceback.print_exc()
+            return None
+
+    def insertRadioButton(
+            self, sName, iControlKey, xActionListener, sProperties, sValues):
+        try:
+            xButton = insertRadioButton(
+                sName, iControlKey, sProperties, sValues)
+            if xActionListener != None:
+                xButton.addActionListener(
+                    ActionListenerProcAdapter(xActionListener))
+
+            return xButton
+        except com.sun.star.uno.Exception, exception:
+            traceback.print_exc()
+            return None
+
+    def insertRadioButton(self, sName, iControlKey, sProperties, sValues):
+        xRadioButton = insertRadioButton(sName, sProperties, sValues)
+        ControlKey = iControlKey
+        self.ControlList.put(sName, ControlKey)
+        return xRadioButton
+
+    def insertRadioButton(self, sName, sProperties, sValues):
+        try:
+            oRadioButtonModel = self.insertControlModel(
+                "com.sun.star.awt.UnoControlRadioButtonModel",
+                sName, sProperties, sValues)
+            oRadioButtonModel.setPropertyValue(
+                PropertyNames.PROPERTY_NAME, sName)
+            xRadioButton = self.xUnoDialog.getControl(sName)
+            return xRadioButton
+        except com.sun.star.uno.Exception, exception:
+            traceback.print_exc()
+            return None
     '''
     The problem with setting the visibility of controls
     is that changing the current step of a dialog will automatically
@@ -175,6 +375,7 @@ class UnoDialog(object):
 
     # repaints the currentDialogStep
 
+
     def repaintDialogStep(self):
         try:
             ncurstep = int(Helper.getUnoPropertyValue(
@@ -186,20 +387,15 @@ class UnoDialog(object):
         except com.sun.star.uno.Exception, exception:
             traceback.print_exc()
 
-    def insertControlModel(
-        self, serviceName, componentName, sPropNames, oPropValues):
+    def insertControlModel(self, ServiceName, sName, sProperties, sValues):
         try:
-            xControlModel = self.xDialogModel.createInstance(serviceName)
-            Helper.setUnoPropertyValues(
-                xControlModel, sPropNames, oPropValues)
-            self.xDialogModel.insertByName(componentName, xControlModel)
-            Helper.setUnoPropertyValue(xControlModel,
-                PropertyNames.PROPERTY_NAME, componentName)
-        except Exception, ex:
+            xControlModel = self.xDialogModel.createInstance(ServiceName)
+            Helper.setUnoPropertyValues(xControlModel, sProperties, sValues)
+            self.xDialogModel.insertByName(sName, xControlModel)
+            return xControlModel
+        except Exception, exception:
             traceback.print_exc()
-
-        aObj = self.xUnoDialog.getControl(componentName)
-        return aObj
+            return None
 
     def setFocus(self, ControlName):
         oFocusControl = self.xUnoDialog.getControl(ControlName)
@@ -348,3 +544,9 @@ class UnoDialog(object):
 
     def addResourceHandler(self, _Unit, _Module):
         self.m_oResource = Resource(self.xMSF, _Unit, _Module)
+
+    def setInitialTabindex(self, _istep):
+        return (short)(_istep * 100)
+
+    def getListBoxLineCount(self):
+        return 20

wizards/com/sun/star/wizards/ui/UnoDialog2.py

@@ -25,7 +25,7 @@ class UnoDialog2(UnoDialog):
 
     def insertButton(
         self, sName, actionPerformed, sPropNames, oPropValues, listener):
-        xButton = self.insertControlModel(
+        xButton = self.insertControlModel2(
             "com.sun.star.awt.UnoControlButtonModel",
             sName, sPropNames, oPropValues)
         if actionPerformed is not None:
@@ -37,7 +37,7 @@ class UnoDialog2(UnoDialog):
 
     def insertImageButton(
             self, sName, actionPerformed, sPropNames, oPropValues, listener):
-        xButton = self.insertControlModel(
+        xButton = self.insertControlModel2(
             "com.sun.star.awt.UnoControlButtonModel",
             sName, sPropNames, oPropValues)
         if actionPerformed is not None:
@@ -49,7 +49,7 @@ class UnoDialog2(UnoDialog):
 
     def insertCheckBox(
         self, sName, itemChanged, sPropNames, oPropValues, listener):
-        xCheckBox = self.insertControlModel(
+        xCheckBox = self.insertControlModel2(
             "com.sun.star.awt.UnoControlCheckBoxModel",
             sName, sPropNames, oPropValues)
         if itemChanged is not None:
@@ -61,7 +61,7 @@ class UnoDialog2(UnoDialog):
     def insertComboBox(
         self, sName, actionPerformed, itemChanged,
         textChanged, sPropNames, oPropValues, listener):
-        xComboBox = self.insertControlModel(
+        xComboBox = self.insertControlModel2(
         "com.sun.star.awt.UnoControlComboBoxModel",
         sName, sPropNames, oPropValues)
         if actionPerformed is not None:
@@ -82,7 +82,7 @@ class UnoDialog2(UnoDialog):
     def insertListBox(
         self, sName, actionPerformed, itemChanged,
         sPropNames, oPropValues, listener):
-        xListBox = self.insertControlModel(
+        xListBox = self.insertControlModel2(
             "com.sun.star.awt.UnoControlListBoxModel",
             sName, sPropNames, oPropValues)
 
@@ -98,7 +98,7 @@ class UnoDialog2(UnoDialog):
 
     def insertRadioButton(
         self, sName, itemChanged, sPropNames, oPropValues, listener):
-        xRadioButton = self.insertControlModel(
+        xRadioButton = self.insertControlModel2(
             "com.sun.star.awt.UnoControlRadioButtonModel",
             sName, sPropNames, oPropValues)
         if itemChanged is not None:
@@ -106,10 +106,11 @@ class UnoDialog2(UnoDialog):
             xRadioButton.addItemListener(
                 ItemListenerProcAdapter(itemChanged))
 
+
         return xRadioButton
 
     def insertTitledBox(self, sName, sPropNames, oPropValues):
-        oTitledBox = self.insertControlModel(
+        oTitledBox = self.insertControlModel2(
             "com.sun.star.awt.UnoControlGroupBoxModel",
             sName, sPropNames, oPropValues)
         return oTitledBox
@@ -121,7 +122,7 @@ class UnoDialog2(UnoDialog):
             sPropNames, oPropValues, listener)
 
     def insertImage(self, sName, sPropNames, oPropValues):
-        return self.insertControlModel(
+        return self.insertControlModel2(
             "com.sun.star.awt.UnoControlImageControlModel",
             sName, sPropNames, oPropValues)
 
@@ -146,11 +147,12 @@ class UnoDialog2(UnoDialog):
     def insertEditField(
         self, sName, sTextChanged, sModelClass,
         sPropNames, oPropValues, listener):
-        xField = self.insertControlModel(sModelClass,
+        xField = self.insertControlModel2(sModelClass,
             sName, sPropNames, oPropValues)
         if sTextChanged is not None:
             sTextChanged = getattr(listener, sTextChanged)
             xField.addTextListener(TextListenerProcAdapter(sTextChanged))
+
         return xField
 
     def insertFileControl(
@@ -201,36 +203,55 @@ class UnoDialog2(UnoDialog):
             sPropNames, oPropValues, listener)
 
     def insertFixedLine(self, sName, sPropNames, oPropValues):
-        oLine = self.insertControlModel(
+        oLine = self.insertControlModel2(
             "com.sun.star.awt.UnoControlFixedLineModel",
             sName, sPropNames, oPropValues)
         return oLine
 
-
-    def insertLabel(self, sName, sPropNames, oPropValues):
-        oFixedText = self.insertControlModel(
-            "com.sun.star.awt.UnoControlFixedTextModel",
-            sName, sPropNames, oPropValues)
-        return oFixedText
-
     def insertScrollBar(self, sName, sPropNames, oPropValues):
-        oScrollBar = self.insertControlModel(
+        oScrollBar = self.insertControlModel2(
             "com.sun.star.awt.UnoControlScrollBarModel",
             sName, sPropNames, oPropValues)
         return oScrollBar
 
     def insertProgressBar(self, sName, sPropNames, oPropValues):
-        oProgressBar = self.insertControlModel(
+        oProgressBar = self.insertControlModel2(
             "com.sun.star.awt.UnoControlProgressBarModel",
             sName, sPropNames, oPropValues)
         return oProgressBar
 
     def insertGroupBox(self, sName, sPropNames, oPropValues):
-        oGroupBox = self.insertControlModel(
+        oGroupBox = self.insertControlModel2(
             "com.sun.star.awt.UnoControlGroupBoxModel",
             sName, sPropNames, oPropValues)
         return oGroupBox
 
+    def insertControlModel2(
+        self, serviceName, componentName, sPropNames, oPropValues):
+        try:
+            xControlModel = self.insertControlModel(
+                serviceName, componentName, (), ())
+            Helper.setUnoPropertyValues(
+                xControlModel, sPropNames, oPropValues)
+            Helper.setUnoPropertyValue(xControlModel,
+                PropertyNames.PROPERTY_NAME, componentName)
+        except Exception, ex:
+            traceback.print_exc()
+
+        aObj = self.xUnoDialog.getControl(componentName)
+        return aObj
+
+    def setControlPropertiesDebug(self, model, names, values):
+        i = 0
+        while i < len(names):
+            print "   Settings: ", names[i]
+            Helper.setUnoPropertyValue(model, names[i], values[i])
+            i += 1
+
+    def getControlModel(self, unoControl):
+        obj = unoControl.Model
+        return obj
+
     def showMessageBox(self, windowServiceName, windowAttribute, MessageText):
         return SystemDialog.showMessageBox(
             xMSF, self.xControl.Peer,

wizards/com/sun/star/wizards/ui/WizardDialog.py

@@ -43,6 +43,7 @@ class WizardDialog(UnoDialog2):
         self.sMsgEndAutopilot = self.__oWizardResource.getResText(
             UIConsts.RID_DB_COMMON + 33)
         self.oRoadmap = None
+        #self.vetos = VetoableChangeSupport.VetoableChangeSupport_unknown(this)
 
     def getResource(self):
         return self.__oWizardResource
@@ -73,7 +74,7 @@ class WizardDialog(UnoDialog2):
             return False
 
     def setCurrentRoadmapItemID(self, ID):
-        if self.oRoadmap is not None:
+        if self.oRoadmap != None:
             nCurItemID = self.getCurrentRoadmapItemID()
             if nCurItemID != ID:
                 Helper.setUnoPropertyValue(self.oRoadmap, "CurrentItemID",ID)
@@ -94,8 +95,7 @@ class WizardDialog(UnoDialog2):
             # the roadmap control has got no real TabIndex ever
             # that is not correct, but changing this would need time,
             # so it is used without TabIndex as before
-
-            xRoadmapControl = self.insertControlModel(
+            self.oRoadmap = self.insertControlModel(
                 "com.sun.star.awt.UnoControlRoadmapModel",
                 "rdmNavi",
                 (PropertyNames.PROPERTY_HEIGHT,
@@ -106,9 +106,12 @@ class WizardDialog(UnoDialog2):
                     PropertyNames.PROPERTY_WIDTH),
                 ((iDialogHeight - 26), 0, 0, 0,
                     0, True, 85))
-            self.oRoadmap = xRoadmapControl.Model
+            self.oRoadmap.setPropertyValue(
+                PropertyNames.PROPERTY_NAME, "rdmNavi")
+
+            self.xRoadmapControl = self.xUnoDialog.getControl("rdmNavi")
             method = getattr(self, "itemStateChanged")
-            xRoadmapControl.addItemListener(
+            self.xRoadmapControl.addItemListener(
                 ItemListenerProcAdapter(method))
 
             Helper.setUnoPropertyValue(
@@ -143,6 +146,9 @@ class WizardDialog(UnoDialog2):
             traceback.print_exc()
             return -1
 
+    def getRMItemCount(self):
+        return self.oRoadmap.Count
+
     def getRoadmapItemByID(self, _ID):
         try:
             getByIndex = self.oRoadmap.getByIndex
@@ -196,6 +202,12 @@ class WizardDialog(UnoDialog2):
         self.enableNextButton(self.getNextAvailableStep() > 0)
         self.enableBackButton(nNewStep != 1)
 
+    def iscompleted(self, _ndialogpage):
+        return False
+
+    def ismodified(self, _ndialogpage):
+        return False
+
     def drawNaviBar(self):
         try:
             curtabindex = UIConsts.SOFIRSTWIZARDNAVITABINDEX
@@ -376,7 +388,9 @@ class WizardDialog(UnoDialog2):
             while i <= self.nMaxStep:
                 if self.isStepEnabled(i):
                     return i
+
                 i += 1
+
         return -1
 
     def gotoNextAvailableStep(self):