[Libreoffice-commits] .: Branch 'feature/gsoc2011_wizards' - wizards/com
Xisco Fauli
xfauli at kemper.freedesktop.org
Tue Jun 21 07:51:04 PDT 2011
wizards/com/sun/star/wizards/common/FileAccess.py | 21 +-
wizards/com/sun/star/wizards/common/Helper.py | 12 -
wizards/com/sun/star/wizards/common/SystemDialog.py | 6
wizards/com/sun/star/wizards/fax/FaxDocument.py | 6
wizards/com/sun/star/wizards/fax/FaxWizardDialog.py | 113 +++++++---------
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py | 14 -
wizards/com/sun/star/wizards/text/TextDocument.py | 2
wizards/com/sun/star/wizards/text/TextFieldHandler.py | 2
wizards/com/sun/star/wizards/text/TextSectionHandler.py | 7
wizards/com/sun/star/wizards/text/ViewHandler.py | 5
wizards/com/sun/star/wizards/ui/PathSelection.py | 7
wizards/com/sun/star/wizards/ui/UnoDialog.py | 26 ---
wizards/com/sun/star/wizards/ui/UnoDialog2.py | 3
wizards/com/sun/star/wizards/ui/WizardDialog.py | 7
wizards/com/sun/star/wizards/ui/event/CommonListener.py | 1
wizards/com/sun/star/wizards/ui/event/UnoDataAware.py | 3
16 files changed, 98 insertions(+), 137 deletions(-)
New commits:
commit 566a61085c0dd4629cf75774a3f098cab599b688
Author: Xisco Fauli <anistenis at gmail.com>
Date: Tue Jun 21 16:14:25 2011 +0200
Replace some uno.invoke(now it loads faster)
diff --git a/wizards/com/sun/star/wizards/common/FileAccess.py b/wizards/com/sun/star/wizards/common/FileAccess.py
index 8ac514a..dfa5d80 100644
--- a/wizards/com/sun/star/wizards/common/FileAccess.py
+++ b/wizards/com/sun/star/wizards/common/FileAccess.py
@@ -542,15 +542,18 @@ class FileAccess(object):
"com.sun.star.ucb.FileContentProvider")
def getURL(self, path, childPath=None):
- if childPath is not None:
- path = self.filenameConverter.getSystemPathFromFileURL(path)
- f = open(path,childPath)
- else:
- f = open(path)
+ try:
+ if childPath is not None:
+ path = self.filenameConverter.getSystemPathFromFileURL(path)
+ f = open(path,childPath)
+ else:
+ f = open(path)
- r = self.filenameConverter.getFileURLFromSystemPath(path,
- osPath.abspath(path))
- return r
+ r = self.filenameConverter.getFileURLFromSystemPath(path,
+ osPath.abspath(path))
+ return r
+ except Exception:
+ return None
def getPath(self, parentURL, childURL):
string = ""
@@ -607,7 +610,7 @@ class FileAccess(object):
return self.fileAccess.exists(filename)
except CommandAbortedException, cax:
pass
- except com.sun.star.uno.Exception, ex:
+ except Exception:
pass
return defe
diff --git a/wizards/com/sun/star/wizards/common/Helper.py b/wizards/com/sun/star/wizards/common/Helper.py
index 727f3f0..45923cf 100644
--- a/wizards/com/sun/star/wizards/common/Helper.py
+++ b/wizards/com/sun/star/wizards/common/Helper.py
@@ -17,14 +17,12 @@ class Helper(object):
@classmethod
def setUnoPropertyValue(self, xPSet, PropertyName, PropertyValue):
try:
- if xPSet.getPropertySetInfo().hasPropertyByName(PropertyName):
- uno.invoke(xPSet,"setPropertyValue",
- (PropertyName,PropertyValue))
- else:
- selementnames = xPSet.getPropertySetInfo().getProperties()
- raise ValueError("No Such Property: '" + PropertyName + "'")
+ if PropertyValue is not None:
+ setattr(xPSet, PropertyName, PropertyValue)
- except Exception, exception:
+ except AttributeError:
+ raise AttributeError, "No Such Property: '%s'" % PropertyName
+ except Exception:
traceback.print_exc()
@classmethod
diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.py b/wizards/com/sun/star/wizards/common/SystemDialog.py
index 3242426..f6bca5b 100644
--- a/wizards/com/sun/star/wizards/common/SystemDialog.py
+++ b/wizards/com/sun/star/wizards/common/SystemDialog.py
@@ -25,9 +25,9 @@ class SystemDialog(object):
self.xMSF = xMSF
self.systemDialog = xMSF.createInstance(ServiceName)
self.xStringSubstitution = self.createStringSubstitution(xMSF)
- if self.systemDialog != None:
- prova = uno.Any("[]short",(Type,))
- #uno.invoke(prova, "initialize", (uno.Any("short",(Type,)),))
+ #if self.systemDialog != None:
+ #COMMENTED
+ #self.systemDialog.initialize(Type)
except Exception, exception:
traceback.print_exc()
diff --git a/wizards/com/sun/star/wizards/fax/FaxDocument.py b/wizards/com/sun/star/wizards/fax/FaxDocument.py
index 581b8e7..a744a7c 100644
--- a/wizards/com/sun/star/wizards/fax/FaxDocument.py
+++ b/wizards/com/sun/star/wizards/fax/FaxDocument.py
@@ -1,4 +1,3 @@
-import uno
from text.TextDocument import *
from text.TextSectionHandler import TextSectionHandler
from text.TextFieldHandler import TextFieldHandler
@@ -24,7 +23,7 @@ class FaxDocument(TextDocument):
self.xTextDocument)
oSection = \
mySectionHandler.xTextDocument.TextSections.getByName(sElement)
- Helper.setUnoPropertyValue(oSection, "IsVisible", bState)
+ Helper.setUnoPropertyValue(oSection,"IsVisible",bState)
except Exception, exception:
traceback.print_exc()
@@ -57,8 +56,7 @@ class FaxDocument(TextDocument):
xPageNumberField = self.xTextDocument.createInstance(
"com.sun.star.text.TextField.PageNumber")
xPageNumberField.setPropertyValue("SubType", CURRENT)
- uno.invoke(xPageNumberField, "setPropertyValue",
- ("NumberingType", uno.Any("short",ARABIC)))
+ xPageNumberField.NumberingType = ARABIC
xFooterText.insertTextContent(xFooterText.End,
xPageNumberField, False)
else:
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
index c3c2bd7..9323215 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
@@ -24,7 +24,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_POSITION_Y,
PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX,
"Title", PropertyNames.PROPERTY_WIDTH),
- (True, 210, True, 104, 52, 1, uno.Any("short",1),
+ (True, 210, True, 104, 52, 1, 1,
self.resources.resFaxWizardDialog_title, 310))
self.fontDescriptor1 = \
@@ -56,7 +56,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(8, OPTBUSINESSFAX_HID, self.resources.resoptBusinessFax_value,
- 97, 28, 1, uno.Any("short",1), 184), self)
+ 97, 28, 1, 1, 184), self)
self.lstBusinessStyle = self.insertListBox("lstBusinessStyle",
LSTBUSINESSSTYLE_ACTION_PERFORMED, LSTBUSINESSSTYLE_ITEM_CHANGED,
("Dropdown", PropertyNames.PROPERTY_HEIGHT,
@@ -66,8 +66,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
- (True, 12, LSTBUSINESSSTYLE_HID, 180, 40, 1,
- uno.Any("short",3), 74), self)
+ (True, 12, LSTBUSINESSSTYLE_HID, 180, 40, 1, 3, 74), self)
self.optPrivateFax = self.insertRadioButton("optPrivateFax",
OPTPRIVATEFAX_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
@@ -79,7 +78,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(8, OPTPRIVATEFAX_HID, self.resources.resoptPrivateFax_value,
- 97, 81, 1, uno.Any("short",2), 184), self)
+ 97, 81, 1, 2, 184), self)
self.lstPrivateStyle = self.insertListBox("lstPrivateStyle",
LSTPRIVATESTYLE_ACTION_PERFORMED,
LSTPRIVATESTYLE_ITEM_CHANGED,
@@ -91,7 +90,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(True, 12, LSTPRIVATESTYLE_HID, 180, 95, 1,
- uno.Any("short",4), 74), self)
+ 4, 74), self)
self.lblBusinessStyle = self.insertLabel("lblBusinessStyle",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
@@ -101,7 +100,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblBusinessStyle_value,
- 110, 42, 1, uno.Any("short",32), 60))
+ 110, 42, 1, 32, 60))
self.lblTitle1 = self.insertLabel("lblTitle1",
("FontDescriptor", PropertyNames.PROPERTY_HEIGHT,
@@ -113,7 +112,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(self.fontDescriptor5, 16, self.resources.reslblTitle1_value,
- True, 91, 8, 1, uno.Any("short",37), 212))
+ True, 91, 8, 1, 37, 212))
self.lblPrivateStyle = self.insertLabel("lblPrivateStyle",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
@@ -122,8 +121,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
- (8, self.resources.reslblPrivateStyle_value, 110, 95, 1,
- uno.Any("short",50), 60))
+ (8, self.resources.reslblPrivateStyle_value, 110, 95, 1, 50, 60))
self.lblIntroduction = self.insertLabel("lblIntroduction",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
@@ -133,8 +131,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
- (39, self.resources.reslblIntroduction_value, True, 104, 145, 1,
- uno.Any("short",55), 199))
+ (39, self.resources.reslblIntroduction_value, True, 104, 145, 1, 55, 199))
self.ImageControl3 = self.insertInfoImage(92, 145, 1)
def buildStep2(self):
self.chkUseLogo = self.insertCheckBox("chkUseLogo",
@@ -149,7 +146,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(8, CHKUSELOGO_HID, self.resources.reschkUseLogo_value, 97, 28,
- uno.Any("short",0), 2, uno.Any("short",5), 212), self)
+ 0, 2, 5, 212), self)
self.chkUseDate = self.insertCheckBox("chkUseDate",
CHKUSEDATE_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
@@ -162,7 +159,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(8, CHKUSEDATE_HID, self.resources.reschkUseDate_value, 97, 43,
- uno.Any("short",0), 2,uno.Any("short",6), 212), self)
+ 0, 2, 6, 212), self)
self.chkUseCommunicationType = self.insertCheckBox(
"chkUseCommunicationType",
CHKUSECOMMUNICATIONTYPE_ITEM_CHANGED,
@@ -177,7 +174,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, CHKUSECOMMUNICATIONTYPE_HID,
self.resources.reschkUseCommunicationType_value, 97, 57,
- uno.Any("short",0), 2, uno.Any("short",07), 100), self)
+ 0, 2, 7, 100), self)
self.lstCommunicationType = self.insertComboBox(
"lstCommunicationType",
LSTCOMMUNICATIONTYPE_ACTION_PERFORMED,
@@ -191,7 +188,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(True, 12, LSTCOMMUNICATIONTYPE_HID, 105, 68, 2,
- uno.Any("short",8), 174), self)
+ 8, 174), self)
self.chkUseSubject = self.insertCheckBox("chkUseSubject",
CHKUSESUBJECT_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
@@ -204,7 +201,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(8, CHKUSESUBJECT_HID, self.resources.reschkUseSubject_value,
- 97, 87, uno.Any("short",0), 2, uno.Any("short",9), 212), self)
+ 97, 87, 0, 2, 9, 212), self)
self.chkUseSalutation = self.insertCheckBox("chkUseSalutation",
CHKUSESALUTATION_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
@@ -218,7 +215,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, CHKUSESALUTATION_HID,
self.resources.reschkUseSalutation_value, 97, 102,
- uno.Any("short",0), 2, uno.Any("short",10), 100), self)
+ 0, 2, 10, 100), self)
self.lstSalutation = self.insertComboBox("lstSalutation",
LSTSALUTATION_ACTION_PERFORMED,
LSTSALUTATION_ITEM_CHANGED,
@@ -231,7 +228,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(True, 12, LSTSALUTATION_HID, 105, 113, 2,
- uno.Any("short",11), 174), self)
+ 11, 174), self)
self.chkUseGreeting = self.insertCheckBox("chkUseGreeting",
CHKUSEGREETING_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
@@ -245,7 +242,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, CHKUSEGREETING_HID,
self.resources.reschkUseGreeting_value, 97, 132,
- uno.Any("short",0), 2, uno.Any("short",12), 100), self)
+ 0, 2, 12, 100), self)
self.lstGreeting = self.insertComboBox("lstGreeting",
LSTGREETING_ACTION_PERFORMED,
LSTGREETING_ITEM_CHANGED,
@@ -257,8 +254,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
- (True, 12, LSTGREETING_HID, 105, 143, 2,
- uno.Any("short",13), 174), self)
+ (True, 12, LSTGREETING_HID, 105, 143, 2, 13, 174), self)
self.chkUseFooter = self.insertCheckBox("chkUseFooter",
CHKUSEFOOTER_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
@@ -272,7 +268,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, CHKUSEFOOTER_HID,
self.resources.reschkUseFooter_value, 97, 163,
- uno.Any("short",0), 2, uno.Any("short",14), 212), self)
+ 0, 2, 14, 212), self)
self.lblTitle3 = self.insertLabel("lblTitle3",
("FontDescriptor", PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
@@ -283,7 +279,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(self.fontDescriptor5, 16, self.resources.reslblTitle3_value,
- True, 91, 8, 2, uno.Any("short",59), 212))
+ True, 91, 8, 2, 59, 212))
def buildStep3(self):
self.optSenderPlaceholder = self.insertRadioButton(
@@ -299,7 +295,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, OPTSENDERPLACEHOLDER_HID,
self.resources.resoptSenderPlaceholder_value,
- 104, 42, 3, uno.Any("short",15), 149), self)
+ 104, 42, 3, 15, 149), self)
self.optSenderDefine = self.insertRadioButton("optSenderDefine",
OPTSENDERDEFINE_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
@@ -311,7 +307,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(8, OPTSENDERDEFINE_HID, self.resources.resoptSenderDefine_value,
- 104, 54, 3, uno.Any("short",16), 149), self)
+ 104, 54, 3, 16, 149), self)
self.txtSenderName = self.insertTextField("txtSenderName",
TXTSENDERNAME_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
@@ -322,7 +318,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(12, TXTSENDERNAME_HID, 182, 67, 3,
- uno.Any("short",17), 119), self)
+ 17, 119), self)
self.txtSenderStreet = self.insertTextField("txtSenderStreet",
TXTSENDERSTREET_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
@@ -333,7 +329,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(12, TXTSENDERSTREET_HID, 182, 81, 3,
- uno.Any("short",18), 119), self)
+ 18, 119), self)
self.txtSenderPostCode = self.insertTextField("txtSenderPostCode",
TXTSENDERPOSTCODE_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
@@ -344,7 +340,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(12, TXTSENDERPOSTCODE_HID, 182, 95, 3,
- uno.Any("short",19), 25), self)
+ 19, 25), self)
self.txtSenderState = self.insertTextField("txtSenderState",
TXTSENDERSTATE_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
@@ -355,7 +351,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(12, TXTSENDERSTATE_HID, 211, 95, 3,
- uno.Any("short",20), 21), self)
+ 20, 21), self)
self.txtSenderCity = self.insertTextField("txtSenderCity",
TXTSENDERCITY_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
@@ -366,7 +362,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(12, TXTSENDERCITY_HID, 236, 95, 3,
- uno.Any("short",21), 65), self)
+ 21, 65), self)
self.txtSenderFax = self.insertTextField("txtSenderFax",
TXTSENDERFAX_TEXT_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
@@ -377,7 +373,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(12, TXTSENDERFAX_HID, 182, 109, 3,
- uno.Any("short",22), 119), self)
+ 22, 119), self)
self.optReceiverPlaceholder = self.insertRadioButton(
"optReceiverPlaceholder",
OPTRECEIVERPLACEHOLDER_ITEM_CHANGED,
@@ -391,7 +387,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, OPTRECEIVERPLACEHOLDER_HID,
self.resources.resoptReceiverPlaceholder_value,
- 104, 148, 3, uno.Any("short",23), 200), self)
+ 104, 148, 3, 23, 200), self)
self.optReceiverDatabase = self.insertRadioButton(
"optReceiverDatabase",
OPTRECEIVERDATABASE_ITEM_CHANGED,
@@ -405,7 +401,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, OPTRECEIVERDATABASE_HID,
self.resources.resoptReceiverDatabase_value, 104, 160, 3,
- uno.Any("short",24), 200), self)
+ 24, 200), self)
self.lblSenderAddress = self.insertLabel("lblSenderAddress",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
@@ -414,14 +410,14 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
- (8, self.resources.reslblSenderAddress_value, 97, 28, 3, uno.Any("short",46), 136))
+ (8, self.resources.reslblSenderAddress_value, 97, 28, 3, 46, 136))
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, uno.Any("short",51), 212))
+ (5, 90, 126, 3, 51, 212))
self.lblSenderName = self.insertLabel("lblSenderName",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
@@ -431,7 +427,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblSenderName_value, 113, 69, 3,
- uno.Any("short",52), 68))
+ 52, 68))
self.lblSenderStreet = self.insertLabel("lblSenderStreet",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
@@ -441,7 +437,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblSenderStreet_value, 113, 82, 3,
- uno.Any("short",53), 68))
+ 53, 68))
self.lblPostCodeCity = self.insertLabel("lblPostCodeCity",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
@@ -451,7 +447,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblPostCodeCity_value,
- 113, 97, 3, uno.Any("short",54), 68))
+ 113, 97, 3, 54, 68))
self.lblTitle4 = self.insertLabel("lblTitle4",
("FontDescriptor",
PropertyNames.PROPERTY_HEIGHT,
@@ -463,7 +459,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(self.fontDescriptor5, 16, self.resources.reslblTitle4_value,
- True, 91, 8, 3, uno.Any("short",60), 212))
+ True, 91, 8, 3, 60, 212))
self.Label1 = self.insertLabel("lblSenderFax",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
@@ -472,8 +468,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
- (8, self.resources.resLabel1_value, 113, 111, 3,
- uno.Any("short",68), 68))
+ (8, self.resources.resLabel1_value, 113, 111, 3, 68, 68))
self.Label2 = self.insertLabel("Label2",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
@@ -482,8 +477,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
- (8, self.resources.resLabel2_value, 97, 137, 3,
- uno.Any("short",69), 136))
+ (8, self.resources.resLabel2_value, 97, 137, 3, 69, 136))
def buildStep4(self):
self.txtFooter = self.insertTextField("txtFooter",
@@ -496,8 +490,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
- (47, TXTFOOTER_HID, True, 97, 40, 4,
- uno.Any("short",25), 203), self)
+ (47, TXTFOOTER_HID, True, 97, 40, 4, 25, 203), self)
self.chkFooterNextPages = self.insertCheckBox("chkFooterNextPages",
CHKFOOTERNEXTPAGES_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
@@ -511,7 +504,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, CHKFOOTERNEXTPAGES_HID,
self.resources.reschkFooterNextPages_value, 97, 92,
- uno.Any("short",0), 4, uno.Any("short",26), 202), self)
+ 0, 4, 26, 202), self)
self.chkFooterPageNumbers = self.insertCheckBox("chkFooterPageNumbers",
CHKFOOTERPAGENUMBERS_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
@@ -525,7 +518,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, CHKFOOTERPAGENUMBERS_HID,
self.resources.reschkFooterPageNumbers_value, 97, 106,
- uno.Any("short",0), 4, uno.Any("short",27), 201), self)
+ 0, 4, 27, 201), self)
self.lblFooter = self.insertLabel("lblFooter",
("FontDescriptor",
PropertyNames.PROPERTY_HEIGHT,
@@ -536,7 +529,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(self.fontDescriptor4, 8, self.resources.reslblFooter_value,
- 97, 28, 4, uno.Any("short",33), 116))
+ 97, 28, 4, 33, 116))
self.lblTitle5 = self.insertLabel("lblTitle5",
("FontDescriptor",
PropertyNames.PROPERTY_HEIGHT,
@@ -548,7 +541,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(self.fontDescriptor5, 16, self.resources.reslblTitle5_value,
- True, 91, 8, 4, uno.Any("short",61), 212))
+ True, 91, 8, 4, 61, 212))
def buildStep5(self):
self.txtTemplateName = self.insertTextField("txtTemplateName",
@@ -561,7 +554,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
"Text",
PropertyNames.PROPERTY_WIDTH),
- (12, TXTTEMPLATENAME_HID, 202, 56, 5, uno.Any("short",28),
+ (12, TXTTEMPLATENAME_HID, 202, 56, 5, 28,
self.resources.restxtTemplateName_value, 100), self)
self.optCreateFax = self.insertRadioButton("optCreateFax",
@@ -575,7 +568,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(8, OPTCREATEFAX_HID, self.resources.resoptCreateFax_value,
- 104, 111, 5, uno.Any("short",30), 198), self)
+ 104, 111, 5, 30, 198), self)
self.optMakeChanges = self.insertRadioButton("optMakeChanges",
OPTMAKECHANGES_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
@@ -587,7 +580,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(8, OPTMAKECHANGES_HID, self.resources.resoptMakeChanges_value,
- 104, 123, 5, uno.Any("short",31), 198), self)
+ 104, 123, 5, 31, 198), self)
self.lblFinalExplanation1 = self.insertLabel("lblFinalExplanation1",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
@@ -598,7 +591,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(28, self.resources.reslblFinalExplanation1_value,
- True, 97, 28, 5, uno.Any("short",34), 205))
+ True, 97, 28, 5, 34, 205))
self.lblProceed = self.insertLabel("lblProceed",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
@@ -608,7 +601,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblProceed_value, 97, 100, 5,
- uno.Any("short",35), 204))
+ 35, 204))
self.lblFinalExplanation2 = self.insertLabel("lblFinalExplanation2",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
@@ -619,7 +612,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(33, self.resources.reslblFinalExplanation2_value, True, 104, 145, 5,
- uno.Any("short",36), 199))
+ 36, 199))
self.ImageControl2 = self.insertImage("ImageControl2",
("Border",
PropertyNames.PROPERTY_HEIGHT,
@@ -630,8 +623,8 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
- (uno.Any("short",0), 10, UIConsts.INFOIMAGEURL, 92, 145,
- False, 5, uno.Any("short",47), 10))
+ (0, 10, UIConsts.INFOIMAGEURL, 92, 145,
+ False, 5, 47, 10))
self.lblTemplateName = self.insertLabel("lblTemplateName",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_LABEL,
@@ -641,7 +634,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(8, self.resources.reslblTemplateName_value, 97, 58, 5,
- uno.Any("short",57), 101))
+ 57, 101))
self.lblTitle6 = self.insertLabel("lblTitle6",
("FontDescriptor",
@@ -654,4 +647,4 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(self.fontDescriptor5, 16, self.resources.reslblTitle6_value,
- True, 91, 8, 5, uno.Any("short",62), 212))
+ True, 91, 8, 5, 62, 212))
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index 5abc8c0..615e0cd 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
@@ -181,11 +181,11 @@ class FaxWizardDialogImpl(FaxWizardDialog):
loadValues[1] = uno.createUnoStruct( \
'com.sun.star.beans.PropertyValue')
loadValues[1].Name = "MacroExecutionMode"
- loadValues[1].Value = uno.Any("short", ALWAYS_EXECUTE)
+ loadValues[1].Value = ALWAYS_EXECUTE
loadValues[2] = uno.createUnoStruct( \
'com.sun.star.beans.PropertyValue')
loadValues[2].Name = "UpdateDocMode"
- loadValues[2].Value = uno.Any("short", FULL_UPDATE)
+ loadValues[2].Value = FULL_UPDATE
loadValues[3] = uno.createUnoStruct( \
'com.sun.star.beans.PropertyValue')
loadValues[3].Name = "InteractionHandler"
@@ -198,8 +198,7 @@ class FaxWizardDialogImpl(FaxWizardDialog):
oDoc = OfficeDocument.load(Desktop.getDesktop(self.xMSF),
self.sPath, "_default", loadValues)
myViewHandler = ViewHandler(self.xMSF, oDoc)
- myViewHandler.setViewSetting("ZoomType",
- uno.Any("short",OPTIMAL))
+ myViewHandler.setViewSetting("ZoomType", OPTIMAL)
else:
pass
#TODO: Error Handling
@@ -295,8 +294,8 @@ class FaxWizardDialogImpl(FaxWizardDialog):
tuple(self.BusinessFiles[0]))
self.setControlProperty("lstPrivateStyle", "StringItemList",
tuple(self.PrivateFiles[0]))
- self.setControlProperty("lstBusinessStyle", "SelectedItems", [0])
- self.setControlProperty("lstPrivateStyle", "SelectedItems" , [0])
+ self.setControlProperty("lstBusinessStyle", "SelectedItems", (0,))
+ self.setControlProperty("lstPrivateStyle", "SelectedItems" , (0,))
return True
except NoValidPathException, e:
# TODO Auto-generated catch block
@@ -313,7 +312,8 @@ class FaxWizardDialogImpl(FaxWizardDialog):
self.setControlProperty("chkUseDate",
PropertyNames.PROPERTY_ENABLED,
self.myFaxDoc.hasElement("Date"))
- self.myFaxDoc.updateDateFields()
+ #COMMENTED
+ #self.myFaxDoc.updateDateFields()
def initializeSalutation(self):
self.setControlProperty("lstSalutation", "StringItemList",
diff --git a/wizards/com/sun/star/wizards/text/TextDocument.py b/wizards/com/sun/star/wizards/text/TextDocument.py
index fb97048..09cae95 100644
--- a/wizards/com/sun/star/wizards/text/TextDocument.py
+++ b/wizards/com/sun/star/wizards/text/TextDocument.py
@@ -136,7 +136,7 @@ class TextDocument(object):
myViewHandler = ViewHandler(self.xTextDocument, self.xTextDocument)
try:
myViewHandler.setViewSetting(
- "ZoomType", uno.Any("short",ENTIRE_PAGE))
+ "ZoomType", ENTIRE_PAGE)
except Exception, e:
traceback.print_exc()
myFieldHandler = TextFieldHandler(self.xMSF, self.xTextDocument)
diff --git a/wizards/com/sun/star/wizards/text/TextFieldHandler.py b/wizards/com/sun/star/wizards/text/TextFieldHandler.py
index 22f94a3..97d578d 100644
--- a/wizards/com/sun/star/wizards/text/TextFieldHandler.py
+++ b/wizards/com/sun/star/wizards/text/TextFieldHandler.py
@@ -176,7 +176,7 @@ class TextFieldHandler(object):
def changeExtendedUserFieldContent(self, UserDataPart, _FieldContent):
try:
xDependentTextFields = self.__getTextFieldsByProperty(
- "UserDataType", uno.Any("short",UserDataPart), "Short")
+ "UserDataType", UserDataPart, "Short")
if xDependentTextFields != None:
i = 0
while i < xDependentTextFields.length:
diff --git a/wizards/com/sun/star/wizards/text/TextSectionHandler.py b/wizards/com/sun/star/wizards/text/TextSectionHandler.py
index 98a19ab..67eee12 100644
--- a/wizards/com/sun/star/wizards/text/TextSectionHandler.py
+++ b/wizards/com/sun/star/wizards/text/TextSectionHandler.py
@@ -10,10 +10,11 @@ class TextSectionHandler(object):
def removeTextSectionbyName(self, SectionName):
try:
xAllTextSections = self.xTextDocument.TextSections
- if xAllTextSections.hasByName(SectionName) == True:
+ if xAllTextSections.hasByName(SectionName):
oTextSection = self.xTextDocument.TextSections.getByName(
SectionName)
- removeTextSection(oTextSection)
+ self.removeTextSection(oTextSection)
+
except Exception, exception:
traceback.print_exc()
@@ -27,7 +28,7 @@ class TextSectionHandler(object):
xAllTextSections = self.xTextDocument.TextSections
oTextSection = xAllTextSections.getByIndex(
xAllTextSections.getCount() - 1)
- removeTextSection(oTextSection)
+ self.removeTextSection(oTextSection)
except Exception, exception:
traceback.print_exc()
diff --git a/wizards/com/sun/star/wizards/text/ViewHandler.py b/wizards/com/sun/star/wizards/text/ViewHandler.py
index 9a646da..32533aa 100644
--- a/wizards/com/sun/star/wizards/text/ViewHandler.py
+++ b/wizards/com/sun/star/wizards/text/ViewHandler.py
@@ -1,5 +1,3 @@
-import uno
-
class ViewHandler(object):
'''Creates a new instance of View '''
@@ -32,8 +30,7 @@ class ViewHandler(object):
exception.printStackTrace(System.out)
def setViewSetting(self, Setting, Value):
- uno.invoke(self.xTextViewCursorSupplier.ViewSettings,"setPropertyValue",(
- Setting, Value))
+ setattr(self.xTextViewCursorSupplier.ViewSettings, Setting, Value)
def collapseViewCursorToStart(self):
xTextViewCursor = self.xTextViewCursorSupplier.ViewCursor
diff --git a/wizards/com/sun/star/wizards/ui/PathSelection.py b/wizards/com/sun/star/wizards/ui/PathSelection.py
index bc26854..2be27ac 100644
--- a/wizards/com/sun/star/wizards/ui/PathSelection.py
+++ b/wizards/com/sun/star/wizards/ui/PathSelection.py
@@ -1,5 +1,4 @@
import traceback
-import uno
from common.PropertyNames import *
from common.FileAccess import *
from common.SystemDialog import SystemDialog
@@ -41,7 +40,7 @@ class PathSelection(object):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(Enabled, 8, LabelText, XPos, YPos, DialogStep,
- uno.Any("short",CurTabIndex), Width))
+ CurTabIndex, Width))
self.xSaveTextBox = self.CurUnoDialog.insertTextField(
"txtSavePath", "callXPathSelectionListener",
(PropertyNames.PROPERTY_ENABLED,
@@ -53,7 +52,7 @@ class PathSelection(object):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(Enabled, 12, TxtHelpURL, XPos, YPos + 10, DialogStep,
- uno.Any("short",(CurTabIndex + 1)), Width - 26), self)
+ (CurTabIndex + 1), Width - 26), self)
self.CurUnoDialog.setControlProperty("txtSavePath",
PropertyNames.PROPERTY_ENABLED, False )
@@ -68,7 +67,7 @@ class PathSelection(object):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(Enabled, 14, BtnHelpURL, "...",XPos + Width - 16, YPos + 9,
- DialogStep, uno.Any("short",(CurTabIndex + 2)), 16), self)
+ DialogStep, (CurTabIndex + 2), 16), self)
def addSelectionListener(self, xAction):
self.xAction = xAction
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.py b/wizards/com/sun/star/wizards/ui/UnoDialog.py
index 6a79746..15412db 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.py
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.py
@@ -50,35 +50,11 @@ class UnoDialog(object):
if not self.xDialogModel.hasByName(ControlName):
return
xPSet = self.xDialogModel.getByName(ControlName)
- if isinstance(PropertyValue,bool):
- xPSet.setPropertyValue(PropertyName, PropertyValue)
- else:
- methodname = "[]string"
- if not isinstance(PropertyValue,tuple):
- if isinstance(PropertyValue,list):
- methodname = "[]short"
- PropertyValue = tuple(PropertyValue)
- else:
- PropertyValue = (PropertyValue,)
-
- uno.invoke(xPSet, "setPropertyValue", (PropertyName,
- uno.Any( methodname, PropertyValue)))
+ setattr(xPSet,PropertyName, PropertyValue)
except Exception, exception:
traceback.print_exc()
- def transform( self, struct , propName, value ):
- myinv = self.inv.createInstanceWithArguments( (struct,) )
- access = self.insp.inspect( myinv )
- method = access.getMethod( "setValue" , -1 )
- uno.invoke( method, "invoke", ( myinv, ( propName , value ) ))
- method = access.getMethod( "getMaterial" , -1 )
- ret,dummy = method.invoke(myinv,() )
- return ret
-
- def getResource(self):
- return self.m_oResource
-
def setControlProperties(
self, ControlName, PropertyNames, PropertyValues):
self.setControlProperty(ControlName, PropertyNames, PropertyValues)
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog2.py b/wizards/com/sun/star/wizards/ui/UnoDialog2.py
index 4fcdadb..0bf8686 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog2.py
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog2.py
@@ -136,8 +136,7 @@ class UnoDialog2(UnoDialog):
PropertyNames.PROPERTY_POSITION_Y, "ScaleImage",
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_WIDTH),
- (uno.Any("short",0), 10,
- UIConsts.INFOIMAGEURL, _posx, _posy, False, _iStep, 10))
+ (0, 10, UIConsts.INFOIMAGEURL, _posx, _posy, False, _iStep, 10))
return xImgControl
'''
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.py b/wizards/com/sun/star/wizards/ui/WizardDialog.py
index 18e3dc9..f32f01a 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.py
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.py
@@ -85,8 +85,7 @@ class WizardDialog(UnoDialog2):
if self.oRoadmap != None:
nCurItemID = self.getCurrentRoadmapItemID()
if nCurItemID != ID:
- Helper.setUnoPropertyValue(self.oRoadmap, "CurrentItemID",
- uno.Any("short",ID))
+ Helper.setUnoPropertyValue(self.oRoadmap, "CurrentItemID",ID)
def getCurrentRoadmapItemID(self):
try:
@@ -114,7 +113,7 @@ class WizardDialog(UnoDialog2):
PropertyNames.PROPERTY_TABINDEX, "Tabstop",
PropertyNames.PROPERTY_WIDTH),
((iDialogHeight - 26), 0, 0, 0,
- uno.Any("short",0), True, uno.Any("short",85)))
+ 0, True, 85))
self.oRoadmap.setPropertyValue(
PropertyNames.PROPERTY_NAME, "rdmNavi")
@@ -468,7 +467,7 @@ class WizardDialog(UnoDialog2):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),(
oFontDesc, 16, self.sRightPaneHeaders(i),
- True, 91, 8, i + 1, uno.Any("short",12), 212))
+ True, 91, 8, i + 1, 12, 212))
i += 1
def cancelWizard(self):
diff --git a/wizards/com/sun/star/wizards/ui/event/CommonListener.py b/wizards/com/sun/star/wizards/ui/event/CommonListener.py
index 1ab35e3..6ff0366 100644
--- a/wizards/com/sun/star/wizards/ui/event/CommonListener.py
+++ b/wizards/com/sun/star/wizards/ui/event/CommonListener.py
@@ -33,7 +33,6 @@
#**********************************************************************
# OOo's libraries
-import uno
import unohelper
import inspect
diff --git a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.py b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
index 2564b88..cca27ae 100644
--- a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
+++ b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
@@ -141,8 +141,7 @@ class UnoDataAware(DataAware):
@classmethod
def attachCheckBox(self, data, prop, checkBox, listener, field):
if field:
- aux = DataAwareFields.getFieldValueFor(
- data, prop, uno.Any("short",0))
+ aux = DataAwareFields.getFieldValueFor(data, prop, 0)
else:
aux = DataAware.PropertyValue (prop, data)
uda = UnoDataAware(data, aux , checkBox, PropertyNames.PROPERTY_STATE)
More information about the Libreoffice-commits
mailing list