diff options
| author | Xisco Fauli <anistenis@gmail.com> | 2011-06-21 21:11:36 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-18 02:13:21 +0200 |
| commit | 439dd36f931c355c5095753d356a472e8767899a (patch) | |
| tree | 677f0723834695b8e7d1f405c275ccaa7d0a84fa /wizards/com | |
| parent | 6ac14d3752a315013bfd048a2b7f624d36d4eb3c (diff) | |
Add an import I deleted by mistake
Diffstat (limited to 'wizards/com')
| -rw-r--r-- | wizards/com/sun/star/wizards/common/FileAccess.py | 2 | ||||
| -rw-r--r-- | wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/wizards/com/sun/star/wizards/common/FileAccess.py b/wizards/com/sun/star/wizards/common/FileAccess.py index c23be6865989..699e293c3bfc 100644 --- a/wizards/com/sun/star/wizards/common/FileAccess.py +++ b/wizards/com/sun/star/wizards/common/FileAccess.py @@ -3,6 +3,7 @@ from NoValidPathException import * from com.sun.star.ucb import CommandAbortedException from com.sun.star.awt.VclWindowPeerAttribute import OK, YES_NO import types +from os import path as osPath ''' This class delivers static convenience methods @@ -571,6 +572,7 @@ class FileAccess(object): osPath.abspath(path)) return r except Exception: + traceback.print_exc() return None def getPath(self, parentURL, childURL): diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py index 615e0cdc1321..2d49456f90ee 100644 --- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py +++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py @@ -135,16 +135,12 @@ class FaxWizardDialogImpl(FaxWizardDialog): self.myFaxDoc.setWizardTemplateDocInfo( \ self.resources.resFaxWizardDialog_title, self.resources.resTemplateDescription) - endWizard = True try: fileAccess = FileAccess(self.xMSF) self.sPath = self.myPathSelection.getSelectedPath() if self.sPath == "": self.myPathSelection.triggerPathPicker() self.sPath = self.myPathSelection.getSelectedPath() - if self.sPath == "": - endWizard = False - return self.sPath = fileAccess.getURL(self.sPath) #first, if the filename was not changed, thus @@ -206,9 +202,8 @@ class FaxWizardDialogImpl(FaxWizardDialog): except Exception, e: traceback.print_exc() finally: - if endWizard: - self.xUnoDialog.endExecute() - self.running = False + self.xUnoDialog.endExecute() + self.running = False return True |