[Libreoffice-commits] .: Branch 'feature/gsoc2011_wizards' - wizards/com

[Xisco Fauli]

 wizards/com/sun/star/wizards/common/FileAccess.py       |    2 ++
 wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py |    9 ++-------
 2 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 1a18c889b4022471f33bfc6f85c2b052880a6672
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Tue Jun 21 21:11:36 2011 +0200

    Add an import I deleted by mistake

diff --git a/wizards/com/sun/star/wizards/common/FileAccess.py b/wizards/com/sun/star/wizards/common/FileAccess.py
index 8a6b145..7506336 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 615e0cd..2d49456 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