summaryrefslogtreecommitdiff
path: root/sc/inc
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2017-03-30 20:27:55 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-03-31 06:27:11 +0000
commita5a571307fb3306b74ab46b085cde6388270a770 (patch)
tree66d4ce12bb5236c50ab6a5d253bc8c6d8b5d292d /sc/inc
parent17d821af6bb9df93569836a92f6bed975587fc6c (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/inc')
-rw-r--r--sc/inc/AccessibleFilterMenu.hxx4
-rw-r--r--sc/inc/AccessibleFilterMenuItem.hxx4
-rw-r--r--sc/inc/detfunc.hxx4
-rw-r--r--sc/inc/document.hxx14
-rw-r--r--sc/inc/docuno.hxx4
-rw-r--r--sc/inc/dpobject.hxx4
-rw-r--r--sc/inc/dpoutput.hxx4
-rw-r--r--sc/inc/drwlayer.hxx10
-rw-r--r--sc/inc/editutil.hxx2
-rw-r--r--sc/inc/postit.hxx6
-rw-r--r--sc/inc/userdat.hxx2
11 files changed, 29 insertions, 29 deletions
diff --git a/sc/inc/AccessibleFilterMenu.hxx b/sc/inc/AccessibleFilterMenu.hxx
index 43d338072153..fe3c42afca83 100644
--- a/sc/inc/AccessibleFilterMenu.hxx
+++ b/sc/inc/AccessibleFilterMenu.hxx
@@ -127,9 +127,9 @@ protected:
sal_Int32 getMenuItemCount() const;
- virtual Rectangle GetBoundingBoxOnScreen() const override;
+ virtual tools::Rectangle GetBoundingBoxOnScreen() const override;
- virtual Rectangle GetBoundingBox() const override;
+ virtual tools::Rectangle GetBoundingBox() const override;
private:
bool isSelected() const;
diff --git a/sc/inc/AccessibleFilterMenuItem.hxx b/sc/inc/AccessibleFilterMenuItem.hxx
index cbf4425cff25..06fbc8a2d6db 100644
--- a/sc/inc/AccessibleFilterMenuItem.hxx
+++ b/sc/inc/AccessibleFilterMenuItem.hxx
@@ -79,9 +79,9 @@ public:
protected:
- virtual Rectangle GetBoundingBoxOnScreen() const override;
+ virtual tools::Rectangle GetBoundingBoxOnScreen() const override;
- virtual Rectangle GetBoundingBox() const override;
+ virtual tools::Rectangle GetBoundingBox() const override;
private:
bool isSelected() const;
diff --git a/sc/inc/detfunc.hxx b/sc/inc/detfunc.hxx
index 47e8a4f2ac1f..93bccd455996 100644
--- a/sc/inc/detfunc.hxx
+++ b/sc/inc/detfunc.hxx
@@ -69,10 +69,10 @@ class SC_DLLPUBLIC ScDetectiveFunc
Point GetDrawPos( SCCOL nCol, SCROW nRow, DrawPosMode eMode ) const;
/** @return the drawing layer rectangle for the passed cell range. */
- Rectangle GetDrawRect( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) const;
+ tools::Rectangle GetDrawRect( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) const;
/** @return the drawing layer rectangle for the passed cell address. */
- Rectangle GetDrawRect( SCCOL nCol, SCROW nRow ) const;
+ tools::Rectangle GetDrawRect( SCCOL nCol, SCROW nRow ) const;
bool HasArrow( const ScAddress& rStart,
SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 8310e973dfc3..bb28fb5a0fd0 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -790,8 +790,8 @@ public:
void GetEmbedded( ScRange& rRange ) const;
void SetEmbedded( const ScRange& rRange );
void ResetEmbedded();
- Rectangle GetEmbeddedRect() const; // 1/100 mm
- void SetEmbedded( SCTAB nTab, const Rectangle& rRect ); // from VisArea (1/100 mm)
+ tools::Rectangle GetEmbeddedRect() const; // 1/100 mm
+ void SetEmbedded( SCTAB nTab, const tools::Rectangle& rRect ); // from VisArea (1/100 mm)
static SC_DLLPUBLIC bool ValidTabName( const OUString& rName );
@@ -942,8 +942,8 @@ public:
void StartAnimations( SCTAB nTab, vcl::Window* pWin );
- bool HasBackgroundDraw( SCTAB nTab, const Rectangle& rMMRect ) const;
- bool HasAnyDraw( SCTAB nTab, const Rectangle& rMMRect ) const;
+ bool HasBackgroundDraw( SCTAB nTab, const tools::Rectangle& rMMRect ) const;
+ bool HasAnyDraw( SCTAB nTab, const tools::Rectangle& rMMRect ) const;
const ScSheetEvents* GetSheetEvents( SCTAB nTab ) const;
void SetSheetEvents( SCTAB nTab, const ScSheetEvents* pNew );
@@ -1141,7 +1141,7 @@ public:
SCCOL nEndCol, SCROW nEndRow,
bool bLeftIsEmpty = false,
ScRange* pLastRange = nullptr,
- Rectangle* pLastMM = nullptr ) const;
+ tools::Rectangle* pLastMM = nullptr ) const;
void SkipOverlapped( SCCOL& rCol, SCROW& rRow, SCTAB nTab ) const;
bool IsHorOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;
@@ -1834,9 +1834,9 @@ public:
ScPrintRangeSaver* CreatePrintRangeSaver() const;
void RestorePrintRanges( const ScPrintRangeSaver& rSaver );
- SC_DLLPUBLIC Rectangle GetMMRect( SCCOL nStartCol, SCROW nStartRow,
+ SC_DLLPUBLIC tools::Rectangle GetMMRect( SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, bool bHiddenAsZero = true ) const;
- SC_DLLPUBLIC ScRange GetRange( SCTAB nTab, const Rectangle& rMMRect, bool bHiddenAsZero = true ) const;
+ SC_DLLPUBLIC ScRange GetRange( SCTAB nTab, const tools::Rectangle& rMMRect, bool bHiddenAsZero = true ) const;
void UpdStlShtPtrsFrmNms();
void StylesToNames();
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index e7195e5a9e61..55f6afb99858 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -340,7 +340,7 @@ public:
virtual void setClientZoom(int nTilePixelWidth, int nTilePixelHeight, int nTileTwipWidth, int nTileTwipHeight) override;
/// @see vcl::ITiledRenderable::getRowColumnHeaders().
- virtual OUString getRowColumnHeaders(const Rectangle& rRectangle) override;
+ virtual OUString getRowColumnHeaders(const tools::Rectangle& rRectangle) override;
/// @see vcl::ITiledRenderable::getCellCursor().
virtual OString getCellCursor( int nOutputWidth,
@@ -355,7 +355,7 @@ public:
OUString getTrackedChanges() override;
/// @see vcl::ITiledRenderable::setClientVisibleArea().
- virtual void setClientVisibleArea(const Rectangle& rRectangle) override;
+ virtual void setClientVisibleArea(const tools::Rectangle& rRectangle) override;
/// @see vcl::ITiledRenderable::getPostIts().
OUString getPostIts() override;
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index d8c20f10f5f8..1b3031f662bc 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -53,7 +53,7 @@ namespace com { namespace sun { namespace star {
}
}}}
-class Rectangle;
+namespace tools { class Rectangle; }
class ScDPSaveData;
class ScDPOutput;
struct ScPivotParam;
@@ -176,7 +176,7 @@ public:
long GetHeaderDim( const ScAddress& rPos, sal_uInt16& rOrient );
bool GetHeaderDrag( const ScAddress& rPos, bool bMouseLeft, bool bMouseTop,
long nDragDim,
- Rectangle& rPosRect, sal_uInt16& rOrient, long& rDimPos );
+ tools::Rectangle& rPosRect, sal_uInt16& rOrient, long& rDimPos );
bool IsFilterButton( const ScAddress& rPos );
double GetPivotData(
diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx
index ecd933c22814..e6d97cc2620a 100644
--- a/sc/inc/dpoutput.hxx
+++ b/sc/inc/dpoutput.hxx
@@ -38,7 +38,7 @@ namespace com { namespace sun { namespace star { namespace sheet {
struct DataPilotTablePositionData;
}}}}
-class Rectangle;
+namespace tools { class Rectangle; }
class ScDocument;
struct ScDPOutLevelData;
@@ -117,7 +117,7 @@ public:
long GetHeaderDim( const ScAddress& rPos, sal_uInt16& rOrient );
bool GetHeaderDrag(
const ScAddress& rPos, bool bMouseLeft, bool bMouseTop, long nDragDim,
- Rectangle& rPosRect, sal_uInt16& rOrient, long& rDimPos );
+ tools::Rectangle& rPosRect, sal_uInt16& rOrient, long& rDimPos );
bool IsFilterButton( const ScAddress& rPos );
void GetMemberResultNames(ScDPUniqueStringSet& rNames, long nDimension);
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index fa31f6f43afd..46b117256957 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -148,20 +148,20 @@ public:
SCCOL nCol2,SCROW nRow2 );
void DeleteObjectsInSelection( const ScMarkData& rMark );
- void CopyToClip( ScDocument* pClipDoc, SCTAB nTab, const Rectangle& rRange );
+ void CopyToClip( ScDocument* pClipDoc, SCTAB nTab, const tools::Rectangle& rRange );
void CopyFromClip( ScDrawLayer* pClipModel,
- SCTAB nSourceTab, const Rectangle& rSourceRange,
- const ScAddress& rDestPos, const Rectangle& rDestRange );
+ SCTAB nSourceTab, const tools::Rectangle& rSourceRange,
+ const ScAddress& rDestPos, const tools::Rectangle& rDestRange );
void SetPageSize( sal_uInt16 nPageNo, const Size& rSize, bool bUpdateNoteCaptionPos );
// mirror or move between positive and negative positions for RTL
void MirrorRTL( SdrObject* pObj );
- static void MirrorRectRTL( Rectangle& rRect ); // for bounding rectangles etc.
+ static void MirrorRectRTL( tools::Rectangle& rRect ); // for bounding rectangles etc.
/** Returns the rectangle for the passed cell address in 1/100 mm.
@param bMergedCell True = regards merged cells. False = use single column/row size. */
- static Rectangle GetCellRect( ScDocument& rDoc, const ScAddress& rPos, bool bMergedCell );
+ static tools::Rectangle GetCellRect( ScDocument& rDoc, const ScAddress& rPos, bool bMergedCell );
// GetVisibleName: name for navigator etc: GetPersistName or GetName
// (ChartListenerCollection etc. must use GetPersistName directly)
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index 00f0029d3eba..88ddd6138ea3 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -82,7 +82,7 @@ public:
OutputDevice* pDevice, double nScaleX, double nScaleY,
const Fraction& rX, const Fraction& rY );
- Rectangle GetEditArea( const ScPatternAttr* pPattern, bool bForceToTop );
+ tools::Rectangle GetEditArea( const ScPatternAttr* pPattern, bool bForceToTop );
};
class ScEditAttrTester
diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx
index c61df47be866..fde974b5f5df 100644
--- a/sc/inc/postit.hxx
+++ b/sc/inc/postit.hxx
@@ -34,7 +34,7 @@ class SdrPage;
class SfxItemSet;
class ScDocument;
-class Rectangle;
+namespace tools { class Rectangle; }
struct ScCaptionInitData;
/** Some desperate attempt to fight against the caption object ownership mess,
@@ -265,7 +265,7 @@ public:
/** Creates and returns a caption object for a temporary caption. */
static ScCaptionPtr CreateTempCaption( ScDocument& rDoc, const ScAddress& rPos,
SdrPage& rDrawPage, const OUString& rUserText,
- const Rectangle& rVisRect, bool bTailFront );
+ const tools::Rectangle& rVisRect, bool bTailFront );
/** Creates a cell note using the passed caption drawing object.
@@ -321,7 +321,7 @@ public:
static ScPostIt* CreateNoteFromObjectData(
ScDocument& rDoc, const ScAddress& rPos,
SfxItemSet* pItemSet, OutlinerParaObject* pOutlinerObj,
- const Rectangle& rCaptionRect, bool bShown,
+ const tools::Rectangle& rCaptionRect, bool bShown,
bool bAlwaysCreateCaption );
/** Creates a cell note based on the passed string and inserts it into the
diff --git a/sc/inc/userdat.hxx b/sc/inc/userdat.hxx
index c8e8d6a98ec0..f9b19ac6fdbd 100644
--- a/sc/inc/userdat.hxx
+++ b/sc/inc/userdat.hxx
@@ -49,7 +49,7 @@ public:
Point maStartOffset;
Point maEndOffset;
Type meType;
- Rectangle maLastRect;
+ tools::Rectangle maLastRect;
explicit ScDrawObjData();