[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sw/source

[Alex McMurchy1917]

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

New commits:
commit 9ec13271b435dc5b2e1753507e1e470624bb93ae
Author: Alex McMurchy1917 <mcmurchy1917-libreoffice at yahoo.co.uk>
Date:   Thu Jan 12 11:06:52 2017 +0000

    tdf#105071 MM no emails sent when using doc as mail body
    
    The conditional statement exits if there is data to process and
    continues if there is no data to process. Thus all records are lost.
    
    This commit reverses this behaviour so that data is processed
    by the rest of the Mail merge activities.
    
    Change-Id: I4c92cbd7ca55be7842b07ad887813e417430ba4f
    Reviewed-on: https://gerrit.libreoffice.org/32994
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
    Tested-by: Jan-Marek Glogowski <glogow at fbihome.de>
    (cherry picked from commit 03ec9c397c676faff51041d992f6d715c475ff13)
    Reviewed-on: https://gerrit.libreoffice.org/33013
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index c5b5123..7be5340 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1056,7 +1056,7 @@ uno::Reference< mail::XMailMessage > lcl_CreateMailFromDoc(
         SfxMedium aMedium( sFileURL, StreamMode::READ );
         SvStream* pInStream = aMedium.GetInStream();
         assert( pInStream && "no output file created?" );
-        if( pInStream )
+        if( !pInStream )
             return xMessage;
 
         pInStream->SetStreamCharSet( sMailEncoding );