diff options
| -rw-r--r-- | sfx2/source/appl/lnkbase2.cxx | 6 | ||||
| -rw-r--r-- | svl/inc/svl/svdde.hxx | 8 | ||||
| -rw-r--r-- | svl/source/svdde/ddesvr.cxx | 4 | ||||
| -rw-r--r-- | tools/inc/tools/list.hxx | 61 |
4 files changed, 7 insertions, 72 deletions
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index 8bc670491176..a2b7410f3516 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -606,8 +606,9 @@ static DdeTopic* FindTopic( const String & rLinkName, sal_uInt16* pItemStt ) String sService( sNm.GetToken( 0, cTokenSeperator, nTokenPos ) ); DdeServices& rSvc = DdeService::GetServices(); - for( DdeService* pService = rSvc.First(); pService; - pService = rSvc.Next() ) + for (DdeServices::iterator aI = rSvc.begin(); aI != rSvc.end(); ++aI) + { + DdeService* pService = *aI; if( pService->GetName() == sService ) { // then we search for the Topic @@ -631,6 +632,7 @@ static DdeTopic* FindTopic( const String & rLinkName, sal_uInt16* pItemStt ) } break; } + } return 0; } 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: diff --git a/tools/inc/tools/list.hxx b/tools/inc/tools/list.hxx index 63d4ff6f7fec..d7a4e0e02d59 100644 --- a/tools/inc/tools/list.hxx +++ b/tools/inc/tools/list.hxx @@ -63,67 +63,6 @@ public: { return Container::operator !=( rList ); } }; -// ---------------- -// - DECLARE_LIST - -// ---------------- - -#define DECLARE_LIST( ClassName, Type ) \ -class ClassName : private List \ -{ \ -public: \ - using List::Clear; \ - using List::Count; \ - using List::GetCurPos; \ - \ - ClassName( sal_uInt16 _nInitSize = 16, \ - sal_uInt16 _nReSize = 16 ) : \ - List( _nInitSize, _nReSize ) {} \ - ClassName( sal_uInt16 _nBlockSize, sal_uInt16 _nInitSize, \ - sal_uInt16 _nReSize ) : \ - List( _nBlockSize, _nInitSize, _nReSize ) {} \ - ClassName( const ClassName& rClassName ) : \ - List( rClassName ) {} \ - \ - void Insert( Type p, sal_uIntPtr nIndex ) \ - { List::Insert( (void*)p, nIndex ); } \ - void Insert( Type p ) \ - { List::Insert( (void*)p ); } \ - Type Remove() \ - { return (Type)List::Remove(); } \ - Type Remove( sal_uIntPtr nIndex ) \ - { return (Type)List::Remove( nIndex ); } \ - Type Remove( Type p ) \ - { return (Type)List::Remove( (void*)p ); } \ - Type Replace( Type p, sal_uIntPtr nIndex ) \ - { return (Type)List::Replace( (void*)p, nIndex ); } \ - Type Replace( Type pNew, Type pOld ) \ - { return (Type)List::Replace( (void*)pNew, \ - (void*)pOld ); } \ - \ - Type GetCurObject() const \ - { return (Type)List::GetCurObject(); } \ - Type GetObject( sal_uIntPtr nIndex ) const \ - { return (Type)List::GetObject( nIndex ); } \ - sal_uIntPtr GetPos( const Type p ) const \ - { return List::GetPos( (const void*)p ); } \ - \ - Type Seek( sal_uIntPtr nIndex ) \ - { return (Type)List::Seek( nIndex ); } \ - Type Seek( void* p ) { return (Type)List::Seek( p ); } \ - Type First() { return (Type)List::First(); } \ - Type Last() { return (Type)List::Last(); } \ - Type Next() { return (Type)List::Next(); } \ - Type Prev() { return (Type)List::Prev(); } \ - \ - ClassName& operator =( const ClassName& rClassName ) \ - { List::operator =( rClassName ); return *this; } \ - \ - sal_Bool operator ==( const ClassName& rList ) const \ - { return List::operator ==( rList ); } \ - sal_Bool operator !=( const ClassName& rList ) const \ - { return List::operator !=( rList ); } \ -}; - #endif // _LIST_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |