diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-03-10 11:29:19 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-03-10 12:59:36 +0100 |
| commit | f8eef913a33b24ce6d9c6e37fdcc2614ab823659 (patch) | |
| tree | 65dda99af1f6504c9ad14a9f5a010c9a94d44881 /connectivity/registry | |
| parent | MSForms: Test insertion of form fields and undo / redo of this insertion. (diff) | |
| download | core-f8eef913a33b24ce6d9c6e37fdcc2614ab823659.tar.gz core-f8eef913a33b24ce6d9c6e37fdcc2614ab823659.zip | |
tdf#121092: save GenerateASBeforeCorrelationName to ODB
As mentioned in connectivity/registry/README, the property should
be named differently in Features and Properties sections.
Also the default value set in ODbAdminDialog::createItemSet should
be synchronized with the other defaults, because otherwise, in case
when the value is absent in the set (when it is default), this value
is used in the dialog... sigh, we have too much places where relevant
defaults are generated and need to be in sync. TODO: this should be
reimplemented to take all defaults from the xcu.
Change-Id: Ia61ab2e585107ede9c977cf563cb30e45d624bed
Reviewed-on: https://gerrit.libreoffice.org/69002
Tested-by: Jenkins
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'connectivity/registry')
5 files changed, 15 insertions, 5 deletions
diff --git a/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu index 9ec276a61dfe..0627fb64066b 100644 --- a/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu +++ b/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu @@ -46,7 +46,8 @@ <value>true</value> </prop> </node> - <node oor:name="UseKeywordAsBeforeAlias" oor:op="replace"> + <node oor:name="GenerateASBeforeCorrelationName" oor:op="replace"> + <!-- Corresponds to UseKeywordAsBeforeAlias in Features - see connectivity/registry/README --> <prop oor:name="Value" oor:type="xs:boolean"> <value>false</value> </prop> @@ -124,6 +125,7 @@ </prop> </node> <node oor:name="UseKeywordAsBeforeAlias" oor:op="replace"> + <!-- Corresponds to GenerateASBeforeCorrelationName in Properties - see connectivity/registry/README --> <prop oor:name="Value" oor:type="xs:boolean"> <value>true</value> </prop> diff --git a/connectivity/registry/hsqldb/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/hsqldb/org/openoffice/Office/DataAccess/Drivers.xcu index d168838fefdd..f683449fe382 100644 --- a/connectivity/registry/hsqldb/org/openoffice/Office/DataAccess/Drivers.xcu +++ b/connectivity/registry/hsqldb/org/openoffice/Office/DataAccess/Drivers.xcu @@ -46,7 +46,8 @@ <value>false</value> </prop> </node> - <node oor:name="UseKeywordAsBeforeAlias" oor:op="replace"> + <node oor:name="GenerateASBeforeCorrelationName" oor:op="replace"> + <!-- Corresponds to UseKeywordAsBeforeAlias in Features - see connectivity/registry/README --> <prop oor:name="Value" oor:type="xs:boolean"> <value>true</value> </prop> @@ -74,6 +75,7 @@ </prop> </node> <node oor:name="UseKeywordAsBeforeAlias" oor:op="replace"> + <!-- Corresponds to GenerateASBeforeCorrelationName in Properties - see connectivity/registry/README --> <prop oor:name="Value" oor:type="xs:boolean"> <value>true</value> </prop> diff --git a/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu index 097399a37b07..c92c02b20ec8 100644 --- a/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu +++ b/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu @@ -71,7 +71,8 @@ <value>true</value> </prop> </node> - <node oor:name="UseKeywordAsBeforeAlias" oor:op="replace"> + <node oor:name="GenerateASBeforeCorrelationName" oor:op="replace"> + <!-- Corresponds to UseKeywordAsBeforeAlias in Features - see connectivity/registry/README --> <prop oor:name="Value" oor:type="xs:boolean"> <value>false</value> </prop> @@ -159,6 +160,7 @@ </prop> </node> <node oor:name="UseKeywordAsBeforeAlias" oor:op="replace"> + <!-- Corresponds to GenerateASBeforeCorrelationName in Properties - see connectivity/registry/README --> <prop oor:name="Value" oor:type="xs:boolean"> <value>true</value> </prop> diff --git a/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu index eccf516fea9a..04b3999d9d56 100644 --- a/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu +++ b/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu @@ -41,7 +41,8 @@ <value></value> </prop> </node> - <node oor:name="UseKeywordAsBeforeAlias" oor:op="replace"> + <node oor:name="GenerateASBeforeCorrelationName" oor:op="replace"> + <!-- Corresponds to UseKeywordAsBeforeAlias in Features - see connectivity/registry/README --> <prop oor:name="Value" oor:type="xs:boolean"> <value>true</value> </prop> @@ -74,6 +75,7 @@ </node> <node oor:name="Features"> <node oor:name="UseKeywordAsBeforeAlias" oor:op="replace"> + <!-- Corresponds to GenerateASBeforeCorrelationName in Properties - see connectivity/registry/README --> <prop oor:name="Value" oor:type="xs:boolean"> <value>true</value> </prop> diff --git a/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu index 85c34cfb2f4d..e66ecd787b4f 100644 --- a/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu +++ b/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu @@ -77,7 +77,8 @@ <value>true</value> </prop> </node> - <node oor:name="UseKeywordAsBeforeAlias" oor:op="replace"> + <node oor:name="GenerateASBeforeCorrelationName" oor:op="replace"> + <!-- Corresponds to UseKeywordAsBeforeAlias in Features - see connectivity/registry/README --> <prop oor:name="Value" oor:type="xs:boolean"> <value>false</value> </prop> @@ -167,6 +168,7 @@ </prop> </node> <node oor:name="UseKeywordAsBeforeAlias" oor:op="replace"> + <!-- Corresponds to GenerateASBeforeCorrelationName in Properties - see connectivity/registry/README --> <prop oor:name="Value" oor:type="xs:boolean"> <value>true</value> </prop> |