diff options
| author | Noel Grandin <noel@peralex.com> | 2012-08-15 08:28:22 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-08-16 15:14:57 +0200 |
| commit | 7d5922ca8f04604aba57708ee20fb4cdeaea2e44 (patch) | |
| tree | fa99fbd40f9aff95d82134d1f90174bb0ef39c88 /svx/inc | |
| parent | aa11e7bae89fe691f914abb27d1c4a03d27a7ee5 (diff) | |
Convert aList in SdrHdlList class from Container to std::deque
Change-Id: I54c60fefe2e808b5e6251286a72537e5a88bf566
Diffstat (limited to 'svx/inc')
| -rw-r--r-- | svx/inc/svx/svdhdl.hxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx index 0744c35c361a..3a44b927fb20 100644 --- a/svx/inc/svx/svdhdl.hxx +++ b/svx/inc/svx/svdhdl.hxx @@ -32,7 +32,6 @@ #include <tools/gen.hxx> #include <vcl/pointr.hxx> -#include <tools/contnr.hxx> #include <svl/solar.hrc> @@ -449,15 +448,15 @@ class SVX_DLLPUBLIC SdrHdlList protected: sal_uIntPtr mnFocusIndex; SdrMarkView* pView; - Container aList; - sal_uInt16 nHdlSize; + std::deque<SdrHdl*> aList; + sal_uInt16 nHdlSize; unsigned bRotateShear : 1; unsigned bDistortShear : 1; unsigned bMoveOutside : 1; // Handles nach aussen ruecken (fuer TextEdit) private: - SVX_DLLPRIVATE SdrHdlList(const SdrHdlList&): aList(1024,64,64) {} + SVX_DLLPRIVATE SdrHdlList(const SdrHdlList&): aList() {} SVX_DLLPRIVATE void operator=(const SdrHdlList&) {} SVX_DLLPRIVATE sal_Bool operator==(const SdrHdlList&) const { return sal_False; } SVX_DLLPRIVATE sal_Bool operator!=(const SdrHdlList&) const { return sal_False; } @@ -480,8 +479,8 @@ public: // 2.Level PageView (Pointer) // 3.Level Position (x+y) void Sort(); - sal_uIntPtr GetHdlCount() const { return aList.Count(); } - SdrHdl* GetHdl(sal_uIntPtr nNum) const { return (SdrHdl*)(aList.GetObject(nNum)); } + sal_uIntPtr GetHdlCount() const { return aList.size(); } + SdrHdl* GetHdl(sal_uIntPtr nNum) const { return aList[nNum]; } sal_uIntPtr GetHdlNum(const SdrHdl* pHdl) const; void SetHdlSize(sal_uInt16 nSiz); sal_uInt16 GetHdlSize() const { return nHdlSize; } |