From a5a571307fb3306b74ab46b085cde6388270a770 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 30 Mar 2017 20:27:55 +0200 Subject: 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 Tested-by: Jenkins --- sw/inc/EnhancedPDFExportHelper.hxx | 4 ++-- sw/inc/PostItMgr.hxx | 8 ++++---- sw/inc/SidebarWin.hxx | 6 +++--- sw/inc/accmap.hxx | 6 +++--- sw/inc/anchoreddrawobject.hxx | 8 ++++---- sw/inc/crsrsh.hxx | 2 +- sw/inc/dcontact.hxx | 22 +++++++++++----------- sw/inc/docsh.hxx | 4 ++-- sw/inc/dpage.hxx | 2 +- sw/inc/fesh.hxx | 2 +- sw/inc/pagepreviewlayout.hxx | 12 ++++++------ sw/inc/swcli.hxx | 2 +- sw/inc/swrect.hxx | 8 ++++---- sw/inc/textboxhelper.hxx | 5 ++++- sw/inc/unotxdoc.hxx | 2 +- sw/inc/view.hxx | 12 ++++++------ sw/inc/viewsh.hxx | 6 +++--- 17 files changed, 57 insertions(+), 54 deletions(-) (limited to 'sw/inc') diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx index 0aab23331921..692e580fae60 100644 --- a/sw/inc/EnhancedPDFExportHelper.hxx +++ b/sw/inc/EnhancedPDFExportHelper.hxx @@ -247,8 +247,8 @@ class SwEnhancedPDFExportHelper static LanguageType GetDefaultLanguage() {return eLanguageDefault; } //scale and position rRectangle if we're scaling due to notes in margins. - Rectangle SwRectToPDFRect(const SwPageFrame* pCurrPage, - const Rectangle& rRectangle) const; + tools::Rectangle SwRectToPDFRect(const SwPageFrame* pCurrPage, + const tools::Rectangle& rRectangle) const; }; #endif diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index 83e3ba469af8..137080292eb3 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -174,7 +174,7 @@ class SwPostItMgr: public SfxListener void AutoScroll(const sw::sidebarwindows::SwSidebarWin* pPostIt,const unsigned long aPage ); bool ScrollbarHit(const unsigned long aPage,const Point &aPoint); bool LayoutByPage( std::list &aVisiblePostItList, - const Rectangle& rBorder, + const tools::Rectangle& rBorder, long lNeededHeight); void CheckForRemovedPostIts(); bool ArrowEnabled(sal_uInt16 aDirection,unsigned long aPage) const; @@ -233,8 +233,8 @@ class SwPostItMgr: public SfxListener void Rescale(); - Rectangle GetBottomScrollRect(const unsigned long aPage) const; - Rectangle GetTopScrollRect(const unsigned long aPage) const; + tools::Rectangle GetBottomScrollRect(const unsigned long aPage) const; + tools::Rectangle GetTopScrollRect(const unsigned long aPage) const; bool IsHit(const Point &aPointPixel); /// Get the matching window that is responsible for handling mouse events of rPointLogic, if any. @@ -293,7 +293,7 @@ class SwPostItMgr: public SfxListener std::vector< vcl::Window* >* pChildren ); void DrawNotesForPage(OutputDevice *pOutDev, sal_uInt32 nPage); - void PaintTile(OutputDevice& rRenderContext, const Rectangle& rRect); + void PaintTile(OutputDevice& rRenderContext, const tools::Rectangle& rRect); }; #endif diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx index 95ac4fb1ab31..630fea42c0d5 100644 --- a/sw/inc/SidebarWin.hxx +++ b/sw/inc/SidebarWin.hxx @@ -188,7 +188,7 @@ class SwSidebarWin : public vcl::Window virtual void MouseButtonDown(const MouseEvent& rMouseEvent) override; virtual void MouseButtonUp(const MouseEvent& rMouseEvent) override; virtual void MouseMove(const MouseEvent& rMouseEvent) override; - void PaintTile(vcl::RenderContext& rRenderContext, const Rectangle& rRect); + void PaintTile(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect); /// Is there a matching sub-widget inside this sidebar widget for rPointLogic? bool IsHitWindow(const Point& rPointLogic); /// Allows adjusting the point or mark of the selection to a document coordinate. @@ -196,7 +196,7 @@ class SwSidebarWin : public vcl::Window protected: virtual void LoseFocus() override; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual void GetFocus() override; virtual VclPtr CreateMenuButton() = 0; @@ -242,7 +242,7 @@ class SwSidebarWin : public vcl::Window sw::sidebarwindows::SidebarPosition meSidebarPosition; - Rectangle mPosSize; + tools::Rectangle mPosSize; SwRect mAnchorRect; long mPageBorder; bool mbAnchorRectChanged; diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index d59852b671c2..2739b1a78a01 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -39,7 +39,7 @@ class SwAccessibleParagraph; class SwViewShell; -class Rectangle; +namespace tools { class Rectangle; } class SwFrame; class SwTextFrame; class SwPageFrame; @@ -271,7 +271,7 @@ public: // IAccessibleViewForwarder - virtual Rectangle GetVisibleArea() const override; + virtual tools::Rectangle GetVisibleArea() const override; virtual Point LogicToPixel (const Point& rPoint) const override; virtual Size LogicToPixel (const Size& rSize) const override; @@ -290,7 +290,7 @@ public: // additional Core/Pixel conversions for internal use; also works // for preview Point PixelToCore (const Point& rPoint) const; - Rectangle CoreToPixel (const Rectangle& rRect) const; + tools::Rectangle CoreToPixel (const tools::Rectangle& rRect) const; private: /** get mapping mode for LogicToPixel and PixelToLogic conversions diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx index 8c0c36e46c2f..870585850960 100644 --- a/sw/inc/anchoreddrawobject.hxx +++ b/sw/inc/anchoreddrawobject.hxx @@ -21,7 +21,7 @@ #include -class Rectangle; +namespace tools { class Rectangle; } /** class for the positioning of drawing objects @@ -35,7 +35,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject bool mbValidPos; // rectangle, keeping the last object rectangle after the positioning - std::unique_ptr mpLastObjRect; + std::unique_ptr mpLastObjRect; // boolean, indicating that anchored drawing object hasn't been attached // to a anchor frame yet. Once, it is attached to a anchor frame the @@ -140,9 +140,9 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject // accessors to the object area and its position virtual const SwRect GetObjRect() const override; // Return value can be NULL. - const Rectangle* GetLastObjRect() const { return mpLastObjRect.get();} + const tools::Rectangle* GetLastObjRect() const { return mpLastObjRect.get();} - void SetLastObjRect( const Rectangle& _rNewObjRect ); + void SetLastObjRect( const tools::Rectangle& _rNewObjRect ); /** adjust positioning and alignment attributes for new anchor frame diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index feafb1a2207a..92cd91a466b2 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -397,7 +397,7 @@ public: /* * virtual paint method to make selection visible again after Paint */ - void Paint(vcl::RenderContext& rRenderContext, const Rectangle & rRect) override; + void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle & rRect) override; // Areas inline void SetMark(); 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 */ diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index f443db828551..b769a1d2600b 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -174,8 +174,8 @@ public: DECL_LINK( Ole2ModifiedHdl, bool, void ); /// OLE-stuff. - virtual void SetVisArea( const Rectangle &rRect ) override; - virtual Rectangle GetVisArea( sal_uInt16 nAspect ) const override; + virtual void SetVisArea( const tools::Rectangle &rRect ) override; + virtual tools::Rectangle GetVisArea( sal_uInt16 nAspect ) const override; virtual Printer *GetDocumentPrinter() override; virtual OutputDevice* GetDocumentRefDev() override; virtual void OnDocumentPrinterChanged( Printer * pNewPrinter ) override; diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx index a000e7052426..0d8438c9ea54 100644 --- a/sw/inc/dpage.hxx +++ b/sw/inc/dpage.hxx @@ -46,7 +46,7 @@ public: virtual SdrObject* ReplaceObject( SdrObject* pNewObj, size_t nObjNum ) override; virtual const SdrPageGridFrameList* GetGridFrameList(const SdrPageView* pPV, - const Rectangle *pRect) const override; + const tools::Rectangle *pRect) const override; bool RequestHelp( vcl::Window* pWindow, SdrView* pView, const HelpEvent& rEvt ); diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 5995c6288e83..881ac0e2010d 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -527,7 +527,7 @@ public: bool EndCreate ( SdrCreateCmd eSdrCreateCmd ); void BreakCreate(); bool IsDrawCreate() const; - void CreateDefaultShape( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, const Rectangle& rRect, sal_uInt16 nSlotId); + void CreateDefaultShape( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, const tools::Rectangle& rRect, sal_uInt16 nSlotId); /// Functions for Rubberbox, ti select Draw-Objects bool BeginMark( const Point &rPos ); diff --git a/sw/inc/pagepreviewlayout.hxx b/sw/inc/pagepreviewlayout.hxx index 8185e8fb96b2..13c53f4f7b39 100644 --- a/sw/inc/pagepreviewlayout.hxx +++ b/sw/inc/pagepreviewlayout.hxx @@ -75,7 +75,7 @@ private: bool mbBookPreviewModeToggled; Size maMaxPageSize; - Rectangle maPreviewDocRect; + tools::Rectangle maPreviewDocRect; SwTwips mnColWidth; SwTwips mnRowHeight; SwTwips mnPreviewLayoutWidth; @@ -90,7 +90,7 @@ private: Point maPaintStartPageOffset; Point maPaintPreviewDocOffset; Point maAdditionalPaintOffset; - Rectangle maPaintedPreviewDocRect; + tools::Rectangle maPaintedPreviewDocRect; sal_uInt16 mnSelectedPageNum; std::vector maPreviewPages; @@ -325,7 +325,7 @@ public: const Point& rProposedStartPos, const Size& _rPxWinSize, sal_uInt16& _onStartPageNum, - Rectangle& _orDocPreviewPaintRect, + tools::Rectangle& _orDocPreviewPaintRect, const bool _bStartWithPageAtFirstCol = true ); @@ -356,7 +356,7 @@ public: @return boolean, indicating, if paint of preview was performed */ - bool Paint(vcl::RenderContext& rRenderContext, const Rectangle& rOutRect) const; + bool Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rOutRect) const; /** repaint pages on page preview @@ -365,7 +365,7 @@ public: @author OD */ - void Repaint(const Rectangle& rInvalidCoreRect) const; + void Repaint(const tools::Rectangle& rInvalidCoreRect) const; /** paint to mark new selected page @@ -550,7 +550,7 @@ public: */ bool SetBookPreviewMode( const bool _bEnableBookPreview, sal_uInt16& _onStartPageNum, - Rectangle& _orDocPreviewPaintRect ); + tools::Rectangle& _orDocPreviewPaintRect ); /** Convert relative to absolute page numbers (see PrintEmptyPages) diff --git a/sw/inc/swcli.hxx b/sw/inc/swcli.hxx index 492b02de3957..546014168399 100644 --- a/sw/inc/swcli.hxx +++ b/sw/inc/swcli.hxx @@ -33,7 +33,7 @@ class SwOleClient : public SfxInPlaceClient bool m_IsOldCheckForOLEInCaption; virtual void ObjectAreaChanged() override; - virtual void RequestNewObjectArea( Rectangle& ) override; + virtual void RequestNewObjectArea( tools::Rectangle& ) override; virtual void ViewChanged() override; public: diff --git a/sw/inc/swrect.hxx b/sw/inc/swrect.hxx index 9bb254515bf2..18bd97149e30 100644 --- a/sw/inc/swrect.hxx +++ b/sw/inc/swrect.hxx @@ -43,7 +43,7 @@ public: inline SwRect( long X, long Y, long Width, long Height ); //SV-SS e.g. SwRect( pWin->GetClipRect() ); - SwRect( const Rectangle &rRect ); + SwRect( const tools::Rectangle &rRect ); //Set-Methods inline void Chg( const Point& rNP, const Size &rNS ); @@ -99,7 +99,7 @@ public: inline SwRect &operator-=( const Point &rPt ); //SV-SS e.g. pWin->DrawRect( aSwRect.SVRect() ); - inline Rectangle SVRect() const; + inline tools::Rectangle SVRect() const; // Output operator for debugging. friend SvStream& WriteSwRect( SvStream &rStream, const SwRect &rRect ); @@ -278,10 +278,10 @@ inline SwRect &SwRect::operator-=( const Point &rPt ) } // other -inline Rectangle SwRect::SVRect() const +inline tools::Rectangle SwRect::SVRect() const { SAL_WARN_IF( IsEmpty(), "sw", "SVRect() without Width or Height" ); - return Rectangle( m_Point.getX(), m_Point.getY(), + return tools::Rectangle( m_Point.getX(), m_Point.getY(), m_Point.getX() + m_Size.getWidth() - 1, //Right() m_Point.getY() + m_Size.getHeight() - 1 ); //Bottom() } diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx index 70d3cf8f4f75..c2756af9a8d2 100644 --- a/sw/inc/textboxhelper.hxx +++ b/sw/inc/textboxhelper.hxx @@ -28,7 +28,10 @@ class SwFrameFormat; class SwFrameFormats; class SwFormatContent; class SwDoc; +namespace tools +{ class Rectangle; +} class ZSortFly; class SwNode; @@ -74,7 +77,7 @@ public: /// If we have an associated TextFrame, then return that. static SwFrameFormat* getOtherTextBoxFormat(css::uno::Reference const& xShape); /// Return the textbox rectangle of a draw shape (in twips). - static Rectangle getTextRectangle(SwFrameFormat* pShape, bool bAbsolute = true); + static tools::Rectangle getTextRectangle(SwFrameFormat* pShape, bool bAbsolute = true); /** * Is the frame format a text box? diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 8e9e22096596..ccbfb62589cd 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -414,7 +414,7 @@ public: /// @see vcl::ITiledRenderable::isMimeTypeSupported(). virtual bool isMimeTypeSupported() override; /// @see vcl::ITiledRenderable::setClientVisibleArea(). - virtual void setClientVisibleArea(const Rectangle& rRectangle) override; + virtual void setClientVisibleArea(const tools::Rectangle& rRectangle) override; /// @see vcl::ITiledRenderable::getPointer(). virtual Pointer getPointer() override; /// @see vcl::ITiledRenderable::getTrackedChanges(). diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index bf9f54160477..ae74f418a769 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -176,7 +176,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SwTextNode * m_pNumRuleNodeFromDoc; // Moving indent of numrule #i23726# Size m_aDocSz; // current document size - Rectangle m_aVisArea; // visible region + tools::Rectangle m_aVisArea; // visible region VclPtr m_pEditWin; SwWrtShell *m_pWrtShell; @@ -272,7 +272,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell inline long GetXScroll() const; inline long GetYScroll() const; SAL_DLLPRIVATE Point AlignToPixel(const Point& rPt) const; - SAL_DLLPRIVATE void CalcPt( Point* pPt,const Rectangle& rRect, + SAL_DLLPRIVATE void CalcPt( Point* pPt,const tools::Rectangle& rRect, sal_uInt16 nRangeX, sal_uInt16 nRangeY); @@ -413,10 +413,10 @@ public: // hand the handler for text blocks to the shell; create if applicable SwGlossaryHdl* GetGlosHdl(); - const Rectangle& GetVisArea() const { return m_aVisArea; } + const tools::Rectangle& GetVisArea() const { return m_aVisArea; } - bool IsScroll(const Rectangle& rRect) const; - void Scroll( const Rectangle& rRect, + bool IsScroll(const tools::Rectangle& rRect) const; + void Scroll( const tools::Rectangle& rRect, sal_uInt16 nRangeX = USHRT_MAX, sal_uInt16 nRangeY = USHRT_MAX); @@ -442,7 +442,7 @@ public: void DocSzChgd( const Size& rNewSize ); const Size& GetDocSz() const { return m_aDocSz; } - void SetVisArea( const Rectangle&, bool bUpdateScrollbar = true); + void SetVisArea( const tools::Rectangle&, bool bUpdateScrollbar = true); void SetVisArea( const Point&, bool bUpdateScrollbar = true); void CheckVisArea(); diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 965d98697f20..c1d62f9a64f7 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -238,7 +238,7 @@ public: void DLPostPaint2(bool bPaintFormLayer); const MapMode& getPrePostMapMode() const { return maPrePostMapMode; } - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle &rRect); + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle &rRect); /** Paint tile. @@ -255,7 +255,7 @@ public: // The passed rect is situated on pixel borders // in order to avoid pixel errors when scrolling. virtual void VisPortChgd( const SwRect & ); - bool SmoothScroll( long lXDiff, long lYDiff, const Rectangle* );//Browser + bool SmoothScroll( long lXDiff, long lYDiff, const tools::Rectangle* );//Browser void EnableSmooth( bool b ) { mbEnableSmooth = b; } const SwRect& VisArea() const; @@ -365,7 +365,7 @@ public: // Printing for OLE 2.0. static void PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, const SwPrintData& rOptions, - vcl::RenderContext& rRenderContext, const Rectangle& rRect ); + vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ); // Fill temporary doc with selected text for Print or PDF export. void FillPrtDoc( SwDoc* pPrtDoc, const SfxPrinter* pPrt ); -- cgit