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/svtools | |
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/svtools')
25 files changed, 108 insertions, 108 deletions
diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx index f4a52304078c..e8ad0d7f4b42 100644 --- a/include/svtools/accessibleruler.hxx +++ b/include/svtools/accessibleruler.hxx @@ -46,7 +46,7 @@ namespace com { namespace sun { namespace star { namespace awt { class XFocusListener; } } } } -class Rectangle; +namespace tools { class Rectangle; } class Ruler; namespace vcl { class Window; } @@ -165,12 +165,12 @@ protected: /// @Return the object's current bounding box relative to the desktop. /// /// @throws css::uno::RuntimeException - Rectangle GetBoundingBoxOnScreen(); + tools::Rectangle GetBoundingBoxOnScreen(); /// @Return the object's current bounding box relative to the parent object. /// /// @throws css::uno::RuntimeException - Rectangle GetBoundingBox(); + tools::Rectangle GetBoundingBox(); virtual void SAL_CALL disposing() override; diff --git a/include/svtools/accessibletable.hxx b/include/svtools/accessibletable.hxx index fd17a67736c8..335379ac3bc1 100644 --- a/include/svtools/accessibletable.hxx +++ b/include/svtools/accessibletable.hxx @@ -71,7 +71,7 @@ public: AccessibleTableControlObjType eObjType ) const= 0; // Window - virtual Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const = 0; + virtual tools::Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const = 0; virtual void GrabFocus()= 0; virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible()= 0; virtual vcl::Window* GetAccessibleParentWindow() const= 0; @@ -81,11 +81,11 @@ public: virtual long GetRowCount() const= 0; virtual long GetColumnCount() const= 0; virtual bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_Int32& _rnColPos, const Point& _rPoint )= 0; - virtual Rectangle calcHeaderRect( bool _bIsColumnBar ) = 0; - virtual Rectangle calcHeaderCellRect( bool _bColHeader, sal_Int32 _nPos ) = 0; - virtual Rectangle calcTableRect() = 0; - virtual Rectangle calcCellRect( sal_Int32 _nRowPos, sal_Int32 _nColPos ) = 0; - virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex)= 0; + virtual tools::Rectangle calcHeaderRect( bool _bIsColumnBar ) = 0; + virtual tools::Rectangle calcHeaderCellRect( bool _bColHeader, sal_Int32 _nPos ) = 0; + virtual tools::Rectangle calcTableRect() = 0; + virtual tools::Rectangle calcCellRect( sal_Int32 _nRowPos, sal_Int32 _nColPos ) = 0; + virtual tools::Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex)= 0; virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint)= 0; virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const= 0; virtual OUString GetRowDescription( sal_Int32 _nRow ) const = 0; diff --git a/include/svtools/accessibletableprovider.hxx b/include/svtools/accessibletableprovider.hxx index 805e95aa5c23..d3ca495b3b9a 100644 --- a/include/svtools/accessibletableprovider.hxx +++ b/include/svtools/accessibletableprovider.hxx @@ -87,9 +87,9 @@ public: virtual bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const = 0; virtual OUString GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const = 0; - virtual Rectangle calcHeaderRect( bool _bIsColumnBar, bool _bOnScreen = true ) = 0; - virtual Rectangle calcTableRect( bool _bOnScreen = true ) = 0; - virtual Rectangle GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumnPos, bool _bIsHeader, bool _bOnScreen = true ) = 0; + virtual tools::Rectangle calcHeaderRect( bool _bIsColumnBar, bool _bOnScreen = true ) = 0; + virtual tools::Rectangle calcTableRect( bool _bOnScreen = true ) = 0; + virtual tools::Rectangle GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumnPos, bool _bIsHeader, bool _bOnScreen = true ) = 0; virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) = 0; virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleRowHeader( sal_Int32 _nRow ) = 0; @@ -114,13 +114,13 @@ public: virtual bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, MetricVector& rVector ) = 0; // Window - virtual Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const = 0; + virtual tools::Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const = 0; virtual void GrabFocus() = 0; virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible() = 0; virtual vcl::Window* GetAccessibleParentWindow() const = 0; virtual vcl::Window* GetWindowInstance() = 0; - virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) = 0; + virtual tools::Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) = 0; virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) = 0; protected: diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 33ff5ac24273..58689dab7c81 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -125,7 +125,7 @@ class BrowseEvent { VclPtr<vcl::Window> pWin; long nRow; - Rectangle aRect; + tools::Rectangle aRect; sal_uInt16 nCol; sal_uInt16 nColId; @@ -133,13 +133,13 @@ public: BrowseEvent( vcl::Window* pWindow, long nAbsRow, sal_uInt16 nColumn, sal_uInt16 nColumnId, - const Rectangle& rRect ); + const tools::Rectangle& rRect ); vcl::Window* GetWindow() const { return pWin; } long GetRow() const { return nRow; } sal_uInt16 GetColumn() const { return nCol; } sal_uInt16 GetColumnId() const { return nColId; } - const Rectangle& GetRect() const { return aRect; } + const tools::Rectangle& GetRect() const { return aRect; } }; @@ -149,7 +149,7 @@ public: BrowserMouseEvent( BrowserDataWin* pWin, const MouseEvent& rEvt ); BrowserMouseEvent( vcl::Window* pWin, const MouseEvent& rEvt, long nAbsRow, sal_uInt16 nColumn, sal_uInt16 nColumnId, - const Rectangle& rRect ); + const tools::Rectangle& rRect ); }; @@ -286,7 +286,7 @@ private: SVT_DLLPRIVATE void AutoSizeLastColumn(); SVT_DLLPRIVATE long ImpGetDataRowHeight() const; - SVT_DLLPRIVATE Rectangle ImplFieldRectPixel( long nRow, sal_uInt16 nColId ) const; + SVT_DLLPRIVATE tools::Rectangle ImplFieldRectPixel( long nRow, sal_uInt16 nColId ) const; SVT_DLLPRIVATE sal_uInt16 FrozenColCount() const; SVT_DLLPRIVATE void ColumnInserted( sal_uInt16 nPos ); @@ -302,7 +302,7 @@ private: bool GoToColumnId( sal_uInt16 nColId, bool bMakeVisible, bool bRowColMove = false); void SelectColumnPos( sal_uInt16 nCol, bool _bSelect, bool bMakeVisible); - void ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, bool _bForeignDevice, bool _bDrawSelections); + void ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRect, bool _bForeignDevice, bool _bDrawSelections); bool PaintCursorIfHiddenOnce() const { return !m_bFocusOnlyCursor && !HasFocus(); } @@ -336,8 +336,8 @@ protected: */ virtual bool SeekRow( long nRow ) = 0; void DrawCursor(); - void PaintData(vcl::Window& rWin, vcl::RenderContext& rRenderContext, const Rectangle& rRect); - virtual void PaintField(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const = 0; + void PaintData(vcl::Window& rWin, vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect); + virtual void PaintField(OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId) const = 0; // Advice for the subclass: the visible scope of rows has changed. // The subclass is able to announce changes of the model with the // help of the methods RowInserted and RowRemoved. Because of the @@ -396,7 +396,7 @@ public: virtual void LoseFocus() override; virtual void GetFocus() override; virtual void Resize() override; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; virtual void Command( const CommandEvent& rEvt ) override; virtual void StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) override; @@ -456,7 +456,7 @@ public: // access to dynamic values of cursor row OUString GetColumnTitle( sal_uInt16 nColumnId ) const; - Rectangle GetFieldRect( sal_uInt16 nColumnId ) const; + tools::Rectangle GetFieldRect( sal_uInt16 nColumnId ) const; sal_uLong GetColumnWidth( sal_uInt16 nColumnId ) const; sal_uInt16 GetColumnId( sal_uInt16 nPos ) const; sal_uInt16 GetColumnPos( sal_uInt16 nColumnId ) const; @@ -499,8 +499,8 @@ public: // access to positions of fields, column and rows vcl::Window& GetDataWindow() const; - Rectangle GetRowRectPixel( long nRow ) const; - Rectangle GetFieldRectPixel( long nRow, sal_uInt16 nColId, + tools::Rectangle GetRowRectPixel( long nRow ) const; + tools::Rectangle GetFieldRectPixel( long nRow, sal_uInt16 nColId, bool bRelToBrowser = true) const; bool IsFieldVisible( long nRow, sal_uInt16 nColId, bool bComplete = false ) const; @@ -517,7 +517,7 @@ public: // miscellaneous bool ReserveControlArea(sal_uInt16 nWidth = USHRT_MAX); - Rectangle GetControlArea() const; + tools::Rectangle GetControlArea() const; bool ProcessKey( const KeyEvent& rEvt ); void Dispatch( sal_uInt16 nId ); void SetMode( BrowserMode nMode ); @@ -538,7 +538,7 @@ public: struct BrowserColumnAccess { friend class BrowserColumn; private: BrowserColumnAccess() { } }; /** public version of PaintField, with selected access rights for the BrowserColumn */ - void DoPaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId, BrowserColumnAccess ) const + void DoPaintField( OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId, BrowserColumnAccess ) const { PaintField( rDev, rRect, nColumnId ); } /** suggests a default width for a column containing a given text @@ -609,7 +609,7 @@ public: @return the Rectangle */ - virtual Rectangle calcHeaderRect(bool _bIsColumnBar, bool _bOnScreen = true) override; + virtual tools::Rectangle calcHeaderRect(bool _bIsColumnBar, bool _bOnScreen = true) override; /** calculates the Rectangle of the table @param _bOnScreen @@ -617,7 +617,7 @@ public: @return the Rectangle */ - virtual Rectangle calcTableRect(bool _bOnScreen = true) override; + virtual tools::Rectangle calcTableRect(bool _bOnScreen = true) override; /** @param _nRowId @@ -629,7 +629,7 @@ public: @return the Rectangle */ - virtual Rectangle GetFieldRectPixelAbs(sal_Int32 _nRowId, sal_uInt16 _nColId, bool _bIsHeader, bool _bOnScreen = true) override; + virtual tools::Rectangle GetFieldRectPixelAbs(sal_Int32 _nRowId, sal_uInt16 _nColId, bool _bIsHeader, bool _bOnScreen = true) override; /// return <TRUE/> if and only if the accessible object for this instance has been created and is alive bool isAccessibleAlive( ) const; @@ -757,7 +757,7 @@ public: virtual bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const override; virtual OUString GetAccessibleCellText(long _nRow, sal_uInt16 _nColPos) const override; virtual bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, MetricVector& rVector ) override; - virtual Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const override; + virtual tools::Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const override; virtual void GrabFocus() override; virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible() override; virtual vcl::Window* GetAccessibleParentWindow() const override; diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index 62d3a9d99227..4c190b73c157 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -159,8 +159,8 @@ private: OUString maDayText; OUString maWeekText; CalendarWrapper maCalendarWrapper; - Rectangle maPrevRect; - Rectangle maNextRect; + tools::Rectangle maPrevRect; + tools::Rectangle maNextRect; OUString maDayOfWeekText; long mnDayOfWeekAry[7]; Date maOldFormatFirstDate; @@ -255,7 +255,7 @@ public: virtual void MouseMove( const MouseEvent& rMEvt ) override; virtual void Tracking( const TrackingEvent& rMEvt ) override; virtual void KeyInput( const KeyEvent& rKEvt ) override; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; virtual void Resize() override; virtual void GetFocus() override; virtual void LoseFocus() override; @@ -280,7 +280,7 @@ public: Date GetLastMonth() const; sal_uInt16 GetMonthCount() const; bool GetDate( const Point& rPos, Date& rDate ) const; - Rectangle GetDateRect( const Date& rDate ) const; + tools::Rectangle GetDateRect( const Date& rDate ) const; void StartSelection(); void EndSelection(); diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 4bf90f3a4792..e73403b921e1 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -278,7 +278,7 @@ namespace svt class SVT_DLLPUBLIC CheckBoxControl : public Control { VclPtr<CheckBox> pBox; - Rectangle aFocusRect; + tools::Rectangle aFocusRect; Link<VclPtr<CheckBox>,void> m_aClickLink; Link<LinkParamNone*,void> m_aModifyLink; @@ -289,7 +289,7 @@ namespace svt virtual void GetFocus() override; virtual bool PreNotify(NotifyEvent& rEvt) override; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rClientRect) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rClientRect) override; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; virtual void StateChanged( StateChangedType nStateChange ) override; virtual void DataChanged( const DataChangedEvent& _rEvent ) override; @@ -528,12 +528,12 @@ namespace svt virtual void EndScroll() override; // should be used instead of GetFieldRectPixel, 'cause this method here takes into account the borders - Rectangle GetCellRect(long nRow, sal_uInt16 nColId, bool bRelToBrowser = true) const; + tools::Rectangle GetCellRect(long nRow, sal_uInt16 nColId, bool bRelToBrowser = true) const; virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId); sal_uInt32 GetAutoColumnWidth(sal_uInt16 nColId); - virtual void PaintStatusCell(OutputDevice& rDev, const Rectangle& rRect) const; - virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId) const = 0; + virtual void PaintStatusCell(OutputDevice& rDev, const tools::Rectangle& rRect) const; + virtual void PaintCell(OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColId) const = 0; virtual RowStatus GetRowStatus(long nRow) const; @@ -559,7 +559,7 @@ namespace svt virtual CellController* GetController(long nRow, sal_uInt16 nCol); virtual void InitController(CellControllerRef& rController, long nRow, sal_uInt16 nCol); - static void ResizeController(CellControllerRef& rController, const Rectangle&); + static void ResizeController(CellControllerRef& rController, const tools::Rectangle&); virtual void DoubleClick(const BrowserMouseEvent&) override; void ActivateCell() { ActivateCell(GetCurRow(), GetCurColumnId()); } @@ -578,7 +578,7 @@ namespace svt virtual bool IsCursorMoveAllowed(long nNewRow, sal_uInt16 nNewColId) const override; - void PaintTristate(OutputDevice& rDev, const Rectangle& rRect, const TriState& eState, bool _bEnabled=true) const; + void PaintTristate(OutputDevice& rDev, const tools::Rectangle& rRect, const TriState& eState, bool _bEnabled=true) const; void AsynchGetFocus(); // secure starting of StartEditHdl @@ -619,7 +619,7 @@ namespace svt /** Sets focus to current cell of the data table. */ virtual void GrabTableFocus() override; - virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) override; + virtual tools::Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) override; virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) override; css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleCheckBoxCell(long _nRow, sal_uInt16 _nColumnPos,const TriState& eState); @@ -628,7 +628,7 @@ namespace svt void implCreateActiveAccessible( ); private: - virtual void PaintField(OutputDevice& rDev, const Rectangle& rRect, + virtual void PaintField(OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId ) const override; using Control::ImplInitSettings; SVT_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); diff --git a/include/svtools/embedhlp.hxx b/include/svtools/embedhlp.hxx index 70d16743e37b..3db446579142 100644 --- a/include/svtools/embedhlp.hxx +++ b/include/svtools/embedhlp.hxx @@ -37,7 +37,7 @@ namespace com { namespace sun { namespace star { namespace embed { class XEmbeddedObject; }}}} -class Rectangle; +namespace tools { class Rectangle; } class OutputDevice; namespace svt { @@ -54,8 +54,8 @@ class SVT_DLLPUBLIC EmbeddedObjectRef EmbeddedObjectRef& operator = ( const EmbeddedObjectRef& ) = delete; public: - static void DrawPaintReplacement( const Rectangle &rRect, const OUString &rText, OutputDevice *pOut ); - static void DrawShading( const Rectangle &rRect, OutputDevice *pOut ); + static void DrawPaintReplacement( const tools::Rectangle &rRect, const OUString &rText, OutputDevice *pOut ); + static void DrawShading( const tools::Rectangle &rRect, OutputDevice *pOut ); static bool TryRunningState( const css::uno::Reference < css::embed::XEmbeddedObject >& ); static void SetGraphicToContainer( const Graphic& rGraphic, comphelper::EmbeddedObjectContainer& aContainer, diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index f85a175a314a..d07a4448531b 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -274,7 +274,7 @@ private: bool SVT_DLLPRIVATE ImplDrawTiled( OutputDevice* pOut, - const Rectangle& rArea, + const tools::Rectangle& rArea, const Size& rSizePixel, const Size& rOffset, const GraphicAttr* pAttr, @@ -297,7 +297,7 @@ private: const GraphicAttr& rAttr, const Size& rCropLeftTop, const Size& rCropRightBottom, - const Rectangle& rCropRect, + const tools::Rectangle& rCropRect, const Size& rDstSize, bool bEnlarge ) const; @@ -449,7 +449,7 @@ public: */ void DrawTiled( OutputDevice* pOut, - const Rectangle& rArea, + const tools::Rectangle& rArea, const Size& rSize, const Size& rOffset, GraphicManagerDrawFlags nFlags = GraphicManagerDrawFlags::STANDARD, diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index 186a70b68ce8..be4c5af01bb3 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -251,14 +251,14 @@ private: SVT_DLLPRIVATE void ImplInit( WinBits nWinStyle ); SVT_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SVT_DLLPRIVATE long ImplGetItemPos( sal_uInt16 nPos ) const; - SVT_DLLPRIVATE Rectangle ImplGetItemRect( sal_uInt16 nPos ) const; + SVT_DLLPRIVATE tools::Rectangle ImplGetItemRect( sal_uInt16 nPos ) const; using Window::ImplHitTest; SVT_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, long& nMouseOff, sal_uInt16& nPos ) const; SVT_DLLPRIVATE void ImplInvertDrag( sal_uInt16 nStartPos, sal_uInt16 nEndPos ); SVT_DLLPRIVATE void ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, bool bHigh, - const Rectangle& rItemRect, const Rectangle* pRect, DrawFlags nFlags); + const tools::Rectangle& rItemRect, const tools::Rectangle* pRect, DrawFlags nFlags); SVT_DLLPRIVATE void ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, bool bHigh, - const Rectangle* pRect); + const tools::Rectangle* pRect); SVT_DLLPRIVATE void ImplUpdate( sal_uInt16 nPos, bool bEnd = false ); SVT_DLLPRIVATE void ImplStartDrag( const Point& rPos, bool bCommand ); @@ -275,7 +275,7 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void MouseMove( const MouseEvent& rMEvt ) override; virtual void Tracking( const TrackingEvent& rTEvt ) override; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; virtual void Resize() override; virtual void Command( const CommandEvent& rCEvt ) override; @@ -301,7 +301,7 @@ public: sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const; sal_uInt16 GetItemId( sal_uInt16 nPos ) const; sal_uInt16 GetItemId( const Point& rPos ) const; - Rectangle GetItemRect( sal_uInt16 nItemId ) const; + tools::Rectangle GetItemRect( sal_uInt16 nItemId ) const; sal_uInt16 GetCurItemId() const { return mnCurItemId; } long GetDragPos() const { return mnDragPos; } bool IsItemMode() const { return mbItemMode; } diff --git a/include/svtools/iconview.hxx b/include/svtools/iconview.hxx index 28dc92255c02..2865f6c54bc4 100644 --- a/include/svtools/iconview.hxx +++ b/include/svtools/iconview.hxx @@ -30,7 +30,7 @@ public: virtual void Resize() SAL_OVERRIDE; - virtual Rectangle GetFocusRect( SvTreeListEntry*, long nEntryPos ) SAL_OVERRIDE; + virtual tools::Rectangle GetFocusRect( SvTreeListEntry*, long nEntryPos ) SAL_OVERRIDE; void ClearAll(); diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx index da68c639b2f0..e54bb3193ccb 100644 --- a/include/svtools/imap.hxx +++ b/include/svtools/imap.hxx @@ -26,7 +26,7 @@ #include <vector> class Point; -class Rectangle; +namespace tools { class Rectangle; } class Size; class Fraction; class IMapObject; diff --git a/include/svtools/imapobj.hxx b/include/svtools/imapobj.hxx index e79e57105812..f5d83ccaeb01 100644 --- a/include/svtools/imapobj.hxx +++ b/include/svtools/imapobj.hxx @@ -25,7 +25,7 @@ #include <rtl/strbuf.hxx> class Point; -class Rectangle; +namespace tools { class Rectangle; } class SvStream; #define IMAP_OBJ_NONE ((sal_uInt16)0x0000) diff --git a/include/svtools/imappoly.hxx b/include/svtools/imappoly.hxx index 42626b5209df..f0b2da8aa7b6 100644 --- a/include/svtools/imappoly.hxx +++ b/include/svtools/imappoly.hxx @@ -29,7 +29,7 @@ class Fraction; class SVT_DLLPUBLIC IMapPolygonObject : public IMapObject { tools::Polygon aPoly; - Rectangle aEllipse; + tools::Rectangle aEllipse; bool bEllipse; SVT_DLLPRIVATE void ImpConstruct( const tools::Polygon& rPoly, bool bPixel ); @@ -57,8 +57,8 @@ public: tools::Polygon GetPolygon( bool bPixelCoords = true ) const; bool HasExtraEllipse() const { return bEllipse; } - const Rectangle& GetExtraEllipse() const { return aEllipse; } - void SetExtraEllipse( const Rectangle& rEllipse ); + const tools::Rectangle& GetExtraEllipse() const { return aEllipse; } + void SetExtraEllipse( const tools::Rectangle& rEllipse ); void Scale( const Fraction& rFractX, const Fraction& rFracY ); diff --git a/include/svtools/imaprect.hxx b/include/svtools/imaprect.hxx index 4aac46946b9b..07c88ae18c0e 100644 --- a/include/svtools/imaprect.hxx +++ b/include/svtools/imaprect.hxx @@ -27,9 +27,9 @@ class Fraction; class SVT_DLLPUBLIC IMapRectangleObject : public IMapObject { - Rectangle aRect; + tools::Rectangle aRect; - SVT_DLLPRIVATE void ImpConstruct( const Rectangle& rRect, bool bPixel ); + SVT_DLLPRIVATE void ImpConstruct( const tools::Rectangle& rRect, bool bPixel ); protected: @@ -40,7 +40,7 @@ protected: public: IMapRectangleObject() {}; - IMapRectangleObject( const Rectangle& rRect, + IMapRectangleObject( const tools::Rectangle& rRect, const OUString& rURL, const OUString& rAltText, const OUString& rDesc, @@ -52,7 +52,7 @@ public: virtual sal_uInt16 GetType() const override; virtual bool IsHit( const Point& rPoint ) const override; - Rectangle GetRectangle( bool bPixelCoords = true ) const; + tools::Rectangle GetRectangle( bool bPixelCoords = true ) const; void Scale( const Fraction& rFractX, const Fraction& rFracY ); diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index c25a3e1622ee..5f9d0f1b4b89 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -74,8 +74,8 @@ class SvxIconChoiceCtrlEntry friend class EntryList_Impl; friend class IcnGridMap_Impl; - Rectangle aRect; // Bounding-Rectangle of the entry - Rectangle aGridRect; // Only valid in Grid-mode + tools::Rectangle aRect; // Bounding-Rectangle of the entry + tools::Rectangle aGridRect; // Only valid in Grid-mode sal_Int32 nPos; /* @@ -195,7 +195,7 @@ protected: virtual void KeyInput( const KeyEvent& rKEvt ) override; virtual void Command( const CommandEvent& rCEvt ) override; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; virtual void MouseMove( const MouseEvent& rMEvt ) override; @@ -278,8 +278,8 @@ public: Point GetPixelPos( const Point& rPosLogic ) const; void SetSelectionMode( SelectionMode eMode ); - Rectangle GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const; - Rectangle GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const; + tools::Rectangle GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const; + tools::Rectangle GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const; void SetNoSelection(); diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 72e546ba0ad1..f2611676db40 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -628,7 +628,7 @@ private: ImplRulerData* mpSaveData; ImplRulerData* mpData; ImplRulerData* mpDragData; - Rectangle maExtraRect; + tools::Rectangle maExtraRect; WinBits mnWinStyle; sal_uInt16 mnUnitIndex; sal_uInt16 mnDragAryPos; @@ -719,7 +719,7 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void MouseMove( const MouseEvent& rMEvt ) override; virtual void Tracking( const TrackingEvent& rTEvt ) override; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual void Resize() override; virtual void StateChanged( StateChangedType nStateChange ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; @@ -740,7 +740,7 @@ public: long GetPageOffset() const; void SetBorderPos( long nOff = 0 ); long GetBorderOffset() const { return mnBorderOff; } - const Rectangle& GetExtraRect() const { return maExtraRect; } + const tools::Rectangle& GetExtraRect() const { return maExtraRect; } void SetUnit( FieldUnit eNewUnit ); FieldUnit GetUnit() const { return meUnit; } diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index a7a7ac7c7172..af146bd70c71 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -77,7 +77,7 @@ protected: virtual void NotifyScrolled() override; virtual void SetTabs() override; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; virtual void HBarClick(); void HBarDrag(); diff --git a/include/svtools/statusbarcontroller.hxx b/include/svtools/statusbarcontroller.hxx index c9f403fd7265..8a2d74cfa129 100644 --- a/include/svtools/statusbarcontroller.hxx +++ b/include/svtools/statusbarcontroller.hxx @@ -53,7 +53,7 @@ class SVT_DLLPUBLIC StatusbarController : css::uno::Reference< css::frame::XFrame > getFrameInterface() const; css::uno::Reference< css::util::XURLTransformer > getURLTransformer() const; - ::Rectangle getControlRect() const; + ::tools::Rectangle getControlRect() const; // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index a824ebd8ba82..23efa2956a09 100644 --- a/include/svtools/svtabbx.hxx +++ b/include/svtools/svtabbx.hxx @@ -141,7 +141,7 @@ public: virtual ~SvHeaderTabListBox() override; virtual void dispose() override; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& ) override; void InitHeaderBar( HeaderBar* pHeaderBar ); static bool IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol ); @@ -204,9 +204,9 @@ public: virtual bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const override; virtual OUString GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const override; - virtual Rectangle calcHeaderRect( bool _bIsColumnBar, bool _bOnScreen = true ) override; - virtual Rectangle calcTableRect( bool _bOnScreen = true ) override; - virtual Rectangle GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumn, bool _bIsHeader, bool _bOnScreen = true ) override; + virtual tools::Rectangle calcHeaderRect( bool _bIsColumnBar, bool _bOnScreen = true ) override; + virtual tools::Rectangle calcTableRect( bool _bOnScreen = true ) override; + virtual tools::Rectangle GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumn, bool _bIsHeader, bool _bOnScreen = true ) override; virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) override; virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleRowHeader( sal_Int32 _nRow ) override; @@ -232,7 +232,7 @@ public: virtual bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, MetricVector& rVector ) override; // Window - virtual Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const override; + virtual tools::Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const override; virtual void GrabFocus() override; virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible() override; virtual vcl::Window* GetAccessibleParentWindow() const override; @@ -240,7 +240,7 @@ public: /** Creates and returns the accessible object of the whole BrowseBox. */ virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; - virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) override; + virtual tools::Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) override; virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) override; }; diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index 2b983036b00a..8019e38996c1 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -373,7 +373,7 @@ public: virtual void MouseMove( const MouseEvent& rMEvt ) override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; virtual void Resize() override; virtual void RequestHelp( const HelpEvent& rHEvt ) override; virtual void StateChanged( StateChangedType nStateChange ) override; @@ -410,9 +410,9 @@ public: sal_uInt16 GetPageId( sal_uInt16 nPos ) const; sal_uInt16 GetPagePos( sal_uInt16 nPageId ) const; sal_uInt16 GetPageId( const Point& rPos ) const; - Rectangle GetPageRect( sal_uInt16 nPageId ) const; + tools::Rectangle GetPageRect( sal_uInt16 nPageId ) const; // returns the rectangle in which page tabs are drawn - Rectangle GetPageArea() const; + tools::Rectangle GetPageArea() const; void SetCurPageId( sal_uInt16 nPageId ); sal_uInt16 GetCurPageId() const { return mnCurPageId; } diff --git a/include/svtools/table/tablerenderer.hxx b/include/svtools/table/tablerenderer.hxx index eb3f47858794..9d7ebd95d808 100644 --- a/include/svtools/table/tablerenderer.hxx +++ b/include/svtools/table/tablerenderer.hxx @@ -84,7 +84,7 @@ namespace svt { namespace table the style to be used for drawing */ virtual void PaintHeaderArea( - OutputDevice& _rDevice, const Rectangle& _rArea, + OutputDevice& _rDevice, const tools::Rectangle& _rArea, bool _bIsColHeaderArea, bool _bIsRowHeaderArea, const StyleSettings& _rStyle ) = 0; @@ -106,7 +106,7 @@ namespace svt { namespace table the style to be used for drawing */ virtual void PaintColumnHeader( ColPos _nCol, bool _bActive, bool _bSelected, - OutputDevice& _rDevice, const Rectangle& _rArea, + OutputDevice& _rDevice, const tools::Rectangle& _rArea, const StyleSettings& _rStyle ) = 0; /** prepares a row for painting @@ -141,7 +141,7 @@ namespace svt { namespace table the style to be used for drawing */ virtual void PrepareRow( RowPos _nRow, bool i_hasControlFocus, bool _bSelected, - OutputDevice& _rDevice, const Rectangle& _rRowArea, + OutputDevice& _rDevice, const tools::Rectangle& _rRowArea, const StyleSettings& _rStyle ) = 0; /** paints the header of a row @@ -170,7 +170,7 @@ namespace svt { namespace table the style to be used for drawing */ virtual void PaintRowHeader( bool i_hasControlFocus, bool _bSelected, - OutputDevice& _rDevice, Rectangle const & _rArea, + OutputDevice& _rDevice, tools::Rectangle const & _rArea, StyleSettings const & _rStyle ) = 0; /** paints a certain cell @@ -201,7 +201,7 @@ namespace svt { namespace table */ virtual void PaintCell( ColPos const i_col, bool i_hasControlFocus, bool _bSelected, - OutputDevice& _rDevice, const Rectangle& _rArea, + OutputDevice& _rDevice, const tools::Rectangle& _rArea, const StyleSettings& _rStyle ) = 0; /** draws a cell cursor in the given rectangle @@ -209,14 +209,14 @@ namespace svt { namespace table The cell cursor is used to indicate the active/current cell of a table control. */ - virtual void ShowCellCursor( vcl::Window& _rView, const Rectangle& _rCursorRect) = 0; + virtual void ShowCellCursor( vcl::Window& _rView, const tools::Rectangle& _rCursorRect) = 0; /** hides the cell cursor previously drawn into the given rectangle The cell cursor is used to indicate the active/current cell of a table control. */ - virtual void HideCellCursor( vcl::Window& _rView, const Rectangle& _rCursorRect) = 0; + virtual void HideCellCursor( vcl::Window& _rView, const tools::Rectangle& _rCursorRect) = 0; /** checks whether a given cell content fits into a given target area on a given device. @@ -232,7 +232,7 @@ namespace svt { namespace table */ virtual bool FitsIntoCell( css::uno::Any const & i_cellContent, - OutputDevice& i_targetDevice, Rectangle const & i_targetArea + OutputDevice& i_targetDevice, tools::Rectangle const & i_targetArea ) const = 0; /** attempts to format the content of the given cell as string diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index 94aba0966a1c..317b65c37932 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -84,7 +84,7 @@ public: virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; virtual void KeyInput( const KeyEvent& rKEvent ) override; virtual void Command( const CommandEvent& rCEvt ) 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; diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 97e0ce929a68..bb3ff359b1f1 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -301,7 +301,7 @@ protected: // In-place editing SvInplaceEdit2* pEdCtrl; - void EditText( const OUString&, const Rectangle&,const Selection&); + void EditText( const OUString&, const tools::Rectangle&,const Selection&); void CancelTextEditing(); bool EditingCanceled() const; @@ -508,7 +508,7 @@ public: @param pEntry The entry. @return The bounding rectangle of an entry. */ - Rectangle GetBoundingRect( SvTreeListEntry* pEntry ); + tools::Rectangle GetBoundingRect( SvTreeListEntry* pEntry ); /** Enables, that one cell of a tablistbox entry can be focused */ void EnableCellFocus(); @@ -665,7 +665,7 @@ public: virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; virtual void MouseMove( const MouseEvent& rMEvt ) override; @@ -715,7 +715,7 @@ public: SvTreeListEntry* GetEntry( const Point& rPos, bool bHit = false ) const; - virtual Rectangle GetFocusRect( SvTreeListEntry*, long nLine ); + virtual tools::Rectangle GetFocusRect( SvTreeListEntry*, long nLine ); // Respects indentation virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ); void InvalidateEntry( SvTreeListEntry* ); @@ -736,7 +736,7 @@ public: using Window::Invalidate; virtual void Invalidate( InvalidateFlags nFlags = InvalidateFlags::NONE) override; - virtual void Invalidate( const Rectangle&, InvalidateFlags nFlags = InvalidateFlags::NONE ) override; + virtual void Invalidate( const tools::Rectangle&, InvalidateFlags nFlags = InvalidateFlags::NONE ) override; void SetHighlightRange(sal_uInt16 nFirstTab=0, sal_uInt16 nLastTab=0xffff); diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 061816e84bb9..e470be598bfd 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -201,8 +201,8 @@ private: ValueItemList mItemList; std::unique_ptr<ValueSetItem> mpNoneItem; VclPtr<ScrollBar> mxScrollBar; - Rectangle maNoneItemRect; - Rectangle maItemListRect; + tools::Rectangle maNoneItemRect; + tools::Rectangle maItemListRect; long mnItemWidth; long mnItemHeight; long mnTextOffset; @@ -247,7 +247,7 @@ private: SVT_DLLPRIVATE void ImplInitScrollBar(); SVT_DLLPRIVATE void ImplDeleteItems(); - SVT_DLLPRIVATE void ImplFormatItem(vcl::RenderContext& rRenderContext, ValueSetItem* pItem, Rectangle aRect); + SVT_DLLPRIVATE void ImplFormatItem(vcl::RenderContext& rRenderContext, ValueSetItem* pItem, tools::Rectangle aRect); SVT_DLLPRIVATE void ImplDrawItemText(vcl::RenderContext& rRenderContext, const OUString& rStr); SVT_DLLPRIVATE void ImplDrawSelect(vcl::RenderContext& rRenderContext, sal_uInt16 nItemId, const bool bFocus, const bool bDrawSel); SVT_DLLPRIVATE void ImplDrawSelect(vcl::RenderContext& rRenderContext); @@ -261,7 +261,7 @@ private: SVT_DLLPRIVATE ValueSetItem* ImplGetFirstItem(); SVT_DLLPRIVATE sal_uInt16 ImplGetVisibleItemCount() const; SVT_DLLPRIVATE void ImplInsertItem( ValueSetItem *const pItem, const size_t nPos ); - SVT_DLLPRIVATE Rectangle ImplGetItemRect( size_t nPos ) const; + SVT_DLLPRIVATE tools::Rectangle ImplGetItemRect( size_t nPos ) const; SVT_DLLPRIVATE void ImplFireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue ); SVT_DLLPRIVATE bool ImplHasAccessibleListeners(); SVT_DLLPRIVATE void ImplTracking( const Point& rPos, bool bRepeat ); @@ -288,7 +288,7 @@ public: virtual void Tracking( const TrackingEvent& rMEvt ) override; virtual void KeyInput( const KeyEvent& rKEvt ) override; virtual void Command( const CommandEvent& rCEvt ) 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; virtual void Resize() override; @@ -320,7 +320,7 @@ public: size_t GetItemPos( sal_uInt16 nItemId ) const; sal_uInt16 GetItemId( size_t nPos ) const; sal_uInt16 GetItemId( const Point& rPos ) const; - Rectangle GetItemRect( sal_uInt16 nItemId ) const; + tools::Rectangle GetItemRect( sal_uInt16 nItemId ) const; void EnableFullItemMode( bool bFullMode ); void SetColCount( sal_uInt16 nNewCols = 1 ); diff --git a/include/svtools/viewdataentry.hxx b/include/svtools/viewdataentry.hxx index 8226cfbb101d..1a61b3f6c13a 100644 --- a/include/svtools/viewdataentry.hxx +++ b/include/svtools/viewdataentry.hxx @@ -51,7 +51,7 @@ class SVT_DLLPUBLIC SvViewDataEntry bool mbExpanded:1; bool mbFocused:1; bool mbSelectable:1; - Rectangle maPaintRectangle; + tools::Rectangle maPaintRectangle; public: SvViewDataEntry(); @@ -74,8 +74,8 @@ public: const SvViewDataItem& GetItem(size_t nPos) const; SvViewDataItem& GetItem(size_t nPos); - void SetPaintRectangle(Rectangle aRectangle); - const Rectangle& GetPaintRectangle() const; + void SetPaintRectangle(tools::Rectangle aRectangle); + const tools::Rectangle& GetPaintRectangle() const; }; |