From f7b305015043c4f9e0a669afc7222d873c548ad5 Mon Sep 17 00:00:00 2001
From: Matteo Casalin <matteo.casalin@yahoo.com>
Date: Sun, 13 Sep 2015 16:50:53 +0200
Subject: Avoid getTokenCount in (SwMailMergeOutputTypePage) TypeHdl_Impl link

Change-Id: If506716a45a869c40a0a449189b049c38215e25c
---
 sw/source/ui/dbui/mmoutputtypepage.cxx | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'sw/source/ui')

diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 382c09cc9318..c2f84e933b78 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -77,7 +77,6 @@ IMPL_LINK_NOARG_TYPED(SwMailMergeOutputTypePage, TypeHdl_Impl, Button*, void)
 
 #include <rtl/ref.hxx>
 #include <com/sun/star/mail/XSmtpService.hpp>
-#include <comphelper/string.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/idle.hxx>
 
@@ -505,27 +504,25 @@ void  SwSendMailDialog::IterateMails()
         //CC and BCC are tokenized by ';'
         if(!pCurrentMailDescriptor->sCC.isEmpty())
         {
-            OUString sTokens( pCurrentMailDescriptor->sCC );
-            sal_uInt16 nTokens = comphelper::string::getTokenCount(sTokens, ';');
             sal_Int32 nPos = 0;
-            for( sal_uInt16 nToken = 0; nToken < nTokens; ++nToken)
+            do
             {
-                OUString sTmp = sTokens.getToken( 0, ';', nPos);
+                OUString sTmp = pCurrentMailDescriptor->sCC.getToken( 0, ';', nPos );
                 if( !sTmp.isEmpty() )
                     pMessage->addCcRecipient( sTmp );
             }
+            while (nPos >= 0);
         }
         if(!pCurrentMailDescriptor->sBCC.isEmpty())
         {
-            OUString sTokens( pCurrentMailDescriptor->sBCC );
-            sal_uInt16 nTokens = comphelper::string::getTokenCount(sTokens, ';');
             sal_Int32 nPos = 0;
-            for( sal_uInt16 nToken = 0; nToken < nTokens; ++nToken)
+            do
             {
-                OUString sTmp = sTokens.getToken( 0, ';', nPos);
+                OUString sTmp = pCurrentMailDescriptor->sBCC.getToken( 0, ';', nPos );
                 if( !sTmp.isEmpty() )
                     pMessage->addBccRecipient( sTmp );
             }
+            while (nPos >= 0);
         }
         m_pImpl->xMailDispatcher->enqueueMailMessage( xMessage );
         pCurrentMailDescriptor = m_pImpl->GetNextDescriptor();
-- 
cgit v1.2.3