[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source

[Rodolfo Ribeiro Gomes]

 sw/source/ui/dbui/mailmergechildwindow.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aa3297af50b9a197428565bb927cf566a9198435
Author: Rodolfo Ribeiro Gomes <rodolforg at gmail.com>
Date:   Mon Nov 25 23:34:09 2013 -0200

    Mailmerge shows wrong number of emails to be sent
    
    The progress bar is ok, but the text is displayed with the total
    number of registers instead of the amount selected to be used.
    
    Change-Id: I81da0e7ba9f193366e12cbf81118e36a43bcaad4
    Signed-off-by: Rodolfo Ribeiro Gomes <rodolforg at gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/6810
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit eda8111fdf9b1c69935237106a73d1c53c2776e1)

diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx
index 682ab22..c1dc07a 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.cxx
+++ b/sw/source/ui/dbui/mailmergechildwindow.cxx
@@ -648,7 +648,7 @@ void SwSendMailDialog::UpdateTransferStatus()
 {
     OUString sStatus( m_sTransferStatus );
     sStatus = sStatus.replaceFirst("%1", OUString::number(m_nSendCount) );
-    sStatus = sStatus.replaceFirst("%2", OUString::number(m_pImpl->nDocumentCount));
+    sStatus = sStatus.replaceFirst("%2", OUString::number(m_pImpl->aDescriptors.size()));
     m_aTransferStatusFT.SetText(sStatus);
 
     sStatus = m_sErrorStatus.replaceFirst("%1", OUString::number(m_nErrorCount) );