extras/source/autotext/lang/de/crdbus50/KLA1/settings.xml | 4 ++-- extras/source/autotext/lang/de/crdbus50/KLA2/settings.xml | 4 ++-- extras/source/autotext/lang/de/crdbus50/KLA3/settings.xml | 4 ++-- extras/source/autotext/lang/de/crdbus50/MOD1/settings.xml | 4 ++-- extras/source/autotext/lang/de/crdbus50/MOD2/settings.xml | 4 ++-- officecfg/registry/data/org/openoffice/Office/Writer.xcu | 2 +- officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs | 4 ++-- officecfg/registry/schema/org/openoffice/Office/Writer.xcs | 4 ++-- sw/source/core/doc/docfld.cxx | 2 +- sw/source/uibase/dbui/mmconfigitem.cxx | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-)
New commits: commit 24418700059d2b6826f800d265f52061c48c34e5 Author: Julien Nabet <serval2...@yahoo.fr> AuthorDate: Mon Apr 26 14:07:40 2021 +0200 Commit: Julien Nabet <serval2...@yahoo.fr> CommitDate: Tue Apr 27 08:44:12 2021 +0200 CommandType is "long" type not "short" type See https://api.libreoffice.org/docs/idl/ref/namespacecom_1_1sun_1_1star_1_1sdb_1_1CommandType.html + discussion here: http://document-foundation-mail-archive.969070.n3.nabble.com/Type-of-CommandType-short-or-long-tt4299416.html Important remark from Stephan: "...the data type corresponding to UNOIDL LONG (i.e., 32 bit) is xs:int, not xs:long" Change-Id: Ic8f027e8a5be96bdb2e5629b0ff1ef4830ef6c88 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114659 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2...@yahoo.fr> diff --git a/extras/source/autotext/lang/de/crdbus50/KLA1/settings.xml b/extras/source/autotext/lang/de/crdbus50/KLA1/settings.xml index b3e356fb2daa..dd9796adb745 100644 --- a/extras/source/autotext/lang/de/crdbus50/KLA1/settings.xml +++ b/extras/source/autotext/lang/de/crdbus50/KLA1/settings.xml @@ -25,7 +25,7 @@ <config:config-item config:name="SaveGlobalDocumentLinks" config:type="boolean">false</config:config-item> <config:config-item config:name="CurrentDatabaseDataSource" config:type="string">Address Book File</config:config-item> <config:config-item config:name="CurrentDatabaseCommand" config:type="string">address</config:config-item> - <config:config-item config:name="CurrentDatabaseCommandType" config:type="short">0</config:config-item> + <config:config-item config:name="CurrentDatabaseCommandType" config:type="int">0</config:config-item> </config:config-item-set> </office:settings> -</office:document-settings> \ No newline at end of file +</office:document-settings> diff --git a/extras/source/autotext/lang/de/crdbus50/KLA2/settings.xml b/extras/source/autotext/lang/de/crdbus50/KLA2/settings.xml index 83dd79040304..ecfec74bb9db 100644 --- a/extras/source/autotext/lang/de/crdbus50/KLA2/settings.xml +++ b/extras/source/autotext/lang/de/crdbus50/KLA2/settings.xml @@ -25,7 +25,7 @@ <config:config-item config:name="SaveGlobalDocumentLinks" config:type="boolean">false</config:config-item> <config:config-item config:name="CurrentDatabaseDataSource" config:type="string"/> <config:config-item config:name="CurrentDatabaseCommand" config:type="string"/> - <config:config-item config:name="CurrentDatabaseCommandType" config:type="short">0</config:config-item> + <config:config-item config:name="CurrentDatabaseCommandType" config:type="int">0</config:config-item> </config:config-item-set> </office:settings> -</office:document-settings> \ No newline at end of file +</office:document-settings> diff --git a/extras/source/autotext/lang/de/crdbus50/KLA3/settings.xml b/extras/source/autotext/lang/de/crdbus50/KLA3/settings.xml index b3e356fb2daa..dd9796adb745 100644 --- a/extras/source/autotext/lang/de/crdbus50/KLA3/settings.xml +++ b/extras/source/autotext/lang/de/crdbus50/KLA3/settings.xml @@ -25,7 +25,7 @@ <config:config-item config:name="SaveGlobalDocumentLinks" config:type="boolean">false</config:config-item> <config:config-item config:name="CurrentDatabaseDataSource" config:type="string">Address Book File</config:config-item> <config:config-item config:name="CurrentDatabaseCommand" config:type="string">address</config:config-item> - <config:config-item config:name="CurrentDatabaseCommandType" config:type="short">0</config:config-item> + <config:config-item config:name="CurrentDatabaseCommandType" config:type="int">0</config:config-item> </config:config-item-set> </office:settings> -</office:document-settings> \ No newline at end of file +</office:document-settings> diff --git a/extras/source/autotext/lang/de/crdbus50/MOD1/settings.xml b/extras/source/autotext/lang/de/crdbus50/MOD1/settings.xml index b3e356fb2daa..dd9796adb745 100644 --- a/extras/source/autotext/lang/de/crdbus50/MOD1/settings.xml +++ b/extras/source/autotext/lang/de/crdbus50/MOD1/settings.xml @@ -25,7 +25,7 @@ <config:config-item config:name="SaveGlobalDocumentLinks" config:type="boolean">false</config:config-item> <config:config-item config:name="CurrentDatabaseDataSource" config:type="string">Address Book File</config:config-item> <config:config-item config:name="CurrentDatabaseCommand" config:type="string">address</config:config-item> - <config:config-item config:name="CurrentDatabaseCommandType" config:type="short">0</config:config-item> + <config:config-item config:name="CurrentDatabaseCommandType" config:type="int">0</config:config-item> </config:config-item-set> </office:settings> -</office:document-settings> \ No newline at end of file +</office:document-settings> diff --git a/extras/source/autotext/lang/de/crdbus50/MOD2/settings.xml b/extras/source/autotext/lang/de/crdbus50/MOD2/settings.xml index b3e356fb2daa..dd9796adb745 100644 --- a/extras/source/autotext/lang/de/crdbus50/MOD2/settings.xml +++ b/extras/source/autotext/lang/de/crdbus50/MOD2/settings.xml @@ -25,7 +25,7 @@ <config:config-item config:name="SaveGlobalDocumentLinks" config:type="boolean">false</config:config-item> <config:config-item config:name="CurrentDatabaseDataSource" config:type="string">Address Book File</config:config-item> <config:config-item config:name="CurrentDatabaseCommand" config:type="string">address</config:config-item> - <config:config-item config:name="CurrentDatabaseCommandType" config:type="short">0</config:config-item> + <config:config-item config:name="CurrentDatabaseCommandType" config:type="int">0</config:config-item> </config:config-item-set> </office:settings> -</office:document-settings> \ No newline at end of file +</office:document-settings> diff --git a/officecfg/registry/data/org/openoffice/Office/Writer.xcu b/officecfg/registry/data/org/openoffice/Office/Writer.xcu index de63ae8c2462..93152e609d0d 100644 --- a/officecfg/registry/data/org/openoffice/Office/Writer.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Writer.xcu @@ -45,7 +45,7 @@ <value oor:separator=",">title,full_name,family_name,org,addr_line1,addr_line2,city,state,zip,country,home_phone,business_phone,email_1,</value> </prop> <node oor:name="DataSource"> - <prop oor:name="DataCommandType" oor:type="xs:short"> + <prop oor:name="DataCommandType" oor:type="xs:int"> <value>0</value> </prop> <prop oor:name="DataSourceName" oor:type="xs:string"> diff --git a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs index e2591ee34aea..786b0b4a9b09 100644 --- a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs @@ -67,7 +67,7 @@ <desc>Specifies the command to execute on the data source to retrieve the result set. This may be an SQL command or a table name or a query name.</desc> </info> </prop> - <prop oor:name="CommandType" oor:type="xs:short"> + <prop oor:name="CommandType" oor:type="xs:int"> <info> <desc>Determines the exact meaning of Command. Valid values are: 0 - Command is a table name 1 - Command is a query name 2 - Command is an SQL command.</desc> </info> @@ -276,7 +276,7 @@ <value/> <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended --> </prop> - <prop oor:name="CommandType" oor:type="xs:short"> + <prop oor:name="CommandType" oor:type="xs:int"> <info> <desc>Determines the exact meaning of Command. Valid values are: 0 - Command is a table name 1 - Command is a query name 2 - Command is an SQL command.</desc> </info> diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index 1d54ace2d950..fde9c9457dc7 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -254,7 +254,7 @@ <desc>Specifies the name of the database table or query.</desc> </info> </prop> - <prop oor:name="CommandType" oor:type="xs:short"> + <prop oor:name="CommandType" oor:type="xs:int"> <info> <desc>Specifies whether the data comes from a table or a query</desc> </info> @@ -356,7 +356,7 @@ <label>Data table or query name</label> </info> </prop> - <prop oor:name="DataCommandType" oor:type="xs:short" oor:nillable="false"> + <prop oor:name="DataCommandType" oor:type="xs:int" oor:nillable="false"> <info> <desc>CommandType of the data source.</desc> <label>Data CommandType</label> diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index 6829089fbb52..74483926e90e 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -574,7 +574,7 @@ void SwDoc::ChangeDBFields( const std::vector<OUString>& rOldNames, sal_Int32 nIdx{ 0 }; aNewDBData.sDataSource = rNewName.getToken(0, DB_DELIM, nIdx); aNewDBData.sCommand = rNewName.getToken(0, DB_DELIM, nIdx); - aNewDBData.nCommandType = static_cast<short>(rNewName.getToken(0, DB_DELIM, nIdx).toInt32()); + aNewDBData.nCommandType = rNewName.getToken(0, DB_DELIM, nIdx).toInt32(); SwSectionFormats& rArr = GetSections(); for (auto n = rArr.size(); n; ) diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx index 969ca4976d36..26462bccf41a 100644 --- a/sw/source/uibase/dbui/mmconfigitem.cxx +++ b/sw/source/uibase/dbui/mmconfigitem.cxx @@ -517,7 +517,7 @@ void SwMailMergeConfigItem_Impl::ImplCommit() case 23: pValues[nProp] <<= m_sMailPassword; break; case 24 :pValues[nProp] <<= m_aDBData.sDataSource; break; case 25 :pValues[nProp] <<= m_aDBData.sCommand; break; - case 26 :pValues[nProp] <<= static_cast<short>(m_aDBData.nCommandType); break; + case 26 :pValues[nProp] <<= m_aDBData.nCommandType; break; case 27 :pValues[nProp] <<= m_sFilter; break; case 28 :pValues[nProp] <<= m_aSavedDocuments; break; case 29: pValues[nProp] <<= m_bIsEMailSupported; break; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits