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 /sc/source/ui/inc/gridwin.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 'sc/source/ui/inc/gridwin.hxx')
-rw-r--r-- | sc/source/ui/inc/gridwin.hxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 93f50dc83516..a9c33ea6555f 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -101,7 +101,7 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou std::unique_ptr<sdr::overlay::OverlayObjectList> mpOOHeader; std::unique_ptr<sdr::overlay::OverlayObjectList> mpOOShrink; - std::unique_ptr<Rectangle> mpAutoFillRect; + std::unique_ptr<tools::Rectangle> mpAutoFillRect; struct MouseEventState; @@ -172,12 +172,12 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou Point aCurMousePos; sal_uInt16 nPaintCount; - Rectangle aRepaintPixel; + tools::Rectangle aRepaintPixel; ScAddress aAutoMarkPos; ScAddress aListValPos; - Rectangle aInvertRect; + tools::Rectangle aInvertRect; RfCorner aRFSelectedCorned; @@ -220,7 +220,7 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou void PagebreakMove( const MouseEvent& rMEvt, bool bUp ); - void UpdateDragRect( bool bShowRange, const Rectangle& rPosRect ); + void UpdateDragRect( bool bShowRange, const tools::Rectangle& rPosRect ); bool IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab ); void FilterSelect( sal_uLong nSel ); @@ -250,9 +250,9 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou bool IsMyModel(SdrEditView* pSdrView); void DrawRedraw( ScOutputData& rOutputData, sal_uLong nLayer ); - void DrawSdrGrid( const Rectangle& rDrawingRect, OutputDevice* pContentDev ); + void DrawSdrGrid( const tools::Rectangle& rDrawingRect, OutputDevice* pContentDev ); void DrawAfterScroll(); - Rectangle GetListValButtonRect( const ScAddress& rButtonPos ); + tools::Rectangle GetListValButtonRect( const ScAddress& rButtonPos ); void DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, vcl::RenderContext& rRenderContext); @@ -279,12 +279,12 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou void SelectForContextMenu( const Point& rPosPixel, SCsCOL nCellX, SCsROW nCellY ); - void GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ); + void GetSelectionRects( ::std::vector< tools::Rectangle >& rPixelRects ); protected: virtual void PrePaint(vcl::RenderContext& rRenderContext) 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 void LoseFocus() override; @@ -321,14 +321,14 @@ public: long nTileWidth, long nTileHeight ); /// @see OutputDevice::LogicInvalidate(). - void LogicInvalidate(const Rectangle* pRectangle) override; + void LogicInvalidate(const tools::Rectangle* pRectangle) override; /// Update the cell selection according to what handles have been dragged. /// @see vcl::ITiledRenderable::setTextSelection() for the values of nType. /// Coordinates are in pixels. void SetCellSelectionPixel(int nType, int nPixelX, int nPixelY); /// Get the cell selection, coordinates are in logic units. - void GetCellSelection(std::vector<Rectangle>& rLogicRects); + void GetCellSelection(std::vector<tools::Rectangle>& rLogicRects); virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; @@ -391,7 +391,7 @@ public: bool NeedsRepaint() { return bNeedsRepaint; } - void DoInvertRect( const Rectangle& rPixel ); + void DoInvertRect( const tools::Rectangle& rPixel ); void CheckNeedsRepaint(); |