diff options
author | Rafael Dominguez <venccsralph@gmail.com> | 2011-02-27 21:45:37 -0800 |
---|---|---|
committer | Joseph Powers <jpowers27@cox.net> | 2011-02-27 21:45:37 -0800 |
commit | 20b77e66d03050108c276f9bb191832125447fa8 (patch) | |
tree | fd379e4eb7adb35b0deefc242bf99dfb54a6ba17 /svx | |
parent | b091c9f867b87d085c0353f61b8f03fa7e6cbd2b (diff) |
[PATCH] Remove deprecated container list for std::vector.
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/inc/clonelist.hxx | 9 | ||||
-rw-r--r-- | svx/source/svdraw/clonelist.cxx | 44 |
2 files changed, 22 insertions, 31 deletions
diff --git a/svx/source/inc/clonelist.hxx b/svx/source/inc/clonelist.hxx index 4320d7332374..3ed91566257b 100644 --- a/svx/source/inc/clonelist.hxx +++ b/svx/source/inc/clonelist.hxx @@ -28,8 +28,9 @@ #ifndef _CLONELIST_HXX_ #define _CLONELIST_HXX_ +#include <vector> + #include <sal/types.h> -#include <tools/list.hxx> // predeclarations class SdrObject; @@ -39,12 +40,10 @@ class SdrObject; // re-creating the connections for contained connectors class CloneList { - List maOriginalList; - List maCloneList; + std::vector<const SdrObject*> maOriginalList; + std::vector<SdrObject*> maCloneList; public: - CloneList(); - ~CloneList(); void AddPair(const SdrObject* pOriginal, SdrObject* pClone); sal_uInt32 Count() const; diff --git a/svx/source/svdraw/clonelist.cxx b/svx/source/svdraw/clonelist.cxx index 1e833213e4d3..e746a257b3d2 100644 --- a/svx/source/svdraw/clonelist.cxx +++ b/svx/source/svdraw/clonelist.cxx @@ -36,18 +36,10 @@ #include <svx/svdoedge.hxx> #include <svx/scene3d.hxx> -CloneList::CloneList() -{ -} - -CloneList::~CloneList() -{ -} - void CloneList::AddPair(const SdrObject* pOriginal, SdrObject* pClone) { - maOriginalList.Insert((SdrObject*)pOriginal, LIST_APPEND); - maCloneList.Insert(pClone, LIST_APPEND); + maOriginalList.push_back(pOriginal); + maCloneList.push_back(pClone); // look for subobjects, too. sal_Bool bOriginalIsGroup(pOriginal->IsGroupObject()); @@ -78,22 +70,22 @@ void CloneList::AddPair(const SdrObject* pOriginal, SdrObject* pClone) sal_uInt32 CloneList::Count() const { - return maOriginalList.Count(); + return maOriginalList.size(); } const SdrObject* CloneList::GetOriginal(sal_uInt32 nIndex) const { - return (SdrObject*)maOriginalList.GetObject(nIndex); + return maOriginalList[nIndex]; } SdrObject* CloneList::GetClone(sal_uInt32 nIndex) const { - return (SdrObject*)maCloneList.GetObject(nIndex); + return maCloneList[nIndex]; } void CloneList::CopyConnections() const { - for(sal_uInt32 a(0); a < maOriginalList.Count(); a++) + for(sal_uInt32 a = 0; a < maOriginalList.size(); a++) { const SdrEdgeObj* pOriginalEdge = PTR_CAST(SdrEdgeObj, GetOriginal(a)); SdrEdgeObj* pCloneEdge = PTR_CAST(SdrEdgeObj, GetClone(a)); @@ -105,27 +97,27 @@ void CloneList::CopyConnections() const if(pOriginalNode1) { - ULONG nPos(maOriginalList.GetPos(pOriginalNode1)); + std::vector<const SdrObject*>::const_iterator it = std::find(maOriginalList.begin(), + maOriginalList.end(), + pOriginalNode1); - if(LIST_ENTRY_NOTFOUND != nPos) + if(it != maOriginalList.end()) { - if(pOriginalEdge->GetConnectedNode(sal_True) != GetClone(nPos)) - { - pCloneEdge->ConnectToNode(sal_True, GetClone(nPos)); - } + if(pOriginalEdge->GetConnectedNode(sal_True) != *it) + pCloneEdge->ConnectToNode(sal_True, const_cast<SdrObject*>(*it)); } } if(pOriginalNode2) { - ULONG nPos(maOriginalList.GetPos(pOriginalNode2)); + std::vector<const SdrObject*>::const_iterator it = std::find(maOriginalList.begin(), + maOriginalList.end(), + pOriginalNode2); - if(LIST_ENTRY_NOTFOUND != nPos) + if(it != maOriginalList.end()) { - if(pOriginalEdge->GetConnectedNode(sal_False) != GetClone(nPos)) - { - pCloneEdge->ConnectToNode(sal_False, GetClone(nPos)); - } + if(pOriginalEdge->GetConnectedNode(sal_True) != *it) + pCloneEdge->ConnectToNode(sal_True, const_cast<SdrObject*>(*it)); } } } |