connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu | 9
++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit f33eb08a2b74e5de033af9b5f5283b220ac58ded
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat Mar 9 17:39:44 2019 +0100
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sun Mar 10 06:25:44 2019 +0100
tdf#121092: synchronize defaults for ODBC settings
The defaults for EnableSQL92Check, PreferDosLikeLineEnds,
RespectDriverResultSetType
in connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
made
consistent with respective defaults in
ODatabaseModelImpl::getDefaultDataSourceSettings
When inconsistent, the settings don't ever get written to the ODB's
content.xml (likely they are filtered out as default at different levels).
This change allows the non-default to be written. Since the defaults in
ODatabaseModelImpl::getDefaultDataSourceSettings are there at least since
2006 (commit 0eb026293c88d422d701d1a06735d9cce5457ca9), so that in any
existing ODB the settings are absent if they are equal to those defaults,
they are not changed.
Change-Id: I220336fae666554c1bc23c1915152515fefd18ce
Reviewed-on: https://gerrit.libreoffice.org/68979
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git
a/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
b/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
index 20d3f45d2a53..85c34cfb2f4d 100644
--- a/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -68,7 +68,8 @@
</node>
<node oor:name="EnableSQL92Check" oor:op="replace">
<prop oor:name="Value" oor:type="xs:boolean">
- <value>true</value>
+ <!-- must be synchronized with
ODatabaseModelImpl::getDefaultDataSourceSettings -->
+ <value>false</value>
</prop>
</node>
<node oor:name="AppendTableAliasInSelect" oor:op="replace">
@@ -118,7 +119,8 @@
</node>
<node oor:name="PreferDosLikeLineEnds" oor:op="replace">
<prop oor:name="Value" oor:type="xs:boolean">
- <value>true</value>
+ <!-- must be synchronized with
ODatabaseModelImpl::getDefaultDataSourceSettings -->
+ <value>false</value>
</prop>
</node>
<node oor:name="BooleanComparisonMode" oor:op="replace">
@@ -143,7 +145,8 @@
</node>
<node oor:name="RespectDriverResultSetType" oor:op="replace">
<prop oor:name="Value" oor:type="xs:boolean">
- <value>true</value>
+ <!-- must be synchronized with
ODatabaseModelImpl::getDefaultDataSourceSettings -->
+ <value>false</value>
</prop>
</node>
</node>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
