[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/source

[Oleg Shchelykalnov (via logerrit)]

 sw/source/uibase/dbui/dbmgr.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 06789981b0ed4485f695ad87b332a1b6c3230365
Author:     Oleg Shchelykalnov <olegshtch at yandex.ru>
AuthorDate: Sat Mar 28 15:48:18 2020 +0300
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Mon Mar 30 10:18:48 2020 +0200

    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 at collabora.co.uk>
    (cherry picked from commit a039725510f13c77591106b02f32f5899c37c007)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91290
    Reviewed-by: Oleg Schelykalnov <olegshtch at yandex.ru>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

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;
     }