diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2021-04-26 14:07:40 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2021-04-27 08:44:12 +0200 |
| commit | 24418700059d2b6826f800d265f52061c48c34e5 (patch) | |
| tree | 9f47814e54029a9cddd84b313505c290a67218cc /sw | |
| parent | 4d60fd1d480521df43120618736465628b540070 (diff) | |
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 <serval2412@yahoo.fr>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/doc/docfld.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/dbui/mmconfigitem.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
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; |