summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKohei Yoshida <kyoshida@novell.com>2011-01-09 14:06:58 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-01-09 14:08:59 +0000
commitb41b7cbef3ca21ad38e527a116e76a62c91c4b16 (patch)
tree00be13d8e80feaef3875d466d0826e06b68f3a7d
parentca1b76d81e4a1ec15d68af98bf6541ca72bcaf2d (diff)
We need to move to the next record during mail merge. (fdo#32790)
I believe this code change was unintentional. We shouldn't be skipping MoveResultSet call or else all the emails would be sent to the first person unintentionally. ;-) (cherry picked from commit 20b3b54b246159baeac941fe0acdeb61cc5cd112)
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 78cc8bab51a7..5a5ba88615c3 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -1221,9 +1221,9 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
#if OSL_DEBUG_LEVEL > 1
sal_Int32 nTarget =
- rConfigItem.MoveResultSet(rInfo.nDBRow);
- OSL_ENSURE( nTarget == rInfo.nDBRow, "row of current document could not be selected");
#endif
+ rConfigItem.MoveResultSet(rInfo.nDBRow);
+ OSL_ENSURE( nTarget == rInfo.nDBRow, "row of current document could not be selected");
OSL_ENSURE( sEMailColumn.Len(), "No email column selected");
::rtl::OUString sEMail = lcl_GetColumnValueOf(sEMailColumn, xColAccess);
SwMailDescriptor aDesc;