diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-30 20:27:55 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-31 06:27:11 +0000 |
commit | a5a571307fb3306b74ab46b085cde6388270a770 (patch) | |
tree | 66d4ce12bb5236c50ab6a5d253bc8c6d8b5d292d /sw/inc/dcontact.hxx | |
parent | 17d821af6bb9df93569836a92f6bed975587fc6c (diff) |
tdf#82580 tools: rename Rectangle to tools::Rectangle
Mostly generated using
make check COMPILER_EXTERNAL_TOOL=1 CCACHE_PREFIX=clang-rename-wrapper RENAME_ARGS="-qualified-name=Rectangle -new-name=tools::Rectangle"
Except some modules have their own foo::tools namespace, so there have
to use ::tools::Rectangle. This commit just moves the class from the
global namespace, it does not update pre/postwin.h yet.
Change-Id: I42b2de3c6f769fcf28cfe086f98eb31e42a305f2
Reviewed-on: https://gerrit.libreoffice.org/35923
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sw/inc/dcontact.hxx')
-rw-r--r-- | sw/inc/dcontact.hxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index 9021f5b7796d..5276f52ba680 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -284,12 +284,12 @@ class SwDrawVirtObj : public SdrVirtObj virtual void Mirror(const Point& rRef1, const Point& rRef2) override; virtual void Shear(const Point& rRef, long nAngle, double tn, bool bVShear) override; virtual void RecalcSnapRect() override; - virtual const Rectangle& GetSnapRect() const override; - virtual void SetSnapRect(const Rectangle& rRect) override; - virtual void NbcSetSnapRect(const Rectangle& rRect) override; - virtual const Rectangle& GetLogicRect() const override; - virtual void SetLogicRect(const Rectangle& rRect) override; - virtual void NbcSetLogicRect(const Rectangle& rRect) override; + virtual const tools::Rectangle& GetSnapRect() const override; + virtual void SetSnapRect(const tools::Rectangle& rRect) override; + virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; + virtual const tools::Rectangle& GetLogicRect() const override; + virtual void SetLogicRect(const tools::Rectangle& rRect) override; + virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override; virtual Point GetSnapPoint(sal_uInt32 i) const override; virtual Point GetPoint(sal_uInt32 i) const override; virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i) override; @@ -301,8 +301,8 @@ class SwDrawVirtObj : public SdrVirtObj virtual void SetLayer(SdrLayerID nLayer) override; virtual void SetBoundRectDirty() override; - virtual const Rectangle& GetCurrentBoundRect() const override; - virtual const Rectangle& GetLastBoundRect() const override; + virtual const tools::Rectangle& GetCurrentBoundRect() const override; + virtual const tools::Rectangle& GetLastBoundRect() const override; }; bool CheckControlLayer( const SdrObject *pObj ); @@ -399,18 +399,18 @@ class SwDrawContact final : public SwContact SdrObject* GetDrawObjectByAnchorFrame( const SwFrame& _rAnchorFrame ); /// Virtual methods of SdrObjUserCall. - virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect) override; + virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const tools::Rectangle& rOldBoundRect) override; /** Used by Changed() and by UndoDraw. Notifies paragraphs that have to get out of the way. */ - void Changed_(const SdrObject& rObj, SdrUserCallType eType, const Rectangle* pOldBoundRect); + void Changed_(const SdrObject& rObj, SdrUserCallType eType, const tools::Rectangle* pOldBoundRect); /// Moves all SW-connections to new Master) void ChangeMasterObject( SdrObject *pNewMaster ); SwDrawVirtObj* AddVirtObj(); - void NotifyBackgrdOfAllVirtObjs( const Rectangle* pOldBoundRect ); + void NotifyBackgrdOfAllVirtObjs( const tools::Rectangle* pOldBoundRect ); /** get data collection of anchored objects, handled by with contact */ |