[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 2 commits - wizards/com

[Xisco Fauli]

 wizards/com/sun/star/wizards/web/WWD_Events.py         |   12 ++++-----
 wizards/com/sun/star/wizards/web/data/CGGeneralInfo.py |   22 -----------------
 2 files changed, 6 insertions(+), 28 deletions(-)

New commits:
commit eca6b8eb8e0d15046810d8d5e0bebe99b79dba48
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Wed Nov 20 23:53:35 2013 +0100

    pyweb: remove unused code
    
    Change-Id: I6141e314e04222544f8fe356d8cdfd3be1984840

diff --git a/wizards/com/sun/star/wizards/web/data/CGGeneralInfo.py b/wizards/com/sun/star/wizards/web/data/CGGeneralInfo.py
index 4fcbd60..e814ec4 100644
--- a/wizards/com/sun/star/wizards/web/data/CGGeneralInfo.py
+++ b/wizards/com/sun/star/wizards/web/data/CGGeneralInfo.py
@@ -37,25 +37,3 @@ class CGGeneralInfo(ConfigGroup):
             [self.cp_Title, self.cp_Author, self.cp_Description,
                 str(self.cp_CreationDate), str(self.cp_UpdateDate),
                 self.cp_Email, self.cp_Copyright])
-
-    def getCreationDate(self):
-        if self.cp_CreationDate == 0:
-            self.cp_CreationDate = currentDate()
-
-        return self.cp_CreationDate
-
-    def getUpdateDate(self):
-        if self.cp_UpdateDate == 0:
-            self.cp_UpdateDate = currentDate()
-
-        return self.cp_UpdateDate
-
-    def setCreationDate(self, i):
-        self.cp_CreationDate = i.intValue()
-
-    def setUpdateDate(self, i):
-        self.cp_UpdateDate = i.intValue()
-
-    def currentDate(self):
-        dt = JavaTools.getDateTime(System.currentTimeMillis())
-        return dt.Day + dt.Month * 100 + dt.Year * 10000
commit 96a27822db655c3788dbbd5a50f1949cb652df3f
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Wed Nov 20 23:40:59 2013 +0100

    pyweb: fix finish button behavior
    
    Change-Id: I6f9313f721ca07e98107cd2770f5846ffae0171a

diff --git a/wizards/com/sun/star/wizards/web/WWD_Events.py b/wizards/com/sun/star/wizards/web/WWD_Events.py
index 0e75c23..4508102 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()