diff options
| author | Noel Grandin <noel@peralex.com> | 2012-08-14 16:31:53 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-08-16 15:14:57 +0200 |
| commit | aa11e7bae89fe691f914abb27d1c4a03d27a7ee5 (patch) | |
| tree | 0a942c1ecf43fb08c87a41517f3b4588bb40968b /svx/inc | |
| parent | 7758eaf702849691dcf24472d864ee7ff6d02345 (diff) | |
Convert maList in SdrMarkList from Container to std::vector
Change-Id: I1e975805a82dcf273cde8a9deba4a7e31dbd72b2
Diffstat (limited to 'svx/inc')
| -rw-r--r-- | svx/inc/svx/svdmark.hxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/svx/inc/svx/svdmark.hxx b/svx/inc/svx/svdmark.hxx index 429570b99475..c29ce818a519 100644 --- a/svx/inc/svx/svdmark.hxx +++ b/svx/inc/svx/svdmark.hxx @@ -31,7 +31,6 @@ #include <vector> -#include <tools/contnr.hxx> #include <tools/string.hxx> #include "svx/svxdllapi.h" #include <svx/sdrobjectuser.hxx> @@ -177,7 +176,7 @@ public: class SVX_DLLPUBLIC SdrMarkList { protected: - Container maList; + std::vector<SdrMark*> maList; String maMarkName; String maPointName; @@ -197,7 +196,7 @@ private: public: SdrMarkList() - : maList(1024, 64, 64), + : maList(), mbPointNameOk(sal_False), mbGluePointNameOk(sal_False), mbNameOk(sal_False), @@ -206,7 +205,7 @@ public: } SdrMarkList(const SdrMarkList& rLst) - : maList(1024, 64, 64) + : maList() { *this = rLst; } @@ -225,12 +224,12 @@ public: sal_uLong GetMarkCount() const { - return maList.Count(); + return maList.size(); } SdrMark* GetMark(sal_uLong nNum) const { - return (SdrMark*)(maList.GetObject(nNum)); + return maList[nNum]; } sal_uLong FindObject(const SdrObject* pObj) const; |