[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - wizards/com

[Julien Nabet]

 wizards/com/sun/star/wizards/web/WWD_Events.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bdc50ac10d5987b7d0545d765f4097c9246a2dc0
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Jul 4 16:20:32 2015 +0200

    tdf#92404: Web Wizard - no result / crash
    
    Fixes
    Traceback (most recent call last):
      File "/home/laci/m/bibisect/lo-linux-dbgutil-daily/opt/program/wizards/web/WWD_Events.py", line 249, in addDocument
        oLoadDocs = self.LoadDocs(self.xMSF, self.xUnoDialog, files, self)
    TypeError: __init__() missing 1 required positional argument: 'parent_'
    
    and:
    Traceback (most recent call last):
      File "/home/julien/compile-libreoffice/libreoffice/instdir/program/wizards/web/WWD_Events.py", line 252, in addDocument
        oLoadDocs.loadDocuments()
      File "/home/julien/compile-libreoffice/libreoffice/instdir/program/wizards/web/WWD_Events.py", line 934, in loadDocuments
        doc.cp_URL = FileAccess.connectURLs(files[0], self.files[i])
    NameError: global name 'files' is not defined
    
    Change-Id: I737117a6981e541f12453bb9d9b2680f5fb79142
    Reviewed-on: https://gerrit.libreoffice.org/16756
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 2f0d1a23759c1b973593bfba642d01fb3df3c269)
    Reviewed-on: https://gerrit.libreoffice.org/17035

diff --git a/wizards/com/sun/star/wizards/web/WWD_Events.py b/wizards/com/sun/star/wizards/web/WWD_Events.py
index 72b393e..4f2208c 100644
--- a/wizards/com/sun/star/wizards/web/WWD_Events.py
+++ b/wizards/com/sun/star/wizards/web/WWD_Events.py
@@ -246,7 +246,7 @@ class WWD_Events(WWD_Startup):
                 sd = self.getStatusDialog()
                 sd.setLabel(self.resources.resValidatingDocuments)
                 sd.execute(self, task, self.resources.prodName)
-                oLoadDocs = self.LoadDocs(self.xMSF, self.xUnoDialog, files, self)
+                oLoadDocs = self.LoadDocs(self.xMSF, self.xUnoDialog, files, task, self)
                 oLoadDocs.loadDocuments()
                 task.removeTaskListener(sd)
             else:
@@ -926,7 +926,7 @@ class WWD_Events(WWD_Startup):
                 if start == 0:
                     doc.cp_URL = self.files[i]
                 else:
-                    doc.cp_URL = FileAccess.connectURLs(files[0], self.files[i])
+                    doc.cp_URL = FileAccess.connectURLs(self.files[0], self.files[i])
 
                 '''
                 so - i check each document and if it is ok I add it.