summaryrefslogtreecommitdiff
path: root/sw
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
commit6bd559789d5867b9a5adf56ec33660539c589a04 (patch)
tree74731b8aa2ee9e3ef66aa02e6429c33720891204 /sw
parentb44161cba1b34f9513034561a206768c029bde5b (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)
Diffstat (limited to 'sw')
-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 a3bad20429..f6d0409700 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;