diff options
| author | Alex McMurchy1917 <mcmurchy1917-libreoffice@yahoo.co.uk> | 2017-01-12 11:06:52 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-01-13 11:50:42 +0000 |
| commit | 4c8be6327f6d71d426bbf9887fd7d8a24ffd06a3 (patch) | |
| tree | 40f8f2081fffb34cdd9818833278f8bf89737da6 | |
| parent | e9c1b787b5b42837f0586add87f76e78b1eba529 (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/33012
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index e9d6363967d3..6052e11b6c94 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1055,7 +1055,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 ); |