From e1544be5759bfbaf93d8a4dd66a950a8736e58e5 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Tue, 31 Jul 2012 14:46:02 +0100
Subject: remove DECLARE_LIST
Change-Id: Ic74476797edbb08ed6721ea9a7d23b0dd042b4ce
---
svl/inc/svl/svdde.hxx | 8 +-------
svl/source/svdde/ddesvr.cxx | 4 ++--
2 files changed, 3 insertions(+), 9 deletions(-)
(limited to 'svl')
diff --git a/svl/inc/svl/svdde.hxx b/svl/inc/svl/svdde.hxx
index e393b368203c..0895a8119e9c 100644
--- a/svl/inc/svl/svdde.hxx
+++ b/svl/inc/svl/svdde.hxx
@@ -23,7 +23,6 @@
#include "svl/svldllapi.h"
#include <sot/exchange.hxx>
#include <tools/string.hxx>
-#include <tools/list.hxx>
#include <tools/link.hxx>
#include <vector>
@@ -45,12 +44,7 @@ struct DdeImp;
class DdeItemImp;
struct Conversation;
-#ifndef _SVDDE_NOLISTS
-DECLARE_LIST( DdeServices, DdeService* )
-#else
-typedef List DdeServices;
-#endif
-
+typedef ::std::vector< DdeService* > DdeServices;
typedef ::std::vector< long > DdeFormats;
typedef ::std::vector< Conversation* > ConvList;
diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index d713191f31a4..dadba4504e16 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -461,7 +461,7 @@ DdeService::DdeService( const String& rService )
pConv = new ConvList;
if ( pInst->pServicesSvr )
- pInst->pServicesSvr->Insert( this );
+ pInst->pServicesSvr->push_back( this );
pName = new DdeString( pInst->hDdeInstSvr, rService );
if ( nStatus == DMLERR_NO_ERROR )
@@ -486,7 +486,7 @@ DdeService::~DdeService()
DdeInstData* pInst = ImpGetInstData();
DBG_ASSERT(pInst,"SVDDE:No instance data");
if ( pInst->pServicesSvr )
- pInst->pServicesSvr->Remove( this );
+ pInst->pServicesSvr->erase(std::remove(pInst->pServicesSvr->begin(), pInst->pServicesSvr->end(), this), pInst->pServicesSvr->end());
// MT: Im Auftrage des Herrn (AM) auskommentiert...
// Grund:
--
cgit