diff options
| author | Oleg Shchelykalnov <olegshtch@yandex.ru> | 2020-03-28 15:48:18 +0300 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2020-03-30 10:18:48 +0200 |
| commit | 06789981b0ed4485f695ad87b332a1b6c3230365 (patch) | |
| tree | b9b6fc7ad0c3b88fc51edbb7b5254ec82d3e8f1c /sw | |
| parent | dd6b6b6fe1f07652ae76e2cd1fb5c0c616dafa1f (diff) | |
tdf#131618 MailMerge: Don't require DataSourceName if ResultSet provided
Allows to use ResultSet instead of DataSourceName and DataCommand
options.
Change-Id: I654cdf3bc850ab1c1a29837e8aabdee410b30439
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91277
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit a039725510f13c77591106b02f32f5899c37c007)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91290
Reviewed-by: Oleg Schelykalnov <olegshtch@yandex.ru>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 8d11292d9e52..05216c55c08b 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -479,7 +479,7 @@ bool SwDBManager::Merge( const SwMergeDescriptor& rMergeDesc ) if ( rMergeDesc.rDescriptor.has(svx::DataAccessDescriptorProperty::Connection) ) rMergeDesc.rDescriptor[svx::DataAccessDescriptorProperty::Connection] >>= xConnection; - if(aData.sDataSource.isEmpty() || aData.sCommand.isEmpty() || !xResSet.is()) + if((aData.sDataSource.isEmpty() || aData.sCommand.isEmpty()) && !xResSet.is()) { return false; } |