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

[Julien Nabet]

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

New commits:
commit cfc880da034ae4a504042d3e78703e338eb43ff8
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Sep 21 21:55:20 2015 +0200

    tdf#94421: Web Wizard, option shift when loading saved session
    
    Just use the right order
    LOCAL_PUBLISHER first, ZIP_PUBLISHER second, FTP_PUBLISHER third and last one
    
    Change-Id: I23ff96785910d62bbb2c221932d0ad2a2e755b3c
    Reviewed-on: https://gerrit.libreoffice.org/18755
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 09c3e186e8b8562e3d502c5cbdef385753336b7f)
    Reviewed-on: https://gerrit.libreoffice.org/18758
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/wizards/com/sun/star/wizards/web/WWD_Startup.py b/wizards/com/sun/star/wizards/web/WWD_Startup.py
index d3a0f29..5dce0e1 100644
--- a/wizards/com/sun/star/wizards/web/WWD_Startup.py
+++ b/wizards/com/sun/star/wizards/web/WWD_Startup.py
@@ -494,8 +494,8 @@ class WWD_Startup(WWD_General):
         self.mountList(session.cp_GeneralInfo, self.genAware)
         task.advance(True)
         self.mountDataAware(session.cp_Publishing.getElement(LOCAL_PUBLISHER), 0)
-        self.mountDataAware(session.cp_Publishing.getElement(FTP_PUBLISHER), 1)
-        self.mountDataAware(session.cp_Publishing.getElement(ZIP_PUBLISHER), 2)
+        self.mountDataAware(session.cp_Publishing.getElement(ZIP_PUBLISHER), 1)
+        self.mountDataAware(session.cp_Publishing.getElement(FTP_PUBLISHER), 2)
         task.advance(True)
         self.sessionNameDA.setDataObject(session, True)
         self.chkSaveSettings.Model.State = 1