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

2015-11-05 Thread Lionel Elie Mamane 
 wizards/com/sun/star/wizards/db/SQLQueryComposer.java |   26 +++---
 wizards/com/sun/star/wizards/ui/FilterComponent.java  |4 +-
 2 files changed, 24 insertions(+), 6 deletions(-)

New commits:
commit c7a520868ecf6d5de48dc3964a7bccab3fa480c3
Author: Lionel Elie Mamane 
Date:   Wed Oct 28 17:41:44 2015 +0100

base new query wizard: fix confusion between display name and field name

Change-Id: I75354ffea2daede55b34e4cf3321d57196be3d9b
Reviewed-on: https://gerrit.libreoffice.org/19652
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java 
b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index 0a30846..c9c9400 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -77,7 +77,7 @@ public class SQLQueryComposer
 int iAggregate = 
CurDBMetaData.getAggregateIndex(CurDBMetaData.FieldColumns[i].getDisplayFieldName());
 if (iAggregate > -1)
 {
-sSelectClause += 
CurDBMetaData.AggregateFieldNames[iAggregate][1] + "(" + 
getComposedAliasFieldName(CurDBMetaData.AggregateFieldNames[iAggregate][0]) + 
")";
+sSelectClause += 
CurDBMetaData.AggregateFieldNames[iAggregate][1] + "(" + 
getComposedAliasDisplayName(CurDBMetaData.AggregateFieldNames[iAggregate][0]) + 
")";
 if (_baddAliasFieldNames)
 {
 sSelectClause += 
getAliasFieldNameClause(CurDBMetaData.AggregateFieldNames[iAggregate][0]);
@@ -85,7 +85,7 @@ public class SQLQueryComposer
 }
 else
 {
-sSelectClause += 
getComposedAliasFieldName(CurDBMetaData.FieldColumns[i].getDisplayFieldName());
+sSelectClause += 
getComposedAliasDisplayName(CurDBMetaData.FieldColumns[i].getDisplayFieldName());
 if (_baddAliasFieldNames)
 {
 sSelectClause += 
getAliasFieldNameClause(CurDBMetaData.FieldColumns[i].getDisplayFieldName());
@@ -182,7 +182,7 @@ public class SQLQueryComposer
 {
 sOrder += ", ";
 }
-sOrder += CurDBMetaData.AggregateFieldNames[iAggregate][1] + 
"(" + 
getComposedAliasFieldName(CurDBMetaData.AggregateFieldNames[iAggregate][0]) + 
")";
+sOrder += CurDBMetaData.AggregateFieldNames[iAggregate][1] + 
"(" + 
getComposedAliasDisplayName(CurDBMetaData.AggregateFieldNames[iAggregate][0]) + 
")";
 sOrder += " " + CurDBMetaData.getSortFieldNames()[i][1];
 m_queryComposer.setOrder(sOrder);
 }
@@ -311,7 +311,7 @@ public class SQLQueryComposer
 }
 }
 
-private String getComposedAliasFieldName(String _fieldname)
+private String getComposedAliasDisplayName(String _fieldname)
 {
 FieldColumn CurFieldColumn = 
CurDBMetaData.getFieldColumnByDisplayName(_fieldname);
 final String curCommandName = CurFieldColumn.getCommandName();
@@ -329,6 +329,24 @@ public class SQLQueryComposer
 return quoteName(curAliasName) + "." + quoteName(curFieldName);
 }
 
+private String getComposedAliasFieldName(String _fieldname)
+{
+FieldColumn CurFieldColumn = 
CurDBMetaData.getFieldColumnByFieldName(_fieldname);
+final String curCommandName = CurFieldColumn.getCommandName();
+final String curFieldName = CurFieldColumn.getFieldName();
+CommandName curComposedCommandName = 
getComposedCommandByDisplayName(curCommandName);
+if (curComposedCommandName == null)
+{
+//return _fieldname;
+if ( curCommandName.length() > 0 )
+return quoteName(curCommandName) + "." + 
quoteName(curFieldName);
+else
+return quoteName(curFieldName);
+}
+String curAliasName = curComposedCommandName.getAliasName();
+return quoteName(curAliasName) + "." + quoteName(curFieldName);
+}
+
 private CommandName getComposedCommandByAliasName(String _AliasName)
 {
 if (composedCommandNames != null)
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java 
b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index 186dcc4..19f7efd 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -119,7 +119,7 @@ public class FilterComponent
 String sControlNameSuffix = sIncSuffix + "_" + 
getIndexNumber(sControlName);
 XListBox xCurFieldListBox = 
UnoRuntime.queryInterface(XListBox.class, 
CurUnoDialog.xDlgContainer.getControl(sControlName));
 String CurDisplayFieldName = 
xCurFieldListBox.getSelectedItem();
-

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

2015-10-08 Thread Julien Nabet 
 wizards/com/sun/star/wizards/common/UCB.py  |2 +-
 wizards/com/sun/star/wizards/web/FTPDialog.py   |8 
 wizards/com/sun/star/wizards/web/WWD_Events.py  |2 +-
 wizards/com/sun/star/wizards/web/WWD_Startup.py |2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 2cb902341e0825a212527865ec0cde5d56543d34
Author: Julien Nabet 
Date:   Sun Oct 4 01:00:57 2015 +0200

tdf#94743: Web Wizard: Cannot export in ftp

1) Fix value of constants RES_OK, RES_CANCEL and RES_HELP

http://opengrok.libreoffice.org/xref/core/offapi/com/sun/star/awt/PushButtonType.idl#29

2) self.updatePublishUI was wrong because FTP appears in second but there 
are 2 elements
for each module (local dir, zip, ftp) in pubAware vector
comment was wrong:
- local takes elements 0 and 1
- zip takes elements 2 and 3
- ftp takes elements 4 (that's why "4" is the right value) and 5
see 
http://opengrok.libreoffice.org/xref/core/wizards/com/sun/star/wizards/web/WWD_Startup.py#509
So fix value passed to self.updatePublishUI + comment

Just a bit of history:
before fix of tdf#92934: Web Wizard: Cannot Export Zip archive 
(http://cgit.freedesktop.org/libreoffice/core/commit/?id=e72a4a3c2e1608e301daef0b6e87cc70d814e736),
the order seemed to be this one for pubAware: local, ftp, zip (whereas UI 
order was already local, zip and ftp)
Perhaps the fix was wrong since there was a similar pb for tdf#94421: Web 
Wizard, option shift when loading saved session

Anyway now the pubAware order is the same as UI order, it may help for 
readability.

minor
a) increase space for lblStatus (there weren't enough room for some 
locales, eg French)
b) replace use of copy3 (deprecated) by copy2

Change-Id: I27d3c2dd699fbe2d51a63e462c7b39e78895d1be
Reviewed-on: https://gerrit.libreoffice.org/19115
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 
(cherry picked from commit e3f8eb8d3a594e3b8afa51c214f6c5c44d8dde4e)
Reviewed-on: https://gerrit.libreoffice.org/19118
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/wizards/com/sun/star/wizards/common/UCB.py 
b/wizards/com/sun/star/wizards/common/UCB.py
index 3689b14..4d97c01 100644
--- a/wizards/com/sun/star/wizards/common/UCB.py
+++ b/wizards/com/sun/star/wizards/common/UCB.py
@@ -64,7 +64,7 @@ class UCB(object):
 def copy1(self, sourceDir, targetDir, verifier):
 files = self.listFiles(sourceDir, verifier)
 for i in range(len(files)):
-  self.copy3(sourceDir, files[i], targetDir)
+  self.copy2(sourceDir, files[i], targetDir, "")
 
 def copy2(self, sourceDir, filename, targetDir, targetName):
 if (not self.fa.exists(targetDir, True)):
diff --git a/wizards/com/sun/star/wizards/web/FTPDialog.py 
b/wizards/com/sun/star/wizards/web/FTPDialog.py
index 07720d1..96bc2db 100644
--- a/wizards/com/sun/star/wizards/web/FTPDialog.py
+++ b/wizards/com/sun/star/wizards/web/FTPDialog.py
@@ -51,9 +51,9 @@ from com.sun.star.ucb.OpenMode import FOLDERS
 # the members ip, username, and password (via the methods setXXX(...))
 # for details see the ui.events.DataAware classes. 
 class FTPDialog(WizardDialog):
-RES_OK = 2
-RES_CANCEL = 3
-RES_HELP = 4
+RES_OK = 1
+RES_CANCEL = 2
+RES_HELP = 3
 
 # A Constant used for the setLabel(int) method to change the
 # status-display. "unknown" is the status when the user first
@@ -160,7 +160,7 @@ class FTPDialog(WizardDialog):
 (0, 14, 68, 80, False, False, 14))
 self.lblStatus = self.insertLabel("lblStatus",
 PROPNAMES_LABEL,
-(8, self.resources.resFTPDisconnected, "lblStatus", 86, 82, 9, 
99))
+(8, self.resources.resFTPDisconnected, "lblStatus", 86, 82, 9, 
130))
 self.ln3 = self.insertFixedLine("ln3",
 PROPNAMES_LABEL,
 (8, self.resources.resln3_value, "ln3", 6, 100, 10, 210))
diff --git a/wizards/com/sun/star/wizards/web/WWD_Events.py 
b/wizards/com/sun/star/wizards/web/WWD_Events.py
index 42b4184..8f6cfb0 100644
--- a/wizards/com/sun/star/wizards/web/WWD_Events.py
+++ b/wizards/com/sun/star/wizards/web/WWD_Events.py
@@ -434,7 +434,7 @@ class WWD_Events(WWD_Startup):
 def setFTPPublish(self):
 if self.showFTPDialog(self.getPublisher(FTP_PUBLISHER)):
 self.getPublisher(FTP_PUBLISHER).cp_Publish = True
-self.updatePublishUI(2)
+self.updatePublishUI(4)
 
 '''
 show the ftp dialog
diff --git a/wizards/com/sun/star/wizards/web/WWD_Startup.py 
b/wizards/com/sun/star/wizards/web/WWD_Startup.py
index 5dce0e1..e022766 100644
--- a/wizards/com/sun/star/wizards/web/WWD_Startup.py
+++ b/wizards/com/sun/star/wizards/web/WWD_Startup.py
@@ -513,7 +513,7 @@ class

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

2015-10-08 Thread Julien Nabet 
 wizards/com/sun/star/wizards/web/FTPDialog.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3a3fb3c5dcbbe974e2f49669bf14937f14261d8a
Author: Julien Nabet 
Date:   Sat Oct 3 18:15:37 2015 +0200

Web Wizard, ftp part: fix logic for dialog

Comment indicated "If one of these fields is empty, the button is disabled",
let's stick to this.

Cherry-picked from 2ff595dbf2b42b4b3ee961b63e5da92067aa8fd9

Change-Id: I99dd23339d888c33e7706935842a91f5da681ade
Reviewed-on: https://gerrit.libreoffice.org/19112
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/wizards/com/sun/star/wizards/web/FTPDialog.py 
b/wizards/com/sun/star/wizards/web/FTPDialog.py
index 96bc2db..b172622 100644
--- a/wizards/com/sun/star/wizards/web/FTPDialog.py
+++ b/wizards/com/sun/star/wizards/web/FTPDialog.py
@@ -249,7 +249,7 @@ class FTPDialog(WizardDialog):
 # according to the status of the hostname, username, password text fields.
 # If one of these fields is empty, the button is disabled.
 def enableTestButton(self):
-self.setEnabled(self.btnTestConnection, not self.isEmpty(self.host) or 
self.isEmpty(self.username) or self.isEmpty(self.password))
+self.setEnabled(self.btnTestConnection, not (self.isEmpty(self.host) 
or self.isEmpty(self.username) or self.isEmpty(self.password)))
 
 # @param s
 # @return True if the string is None or "".
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-10-01 Thread Julien Nabet 
 wizards/com/sun/star/wizards/web/FTPDialog.py  |   24 +++--
 wizards/com/sun/star/wizards/web/FTPDialogResources.py |2 -
 2 files changed, 11 insertions(+), 15 deletions(-)

New commits:
commit 05f24922fbf39c00b6d06f8594f0cd9b06b40b2c
Author: Julien Nabet 
Date:   Fri Sep 25 00:02:41 2015 +0200

tdf#92553: Web Wizard: Not open FTP Configure on Web Wizard Preview Setting

Inherit from WizardDialog instead of object
Define required constants for buttons
Remove or tweak calls to super methods
Fix call setDialogProperties which was wrong since unification of this 
method
See ee122cfd36b3af030520f26a6a313bc7cd3156fd

With the patch, FTP dialog opens, we can also connect successfully to an 
ftp server
Still there are bugs to fix then, first of them directory selection

Change-Id: I86c3c9638114216627d92832c26ad780c12860b4
Reviewed-on: https://gerrit.libreoffice.org/18831
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 7e09b3656472bd5a3ef4090fd2ea6f521956fd53)
Reviewed-on: https://gerrit.libreoffice.org/19068

diff --git a/wizards/com/sun/star/wizards/web/FTPDialog.py 
b/wizards/com/sun/star/wizards/web/FTPDialog.py
index 8b63150..07720d1 100644
--- a/wizards/com/sun/star/wizards/web/FTPDialog.py
+++ b/wizards/com/sun/star/wizards/web/FTPDialog.py
@@ -19,7 +19,7 @@ import uno
 
 from .WWHID import *
 from .FTPDialogResources import FTPDialogResources
-from ..ui.UnoDialog2 import UnoDialog2
+from ..ui.WizardDialog import WizardDialog
 from ..ui.UIConsts import UIConsts
 from ..ui.event.DataAware import DataAware
 from ..ui.event.UnoDataAware import UnoDataAware
@@ -36,11 +36,6 @@ from com.sun.star.ucb import 
InteractiveNetworkResolveNameException
 from com.sun.star.ucb import OpenCommandArgument2
 from com.sun.star.ucb.OpenMode import FOLDERS
 
-#PushButtonType_OK_value = uno.getConstantByName( 
"com.sun.star.awt.PushButtonType.OK" )
-#PushButtonType_CANCEL_value = uno.getConstantByName( 
"com.sun.star.awt.PushButtonType.CANCEL" )
-#PushButtonType_HELP_value = uno.getConstantByName( 
"com.sun.star.awt.PushButtonType.HELP" )
-
-
 # This is the FTP Dialog. 
 # The Dialog enables the user:
 # (*) entering FTP server and user information.
@@ -55,7 +50,10 @@ from com.sun.star.ucb.OpenMode import FOLDERS
 # I use here the DataAware concept to automatically update
 # the members ip, username, and password (via the methods setXXX(...))
 # for details see the ui.events.DataAware classes. 
-class FTPDialog(UnoDialog2, UIConsts):
+class FTPDialog(WizardDialog):
+RES_OK = 2
+RES_CANCEL = 3
+RES_HELP = 4
 
 # A Constant used for the setLabel(int) method to change the
 # status-display. "unknown" is the status when the user first
@@ -97,7 +95,7 @@ class FTPDialog(UnoDialog2, UIConsts):
 # @throws Exception
 def __init__(self, xmsf, p, oWizardResource):
 
-super(FTPDialog, self).__init__(xmsf)
+super(FTPDialog, self).__init__(xmsf, HID_FTP)
 self.publish = p
 
 templateDir = p.root.soTemplateDir
@@ -113,8 +111,8 @@ class FTPDialog(UnoDialog2, UIConsts):
 self.ucb = UCB(xmsf)
 
 # set dialog properties...
-self.setDialogProperties( True, 160, HelpIds.getHelpIdString(HID_FTP),
-True, "FTPDialog", 167, 82, self.resources.resFTPDialog_title, 222)
+self.setDialogProperties(True, 210, True, 104, 52, 1, 1,
+self.resources.resFTPDialog_title, 310)
 
 # add controls to dialog
 self.build()
@@ -174,13 +172,13 @@ class FTPDialog(UnoDialog2, UIConsts):
 (14, HelpIds.getHelpIdString(HID_FTP_BTN_PATH), 
self.resources.resbtnDir_value, "btnDir", 199, 112, 12, 16), self)
 self.btnOK = self.insertButton("btnOK", None,
 PROPNAMES_BUTTON2,
-(14, HelpIds.getHelpIdString(HID_FTP_OK), 
self.resources.resbtnOK_value, "btnOK", 165, 142, PushButtonType_OK_value, 13, 
50), self)
+(14, HelpIds.getHelpIdString(HID_FTP_OK), 
self.resources.resbtnOK_value, "btnOK", 165, 142, self.RES_OK, 13, 50), self)
 self.btnCancel = self.insertButton("btnCancel",
 None, PROPNAMES_BUTTON2,
-(14, HelpIds.getHelpIdString(HID_FTP_CANCEL), 
self.resources.resbtnCancel_value, "btnCancel", 113, 142, 
PushButtonType_CANCEL_value, 14, 50), self)
+(14, HelpIds.getHelpIdString(HID_FTP_CANCEL), 
self.resources.resbtnCancel_value, "btnCancel", 113, 142, self.RES_CANCEL, 14, 
50), self)
 self.btnHelp = self.insertButton("btnHelp", None,
 PROPNAMES_BUTTON2,
-(14, "", self.resources.resbtnHelp_value, "btnHelp", 57, 142, 
PushButtonType_HELP_value, 15, 50), self)
+(14, "", self.resources.resbtnHelp_value, "btnHelp", 57, 142, 
self.RES_HELP, 15, 50), self)
 
 
 # Make hostname,

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

2015-09-23 Thread Julien Nabet 
 wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit db25bda687f2981dbad1109357dbc721e4104962
Author: Julien Nabet 
Date:   Tue Sep 22 22:01:33 2015 +0200

tdf#94451: Agenda: Not enough space for date in step 5 (French UI)

Adjust some values for make room (ok with French, German and English UI)

Change-Id: I7600acae64f5ae1110c07798cc950ec73a48deab
Reviewed-on: https://gerrit.libreoffice.org/18787
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 
(cherry picked from commit 0ca9a3523cb2ccf97d7d13fdf4616af0dbe173d9)
Reviewed-on: https://gerrit.libreoffice.org/18791
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py 
b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py
index fc9eef9..f89afdb 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py
@@ -284,11 +284,11 @@ class AgendaWizardDialog(WizardDialog):
 self.btnUp = self.insertButton("btnUp",
 AgendaWizardDialogConst.BTNUP_ACTION_PERFORMED,
 self.PROPS_BUTTON, (14, AgendaWizardDialogConst.BTNUP_HID,
-self.resources.resButtonUp, 202, 136, 5, 582, 50), self)
+self.resources.resButtonUp, 180, 136, 5, 582, 60), self)
 self.btnDown = self.insertButton("btnDown",
 AgendaWizardDialogConst.BTNDOWN_ACTION_PERFORMED,
 self.PROPS_BUTTON, (14, AgendaWizardDialogConst.BTNDOWN_HID,
-self.resources.resButtonDown, 254, 136, 5, 583, 50), self)
+self.resources.resButtonDown, 244, 136, 5, 583, 60), self)
 
 def buildStep6(self):
 self.insertLabel("lblTitle6", self.PROPS_LABEL_B,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-09-23 Thread Julien Nabet 
 wizards/com/sun/star/wizards/web/WebWizardDialog.py |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a0720dab70621edf7286eac1d16004e4a4491f8b
Author: Julien Nabet 
Date:   Tue Sep 22 21:42:35 2015 +0200

tdf#94450: Web Wizard: Not enough space for date in step 6

Value of 60 allows to display the selected dates + let a margin if year is 
in 4 numbers one day.

Change-Id: I3d7db50dd318897b0b7a515f9428401c53218c08
Reviewed-on: https://gerrit.libreoffice.org/18786
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 
(cherry picked from commit 9e99b18f20f46d656c7a52413d23193f75065d1a)
Reviewed-on: https://gerrit.libreoffice.org/18790
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/wizards/com/sun/star/wizards/web/WebWizardDialog.py 
b/wizards/com/sun/star/wizards/web/WebWizardDialog.py
index 5a066fd..f1248bd 100644
--- a/wizards/com/sun/star/wizards/web/WebWizardDialog.py
+++ b/wizards/com/sun/star/wizards/web/WebWizardDialog.py
@@ -525,7 +525,7 @@ class WebWizardDialog(WizardDialog):
 PropertyNames.PROPERTY_TABINDEX,
 PropertyNames.PROPERTY_WIDTH),
 (True, 12, HelpIds.getHelpIdString(HID6_DATE_SITE_CREATED),
-"dateSiteCreated", 179, 124, 6, tabIndex + 1, 49), self)
+"dateSiteCreated", 179, 124, 6, tabIndex + 1, 60), self)
 self.insertLabel("lblSiteUpdated", WebWizardDialog.PROPNAMES_LBL,
 (8, self.resources.reslblSiteUpdated_value, "lblSiteUpdated",
 103, 144, 6, tabIndex + 1, 80))
@@ -540,7 +540,7 @@ class WebWizardDialog(WizardDialog):
 PropertyNames.PROPERTY_TABINDEX,
 PropertyNames.PROPERTY_WIDTH),
 (True, 12, HelpIds.getHelpIdString(HID6_DATE_SITE_UPDATED),
-"dateSiteUpdate", 179, 142, 6, tabIndex + 1, 49), self)
+"dateSiteUpdate", 179, 142, 6, tabIndex + 1, 60), self)
 
 def buildStep7(self, disableFTP, exclamationURL):
 tabIndex = 700
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-09-23 Thread 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 
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 
Reviewed-by: Julien Nabet 
(cherry picked from commit 09c3e186e8b8562e3d502c5cbdef385753336b7f)
Reviewed-on: https://gerrit.libreoffice.org/18758
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

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
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-09-21 Thread Julien Nabet 
 wizards/com/sun/star/wizards/web/WWD_Events.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7a4edfbc4bce290e4e26f55728f670bf24423151
Author: Julien Nabet 
Date:   Sat Sep 19 14:51:24 2015 +0200

tdf#92934: Web Wizard: Cannot Export Zip archive

pubAware_ adds 2 elements for each of these:
LOCAL_PUBLISHER, ZIP_PUBLISHER, FTP_PUBLISHER
and since ZIP_PUBLISHER is added in second positon,
the right index is 2 not 4

Change-Id: I0a533fd0cefcbbfca0e95628f64fac6258019600
Reviewed-on: https://gerrit.libreoffice.org/18715
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 
(cherry picked from commit e72a4a3c2e1608e301daef0b6e87cc70d814e736)
Reviewed-on: https://gerrit.libreoffice.org/18717
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/wizards/com/sun/star/wizards/web/WWD_Events.py 
b/wizards/com/sun/star/wizards/web/WWD_Events.py
index 4f2208c..42b4184 100644
--- a/wizards/com/sun/star/wizards/web/WWD_Events.py
+++ b/wizards/com/sun/star/wizards/web/WWD_Events.py
@@ -459,7 +459,7 @@ class WWD_Events(WWD_Startup):
 zipFile = sd.callStoreDialog(
 self.settings.cp_DefaultSession.cp_OutDirectory,
 self.resources.resDefaultArchiveFilename)
-self.setPublishUrl(ZIP_PUBLISHER, zipFile, 4)
+self.setPublishUrl(ZIP_PUBLISHER, zipFile, 2)
 self.getPublisher(ZIP_PUBLISHER).overwriteApproved = True
 
 '''
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-09-01 Thread Julien Nabet 
 wizards/com/sun/star/wizards/db/RecordParser.java |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit f46d8fd4862bd1a2872f02f132c2267d08a1526c
Author: Julien Nabet 
Date:   Tue Sep 1 07:27:05 2015 +0200

tdf#91022: Incorrect Dates in Report created with legacy report wizard

Regression from 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=5d8ecad569fd7a254902da154ed8057ec61f3a83
Thank you Matthew Francis for having found the root cause!

Change-Id: I4128368a5f5df6a9fc5f7668fb1f8f330b5795b9
Reviewed-on: https://gerrit.libreoffice.org/18210
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 
(cherry picked from commit ed33646cdecac866ab480bf5770726b4a5bfa6c9)
Reviewed-on: https://gerrit.libreoffice.org/18224
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/wizards/com/sun/star/wizards/db/RecordParser.java 
b/wizards/com/sun/star/wizards/db/RecordParser.java
index b71ae99..21be84a 100644
--- a/wizards/com/sun/star/wizards/db/RecordParser.java
+++ b/wizards/com/sun/star/wizards/db/RecordParser.java
@@ -131,12 +131,14 @@ public class RecordParser extends QueryMetaData
 case DataType.FLOAT: // ==   6;
 case DataType.REAL: // ==   7;
 case DataType.DOUBLE: // ==   8;
-case DataType.DATE: // ==  91;
 case DataType.TIME: // ==  92;
-case DataType.TIMESTAMP: // ==  93;
 oAny = getColumnDoubleValue(ColIndex, false);
 break;
 
+case DataType.DATE: // ==  91;
+case DataType.TIMESTAMP: // ==  93;
+oAny = getColumnDoubleValue(ColIndex, true);
+break;
 case DataType.CHAR: // ==   1;
 case DataType.VARCHAR: // ==  12;
 case DataType.LONGVARCHAR: // ==  -1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-08-05 Thread Michael Stahl 
 wizards/com/sun/star/wizards/web/Process.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5beb43b3fe989a25234b17dfa5d6ba0f785c5deb
Author: Michael Stahl mst...@redhat.com
Date:   Tue Aug 4 23:36:13 2015 +0200

tdf#76845: wizards: fix Web wizard XSLT deadlock on Windows

The web wizard runs some XSLT over the exported file.  It registers
a handler that is called when the output stream is closed, and this
Process.streamClosedHandler() calls terminate(), which causes the
deadlock, because it wants to join() the extra XSLT thread but the
handler is actually called from the XSLT thread itself.

Fix that by moving the terminate() to another function that runs in the
main thread.

It does not deadlock on Unixes because osl_joinWithThread() actually
detects an attempt to join the calling thread and returns early.

Change-Id: Ia176562fa28b97c7e8956c1e8975c9aa6ee23236
(cherry picked from commit 62de18ab98289fc80984299f13ad71e4a4452ea3)
Reviewed-on: https://gerrit.libreoffice.org/17511
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/wizards/com/sun/star/wizards/web/Process.py 
b/wizards/com/sun/star/wizards/web/Process.py
index 530b979..82be8b7 100644
--- a/wizards/com/sun/star/wizards/web/Process.py
+++ b/wizards/com/sun/star/wizards/web/Process.py
@@ -375,6 +375,7 @@ class Process(ProcessErrors):
 self.tf.start()
 while (not self.tfCompleted):
 pass
+self.tf.terminate()
 task.advance(True)
 
 
@@ -400,7 +401,6 @@ class Process(ProcessErrors):
 print (DEBUG !!! Stream 'error' event handler)
 
 def streamClosedHandler(self, parent):
-parent.tf.terminate()
 parent.tfCompleted = True
 
 # I broke the export method to two methods
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-08-05 Thread Michael Stahl 
 wizards/com/sun/star/wizards/common/FileAccess.py |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 4fab83e1e12246a7183e5da090087ab65c0ccb3a
Author: Michael Stahl mst...@redhat.com
Date:   Tue Aug 4 22:44:06 2015 +0200

wizards: FileAccess.getURL does not work on Windows

The hard-coded / separator causes getFileURLFromSystemPath to fail,
and it's not obvious why the URL is being converted to a system path
in the first place.

Change-Id: I06ebe6d92954c4f3c884ae6f0b327ea8a36c10a4
(cherry picked from commit 8bf374b98d07c24a37933b8c03a53abb3a8ff5c6)
Reviewed-on: https://gerrit.libreoffice.org/17512
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/wizards/com/sun/star/wizards/common/FileAccess.py 
b/wizards/com/sun/star/wizards/common/FileAccess.py
index 0e67851..7ff92c3 100644
--- a/wizards/com/sun/star/wizards/common/FileAccess.py
+++ b/wizards/com/sun/star/wizards/common/FileAccess.py
@@ -303,10 +303,12 @@ class FileAccess(object):
 i += 1
 return url
 
-def getURL(self, parentPath, childPath):
-parent = self.filenameConverter.getSystemPathFromFileURL(parentPath);
-path = parent + / + childPath
-return self.filenameConverter.getFileURLFromSystemPath(parentPath, 
path)
+def getURL(self, parentURL, childPath):
+if len(childPath)  0 and childPath[0] == /:
+path = parentURL + childPath
+else:
+path = parentURL + / + childPath
+return path
 
 def getURL1(self, path):
 f = /
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-08-05 Thread Michael Stahl 
 wizards/com/sun/star/wizards/text/TextDocument.py |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bcb2be2b846d99e3e21cfdc88a1395c842fa435e
Author: Michael Stahl mst...@redhat.com
Date:   Tue Aug 4 23:03:05 2015 +0200

wizards: text.TextDocument.getPageCount called as class method only

Change-Id: I9888f8ab7bccdd2902d61948727f2ff9ab13
(cherry picked from commit c1617b8d74b5e232efeec864241ada89f874fe63)
Reviewed-on: https://gerrit.libreoffice.org/17513
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/wizards/com/sun/star/wizards/text/TextDocument.py 
b/wizards/com/sun/star/wizards/text/TextDocument.py
index b52f885..3119b16 100644
--- a/wizards/com/sun/star/wizards/text/TextDocument.py
+++ b/wizards/com/sun/star/wizards/text/TextDocument.py
@@ -211,6 +211,7 @@ class TextDocument(object):
 @return the page count of the document.
 '''
 
+@classmethod
 def getPageCount(self, model):
 xController = model.getCurrentController()
 xPC = xController.getViewCursor()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-07-14 Thread Julien Nabet 
 wizards/com/sun/star/wizards/web/WWD_Events.py |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4f0f8a5c6860bde571ab8babc6559cfd638d6c3d
Author: Julien Nabet serval2...@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 c...@libreoffice.org
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit 2f0d1a23759c1b973593bfba642d01fb3df3c269)
Reviewed-on: https://gerrit.libreoffice.org/17034

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.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-27 Thread Caolán McNamara 
 wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e092c5b2a285db9447b5918a2f5c3ace02437113
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 27 15:39:12 2015 +0100

wrong comparison in letter wizard

the file name widget is empty when it shouldn't be.
the other wizards get this right

Change-Id: Icdb629e676a73fcf8d8be4352818abbef455bbaf
(cherry picked from commit a3727ad62b7c1a30f9b0531042cce5ce5b8c6089)

diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py 
b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
index d8598ff..f4a16e2 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
@@ -123,7 +123,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
 self.myConfig.cp_PrivateLetter.cp_Salutation = \
 self.resources.SalutationLabels[2]
 
-if self.myPathSelection.xSaveTextBox.Text.lower():
+if self.myPathSelection.xSaveTextBox.Text.lower() == :
 self.myPathSelection.initializePath()
 
 xContainerWindow = self.myLetterDoc.xFrame.ContainerWindow
@@ -256,7 +256,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
 self.lstBusinessStyleItemChanged()
 self.enableSenderReceiver()
 self.setPossibleFooter(True)
-if self.myPathSelection.xSaveTextBox.Text.lower():
+if self.myPathSelection.xSaveTextBox.Text.lower() == :
 self.myPathSelection.initializePath()
 
 def optPrivOfficialLetterItemChanged(self):
@@ -273,7 +273,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
 self.disableBusinessPaper()
 self.disableSenderReceiver()
 self.setPossibleFooter(True)
-if self.myPathSelection.xSaveTextBox.Text.lower():
+if self.myPathSelection.xSaveTextBox.Text.lower() == :
 self.myPathSelection.initializePath()
 self.myLetterDoc.fillSenderWithUserData()
 
@@ -291,7 +291,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
 self.disableBusinessPaper()
 self.disableSenderReceiver()
 self.setPossibleFooter(False)
-if self.myPathSelection.xSaveTextBox.Text.lower():
+if self.myPathSelection.xSaveTextBox.Text.lower() == :
 self.myPathSelection.initializePath()
 
 def optSenderPlaceholderItemChanged(self):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits