[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - wizards/source

2022-09-07 Thread Stephan Bergmann (via logerrit)
 wizards/source/access2base/DoCmd.xba |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2231c91ac825dba9ee4d764806ad49080b9d4bad
Author: Stephan Bergmann 
AuthorDate: Tue Aug 30 14:04:52 2022 +0200
Commit: Andras Timar 
CommitDate: Wed Sep 7 13:16:20 2022 +0200

These commands are always URLs already

Conflicts:
wizards/source/scriptforge/SF_Session.xba

Change-Id: I5083765c879689d7f933bbe00ad70bb68e635a21
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139042
Tested-by: Jean-Pierre Ledure 
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139245
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 8e11376b0964451b1132c094dbc98a828b0ede4b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139507
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/wizards/source/access2base/DoCmd.xba 
b/wizards/source/access2base/DoCmd.xba
index 27b0d74be34f..26755a8d901d 100644
--- a/wizards/source/access2base/DoCmd.xba
+++ b/wizards/source/access2base/DoCmd.xba
@@ -2655,7 +2655,7 @@ Private Sub _ShellExecute(sCommand As String)
 
 Dim oShell As Object
Set oShell = 
createUnoService(com.sun.star.system.SystemShellExecute)
-   oShell.execute(sCommand,  , 
com.sun.star.system.SystemShellExecuteFlags.DEFAULTS)
+   oShell.execute(sCommand,  , 
com.sun.star.system.SystemShellExecuteFlags.URIS_ONLY)
 
 End Sub  _ShellExecute   
V0.8.5
 


[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - wizards/source

2020-12-28 Thread Jean-Pierre Ledure (via logerrit)
 wizards/source/access2base/Database.xba |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 187ce4ec14cc5fe4bee31d8051b34be903a34233
Author: Jean-Pierre Ledure 
AuthorDate: Thu Dec 24 13:55:43 2020 +0100
Commit: Andras Timar 
CommitDate: Mon Dec 28 11:30:10 2020 +0100

Fix #118767 - Identify Firebird DBMS in DFunction()

Change-Id: I2fb3d414e3cd537654bbfae71fcdd80cf8ae4648
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108185
Reviewed-by: Jean-Pierre Ledure 
Tested-by: Jean-Pierre Ledure 

diff --git a/wizards/source/access2base/Database.xba 
b/wizards/source/access2base/Database.xba
index 2e361cecfc13..07b19ca0a2bd 100644
--- a/wizards/source/access2base/Database.xba
+++ b/wizards/source/access2base/Database.xba
@@ -1167,7 +1167,7 @@ Dim sProductName As String
sTarget = UCase(psFunction)  ( 
 psExpr  )
End If
sSql = SELECT   sTarget   
AS   sTempField   FROM   psDomain   
sWhere  sOrderBy  sLimit
-   Case FIREBIRD
+   Case FIREBIRD, FIREBIRD (ENGINE12)
If psFunction =  Then sTarget = FIRST 
1   psExpr Else sTarget = UCase(psFunction)  ( 
 psExpr  )
sSql = SELECT   sTarget   
AS   sTempField   FROM   psDomain  sWhere 
 sOrderBy
Case Else Standard syntax - Includes 
HSQLDB
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits