[Libreoffice-commits] .: Branch 'libreoffice-3-3' - sw/source

[Caolán McNamara]

 sw/source/ui/dbui/mmoutputpage.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6bd559789d5867b9a5adf56ec33660539c589a04
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Sun Jan 9 14:06:58 2011 +0000

    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)

diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index a3bad20..f6d0409 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;