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 /include/svx/svdmrkv.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 'include/svx/svdmrkv.hxx')
-rw-r--r-- | include/svx/svdmrkv.hxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index 7a2b1e30c42e..8afceb7e2082 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -109,10 +109,10 @@ protected: SdrHdlList maHdlList; sdr::ViewSelection* mpSdrViewSelection; - Rectangle maMarkedObjRect; - Rectangle maMarkedObjRectNoOffset; - Rectangle maMarkedPointsRect; - Rectangle maMarkedGluePointsRect; + tools::Rectangle maMarkedObjRect; + tools::Rectangle maMarkedObjRectNoOffset; + tools::Rectangle maMarkedPointsRect; + tools::Rectangle maMarkedGluePointsRect; sal_uInt16 mnFrameHandlesLimit; sal_uIntPtr mnInsPointNum; // Number of the InsPoint @@ -162,8 +162,8 @@ protected: // Generates a string including degrees symbol, from an angel specification in 1/100deg bool ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark); - virtual bool MarkPoints(const Rectangle* pRect, bool bUnmark); - bool MarkGluePoints(const Rectangle* pRect, bool bUnmark); + virtual bool MarkPoints(const tools::Rectangle* pRect, bool bUnmark); + bool MarkGluePoints(const tools::Rectangle* pRect, bool bUnmark); void SetMoveOutside(bool bOn); @@ -178,7 +178,7 @@ public: virtual void EndAction() override; virtual void BckAction() override; virtual void BrkAction() override; - virtual void TakeActionRect(Rectangle& rRect) const override; + virtual void TakeActionRect(tools::Rectangle& rRect) const override; virtual void ClearPageView() override; virtual void HideSdrPage() override; @@ -291,7 +291,7 @@ public: // Mark all objects within a rectangular area // Just objects are marked which are inclosed completely - void MarkObj(const Rectangle& rRect, bool bUnmark); + void MarkObj(const tools::Rectangle& rRect, bool bUnmark); void MarkObj(SdrObject* pObj, SdrPageView* pPV, bool bUnmark=false, bool bImpNoSetMarkHdl=false); void MarkAllObj(SdrPageView* pPV=nullptr); // pPage=NULL => all displayed pages void UnmarkAllObj(SdrPageView* pPV=nullptr); // pPage=NULL => all displayed pages @@ -403,12 +403,12 @@ public: // The purpose is to avoid unnecessary flickering. -> This does not yet work, that's why sal_True! void AdjustMarkHdl(SfxViewShell* pOtherShell = nullptr); //HMHBOOL bRestraintPaint=sal_True); - const Rectangle& GetMarkedObjRect() const; // SnapRects of Objects, without line width - Rectangle GetMarkedObjBoundRect() const; // incl. line width, overlapping rags, ... - const Rectangle& GetMarkedPointsRect() const; // Enclosing rectangle of all marked points - const Rectangle& GetMarkedGluePointsRect() const; // Enclosing rectangle of all marked glue points - const Rectangle& GetAllMarkedRect() const { return GetMarkedObjRect(); } - Rectangle GetAllMarkedBoundRect() const { return GetMarkedObjBoundRect(); } + const tools::Rectangle& GetMarkedObjRect() const; // SnapRects of Objects, without line width + tools::Rectangle GetMarkedObjBoundRect() const; // incl. line width, overlapping rags, ... + const tools::Rectangle& GetMarkedPointsRect() const; // Enclosing rectangle of all marked points + const tools::Rectangle& GetMarkedGluePointsRect() const; // Enclosing rectangle of all marked glue points + const tools::Rectangle& GetAllMarkedRect() const { return GetMarkedObjRect(); } + tools::Rectangle GetAllMarkedBoundRect() const { return GetMarkedObjBoundRect(); } Point GetGridOffset() const; // Will be always called, if the list of marked objects might be changed. |