[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - connectivity/registry svx/source

2018-10-25 Thread Libreoffice Gerrit user 
 connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu |  
  5 +++
 svx/source/fmcomp/gridcell.cxx  |  
 13 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit 424454997a2a464d99c0e7125ea6b143716715b0
Author: Lionel Elie Mamane 
AuthorDate: Wed Oct 24 18:13:56 2018 +0200
Commit: Lionel Elie Mamane 
CommitDate: Thu Oct 25 10:03:23 2018 +0200

tdf#120713 correctly handle boolean values in filters

This commit has two parts:
 - Hardcode the correct BooleanComparisonMode in the firebird-sdbc driver
   (this fixes on Firebird databases, among others, the AutoFilter for 
bools)
 - Generic to all DBMS, have the "form-based filter" obey the 
BooleanComparisonMode

Change-Id: Ib14e6c3d5cb773ae1f972840f8b53062f0224396
Reviewed-on: https://gerrit.libreoffice.org/62320
Reviewed-by: Lionel Elie Mamane 
Tested-by: Jenkins

diff --git 
a/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu 
b/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu
index 03896aff4412..586264183b60 100644
--- 
a/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu
+++ 
b/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -66,6 +66,11 @@
 true
   
 
+
+  
+2
+  
+
   
   
   
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 67f4b85e..a6abdc7cdc83 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -3099,20 +3099,27 @@ void DbFilterField::UpdateFromField(const Reference< 
XColumn >& /*_rxField*/, co
 IMPL_LINK_NOARG(DbFilterField, OnClick, VclPtr, void)
 {
 TriState eState = 
static_cast(m_pWindow.get())->GetBox().GetState();
-OUString aText;
+OUStringBuffer aTextBuf;
+
+Reference< XRowSet > xDataSourceRowSet(
+Reference< XInterface 
>(*m_rColumn.GetParent().getDataSource()), UNO_QUERY);
+Reference< XConnection >  xConnection(getConnection(xDataSourceRowSet));
+const sal_Int32 nBooleanComparisonMode = ::dbtools::DatabaseMetaData( 
xConnection ).getBooleanComparisonMode();
 
 switch (eState)
 {
 case TRISTATE_TRUE:
-aText = "1";
+::dbtools::getBooleanComparisonPredicate("", true, 
nBooleanComparisonMode, aTextBuf);
 break;
 case TRISTATE_FALSE:
-aText = "0";
+::dbtools::getBooleanComparisonPredicate("", false, 
nBooleanComparisonMode, aTextBuf);
 break;
 case TRISTATE_INDET:
 break;
 }
 
+const OUString aText(aTextBuf.makeStringAndClear());
+
 if (m_aText != aText)
 {
 m_aText = aText;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - connectivity/registry mysqlc/source

2018-10-04 Thread Libreoffice Gerrit user 
 connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu|  
107 +-
 connectivity/registry/calc/org/openoffice/Office/DataAccess/Drivers.xcu   |
7 
 connectivity/registry/dbase/org/openoffice/Office/DataAccess/Drivers.xcu  |   
10 
 connectivity/registry/evoab2/org/openoffice/Office/DataAccess/Drivers.xcu |   
21 +
 connectivity/registry/flat/org/openoffice/Office/DataAccess/Drivers.xcu   |
5 
 connectivity/registry/hsqldb/org/openoffice/Office/DataAccess/Drivers.xcu |   
27 ++
 connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu   |   
87 
 connectivity/registry/macab/org/openoffice/Office/DataAccess/Drivers.xcu  |
7 
 connectivity/registry/mork/org/openoffice/Office/DataAccess/Drivers.xcu   |
7 
 connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu   |   
87 
 connectivity/registry/writer/org/openoffice/Office/DataAccess/Drivers.xcu |
7 
 mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu  |   
30 ++
 12 files changed, 399 insertions(+), 3 deletions(-)

New commits:
commit 8d0f2c5192d2c6bc18e406906825c0889e1edc22
Author: Julien Nabet 
AuthorDate: Thu Sep 13 22:57:58 2018 +0200
Commit: Lionel Elie Mamane 
CommitDate: Thu Oct 4 19:47:26 2018 +0200

tdf#119743: add Features entries in Properties block Drivers.xcu

in order to save special options of a database file.

Regression from d6fce54c82868b82bd6fa190db6047d69bbb3ecf
Read https://bugs.documentfoundation.org/show_bug.cgi?id=119743#c5
for detailed explanation

+ merge with 6de679cca6978694bacf5322c9ab8559740f0443
1) Fix BooleanComparisonMode
2) Revert partly 568778874429595855b435792e5ebecd52956dae
(UseKeywordAsBeforeAlias)
See this commit for more details

Change-Id: Icea932ef5e7358db1cd819583f6ef3ad9399ca87
Reviewed-on: https://gerrit.libreoffice.org/60471
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
Reviewed-on: https://gerrit.libreoffice.org/60890
Reviewed-by: Lionel Elie Mamane 

diff --git 
a/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu 
b/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu
index 210a9b7e9bb6..9ec276a61dfe 100644
--- a/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -31,6 +31,81 @@
 
   
 
+
+  
+true
+  
+
+
+  
+true
+  
+
+
+  
+true
+  
+
+
+  
+false
+  
+
+
+  
+true
+  
+
+
+  
+true
+  
+
+
+  
+true
+  
+
+
+  
+true
+  
+
+
+  
+true
+  
+
+
+  
+true
+  
+
+
+  
+0
+  
+
+
+  
+true
+  
+
+
+  
+true
+  
+
+
+  
+true
+  
+
+
+  
+true
+  
+
   
   
 
@@ -50,7 +125,7 @@
 
 
   
-false
+true
   
 
 
@@ -165,6 +240,36 @@
 Column(2) = 16,Column(3) = 1
   
 
+
+  
+true
+  
+
+
+  
+true
+  
+
+
+  
+true
+  
+
+
+  
+true
+  
+
+
+  
+true
+  
+
+
+  
+true
+  
+
   
   
 
diff --git 
a/connectivity/registry/calc/org/openoffice/Office/DataAccess/Drivers.xcu 
b/connectivity/registry/calc/org/openoffice/Office/DataAccess/Drivers.xcu
index 16802ceea6ad..8fe901b0fe02 100644
--- a/connectivity/registry/calc/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/calc/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -25,6 +25,13 @@
   
 Spreadsheet
   
+  
+
+  
+true
+  
+
+  
   
 
   
diff --git 
a/connectivity/registry/dbase/org/openoffice/Office/DataAccess/Drivers.xcu 
b/connectivity/registry/dbase/org/openoffice/Office/DataAccess/Drivers.xcu
index 8798ce8779d8..5472d78a05de 100644
--- a/connectivity/registry/dbase/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/dbase/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -46,6 +46,16 @@
 false
   
 
+

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - connectivity/registry

2018-06-14 Thread Julien Nabet 
 connectivity/registry/mysql/org/openoffice/Office/DataAccess/Drivers.xcu |   
15 ++
 1 file changed, 15 insertions(+)

New commits:
commit 90d77c7d18050437d47ba967e4c4ad7e523ced0e
Author: Julien Nabet 
Date:   Wed Jun 13 22:16:44 2018 +0200

tdf#118112: Use ParameterNameSubstitution for Mysql

Change-Id: Ic48aee378d0a89466c49de85baa96a3bea127d2f
Reviewed-on: https://gerrit.libreoffice.org/55771
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 
(cherry picked from commit c179e8a7ea273a48713192c3ba7dfea313149cd8)
Reviewed-on: https://gerrit.libreoffice.org/55779
Tested-by: Jenkins
Reviewed-by: Lionel Elie Mamane 

diff --git 
a/connectivity/registry/mysql/org/openoffice/Office/DataAccess/Drivers.xcu 
b/connectivity/registry/mysql/org/openoffice/Office/DataAccess/Drivers.xcu
index faf9ddb9fa55..77988448f722 100644
--- a/connectivity/registry/mysql/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/mysql/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -41,6 +41,11 @@
 true
   
 
+
+  
+true
+  
+
   
   
 
@@ -115,6 +120,11 @@
 true
   
 
+
+  
+true
+  
+
   
   
 
@@ -194,6 +204,11 @@
 true
   
 
+
+  
+true
+  
+
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits