sw/source/uibase/dbui/dbmgr.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a039725510f13c77591106b02f32f5899c37c007
Author: Oleg Shchelykalnov <olegsh...@yandex.ru>
AuthorDate: Sat Mar 28 15:48:18 2020 +0300
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Mar 28 20:29:04 2020 +0100
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.gran...@collabora.co.uk>
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;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
