summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorOleg Shchelykalnov <olegshtch@yandex.ru>2020-03-28 15:48:18 +0300
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-03-28 20:29:04 +0100
commita039725510f13c77591106b02f32f5899c37c007 (patch)
treecec465b89b08e2f881ea0af12f240516513deb86 /sw/source
parentcd868678583fa92833c37a63089131ba905dd3a6 (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>
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 0fd0ffc46cf5..a51cb6366753 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -466,7 +466,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;
}