From 8594ff4e6b1a8ea16f4b11c91b2e3f3971073bf6 Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Wed, 20 Nov 2013 23:40:59 +0100 Subject: pyweb: fix finish button behavior Change-Id: I6f9313f721ca07e98107cd2770f5846ffae0171a --- wizards/com/sun/star/wizards/web/WWD_Events.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'wizards/com/sun') diff --git a/wizards/com/sun/star/wizards/web/WWD_Events.py b/wizards/com/sun/star/wizards/web/WWD_Events.py index d0f65080b830..05479837c854 100644 --- a/wizards/com/sun/star/wizards/web/WWD_Events.py +++ b/wizards/com/sun/star/wizards/web/WWD_Events.py @@ -768,8 +768,7 @@ class WWD_Events(WWD_Startup): ''' def finishWizard(self): - self.finishWizard1(True) - return True + return self.finishWizard1(True) ''' finish the wizard @@ -792,10 +791,10 @@ class WWD_Events(WWD_Startup): if self.showFTPDialog(p): self.updatePublishUI(2) #now continue... - self.finishWizard2() + return self.finishWizard2() else: - self.finishWizard2() + return self.finishWizard2() ''' this method is only called @@ -829,7 +828,7 @@ class WWD_Events(WWD_Startup): (or rather:clicked) ''' if not self.publishTargetApproved(): - return + return False ''' In order to save the session correctly, I return the value of the ftp publisher cp_Publish @@ -842,7 +841,7 @@ class WWD_Events(WWD_Startup): if self.isSaveSession(): # if canceled by user if not self.saveSession(): - return + return False else: self.settings.cp_LastSavedSession = "" @@ -880,6 +879,7 @@ class WWD_Events(WWD_Startup): self.process.runProcess() self.finishWizardFinished() self.process.myTask.removeTaskListener(pd) + return True except Exception: traceback.print_exc() -- cgit v1.2.3