summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sfx2/inc/mailmodelapi.hxx6
-rw-r--r--sfx2/source/dialog/mailmodel.cxx51
-rw-r--r--sfx2/source/dialog/mailmodelapi.cxx25
3 files changed, 35 insertions, 47 deletions
diff --git a/sfx2/inc/mailmodelapi.hxx b/sfx2/inc/mailmodelapi.hxx
index 7118f916cb07..6abe5f987597 100644
--- a/sfx2/inc/mailmodelapi.hxx
+++ b/sfx2/inc/mailmodelapi.hxx
@@ -35,9 +35,11 @@
#include <tools/string.hxx>
#include "sfx2/dllapi.h"
-// class SfxMailModel_Impl -----------------------------------------------
+// class AddressList_Impl ------------------------------------------------
+typedef String* AddressItemPtr_Impl;
+typedef ::std::vector< AddressItemPtr_Impl > AddressList_Impl;
-class AddressList_Impl;
+// class SfxMailModel_Impl -----------------------------------------------
class SFX2_DLLPUBLIC SfxMailModel
{
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index 88e7d50150d4..43ec237bbba9 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -96,11 +96,6 @@ using namespace ::rtl;
namespace css = ::com::sun::star;
-// class AddressList_Impl ------------------------------------------------
-
-typedef String* AddressItemPtr_Impl;
-DECLARE_LIST( AddressList_Impl, AddressItemPtr_Impl )
-
// class SfxMailModel -----------------------------------------------
static const char PDF_DOCUMENT_TYPE[] = "pdf_Portable_Document_Format";
@@ -110,10 +105,9 @@ void SfxMailModel::ClearList( AddressList_Impl* pList )
{
if ( pList )
{
- ULONG i, nCount = pList->Count();
- for ( i = 0; i < nCount; ++i )
- delete pList->GetObject(i);
- pList->Clear();
+ for( size_t i = 0, n = pList->size(); i < n; ++i )
+ delete pList->at(i);
+ pList->clear();
}
}
@@ -122,12 +116,11 @@ void SfxMailModel::MakeValueList( AddressList_Impl* pList, String& rValueList )
rValueList.Erase();
if ( pList )
{
- ULONG i, nCount = pList->Count();
- for ( i = 0; i < nCount; ++i )
+ for( size_t i = 0, n = pList->size(); i < n; ++i )
{
if ( rValueList.Len() > 0 )
rValueList += ',';
- rValueList += *pList->GetObject(i);
+ rValueList += *pList->at(i);
}
}
}
@@ -704,21 +697,21 @@ void SfxMailModel::AddAddress( const String& rAddress, AddressRole eRole )
{
if ( !mpToList )
// create the list
- mpToList = new AddressList_Impl;
+ mpToList = new AddressList_Impl();
pList = mpToList;
}
else if ( ROLE_CC == eRole )
{
if ( !mpCcList )
// create the list
- mpCcList = new AddressList_Impl;
+ mpCcList = new AddressList_Impl();
pList = mpCcList;
}
else if ( ROLE_BCC == eRole )
{
if ( !mpBccList )
// create the list
- mpBccList = new AddressList_Impl;
+ mpBccList = new AddressList_Impl();
pList = mpBccList;
}
else
@@ -730,7 +723,7 @@ void SfxMailModel::AddAddress( const String& rAddress, AddressRole eRole )
{
// add address to list
AddressItemPtr_Impl pAddress = new String( rAddress );
- pList->Insert( pAddress, LIST_APPEND );
+ pList->push_back( pAddress );
}
}
}
@@ -793,52 +786,52 @@ SfxMailModel::SendMailResult SfxMailModel::Send( const css::uno::Reference< css:
}
xSimpleMailMessage->setOriginator( maFromAddress );
- sal_Int32 nToCount = mpToList ? mpToList->Count() : 0;
- sal_Int32 nCcCount = mpCcList ? mpCcList->Count() : 0;
- sal_Int32 nCcSeqCount = nCcCount;
+ size_t nToCount = mpToList ? mpToList->size() : 0;
+ size_t nCcCount = mpCcList ? mpCcList->size() : 0;
+ size_t nCcSeqCount = nCcCount;
// set recipient (only one) for this simple mail server!!
if ( nToCount > 1 )
{
nCcSeqCount = nToCount - 1 + nCcCount;
- xSimpleMailMessage->setRecipient( *mpToList->GetObject( 0 ));
+ xSimpleMailMessage->setRecipient( *mpToList->at( 0 ) );
nSendFlags = SimpleMailClientFlags::NO_USER_INTERFACE;
}
else if ( nToCount == 1 )
{
- xSimpleMailMessage->setRecipient( *mpToList->GetObject( 0 ));
+ xSimpleMailMessage->setRecipient( *mpToList->at( 0 ) );
nSendFlags = SimpleMailClientFlags::NO_USER_INTERFACE;
}
// all other recipient must be handled with CC recipients!
if ( nCcSeqCount > 0 )
{
- sal_Int32 nIndex = 0;
+ size_t nIndex = 0;
Sequence< OUString > aCcRecipientSeq;
aCcRecipientSeq.realloc( nCcSeqCount );
if ( nCcSeqCount > nCcCount )
{
- for ( sal_Int32 i = 1; i < nToCount; ++i )
+ for ( size_t i = 1; i < nToCount; ++i )
{
- aCcRecipientSeq[nIndex++] = *mpToList->GetObject(i);
+ aCcRecipientSeq[nIndex++] = *mpToList->at(i);
}
}
- for ( sal_Int32 i = 0; i < nCcCount; i++ )
+ for ( size_t i = 0; i < nCcCount; i++ )
{
- aCcRecipientSeq[nIndex++] = *mpCcList->GetObject(i);
+ aCcRecipientSeq[nIndex++] = *mpCcList->at(i);
}
xSimpleMailMessage->setCcRecipient( aCcRecipientSeq );
}
- sal_Int32 nBccCount = mpBccList ? mpBccList->Count() : 0;
+ size_t nBccCount = mpBccList ? mpBccList->size() : 0;
if ( nBccCount > 0 )
{
Sequence< OUString > aBccRecipientSeq( nBccCount );
- for ( sal_Int32 i = 0; i < nBccCount; ++i )
+ for ( size_t i = 0; i < nBccCount; ++i )
{
- aBccRecipientSeq[i] = *mpBccList->GetObject(i);
+ aBccRecipientSeq[i] = *mpBccList->at(i);
}
xSimpleMailMessage->setBccRecipient( aBccRecipientSeq );
}
diff --git a/sfx2/source/dialog/mailmodelapi.cxx b/sfx2/source/dialog/mailmodelapi.cxx
index 93d0291ac310..5a488f845b8f 100644
--- a/sfx2/source/dialog/mailmodelapi.cxx
+++ b/sfx2/source/dialog/mailmodelapi.cxx
@@ -213,21 +213,15 @@ void SAL_CALL OMailSendThreadImpl::onTerminated()
delete this;
}
-// class AddressList_Impl ------------------------------------------------
-
-typedef String* AddressItemPtr_Impl;
-DECLARE_LIST( AddressList_Impl, AddressItemPtr_Impl )
-
// class SfxMailModel -----------------------------------------------
void SfxMailModel::ClearList( AddressList_Impl* pList )
{
if ( pList )
{
- ULONG i, nCount = pList->Count();
- for ( i = 0; i < nCount; ++i )
- delete pList->GetObject(i);
- pList->Clear();
+ for ( size_t i = 0, nCount = pList->size(); i < nCount; ++i )
+ delete pList->at(i);
+ pList->clear();
}
}
@@ -236,12 +230,11 @@ void SfxMailModel::MakeValueList( AddressList_Impl* pList, String& rValueList )
rValueList.Erase();
if ( pList )
{
- ULONG i, nCount = pList->Count();
- for ( i = 0; i < nCount; ++i )
+ for ( size_t i = 0, nCount = pList->size(); i < nCount; ++i )
{
if ( rValueList.Len() > 0 )
rValueList += ',';
- rValueList += *pList->GetObject(i);
+ rValueList += *pList->at(i);
}
}
}
@@ -539,21 +532,21 @@ void SfxMailModel::AddAddress( const String& rAddress, AddressRole eRole )
{
if ( !mpToList )
// create the list
- mpToList = new AddressList_Impl;
+ mpToList = new AddressList_Impl();
pList = mpToList;
}
else if ( ROLE_CC == eRole )
{
if ( !mpCcList )
// create the list
- mpCcList = new AddressList_Impl;
+ mpCcList = new AddressList_Impl();
pList = mpCcList;
}
else if ( ROLE_BCC == eRole )
{
if ( !mpBccList )
// create the list
- mpBccList = new AddressList_Impl;
+ mpBccList = new AddressList_Impl();
pList = mpBccList;
}
else
@@ -565,7 +558,7 @@ void SfxMailModel::AddAddress( const String& rAddress, AddressRole eRole )
{
// add address to list
AddressItemPtr_Impl pAddress = new String( rAddress );
- pList->Insert( pAddress, LIST_APPEND );
+ pList->push_back( pAddress );
}
}
}
generated by cgit (git 2.34.1) at 2025-02-28 16:33:04 +0000