diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-20 09:48:50 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-21 10:52:46 +0200 |
commit | ffe84f49270e0a8818365ca7d1fd5242abff5562 (patch) | |
tree | 9fc133fc58737afcfbd49242528811eb320705c3 /include/svx | |
parent | 6b28441fb8823ba28a9db6cf1d97aa277cdcd7b4 (diff) |
remove SdrObject::GetHdl in favour of AddToHdlList
the code already says that using GetHdl is inefficient, and client code
should be using AddToHdlList, so just drop the bad one
Change-Id: I88c43154c8cc0988127b9292e4cda28917f54eb9
Reviewed-on: https://gerrit.libreoffice.org/60792
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/svx')
-rw-r--r-- | include/svx/svdhdl.hxx | 3 | ||||
-rw-r--r-- | include/svx/svdoashp.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdobj.hxx | 1 | ||||
-rw-r--r-- | include/svx/svdocapt.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdocirc.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdoedge.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdograf.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdomeas.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdopath.hxx | 3 | ||||
-rw-r--r-- | include/svx/svdorect.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdotable.hxx | 1 | ||||
-rw-r--r-- | include/svx/svdotext.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdovirt.hxx | 1 |
13 files changed, 12 insertions, 13 deletions
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 0e954c16dce0..5416ec71c68d 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -461,6 +461,9 @@ public: SdrHdl* RemoveHdl(size_t nNum); void RemoveAllByKind(SdrHdlKind eKind); + // move the ownership of all the SdrHdl to rOther + void MoveTo(SdrHdlList& rOther); + // Last inserted handles are likely hit (if the handles are above each other) SdrHdl* IsHdlListHit(const Point& rPnt) const; SdrHdl* GetHdl(SdrHdlKind eKind1) const; diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index ed90a91d79d0..e7f915992eae 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -240,7 +240,7 @@ public: virtual SdrGluePointList* ForceGluePointList() override; virtual sal_uInt32 GetHdlCount() const override; - virtual SdrHdl* GetHdl( sal_uInt32 nHdlNum ) const override; + virtual void AddToHdlList(SdrHdlList& rHdlList) const override; // #i33136# static bool doConstructOrthogonal(const OUString& rName); diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index d01031c40112..5c5fb75ca26a 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -521,7 +521,6 @@ public: /// An object that returns true from HasSpacialDrag() must provide these /// methods (incl. FillHdlList()). virtual sal_uInt32 GetHdlCount() const; - virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const; virtual sal_uInt32 GetPlusHdlCount(const SdrHdl& rHdl) const; virtual SdrHdl* GetPlusHdl(const SdrHdl& rHdl, sal_uInt32 nPlNum) const; virtual void AddToHdlList(SdrHdlList& rHdlList) const; diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx index 124e83c206b2..68bc32a51fae 100644 --- a/include/svx/svdocapt.hxx +++ b/include/svx/svdocapt.hxx @@ -106,7 +106,7 @@ public: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; virtual sal_uInt32 GetHdlCount() const override; - virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const override; + virtual void AddToHdlList(SdrHdlList& rHdlList) const override; // special drag methods virtual bool hasSpecialDrag() const override; diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx index 8ce5681094b4..b681ad5acc44 100644 --- a/include/svx/svdocirc.hxx +++ b/include/svx/svdocirc.hxx @@ -109,7 +109,7 @@ public: virtual Point GetSnapPoint(sal_uInt32 i) const override; virtual sal_uInt32 GetHdlCount() const override; - virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const override; + virtual void AddToHdlList(SdrHdlList& rHdlList) const override; // special drag methods virtual bool hasSpecialDrag() const override; diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx index 61b53414fa6d..0a68d6f84646 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -227,7 +227,7 @@ public: virtual basegfx::B2DPolyPolygon TakeXorPoly() const override; virtual sal_uInt32 GetHdlCount() const override; - virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const override; + virtual void AddToHdlList(SdrHdlList& rHdlList) const override; // special drag methods virtual bool hasSpecialDrag() const override; diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index 42cc1a37f83a..8cc7395a2283 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -179,7 +179,7 @@ public: SdrGrafObj& operator=(const SdrGrafObj& rObj); virtual sal_uInt32 GetHdlCount() const override; - virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const override; + virtual void AddToHdlList(SdrHdlList& rHdlList) const override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; virtual void NbcMirror(const Point& rRef1, const Point& rRef2) override; diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx index 409dbbf92d9c..374cdff602fd 100644 --- a/include/svx/svdomeas.hxx +++ b/include/svx/svdomeas.hxx @@ -95,7 +95,7 @@ public: virtual basegfx::B2DPolyPolygon TakeXorPoly() const override; virtual sal_uInt32 GetHdlCount() const override; - virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const override; + virtual void AddToHdlList(SdrHdlList& rHdlList) const override; // special drag methods virtual bool hasSpecialDrag() const override; diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx index 0f58f1f7354c..66c3b0410e5b 100644 --- a/include/svx/svdopath.hxx +++ b/include/svx/svdopath.hxx @@ -86,10 +86,9 @@ public: virtual void RecalcSnapRect() override; virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; virtual sal_uInt32 GetHdlCount() const override; - virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const override; + virtual void AddToHdlList(SdrHdlList& rHdlList) const override; virtual sal_uInt32 GetPlusHdlCount(const SdrHdl& rHdl) const override; virtual SdrHdl* GetPlusHdl(const SdrHdl& rHdl, sal_uInt32 nPlNum) const override; - virtual void AddToHdlList(SdrHdlList& rHdlList) const override; // special drag methods virtual bool hasSpecialDrag() const override; diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx index 15d5c3672f9b..00f1b481b733 100644 --- a/include/svx/svdorect.hxx +++ b/include/svx/svdorect.hxx @@ -99,7 +99,7 @@ public: virtual basegfx::B2DPolyPolygon TakeXorPoly() const override; virtual sal_uInt32 GetHdlCount() const override; - virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const override; + virtual void AddToHdlList(SdrHdlList& rHdlList) const override; // Special drag methods virtual bool hasSpecialDrag() const override; diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index 6f52fde2a7dc..72d5f25f627e 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -211,7 +211,6 @@ public: virtual void AdjustToMaxRect( const tools::Rectangle& rMaxRect, bool bShrinkOnly = false ) override; virtual sal_uInt32 GetHdlCount() const override; - virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const override; virtual void AddToHdlList(SdrHdlList& rHdlList) const override; // Special drag methods diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index deb8e74477cf..9bca148fd443 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -459,7 +459,7 @@ public: virtual Point GetSnapPoint(sal_uInt32 i) const override; virtual sal_uInt32 GetHdlCount() const override; - virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const override; + virtual void AddToHdlList(SdrHdlList& rHdlList) const override; // special drag methods virtual bool hasSpecialDrag() const override; diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx index 45c04ccff893..5d562a73e2c9 100644 --- a/include/svx/svdovirt.hxx +++ b/include/svx/svdovirt.hxx @@ -77,7 +77,6 @@ public: virtual basegfx::B2DPolyPolygon TakeXorPoly() const override; virtual sal_uInt32 GetHdlCount() const override; - virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const override; virtual sal_uInt32 GetPlusHdlCount(const SdrHdl& rHdl) const override; virtual SdrHdl* GetPlusHdl(const SdrHdl& rHdl, sal_uInt32 nPlNum) const override; virtual void AddToHdlList(SdrHdlList& rHdlList) const override; |