summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex McMurchy1917 <mcmurchy1917-libreoffice@yahoo.co.uk>2017-01-12 11:06:52 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-01-13 11:51:33 +0000
commit9ec13271b435dc5b2e1753507e1e470624bb93ae (patch)
treea98550fe92742f244f0b3e03002204a401f65a7b
parent9e03d012047101043c0b71d79f5497728125e089 (diff)
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@fbihome.de> Tested-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 03ec9c397c676faff51041d992f6d715c475ff13) Reviewed-on: https://gerrit.libreoffice.org/33013 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-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 c5b512337b44..7be5340eb1b3 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 );