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 | |
| parent | spelling in comments: minmal -> minimal (diff) | |
| download | core-a5a571307fb3306b74ab46b085cde6388270a770.tar.gz core-a5a571307fb3306b74ab46b085cde6388270a770.zip | |
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')
194 files changed, 974 insertions, 965 deletions
diff --git a/include/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx index 414b06f3f508..c24fcdcfb589 100644 --- a/include/avmedia/mediawindow.hxx +++ b/include/avmedia/mediawindow.hxx @@ -65,7 +65,7 @@ namespace avmedia vcl::Window* getWindow() const; - void setPosSize( const Rectangle& rNewRect ); + void setPosSize( const tools::Rectangle& rNewRect ); void setPointer( const Pointer& rPointer ); diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx index df50c19a15f2..6394539dcff7 100644 --- a/include/dbaccess/dataview.hxx +++ b/include/dbaccess/dataview.hxx @@ -41,7 +41,7 @@ namespace svt { class DataChangedEvent; class FixedLine; class NotifyEvent; -class Rectangle; +namespace tools { class Rectangle; } namespace dbaui { @@ -82,13 +82,13 @@ namespace dbaui void attachFrame(const css::uno::Reference< css::frame::XFrame >& _xFrame); protected: // window overridables - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& _rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& _rRect ) override; /// re-arrange all controls, including the toolbox, it's separator, and the "real view" - virtual void resizeAll( const Rectangle& _rPlayground ); + virtual void resizeAll( const tools::Rectangle& _rPlayground ); // re-arrange the controls belonging to the document itself - virtual void resizeDocumentView( Rectangle& _rPlayground ); + virtual void resizeDocumentView( tools::Rectangle& _rPlayground ); }; } #endif // INCLUDED_DBACCESS_DATAVIEW_HXX diff --git a/include/drawinglayer/primitive2d/textlayoutdevice.hxx b/include/drawinglayer/primitive2d/textlayoutdevice.hxx index 5761d3a03a9d..c8670603e26a 100644 --- a/include/drawinglayer/primitive2d/textlayoutdevice.hxx +++ b/include/drawinglayer/primitive2d/textlayoutdevice.hxx @@ -36,7 +36,7 @@ namespace rtl { }; class OutputDevice; class GDIMetaFile; -class Rectangle; +namespace tools { class Rectangle; } enum class DrawTextFlags; namespace drawinglayer { namespace attribute { class FontAttribute; @@ -102,7 +102,7 @@ namespace drawinglayer double getFontDescent() const; void addTextRectActions( - const Rectangle& rRectangle, + const tools::Rectangle& rRectangle, const rtl::OUString& rText, DrawTextFlags nStyle, GDIMetaFile& rGDIMetaFile) const; diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx index 7a57582386ae..7d05f74ee876 100644 --- a/include/editeng/AccessibleEditableTextPara.hxx +++ b/include/editeng/AccessibleEditableTextPara.hxx @@ -234,7 +234,7 @@ namespace accessibility /// Unsets the given state on the internal state set and fires STATE_CHANGE event. Don't hold locks when calling this! void UnSetState( const sal_Int16 nStateId ); - static Rectangle LogicToPixel( const Rectangle& rRect, const MapMode& rMapMode, SvxViewForwarder& rForwarder ); + static tools::Rectangle LogicToPixel( const tools::Rectangle& rRect, const MapMode& rMapMode, SvxViewForwarder& rForwarder ); SvxEditSourceAdapter& GetEditSource() const; diff --git a/include/editeng/AccessibleStaticTextBase.hxx b/include/editeng/AccessibleStaticTextBase.hxx index fd34ba76639f..fef4cefa65f5 100644 --- a/include/editeng/AccessibleStaticTextBase.hxx +++ b/include/editeng/AccessibleStaticTextBase.hxx @@ -216,7 +216,7 @@ namespace accessibility virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ); protected: - Rectangle GetParagraphBoundingBox() const; + tools::Rectangle GetParagraphBoundingBox() const; private: diff --git a/include/editeng/AccessibleStringWrap.hxx b/include/editeng/AccessibleStringWrap.hxx index 5a2dd3440528..73e41d7ab432 100644 --- a/include/editeng/AccessibleStringWrap.hxx +++ b/include/editeng/AccessibleStringWrap.hxx @@ -26,7 +26,7 @@ class OutputDevice; class SvxFont; -class Rectangle; +namespace tools { class Rectangle; } class Point; @@ -39,7 +39,7 @@ public: EDITENG_DLLPUBLIC AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const OUString& rText ); - EDITENG_DLLPUBLIC void GetCharacterBounds( sal_Int32 nIndex, Rectangle& rRect ); + EDITENG_DLLPUBLIC void GetCharacterBounds( sal_Int32 nIndex, tools::Rectangle& rRect ); EDITENG_DLLPUBLIC sal_Int32 GetIndexAtPoint( const Point& rPoint ); private: diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index 69d2d61b5951..fcab47ad4269 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -83,7 +83,7 @@ class KeyEvent; namespace tools { class PolyPolygon; } class Size; class Point; -class Rectangle; +namespace tools { class Rectangle; } class SvStream; class OutputDevice; namespace vcl { class Window; } @@ -293,7 +293,7 @@ public: ParagraphInfos GetParagraphInfos( sal_Int32 nPara ); sal_Int32 FindParagraph( long nDocPosY ); EPosition FindDocPosition( const Point& rDocPos ) const; - Rectangle GetCharacterBounds( const EPosition& rPos ) const; + tools::Rectangle GetCharacterBounds( const EPosition& rPos ) const; OUString GetWord(sal_Int32 nPara, sal_Int32 nIndex); @@ -365,9 +365,9 @@ public: bool IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder ); // StartDocPos corresponds to VisArea.TopLeft(). - void Draw( OutputDevice* pOutDev, const Rectangle& rOutRect ); - void Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const Point& rStartDocPos ); - void Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const Point& rStartDocPos, bool bClip ); + void Draw( OutputDevice* pOutDev, const tools::Rectangle& rOutRect ); + void Draw( OutputDevice* pOutDev, const tools::Rectangle& rOutRect, const Point& rStartDocPos ); + void Draw( OutputDevice* pOutDev, const tools::Rectangle& rOutRect, const Point& rStartDocPos, bool bClip ); void Draw( OutputDevice* pOutDev, const Point& rStartPos, short nOrientation = 0 ); // sal_uInt32: Error code of the stream. @@ -510,7 +510,7 @@ public: // override this if access to bullet information needs to be provided virtual const SvxNumberFormat * GetNumberFormat( sal_Int32 nPara ) const; - virtual Rectangle GetBulletArea( sal_Int32 nPara ); + virtual tools::Rectangle GetBulletArea( sal_Int32 nPara ); static SfxItemPool* CreatePool( bool bLoadRefCounts = true ); static SfxItemPool& GetGlobalItemPool(); diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx index 15e53a141eb6..b246e8db6ac6 100644 --- a/include/editeng/editview.hxx +++ b/include/editeng/editview.hxx @@ -48,7 +48,7 @@ class KeyEvent; class MouseEvent; class DropEvent; class CommandEvent; -class Rectangle; +namespace tools { class Rectangle; } class Pair; class Point; class Range; @@ -114,9 +114,9 @@ public: bool AddOtherViewWindow( vcl::Window* pWin ); bool RemoveOtherViewWindow( vcl::Window* pWin ); - void Paint( const Rectangle& rRect, OutputDevice* pTargetDevice = nullptr ); - Rectangle GetInvalidateRect() const; - void InvalidateOtherViewWindows( const Rectangle& rInvRect ); + void Paint( const tools::Rectangle& rRect, OutputDevice* pTargetDevice = nullptr ); + tools::Rectangle GetInvalidateRect() const; + void InvalidateOtherViewWindows( const tools::Rectangle& rInvRect ); void Invalidate(); Pair Scroll( long nHorzScroll, long nVertScroll, ScrollRangeCheck nRangeCheck = ScrollRangeCheck::NoNegative ); @@ -133,7 +133,7 @@ public: void SetSelection( const ESelection& rNewSel ); void SelectCurrentWord( sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES ); /// Returns the rectangles of the current selection in TWIPs. - void GetSelectionRectangles(std::vector<Rectangle>& rLogicRects) const; + void GetSelectionRectangles(std::vector<tools::Rectangle>& rLogicRects) const; bool IsInsertMode() const; void SetInsertMode( bool bInsert ); @@ -145,13 +145,13 @@ public: // VisArea position of the Output window. // A size change also affects the VisArea - void SetOutputArea( const Rectangle& rRect ); - const Rectangle& GetOutputArea() const; + void SetOutputArea( const tools::Rectangle& rRect ); + const tools::Rectangle& GetOutputArea() const; // Document position. // A size change also affects the VisArea - void SetVisArea( const Rectangle& rRect ); - const Rectangle& GetVisArea() const; + void SetVisArea( const tools::Rectangle& rRect ); + const tools::Rectangle& GetVisArea() const; const Pointer& GetPointer() const; diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 75127e7e5f30..665497ed33a3 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -222,7 +222,7 @@ public: void Scroll( long nHorzScroll, long nVertScroll ); - void Paint( const Rectangle& rRect, OutputDevice* pTargetDevice = nullptr ); + void Paint( const tools::Rectangle& rRect, OutputDevice* pTargetDevice = nullptr ); bool PostKeyEvent( const KeyEvent& rKEvt, vcl::Window* pFrameWin = nullptr ); bool MouseButtonDown( const MouseEvent& ); bool MouseButtonUp( const MouseEvent& ); @@ -240,10 +240,10 @@ public: void SetReadOnly( bool bReadOnly ); bool IsReadOnly() const; - void SetOutputArea( const Rectangle& rRect ); - Rectangle GetOutputArea() const; + void SetOutputArea( const tools::Rectangle& rRect ); + tools::Rectangle GetOutputArea() const; - Rectangle GetVisArea() const; + tools::Rectangle GetVisArea() const; void CreateSelectionList (std::vector<Paragraph*> &aSelList) ; @@ -305,9 +305,9 @@ public: SvtScriptType GetSelectedScriptType() const; - void SetVisArea( const Rectangle& rRect ); + void SetVisArea( const tools::Rectangle& rRect ); void SetSelection( const ESelection& ); - void GetSelectionRectangles(std::vector<Rectangle>& rLogicRects) const; + void GetSelectionRectangles(std::vector<tools::Rectangle>& rLogicRects) const; void RemoveAttribs( bool bRemoveParaAttribs, bool bKeepLanguages = false ); void RemoveAttribsKeepLanguages( bool bRemoveParaAttribs ); @@ -561,7 +561,7 @@ struct EBulletInfo SvxFont aFont; Graphic aGraphic; sal_Int32 nParagraph; - Rectangle aBounds; + tools::Rectangle aBounds; EBulletInfo() : bVisible( false ), nType( 0 ), nParagraph( EE_PARA_NOT_FOUND ) {} }; @@ -650,7 +650,7 @@ private: void ImpTextPasted( sal_Int32 nStartPara, sal_Int32 nCount ); vcl::Font ImpCalcBulletFont( sal_Int32 nPara ) const; - Rectangle ImpCalcBulletArea( sal_Int32 nPara, bool bAdjust, bool bReturnPaperPos ); + tools::Rectangle ImpCalcBulletArea( sal_Int32 nPara, bool bAdjust, bool bReturnPaperPos ); bool ImpCanIndentSelectedPages( OutlinerView* pCurView ); bool ImpCanDeleteSelectedPages( OutlinerView* pCurView ); bool ImpCanDeleteSelectedPages( OutlinerView* pCurView, sal_Int32 nFirstPage, sal_Int32 nPages ); @@ -800,7 +800,7 @@ public: void SetStatusEventHdl( const Link<EditStatus&, void>& rLink ); Link<EditStatus&, void> GetStatusEventHdl() const; - void Draw( OutputDevice* pOutDev, const Rectangle& rOutRect ); + void Draw( OutputDevice* pOutDev, const tools::Rectangle& rOutRect ); void Draw( OutputDevice* pOutDev, const Point& rStartPos ); const Size& GetPaperSize() const; diff --git a/include/editeng/svxfont.hxx b/include/editeng/svxfont.hxx index 2034bd6363df..0c631e706548 100644 --- a/include/editeng/svxfont.hxx +++ b/include/editeng/svxfont.hxx @@ -33,7 +33,7 @@ class SvxDoCapitals; class OutputDevice; class Printer; class Point; -class Rectangle; +namespace tools { class Rectangle; } class Size; class EDITENG_DLLPUBLIC SvxFont : public vcl::Font @@ -102,7 +102,7 @@ public: const Point &rPos, const OUString &rTxt, const sal_Int32 nIdx = 0, const sal_Int32 nLen = SAL_MAX_INT32 ) const; - static void DrawArrow( OutputDevice &rOut, const Rectangle& rRect, + static void DrawArrow( OutputDevice &rOut, const tools::Rectangle& rRect, const Size& rSize, const Color& rCol, bool bLeft ); SvxFont& operator=( const SvxFont& rFont ); SvxFont& operator=( const Font& rFont ); diff --git a/include/editeng/txtrange.hxx b/include/editeng/txtrange.hxx index 9611a263f9b5..db510d319b1b 100644 --- a/include/editeng/txtrange.hxx +++ b/include/editeng/txtrange.hxx @@ -25,7 +25,7 @@ #include <deque> namespace tools { class PolyPolygon; } -class Rectangle; +namespace tools { class Rectangle; } namespace basegfx { class B2DPolyPolygon; @@ -45,7 +45,7 @@ class EDITENG_DLLPUBLIC TextRanger std::deque<RangeCache> mRangeCache; //!< Cached range calculations. tools::PolyPolygon *mpPolyPolygon; // Surface polygon tools::PolyPolygon *mpLinePolyPolygon; // Line polygon - Rectangle *pBound; // Comprehensive rectangle + tools::Rectangle *pBound; // Comprehensive rectangle sal_uInt16 nCacheSize; // Cache-Size sal_uInt16 nRight; // Distance Contour-Text sal_uInt16 nLeft; // Distance Text-Contour @@ -58,7 +58,7 @@ class EDITENG_DLLPUBLIC TextRanger bool bVertical :1;// for vertical writing mode TextRanger( const TextRanger& ) = delete; - const Rectangle& GetBoundRect_(); + const tools::Rectangle& GetBoundRect_(); public: TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon, @@ -74,8 +74,8 @@ public: bool IsSimple() const { return bSimple; } bool IsInner() const { return bInner; } bool IsVertical() const { return bVertical; } - const Rectangle& GetBoundRect() - { return pBound ? static_cast< const Rectangle& >(*pBound) : GetBoundRect_(); } + const tools::Rectangle& GetBoundRect() + { return pBound ? static_cast< const tools::Rectangle& >(*pBound) : GetBoundRect_(); } void SetUpper( sal_uInt16 nNew ){ nUpper = nNew; } void SetLower( sal_uInt16 nNew ){ nLower = nNew; } void SetVertical( bool bNew ); diff --git a/include/editeng/unoedhlp.hxx b/include/editeng/unoedhlp.hxx index c08576741cd8..3d0a42cde3f7 100644 --- a/include/editeng/unoedhlp.hxx +++ b/include/editeng/unoedhlp.hxx @@ -150,7 +150,7 @@ public: @return the possibly transformed rect */ - static Rectangle EEToUserSpace( const Rectangle& rRect, const Size& rEESize, bool bIsVertical ); + static tools::Rectangle EEToUserSpace( const tools::Rectangle& rRect, const Size& rEESize, bool bIsVertical ); }; diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx index cc92ef40bddc..39bc5f163b6d 100644 --- a/include/editeng/unoedprx.hxx +++ b/include/editeng/unoedprx.hxx @@ -63,8 +63,8 @@ public: virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const override; virtual EFieldInfo GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const override; virtual EBulletInfo GetBulletInfo( sal_Int32 nPara ) const override; - virtual Rectangle GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const override; - virtual Rectangle GetParaBounds( sal_Int32 nPara ) const override; + virtual tools::Rectangle GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const override; + virtual tools::Rectangle GetParaBounds( sal_Int32 nPara ) const override; virtual MapMode GetMapMode() const override; virtual OutputDevice* GetRefDevice() const override; virtual bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const override; @@ -118,7 +118,7 @@ public: // SvxViewForwarder interface virtual bool IsValid() const override; - virtual Rectangle GetVisArea() const override; + virtual tools::Rectangle GetVisArea() const override; virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const override; virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const override; diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx index 8094d0509604..6274ccfd9046 100644 --- a/include/editeng/unoedsrc.hxx +++ b/include/editeng/unoedsrc.hxx @@ -233,7 +233,7 @@ public: left corner of text. The coordinates returned here are to be interpreted in the map mode given by GetMapMode(). */ - virtual Rectangle GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const = 0; + virtual tools::Rectangle GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const = 0; /** Query the bounding rectangle of the given paragraph @@ -244,7 +244,7 @@ public: left corner of text. The coordinates returned here are to be interpreted in the map mode given by GetMapMode(). */ - virtual Rectangle GetParaBounds( sal_Int32 nPara ) const = 0; + virtual tools::Rectangle GetParaBounds( sal_Int32 nPara ) const = 0; /** Query the map mode of the underlying EditEngine/Outliner @@ -461,7 +461,7 @@ public: values are already in screen coordinates (pixel), and have to be relative to the EditEngine/Outliner's upper left corner. */ - virtual Rectangle GetVisArea() const = 0; + virtual tools::Rectangle GetVisArea() const = 0; /** Convert from logical, EditEngine-relative coordinates to screen coordinates diff --git a/include/editeng/unofored.hxx b/include/editeng/unofored.hxx index b6c561caa37f..c450598f1c1c 100644 --- a/include/editeng/unofored.hxx +++ b/include/editeng/unofored.hxx @@ -62,8 +62,8 @@ public: virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const override; virtual EFieldInfo GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const override; virtual EBulletInfo GetBulletInfo( sal_Int32 nPara ) const override; - virtual Rectangle GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const override; - virtual Rectangle GetParaBounds( sal_Int32 nPara ) const override; + virtual tools::Rectangle GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const override; + virtual tools::Rectangle GetParaBounds( sal_Int32 nPara ) const override; virtual MapMode GetMapMode() const override; virtual OutputDevice* GetRefDevice() const override; virtual bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const override; diff --git a/include/editeng/unoforou.hxx b/include/editeng/unoforou.hxx index 02a78236e585..a26fc406c220 100644 --- a/include/editeng/unoforou.hxx +++ b/include/editeng/unoforou.hxx @@ -81,8 +81,8 @@ public: virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const override; virtual EFieldInfo GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const override; virtual EBulletInfo GetBulletInfo( sal_Int32 nPara ) const override; - virtual Rectangle GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const override; - virtual Rectangle GetParaBounds( sal_Int32 nPara ) const override; + virtual tools::Rectangle GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const override; + virtual tools::Rectangle GetParaBounds( sal_Int32 nPara ) const override; virtual MapMode GetMapMode() const override; virtual OutputDevice* GetRefDevice() const override; virtual bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const override; diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index 179a3a621994..2318730d5e06 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -204,8 +204,8 @@ public: virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const override; virtual EFieldInfo GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const override; virtual EBulletInfo GetBulletInfo( sal_Int32 nPara ) const override; - virtual Rectangle GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const override; - virtual Rectangle GetParaBounds( sal_Int32 nPara ) const override; + virtual tools::Rectangle GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const override; + virtual tools::Rectangle GetParaBounds( sal_Int32 nPara ) const override; virtual MapMode GetMapMode() const override; virtual OutputDevice* GetRefDevice() const override; virtual bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const override; diff --git a/include/editeng/unoviwou.hxx b/include/editeng/unoviwou.hxx index ec3fa18dc33b..7a4dc1c2b3ca 100644 --- a/include/editeng/unoviwou.hxx +++ b/include/editeng/unoviwou.hxx @@ -41,7 +41,7 @@ public: virtual bool IsValid() const override; - virtual Rectangle GetVisArea() const override; + virtual tools::Rectangle GetVisArea() const override; virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const override; virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const override; diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index 5a2f1d3bd676..63f2a346f306 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -577,7 +577,7 @@ public: sal_uInt32 GetBlibID( SvStream& rPicOutStream, const OString& rGraphicId, - const Rectangle& rBoundRect, + const tools::Rectangle& rBoundRect, const css::awt::Rectangle* pVisArea = nullptr, const GraphicAttr* pGrafikAttr = nullptr, const bool ooxmlExport = false @@ -648,7 +648,7 @@ class MSFILTER_DLLPUBLIC EscherPropertyContainer { EscherGraphicProvider* pGraphicProvider; SvStream* pPicOutStrm; - Rectangle* pShapeBoundRect; + tools::Rectangle* pShapeBoundRect; sal_uInt32 nSortCount; sal_uInt32 nSortBufSize; @@ -670,7 +670,7 @@ class MSFILTER_DLLPUBLIC EscherPropertyContainer SAL_DLLPRIVATE explicit EscherPropertyContainer( EscherGraphicProvider * pGraphProv, SvStream * pPiOutStrm, - Rectangle * pBoundRect); + tools::Rectangle * pBoundRect); public: @@ -678,7 +678,7 @@ public: EscherPropertyContainer( EscherGraphicProvider& rGraphicProvider, // the PropertyContainer needs to know SvStream* pPicOutStrm, // the GraphicProvider to be able to write - Rectangle& rShapeBoundRect // FillBitmaps or GraphicObjects. + tools::Rectangle& rShapeBoundRect // FillBitmaps or GraphicObjects. ); // under some circumstances the ShapeBoundRect // is adjusted this will happen when rotated // GraphicObjects are saved to PowerPoint @@ -883,7 +883,7 @@ public: /// using rEx.AddAtom(...) followed by /// record data written to rEx.GetStream() virtual void WriteData( EscherEx& rEx, - const Rectangle& rRect ) = 0; + const tools::Rectangle& rRect ) = 0; }; class InteractionInfo @@ -930,7 +930,7 @@ public: EscherExClientRecord_Base* GetClientTextbox() const { return pClientTextbox; } - void WriteClientAnchor( EscherEx& rEx, const Rectangle& rRect ) + void WriteClientAnchor( EscherEx& rEx, const tools::Rectangle& rRect ) { if( pClientAnchor ) pClientAnchor->WriteData( rEx, rRect ); } void WriteClientData( EscherEx& rEx ) { if( pClientData ) pClientData->WriteData( rEx ); } @@ -1115,20 +1115,20 @@ public: void BeginAtom(); void EndAtom( sal_uInt16 nRecType, int nRecVersion = 0, int nRecInstance = 0 ); void AddAtom( sal_uInt32 nAtomSitze, sal_uInt16 nRecType, int nRecVersion = 0, int nRecInstance = 0 ); - void AddChildAnchor( const Rectangle& rRectangle ); - void AddClientAnchor( const Rectangle& rRectangle ); + void AddChildAnchor( const tools::Rectangle& rRectangle ); + void AddClientAnchor( const tools::Rectangle& rRectangle ); - virtual sal_uInt32 EnterGroup( const OUString& rShapeName, const Rectangle* pBoundRect ); - sal_uInt32 EnterGroup( const Rectangle* pBoundRect = nullptr ); + virtual sal_uInt32 EnterGroup( const OUString& rShapeName, const tools::Rectangle* pBoundRect ); + sal_uInt32 EnterGroup( const tools::Rectangle* pBoundRect = nullptr ); sal_uInt32 GetGroupLevel() const { return mnGroupLevel; }; - void SetGroupSnapRect( sal_uInt32 nGroupLevel, const Rectangle& rRect ); - void SetGroupLogicRect( sal_uInt32 nGroupLevel, const Rectangle& rRect ); + void SetGroupSnapRect( sal_uInt32 nGroupLevel, const tools::Rectangle& rRect ); + void SetGroupLogicRect( sal_uInt32 nGroupLevel, const tools::Rectangle& rRect ); virtual void LeaveGroup(); // a ESCHER_Sp is being written ( a ESCHER_DgContainer has to be opened for this purpose!) virtual void AddShape( sal_uInt32 nShpInstance, sal_uInt32 nFlagIds, sal_uInt32 nShapeID = 0 ); - virtual void Commit( EscherPropertyContainer& rProps, const Rectangle& rRect); + virtual void Commit( EscherPropertyContainer& rProps, const tools::Rectangle& rRect); static sal_uInt32 GetColor( const sal_uInt32 nColor ); static sal_uInt32 GetColor( const Color& rColor, bool bSwap ); @@ -1155,7 +1155,7 @@ public: /// shape is ignored. virtual EscherExHostAppData* StartShape( const css::uno::Reference< css::drawing::XShape >& rShape, - const Rectangle* pChildAnchor ); + const tools::Rectangle* pChildAnchor ); /// Called after a shape is written to inform the application /// of the resulted shape type and ID. diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 9b810357450e..5016902e5994 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -271,10 +271,10 @@ typedef std::set<std::unique_ptr<SvxMSDffImportRec>, struct SvxMSDffImportData { MSDffImportRecords m_Records; ///< Shape pointer, Shape ids and private data - Rectangle aParentRect;///< Rectangle of the surrounding groups, + tools::Rectangle aParentRect;///< Rectangle of the surrounding groups, ///< which might have been provided externally - explicit SvxMSDffImportData( const Rectangle& rParentRect ) : aParentRect( rParentRect ) {} + explicit SvxMSDffImportData( const tools::Rectangle& rParentRect ) : aParentRect( rParentRect ) {} bool empty() const { return m_Records.empty(); } size_t size() const { return m_Records.size(); } MSDffImportRecords::const_iterator begin() const { return m_Records.begin(); } @@ -285,8 +285,8 @@ struct DffObjData { const DffRecordHeader& rSpHd; - Rectangle aBoundRect; - Rectangle aChildAnchor; + tools::Rectangle aBoundRect; + tools::Rectangle aChildAnchor; sal_uInt32 nShapeId; sal_uInt32 nSpFlags; @@ -303,7 +303,7 @@ struct DffObjData int nCalledByGroup; DffObjData( const DffRecordHeader& rObjHd, - const Rectangle& rBoundRect, + const tools::Rectangle& rBoundRect, int nClByGroup ) : rSpHd( rObjHd ), aBoundRect( rBoundRect ), @@ -474,15 +474,15 @@ protected: // inside groups. Instead a graphic object is created. virtual SdrObject* ImportOLE( sal_uInt32 nOLEId, const Graphic& rGraf, - const Rectangle& rBoundRect, - const Rectangle& rVisArea, + const tools::Rectangle& rBoundRect, + const tools::Rectangle& rVisArea, const int _nCalledByGroup, sal_Int64 nAspect ) const; static css::uno::Reference < css::embed::XEmbeddedObject > CheckForConvertToSOObj( sal_uInt32 nConvertFlags, SotStorage& rSrcStg, const css::uno::Reference < css::embed::XStorage >& xDestStg, const Graphic& rGrf, - const Rectangle& rVisArea, + const tools::Rectangle& rVisArea, OUString const& rBaseURL); // the following methods need to be overridden for Excel imports @@ -500,7 +500,7 @@ protected: virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, - Rectangle& rTextRect, + tools::Rectangle& rTextRect, SdrObject* pObj); /** Object finalization, used by the Excel filter to correctly @@ -634,7 +634,7 @@ public: @return true if successful, false otherwise */ - bool GetBLIP( sal_uLong nIdx, Graphic& rData, Rectangle* pVisArea = nullptr ); + bool GetBLIP( sal_uLong nIdx, Graphic& rData, tools::Rectangle* pVisArea = nullptr ); // TODO: provide proper documentation here /** read a BLIP out of a already positioned stream @@ -646,40 +646,40 @@ public: @return true if successful, false otherwise */ - static bool GetBLIPDirect(SvStream& rBLIPStream, Graphic& rData, Rectangle* pVisArea = nullptr ); + static bool GetBLIPDirect(SvStream& rBLIPStream, Graphic& rData, tools::Rectangle* pVisArea = nullptr ); bool GetShape(sal_uLong nId, SdrObject*& rpData, SvxMSDffImportData& rData); SdrObject* ImportObj( SvStream& rSt, void* pData, - Rectangle& rClientRect, - const Rectangle& rGlobalChildRect, + tools::Rectangle& rClientRect, + const tools::Rectangle& rGlobalChildRect, int nCalledByGroup = 0, sal_Int32* pShapeId = nullptr); SdrObject* ImportGroup( const DffRecordHeader& rHd, SvStream& rSt, void* pData, - Rectangle& rClientRect, - const Rectangle& rGlobalChildRect, + tools::Rectangle& rClientRect, + const tools::Rectangle& rGlobalChildRect, int nCalledByGroup, sal_Int32* pShapeId = nullptr ); SdrObject* ImportShape( const DffRecordHeader& rHd, SvStream& rSt, void* pData, - Rectangle& rClientRect, - const Rectangle& rGlobalChildRect, + tools::Rectangle& rClientRect, + const tools::Rectangle& rGlobalChildRect, int nCalledByGroup, sal_Int32* pShapeId = nullptr); - Rectangle GetGlobalChildAnchor( const DffRecordHeader& rHd, + tools::Rectangle GetGlobalChildAnchor( const DffRecordHeader& rHd, SvStream& rSt, - Rectangle& aClientRect ); + tools::Rectangle& aClientRect ); void GetGroupAnchors( const DffRecordHeader& rHd, SvStream& rSt, - Rectangle& rGroupClientAnchor, - Rectangle& rGroupChildAnchor, - const Rectangle& rClientRect, - const Rectangle& rGlobalChildRect ); + tools::Rectangle& rGroupClientAnchor, + tools::Rectangle& rGroupChildAnchor, + const tools::Rectangle& rClientRect, + const tools::Rectangle& rGlobalChildRect ); const SvxMSDffShapeInfos_ById* GetShapeInfos() const { return m_xShapeInfosById.get(); } @@ -703,8 +703,8 @@ public: tools::SvRef<SotStorage>& rSrcStorage, const css::uno::Reference < css::embed::XStorage >& xDestStg, const Graphic& rGraf, - const Rectangle& rBoundRect, - const Rectangle& rVisArea, + const tools::Rectangle& rBoundRect, + const tools::Rectangle& rVisArea, SvStream* pDataStrrm, ErrCode& rError, sal_uInt32 nConvertFlags, diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index f0a78072b3d8..65aa8a9884d3 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -461,7 +461,7 @@ public: PptFontEntityAtom* GetFontEnityAtom( sal_uInt32 nNum ) const; void RecolorGraphic( SvStream& rSt, sal_uInt32 nRecLen, Graphic& rGraph ); virtual SdrObject* ReadObjText( PPTTextObj* pTextObj, SdrObject* pObj, SdPageCapsule pPage ) const; - virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj ) override; + virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, tools::Rectangle& rTextRect, SdrObject* pObj ) override; virtual void ProcessClientAnchor2( SvStream& rSt, DffRecordHeader& rHd, void* pData, DffObjData& rObj ) override; void ImportHeaderFooterContainer( DffRecordHeader& rHeader, HeaderFooterEntry& rEntry ); }; @@ -576,8 +576,8 @@ protected: virtual SdrObject* ImportOLE( sal_uInt32 nOLEId, const Graphic& rGraf, - const Rectangle& rBoundRect, - const Rectangle& rVisArea, + const tools::Rectangle& rBoundRect, + const tools::Rectangle& rVisArea, const int _nCalledByGroup, sal_Int64 nAspect ) const override; diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx index 97d8dff58de6..94ccc6aac24d 100644 --- a/include/oox/export/drawingml.hxx +++ b/include/oox/export/drawingml.hxx @@ -75,7 +75,7 @@ namespace uno { struct EscherConnectorListEntry; class OutlinerParaObject; -class Rectangle; +namespace tools { class Rectangle; } namespace tools { class PolyPolygon; @@ -190,7 +190,7 @@ public: void WriteShapeTransformation( const css::uno::Reference< css::drawing::XShape >& rXShape, sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = false, bool bSuppressRotation = false ); - void WriteTransformation( const Rectangle& rRectangle, + void WriteTransformation( const tools::Rectangle& rRectangle, sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = false, sal_Int32 nRotation = 0 ); void WriteText( const css::uno::Reference< css::uno::XInterface >& rXIface, const OUString& presetWarp, bool bBodyPr = true, bool bText = true, sal_Int32 nXmlNamespace = 0); diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx index 37dc577c10c1..222be73aa7bc 100644 --- a/include/oox/export/vmlexport.hxx +++ b/include/oox/export/vmlexport.hxx @@ -48,7 +48,7 @@ namespace sax_fastparser { } class Point; -class Rectangle; +namespace tools { class Rectangle; } class SdrObject; namespace oox { @@ -140,14 +140,14 @@ protected: /// /// The parameter is just what we got from StartShape(). virtual void EndShape( sal_Int32 nShapeElement ); - virtual void Commit( EscherPropertyContainer& rProps, const Rectangle& rRect ) override; + virtual void Commit( EscherPropertyContainer& rProps, const tools::Rectangle& rRect ) override; private: virtual void OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance = 0 ) override; virtual void CloseContainer() override; - virtual sal_uInt32 EnterGroup( const OUString& rShapeName, const Rectangle* pBoundRect ) override; + virtual sal_uInt32 EnterGroup( const OUString& rShapeName, const tools::Rectangle* pBoundRect ) override; virtual void LeaveGroup() override; virtual void AddShape( sal_uInt32 nShapeType, sal_uInt32 nShapeFlags, sal_uInt32 nShapeId = 0 ) override; @@ -160,10 +160,10 @@ private: void AddFlipXY( ); /// Add starting and ending point of a line to the m_pShapeAttrList. - void AddLineDimensions( const Rectangle& rRectangle ); + void AddLineDimensions( const tools::Rectangle& rRectangle ); /// Add position and size to the OStringBuffer. - void AddRectangleDimensions( OStringBuffer& rBuffer, const Rectangle& rRectangle, bool rbAbsolutePos = true ); + void AddRectangleDimensions( OStringBuffer& rBuffer, const tools::Rectangle& rRectangle, bool rbAbsolutePos = true ); }; } // namespace vml diff --git a/include/sfx2/StylePreviewRenderer.hxx b/include/sfx2/StylePreviewRenderer.hxx index 419a7ee8097c..6e3cf72b2212 100644 --- a/include/sfx2/StylePreviewRenderer.hxx +++ b/include/sfx2/StylePreviewRenderer.hxx @@ -50,7 +50,7 @@ public: virtual bool recalculate() = 0; virtual Size getRenderSize() = 0; - virtual bool render(const Rectangle& aRectangle, RenderAlign eRenderAlign = RenderAlign::CENTER) = 0; + virtual bool render(const tools::Rectangle& aRectangle, RenderAlign eRenderAlign = RenderAlign::CENTER) = 0; }; } // end namespace sfx2 diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index 5798c07d3de2..dbdabc015f77 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -41,7 +41,7 @@ class BasicManager; class DdeService; class PrinterDialog; class Point; -class Rectangle; +namespace tools { class Rectangle; } class AppSettings; struct SfxChildWinContextFactory; class SfxAppData_Impl; diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index d9b3109e4466..62b6231e8bd3 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -40,8 +40,8 @@ bool SFX2_DLLPUBLIC SAL_CALL IsDockingWindowVisible( const css::uno::Reference< class SFX2_DLLPUBLIC SfxDockingWindow : public DockingWindow { private: - Rectangle aInnerRect; - Rectangle aOuterRect; + tools::Rectangle aInnerRect; + tools::Rectangle aOuterRect; SfxBindings* pBindings; Size aFloatSize; SfxChildWindow* pMgr; @@ -51,7 +51,7 @@ private: void operator =(SfxDockingWindow &) = delete; protected: - SfxChildAlignment CalcAlignment(const Point& rPos, Rectangle& rRect ); + SfxChildAlignment CalcAlignment(const Point& rPos, tools::Rectangle& rRect ); virtual Size CalcDockingSize(SfxChildAlignment); virtual SfxChildAlignment CheckAlignment(SfxChildAlignment,SfxChildAlignment); @@ -60,10 +60,10 @@ protected: virtual bool PrepareToggleFloatingMode() override; virtual void ToggleFloatingMode() override; virtual void StartDocking() override; - virtual bool Docking( const Point& rPos, Rectangle& rRect ) override; - virtual void EndDocking( const Rectangle& rRect, bool bFloatMode ) override; + virtual bool Docking( const Point& rPos, tools::Rectangle& rRect ) override; + virtual void EndDocking( const tools::Rectangle& rRect, bool bFloatMode ) override; virtual void Resizing( Size& rSize ) override; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; virtual bool Close() override; virtual void Move() override; @@ -85,10 +85,10 @@ public: virtual void FillInfo(SfxChildWinInfo&) const; virtual void StateChanged( StateChangedType nStateChange ) override; - void SetDockingRects(const Rectangle& rOuter, const Rectangle& rInner) + void SetDockingRects(const tools::Rectangle& rOuter, const tools::Rectangle& rInner) { aInnerRect = rInner; aOuterRect = rOuter; } - const Rectangle& GetInnerRect() const { return aInnerRect; } - const Rectangle& GetOuterRect() const { return aOuterRect; } + const tools::Rectangle& GetInnerRect() const { return aInnerRect; } + const tools::Rectangle& GetOuterRect() const { return aOuterRect; } SfxBindings& GetBindings() const { return *pBindings; } sal_uInt16 GetType() const { return pMgr->GetType(); } SfxChildAlignment GetAlignment() const { return pMgr->GetAlignment(); } diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index b8afc7f9b26d..b14bb6e6f0b5 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -69,7 +69,7 @@ class SfxViewFrame; class SfxFrameDescriptor; class SfxFrameSetDescriptor; class SfxDispatcher; -class Rectangle; +namespace tools { class Rectangle; } class SfxRequest; class SystemWindow; class SfxFrameArr_Impl; @@ -163,7 +163,7 @@ public: SAL_DLLPRIVATE bool OwnsBindings_Impl() const; SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl() const; SAL_DLLPRIVATE void SetToolSpaceBorderPixel_Impl( const SvBorder& ); - SAL_DLLPRIVATE Rectangle GetTopOuterRectPixel_Impl() const; + SAL_DLLPRIVATE tools::Rectangle GetTopOuterRectPixel_Impl() const; SAL_DLLPRIVATE void CreateWorkWindow_Impl(); SAL_DLLPRIVATE void GrabFocusOnComponent_Impl(); diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx index d78aed2d61a9..4ad6d8a7ab14 100644 --- a/include/sfx2/infobar.hxx +++ b/include/sfx2/infobar.hxx @@ -64,7 +64,7 @@ class SfxInfoBarWindow : public vcl::Window virtual void dispose() override; const OUString& getId() const { return m_sId; } - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& ) override; virtual void Resize( ) override; basegfx::BColor m_aBackgroundColor; basegfx::BColor m_aForegroundColor; diff --git a/include/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx index 1ab9f4df89fd..0bc3d99ebc21 100644 --- a/include/sfx2/ipclient.hxx +++ b/include/sfx2/ipclient.hxx @@ -50,7 +50,7 @@ friend class SfxInPlaceClient_Impl; SAL_DLLPRIVATE virtual void ObjectAreaChanged(); // an active object was resized by the user and now asks for the new space - SAL_DLLPRIVATE virtual void RequestNewObjectArea( Rectangle& ); + SAL_DLLPRIVATE virtual void RequestNewObjectArea( tools::Rectangle& ); // notify the client that an active object has changed its VisualAreaSize SAL_DLLPRIVATE virtual void ViewChanged(); @@ -70,11 +70,11 @@ public: bool IsObjectUIActive() const; bool IsObjectInPlaceActive() const; void DeactivateObject(); - bool SetObjArea( const Rectangle & ); - const Rectangle& GetObjArea() const; - Rectangle GetScaledObjArea() const; + bool SetObjArea( const tools::Rectangle & ); + const tools::Rectangle& GetObjArea() const; + tools::Rectangle GetScaledObjArea() const; void SetSizeScale( const Fraction & rScaleWidth, const Fraction & rScaleHeight ); - void SetObjAreaAndScale( const Rectangle&, const Fraction&, const Fraction& ); + void SetObjAreaAndScale( const tools::Rectangle&, const Fraction&, const Fraction& ); const Fraction& GetScaleWidth() const; const Fraction& GetScaleHeight() const; void Invalidate(); diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index cf1ca2a2fe2d..d8a74fcbf307 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -628,9 +628,9 @@ public: virtual Printer * GetDocumentPrinter(); virtual OutputDevice* GetDocumentRefDev(); virtual void OnDocumentPrinterChanged( Printer * pNewPrinter ); - virtual Rectangle GetVisArea( sal_uInt16 nAspect ) const; - virtual void SetVisArea( const Rectangle & rVisArea ); - const Rectangle & GetVisArea() const; + virtual tools::Rectangle GetVisArea( sal_uInt16 nAspect ) const; + virtual void SetVisArea( const tools::Rectangle & rVisArea ); + const tools::Rectangle & GetVisArea() const; void SetVisAreaSize( const Size & rVisSize ); virtual sal_uIntPtr GetMiscStatus() const; diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx index 0c2a238092c8..bbf2ac917faa 100644 --- a/include/sfx2/recentdocsview.hxx +++ b/include/sfx2/recentdocsview.hxx @@ -80,7 +80,7 @@ protected: virtual void OnItemDblClicked(ThumbnailViewItem *pItem) override; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual void LoseFocus() override; diff --git a/include/sfx2/recentdocsviewitem.hxx b/include/sfx2/recentdocsviewitem.hxx index 63ff1ef31277..00fdb3e77d23 100644 --- a/include/sfx2/recentdocsviewitem.hxx +++ b/include/sfx2/recentdocsviewitem.hxx @@ -24,7 +24,7 @@ public: Returns rectangle that needs to be invalidated. */ - virtual Rectangle updateHighlight(bool bVisible, const Point& rPoint) override; + virtual tools::Rectangle updateHighlight(bool bVisible, const Point& rPoint) override; /// Text to be used for the tooltip. virtual OUString getHelpText() const override; @@ -39,7 +39,7 @@ public: protected: /// Return area where is the icon to remove document from the recent documents. - Rectangle getRemoveIconArea() const; + tools::Rectangle getRemoveIconArea() const; private: OUString maURL; diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx index fa27ec5c1d4c..044c7edfda8c 100644 --- a/include/sfx2/sidebar/Deck.hxx +++ b/include/sfx2/sidebar/Deck.hxx @@ -47,7 +47,7 @@ public: const OUString& GetId() const { return msId; } VclPtr<DeckTitleBar> GetTitleBar() const; - Rectangle GetContentArea() const; + tools::Rectangle GetContentArea() const; void ResetPanels (const SharedPanelContainer& rPanels); const SharedPanelContainer& GetPanels() const { return maPanels; } @@ -63,7 +63,7 @@ public: void ShowPanel (const Panel& rPanel); virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rUpdateArea) override; virtual void DataChanged (const DataChangedEvent& rEvent) override; virtual bool EventNotify(NotifyEvent& rEvent) override; @@ -75,7 +75,7 @@ public: { public: ScrollContainerWindow(vcl::Window* pParentWindow); - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rUpdateArea) override; void SetSeparators(const ::std::vector<sal_Int32>& rSeparators); private: std::vector<sal_Int32> maSeparators; diff --git a/include/sfx2/sidebar/DeckLayouter.hxx b/include/sfx2/sidebar/DeckLayouter.hxx index 8b3b24810aba..27a94dd7b3e9 100644 --- a/include/sfx2/sidebar/DeckLayouter.hxx +++ b/include/sfx2/sidebar/DeckLayouter.hxx @@ -40,7 +40,7 @@ class Panel; namespace DeckLayouter { void LayoutDeck ( - const Rectangle& rContentArea, + const tools::Rectangle& rContentArea, sal_Int32& rMinimalWidth, SharedPanelContainer& rPanels, vcl::Window& pDeckTitleBar, diff --git a/include/sfx2/sidebar/DeckTitleBar.hxx b/include/sfx2/sidebar/DeckTitleBar.hxx index 9ddba79046a2..3542cd45e0fb 100644 --- a/include/sfx2/sidebar/DeckTitleBar.hxx +++ b/include/sfx2/sidebar/DeckTitleBar.hxx @@ -35,8 +35,8 @@ public: virtual void DataChanged(const DataChangedEvent& rEvent) override; protected: - virtual Rectangle GetTitleArea(const Rectangle& rTitleBarBox) override; - virtual void PaintDecoration(vcl::RenderContext& rRenderContext, const Rectangle& rTitleBarBox) override; + virtual tools::Rectangle GetTitleArea(const tools::Rectangle& rTitleBarBox) override; + virtual void PaintDecoration(vcl::RenderContext& rRenderContext, const tools::Rectangle& rTitleBarBox) override; virtual sidebar::Paint GetBackgroundPaint() override; virtual void HandleToolBoxItemClick(const sal_uInt16 nItemIndex) override; virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; diff --git a/include/sfx2/sidebar/DrawHelper.hxx b/include/sfx2/sidebar/DrawHelper.hxx index 97bdb0c04530..f80a0ca12775 100644 --- a/include/sfx2/sidebar/DrawHelper.hxx +++ b/include/sfx2/sidebar/DrawHelper.hxx @@ -34,13 +34,13 @@ class Paint; class DrawHelper { public: - static void DrawBorder(vcl::RenderContext& rRenderContext, const Rectangle& rBox, const SvBorder& rBorderSize, + static void DrawBorder(vcl::RenderContext& rRenderContext, const tools::Rectangle& rBox, const SvBorder& rBorderSize, const Paint& rHorizontalPaint, const Paint& rVerticalPaint); static void DrawHorizontalLine(vcl::RenderContext& rRenderContext, const sal_Int32 nLeft, const sal_Int32 nRight, const sal_Int32 nY, const sal_Int32 nHeight, const Paint& rPaint); static void DrawVerticalLine(vcl::RenderContext& rRenderContext, const sal_Int32 nTop, const sal_Int32 nBottom, const sal_Int32 nX, const sal_Int32 nWidth, const Paint& rPaint); - static void DrawRoundedRectangle(vcl::RenderContext& rRenderContext, const Rectangle& rBox, const sal_Int32 nCornerRadius, + static void DrawRoundedRectangle(vcl::RenderContext& rRenderContext, const tools::Rectangle& rBox, const sal_Int32 nCornerRadius, const Color& rBorderColor, const Paint& rFillPaint); }; diff --git a/include/sfx2/sidebar/MenuButton.hxx b/include/sfx2/sidebar/MenuButton.hxx index 72438050a654..e5be89ffd075 100644 --- a/include/sfx2/sidebar/MenuButton.hxx +++ b/include/sfx2/sidebar/MenuButton.hxx @@ -29,7 +29,7 @@ class MenuButton public: MenuButton (vcl::Window* pParentWindow); - virtual void Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) override; + virtual void Paint (vcl::RenderContext& /*rRenderContext*/, const tools::Rectangle& rUpdateArea) override; virtual void MouseMove (const MouseEvent& rEvent) override; virtual void MouseButtonDown (const MouseEvent& rMouseEvent) override; virtual void MouseButtonUp (const MouseEvent& rMouseEvent) override; diff --git a/include/sfx2/sidebar/PanelTitleBar.hxx b/include/sfx2/sidebar/PanelTitleBar.hxx index 998a12d68ee6..4a5475a98c93 100644 --- a/include/sfx2/sidebar/PanelTitleBar.hxx +++ b/include/sfx2/sidebar/PanelTitleBar.hxx @@ -44,8 +44,8 @@ public: virtual void MouseButtonUp(const MouseEvent& rMouseEvent) override; protected: - virtual Rectangle GetTitleArea(const Rectangle& rTitleBarBox) override; - virtual void PaintDecoration(vcl::RenderContext& rRenderContext, const Rectangle& rTitleBarBox) override; + virtual tools::Rectangle GetTitleArea(const tools::Rectangle& rTitleBarBox) override; + virtual void PaintDecoration(vcl::RenderContext& rRenderContext, const tools::Rectangle& rTitleBarBox) override; virtual sidebar::Paint GetBackgroundPaint() override; virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex) override; virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx index 5832f2124db3..cf46885a4a7b 100644 --- a/include/sfx2/sidebar/SidebarController.hxx +++ b/include/sfx2/sidebar/SidebarController.hxx @@ -235,7 +235,7 @@ private: const Context& rContext); void ShowPopupMenu ( - const Rectangle& rButtonBox, + const tools::Rectangle& rButtonBox, const ::std::vector<TabBar::DeckMenuData>& rMenuData) const; VclPtr<PopupMenu> CreatePopupMenu ( const ::std::vector<TabBar::DeckMenuData>& rMenuData) const; diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx index df4b0c01983e..6ae1edeb93c5 100644 --- a/include/sfx2/sidebar/TabBar.hxx +++ b/include/sfx2/sidebar/TabBar.hxx @@ -63,7 +63,7 @@ public: bool mbIsEnabled; }; typedef ::std::function<void ( - const Rectangle&, + const tools::Rectangle&, const ::std::vector<DeckMenuData>& rMenuData)> PopupMenuProvider; TabBar ( vcl::Window* pParentWindow, @@ -75,7 +75,7 @@ public: virtual ~TabBar() override; virtual void dispose() override; - virtual void Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) override; + virtual void Paint (vcl::RenderContext& /*rRenderContext*/, const tools::Rectangle& rUpdateArea) override; virtual void DataChanged (const DataChangedEvent& rDataChangedEvent) override; virtual bool EventNotify (NotifyEvent& rEvent) override; diff --git a/include/sfx2/sidebar/TabItem.hxx b/include/sfx2/sidebar/TabItem.hxx index a5e26ffd7500..ff39fb4e9cd6 100644 --- a/include/sfx2/sidebar/TabItem.hxx +++ b/include/sfx2/sidebar/TabItem.hxx @@ -35,7 +35,7 @@ class TabItem public: TabItem (vcl::Window* pParentWindow); - virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) override; + virtual void Paint (vcl::RenderContext& rRenderContext, const tools::Rectangle& rUpdateArea) override; virtual void MouseMove (const MouseEvent& rEvent) override; virtual void MouseButtonDown (const MouseEvent& rMouseEvent) override; virtual void MouseButtonUp (const MouseEvent& rMouseEvent) override; diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx index 6f0915e1c17a..ba71420b9f92 100644 --- a/include/sfx2/sidebar/Theme.hxx +++ b/include/sfx2/sidebar/Theme.hxx @@ -185,7 +185,7 @@ private: std::vector<Paint> maPaints; std::vector<sal_Int32> maIntegers; std::vector<bool> maBooleans; - std::vector<Rectangle> maRectangles; + std::vector<tools::Rectangle> maRectangles; bool mbIsHighContrastMode; bool mbIsHighContrastModeSetManually; diff --git a/include/sfx2/sidebar/TitleBar.hxx b/include/sfx2/sidebar/TitleBar.hxx index 2a554317fb39..35c37fc11424 100644 --- a/include/sfx2/sidebar/TitleBar.hxx +++ b/include/sfx2/sidebar/TitleBar.hxx @@ -41,7 +41,7 @@ public: void SetIcon (const Image& rIcon); virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rUpdateArea) override; virtual void DataChanged (const DataChangedEvent& rEvent) override; virtual void setPosSizePixel (long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All) override; @@ -58,9 +58,9 @@ protected: VclPtr<SidebarToolBox> maToolBox; OUString msTitle; - virtual Rectangle GetTitleArea (const Rectangle& rTitleBarBox) = 0; - virtual void PaintDecoration (vcl::RenderContext& rRenderContext, const Rectangle& rTitleBarBox) = 0; - void PaintFocus(vcl::RenderContext& rRenderContext, const Rectangle& rFocusBox); + virtual tools::Rectangle GetTitleArea (const tools::Rectangle& rTitleBarBox) = 0; + virtual void PaintDecoration (vcl::RenderContext& rRenderContext, const tools::Rectangle& rTitleBarBox) = 0; + void PaintFocus(vcl::RenderContext& rRenderContext, const tools::Rectangle& rFocusBox); virtual sidebar::Paint GetBackgroundPaint() = 0; virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex); virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; @@ -69,7 +69,7 @@ private: Image maIcon; sidebar::Paint maBackgroundPaint; - void PaintTitle(vcl::RenderContext& rRenderContext, const Rectangle& rTitleBox); + void PaintTitle(vcl::RenderContext& rRenderContext, const tools::Rectangle& rTitleBox); DECL_LINK(SelectionHandler, ToolBox*, void); }; diff --git a/include/sfx2/templateviewitem.hxx b/include/sfx2/templateviewitem.hxx index 098241fcf1af..f16d8393fbf6 100644 --- a/include/sfx2/templateviewitem.hxx +++ b/include/sfx2/templateviewitem.hxx @@ -28,7 +28,7 @@ public: bool IsDefaultTemplate() const { return mbIsDefaultTemplate; } - Rectangle getDefaultIconArea() const; + tools::Rectangle getDefaultIconArea() const; virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor, const ThumbnailItemAttributes *pAttrs) override; diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index d5f0a5a91b14..421f2414398d 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -246,7 +246,7 @@ protected: 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; diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx index b39c1d2d5844..11236f3bdfa2 100644 --- a/include/sfx2/thumbnailviewitem.hxx +++ b/include/sfx2/thumbnailviewitem.hxx @@ -98,7 +98,7 @@ public: Returns rectangle that needs to be invalidated. */ - virtual Rectangle updateHighlight(bool bVisible, const Point& rPoint); + virtual tools::Rectangle updateHighlight(bool bVisible, const Point& rPoint); /// Text to be used for the tooltip. @@ -112,9 +112,9 @@ public: css::uno::Reference< css::accessibility::XAccessible > const & GetAccessible( bool bIsTransientChildrenDisabled ); - void setDrawArea (const Rectangle &area); + void setDrawArea (const tools::Rectangle &area); - const Rectangle& getDrawArea () const { return maDrawArea; } + const tools::Rectangle& getDrawArea () const { return maDrawArea; } virtual void calculateItemsPosition (const long nThumbnailHeight, const long nDisplayHeight, const long nPadding, sal_uInt32 nMaxTextLength, @@ -133,7 +133,7 @@ protected: Point maTextPos; Point maPrev1Pos; - Rectangle maDrawArea; + tools::Rectangle maDrawArea; }; #endif // INCLUDED_SFX2_THUMBNAILVIEWITEM_HXX diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx index a83de3084d5e..93c5f5527f57 100644 --- a/include/sfx2/titledockwin.hxx +++ b/include/sfx2/titledockwin.hxx @@ -57,14 +57,14 @@ namespace sfx2 protected: // Window overridables - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& i_rArea) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& i_rArea) override; virtual void Resize() override; virtual void StateChanged( StateChangedType i_nType ) override; virtual void DataChanged( const DataChangedEvent& i_rDataChangedEvent ) override; virtual void SetText( const OUString& i_rText ) override; // DockingWindow overridables - void EndDocking(const Rectangle& rRect, bool bFloatMode) override; + void EndDocking(const tools::Rectangle& rRect, bool bFloatMode) override; virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; protected: diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 52792c3d2f7b..72fed2785283 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -201,7 +201,7 @@ public: virtual void UIDeactivated( SfxInPlaceClient* pClient ); void JumpToMark( const OUString& rMark ); - void VisAreaChanged(const Rectangle& rRect); + void VisAreaChanged(const tools::Rectangle& rRect); // Misc @@ -249,7 +249,7 @@ public: virtual void ReadUserData( const OUString&, bool bBrowse = false ); virtual void WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >& ); virtual void ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >& ); - virtual void QueryObjAreaPixel( Rectangle& rRect ) const; + virtual void QueryObjAreaPixel( tools::Rectangle& rRect ) const; virtual SfxObjectShell* GetObjectShell() override; @@ -315,7 +315,7 @@ public: SAL_DLLPRIVATE void ExecPrint_Impl(SfxRequest &); SAL_DLLPRIVATE void ExecMisc_Impl(SfxRequest &); SAL_DLLPRIVATE void GetState_Impl(SfxItemSet&); - SAL_DLLPRIVATE void CheckIPClient_Impl(SfxInPlaceClient*, const Rectangle&); + SAL_DLLPRIVATE void CheckIPClient_Impl(SfxInPlaceClient*, const tools::Rectangle&); SAL_DLLPRIVATE void PushSubShells_Impl( bool bPush=true ); SAL_DLLPRIVATE void PopSubShells_Impl() { PushSubShells_Impl( false ); } SAL_DLLPRIVATE void TakeOwnership_Impl(); diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx index 359b7aa4de41..bbd33b936161 100644 --- a/include/svl/rectitem.hxx +++ b/include/svl/rectitem.hxx @@ -28,12 +28,12 @@ class SvStream; class SVL_DLLPUBLIC SfxRectangleItem: public SfxPoolItem { - Rectangle aVal; + tools::Rectangle aVal; public: static SfxPoolItem* CreateDefault(); SfxRectangleItem(); - SfxRectangleItem( sal_uInt16 nWhich, const Rectangle& rVal ); + SfxRectangleItem( sal_uInt16 nWhich, const tools::Rectangle& rVal ); SfxRectangleItem( const SfxRectangleItem& ); virtual bool GetPresentation( SfxItemPresentation ePres, @@ -47,7 +47,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; - const Rectangle& GetValue() const { return aVal; } + const tools::Rectangle& GetValue() const { return aVal; } virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, 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; }; diff --git a/include/svx/CommonStylePreviewRenderer.hxx b/include/svx/CommonStylePreviewRenderer.hxx index fe30c2277eb3..717ccb2cc785 100644 --- a/include/svx/CommonStylePreviewRenderer.hxx +++ b/include/svx/CommonStylePreviewRenderer.hxx @@ -41,7 +41,7 @@ public: virtual bool recalculate() override; virtual Size getRenderSize() override; - virtual bool render(const Rectangle& aRectangle, RenderAlign eRenderAlign = RenderAlign::CENTER) override; + virtual bool render(const tools::Rectangle& aRectangle, RenderAlign eRenderAlign = RenderAlign::CENTER) override; }; } // end namespace svx diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx index e0db73fdc36b..87b21855aaf7 100644 --- a/include/svx/EnhancedCustomShape2d.hxx +++ b/include/svx/EnhancedCustomShape2d.hxx @@ -81,7 +81,7 @@ class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet sal_Int32 nCoordHeightG; sal_Int32 nCoordWidth; sal_Int32 nCoordHeight; - Rectangle aLogicRect; + tools::Rectangle aLogicRect; double fXScale; double fYScale; @@ -178,8 +178,8 @@ class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet SdrObject* CreateLineGeometry(); SdrObject* CreateObject( bool bLineGeometryNeededOnly ); void ApplyGluePoints( SdrObject* pObj ); - Rectangle GetTextRect() const; - const Rectangle& GetLogicRect() const { return aLogicRect; } + tools::Rectangle GetTextRect() const; + const tools::Rectangle& GetLogicRect() const { return aLogicRect; } sal_uInt32 GetHdlCount() const; bool GetHandlePosition( const sal_uInt32 nIndex, Point& rReturnPosition ) const; diff --git a/include/svx/IAccessibleViewForwarder.hxx b/include/svx/IAccessibleViewForwarder.hxx index 35d1fd77ad7f..eb89854fe1fe 100644 --- a/include/svx/IAccessibleViewForwarder.hxx +++ b/include/svx/IAccessibleViewForwarder.hxx @@ -61,7 +61,7 @@ public: are, contrary to the base class, in internal coordinates of 100th of mm. */ - virtual Rectangle GetVisibleArea() const = 0; + virtual tools::Rectangle GetVisibleArea() const = 0; /** Transform the specified point from internal coordinates in 100th of mm to an absolute screen position. diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index ca48018229f4..ade653b697be 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -93,7 +93,7 @@ public: virtual FactoryFunction GetUITestFactory() const override; protected: - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& ) override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; virtual void MouseMove( const MouseEvent& rMEvt ) override; @@ -139,7 +139,7 @@ private: DECL_LINK(VscrollHdl, ScrollBar*, void); void init(); - Rectangle getGridRectangle(const Point &rPointUL, const Size &rOutputSize); + tools::Rectangle getGridRectangle(const Point &rPointUL, const Size &rOutputSize); }; #endif diff --git a/include/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx index 4499b190777d..d36e71a54a77 100644 --- a/include/svx/compressgraphicdialog.hxx +++ b/include/svx/compressgraphicdialog.hxx @@ -69,7 +69,7 @@ private: SdrGrafObj* m_pGraphicObj; Graphic m_aGraphic; Size m_aViewSize100mm; - Rectangle m_aCropRectangle; + tools::Rectangle m_aCropRectangle; SfxBindings& m_rBindings; double m_dResolution; @@ -102,14 +102,14 @@ private: public: CompressGraphicsDialog( vcl::Window* pParent, SdrGrafObj* pGraphicObj, SfxBindings& rBindings ); - CompressGraphicsDialog( vcl::Window* pParent, Graphic& rGraphic, Size rViewSize100mm, Rectangle& rCropRectangle, SfxBindings& rBindings ); + CompressGraphicsDialog( vcl::Window* pParent, Graphic& rGraphic, Size rViewSize100mm, tools::Rectangle& rCropRectangle, SfxBindings& rBindings ); virtual ~CompressGraphicsDialog() override; virtual void dispose() override; SdrGrafObj* GetCompressedSdrGrafObj(); Graphic GetCompressedGraphic(); - Rectangle GetScaledCropRectangle(); + tools::Rectangle GetScaledCropRectangle(); }; #endif diff --git a/include/svx/connctrl.hxx b/include/svx/connctrl.hxx index b3b1b54da9f1..360ff38522da 100644 --- a/include/svx/connctrl.hxx +++ b/include/svx/connctrl.hxx @@ -55,7 +55,7 @@ public: virtual ~SvxXConnectionPreview() override; virtual void dispose() 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 Size GetOptimalSize() const override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; diff --git a/include/svx/contdlg.hxx b/include/svx/contdlg.hxx index 15cc8a9ca895..2664a656f002 100644 --- a/include/svx/contdlg.hxx +++ b/include/svx/contdlg.hxx @@ -80,7 +80,7 @@ public: const tools::PolyPolygon* pPolyPoly, void* pEditingObj ); static tools::PolyPolygon CreateAutoContour( const Graphic& rGraphic, - const Rectangle* pRect = nullptr, + const tools::Rectangle* pRect = nullptr, const sal_uIntPtr nFlags = 0L ); }; diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index 90815338d57d..c12f3c97652b 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -43,7 +43,7 @@ public: void DrawElements( const OUString& rText, sal_Int32 nAngle ); protected: - Rectangle maRect; + tools::Rectangle maRect; bool mbEnabled; private: @@ -79,7 +79,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC DialControl : public Control public: explicit DialControl( vcl::Window* pParent, WinBits nBits ); - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual void StateChanged( StateChangedType nStateChange ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx index 056056db8d86..57edb8a46fe9 100644 --- a/include/svx/dlgctl3d.hxx +++ b/include/svx/dlgctl3d.hxx @@ -52,7 +52,7 @@ public: virtual ~Svx3DPreviewControl() override; virtual void dispose() 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 Resize() override; virtual Size GetOptimalSize() const override; @@ -100,7 +100,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC Svx3DLightControl : public Svx3DPreviewContr public: Svx3DLightControl(vcl::Window* pParent, WinBits nStyle); - 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 Tracking( const TrackingEvent& rTEvt ) override; virtual void Resize() override; diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 98e7ecac0673..2cb800216f39 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -113,7 +113,7 @@ public: virtual ~SvxRectCtl() override; virtual void dispose() 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 KeyInput( const KeyEvent& rKeyEvt ) override; virtual void StateChanged( StateChangedType nStateChange ) override; @@ -129,8 +129,8 @@ public: static const sal_uInt8 NO_CHILDREN = 9; // returns number of usable radio buttons - Rectangle CalculateFocusRectangle() const; - Rectangle CalculateFocusRectangle( RectPoint eRectPoint ) const; + tools::Rectangle CalculateFocusRectangle() const; + tools::Rectangle CalculateFocusRectangle( RectPoint eRectPoint ) const; virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; @@ -161,7 +161,7 @@ protected: Point aFocusPosition; rtl::Reference<SvxPixelCtlAccessible> m_xAccess; - Rectangle implCalFocusRect( const Point& aPosition ); + tools::Rectangle implCalFocusRect( const Point& aPosition ); void ChangePixel( sal_uInt16 nPixel ); public: @@ -170,7 +170,7 @@ public: virtual ~SvxPixelCtl() override; virtual void dispose() 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 Resize() override; virtual Size GetOptimalSize() const override; @@ -357,7 +357,7 @@ public: void SetSymbol( Graphic* p, const Size& s ); void ResizeSymbol( const Size& s ); - 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 Size GetOptimalSize() const override; }; @@ -380,7 +380,7 @@ public: void SetAttributes(const SfxItemSet& rItemSet); - 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; }; @@ -408,7 +408,7 @@ public: void SetShadowAttributes(const SfxItemSet& rItemSet); void SetShadowPosition(const Point& rPos); - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; }; #endif // INCLUDED_SVX_DLGCTRL_HXX diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx index 758f1eb6bddc..e753970341af 100644 --- a/include/svx/fntctrl.hxx +++ b/include/svx/fntctrl.hxx @@ -62,7 +62,7 @@ public: void ResetColor(); void SetBackColor( const Color& rColor ); void UseResourceText(); - void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override; + void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& ) override; bool IsTwoLines() const; void SetTwoLines(bool bSet); diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx index eacf64633d73..20ef1dbc6dcc 100644 --- a/include/svx/framelink.hxx +++ b/include/svx/framelink.hxx @@ -30,7 +30,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> class Point; -class Rectangle; +namespace tools { class Rectangle; } class OutputDevice; namespace svx { @@ -218,7 +218,7 @@ SVX_DLLPUBLIC double GetHorDiagAngle( long nWidth, long nHeight ); The returned values represents the inner angle between the diagonals and horizontal borders, and is therefore in the range [0,PI/2] (inclusive). */ -inline double GetHorDiagAngle( const Rectangle& rRect ) +inline double GetHorDiagAngle( const tools::Rectangle& rRect ) { return GetHorDiagAngle( rRect.GetWidth(), rRect.GetHeight() ); } @@ -236,7 +236,7 @@ inline double GetVerDiagAngle( long nWidth, long nHeight ) The returned values represents the inner angle between the diagonals and vertical borders, and is therefore in the range [0,PI/2] (inclusive). */ -inline double GetVerDiagAngle( const Rectangle& rRect ) +inline double GetVerDiagAngle( const tools::Rectangle& rRect ) { return GetVerDiagAngle( rRect.GetWidth(), rRect.GetHeight() ); } @@ -471,7 +471,7 @@ SVX_DLLPUBLIC drawinglayer::primitive2d::Primitive2DContainer CreateBorderPrimit SVX_DLLPUBLIC drawinglayer::primitive2d::Primitive2DContainer CreateClippedBorderPrimitives ( const Point& rStart, const Point& rEnd, const Style& rBorder, - const Rectangle& rClipRect ); + const tools::Rectangle& rClipRect ); /** Draws a horizontal frame border, regards all connected frame styles. @@ -610,7 +610,7 @@ SVX_DLLPUBLIC void DrawVerFrameBorder( SVX_DLLPUBLIC void DrawDiagFrameBorders( OutputDevice& rDev, /// The output device used to draw the frame border. - const Rectangle& rRect, /// Rectangle for both diagonal frame borders. + const tools::Rectangle& rRect, /// Rectangle for both diagonal frame borders. const Style& rTLBR, /// Style of the processed top-left to bottom-right diagonal frame border. const Style& rBLTR, /// Style of the processed bottom-left to top-right diagonal frame border. diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx index d48fbf8c98c0..a899caa7ee40 100644 --- a/include/svx/framelinkarray.hxx +++ b/include/svx/framelinkarray.hxx @@ -247,7 +247,7 @@ public: void SetClipRange( size_t nFirstCol, size_t nFirstRow, size_t nLastCol, size_t nLastRow ); /** Returns the rectangle (output coordinates) of the current clipping range. */ - Rectangle GetClipRangeRectangle() const; + tools::Rectangle GetClipRangeRectangle() const; // cell coordinates ------------------------------------------------------- @@ -301,7 +301,7 @@ public: /** Returns the output rectangle of the cell (nCol,nRow). Returns total output rectangle of merged ranges. */ - Rectangle GetCellRect( size_t nCol, size_t nRow ) const; + tools::Rectangle GetCellRect( size_t nCol, size_t nRow ) const; // diagonal frame borders ------------------------------------------------- diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx index 3221512f8c44..c91241b69653 100644 --- a/include/svx/frmsel.hxx +++ b/include/svx/frmsel.hxx @@ -171,11 +171,11 @@ public: /** Returns true, if the passed point is inside the click area of any enabled frame border. */ bool ContainsClickPoint( const Point& rPos ) const; /** Returns the bounding rectangle of the specified frame border (if enabled). */ - Rectangle GetClickBoundRect( FrameBorderType eBorder ) const; + tools::Rectangle GetClickBoundRect( FrameBorderType eBorder ) const; protected: - 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 KeyInput( const KeyEvent& rKEvt ) override; virtual void GetFocus() override; diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx index 63e8a8932e91..6c1091c420c7 100644 --- a/include/svx/galctrl.hxx +++ b/include/svx/galctrl.hxx @@ -45,14 +45,14 @@ class SVX_DLLPUBLIC GalleryPreview : public vcl::Window, public DropTargetHelper private: GraphicObject aGraphicObj; - Rectangle aPreviewRect; + tools::Rectangle aPreviewRect; GalleryTheme* mpTheme; - SVX_DLLPRIVATE bool ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const; + SVX_DLLPRIVATE bool ImplGetGraphicCenterRect( const Graphic& rGraphic, tools::Rectangle& rResultRect ) const; SVX_DLLPRIVATE void InitSettings(); // Window - SVX_DLLPRIVATE virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + SVX_DLLPRIVATE virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; SVX_DLLPRIVATE virtual Size GetOptimalSize() const override; SVX_DLLPRIVATE virtual void MouseButtonDown(const MouseEvent& rMEvt) override; SVX_DLLPRIVATE virtual void Command(const CommandEvent& rCEvt) override; @@ -124,7 +124,7 @@ private: // BrowseBox virtual bool SeekRow( long nRow ) override; - virtual void PaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const override; + virtual void PaintField( OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId ) const override; virtual void DoubleClick( const BrowserMouseEvent& rEvt ) override; virtual void Select() override; virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt ) override; @@ -155,7 +155,7 @@ public: virtual OUString GetCellText(long _nRow, sal_uInt16 _nColId) const override; // from IAccessibleTableProvider - 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/svx/graphctl.hxx b/include/svx/graphctl.hxx index 1cf1c9cb419e..ff89fd40b468 100644 --- a/include/svx/graphctl.hxx +++ b/include/svx/graphctl.hxx @@ -63,7 +63,7 @@ protected: SdrModel* pModel; SdrView* pView; - 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 KeyInput(const KeyEvent& rKEvt) override; virtual void MouseButtonDown(const MouseEvent& rMEvt) override; @@ -125,7 +125,7 @@ public: : rWin(rGraphWin) {} - 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; }; SdrObjUserCall* GraphCtrl::GetSdrUserCall() diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 2bd8f90b72ba..43a6a12ee059 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -214,7 +214,7 @@ public: protected: 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 StateChanged( StateChangedType nType ) override; private: @@ -307,7 +307,7 @@ protected: protected: virtual bool SeekRow(long nRow) override; virtual void VisibleRowsChanged( long nNewTopRow, sal_uInt16 nNumRows) override; - virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId) const override; + virtual void PaintCell(OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColId) const override; virtual RowStatus GetRowStatus(long nRow) const override; virtual bool CursorMoving(long nNewRow, sal_uInt16 nNewCol) override; virtual void CursorMoved() override; diff --git a/include/svx/measctrl.hxx b/include/svx/measctrl.hxx index 118ea02ba764..09b861703ee4 100644 --- a/include/svx/measctrl.hxx +++ b/include/svx/measctrl.hxx @@ -39,7 +39,7 @@ public: virtual ~SvxXMeasurePreview() override; virtual void dispose() 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 MouseButtonDown(const MouseEvent& rMEvt) override; virtual Size GetOptimalSize() const override; diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx index 1c2da29a55ee..eaba4507685e 100644 --- a/include/svx/numvset.hxx +++ b/include/svx/numvset.hxx @@ -58,7 +58,7 @@ enum class NumberingPageType class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet { NumberingPageType ePageType; - Rectangle aOrgRect; + tools::Rectangle aOrgRect; VclPtr<VirtualDevice> pVDev; css::uno::Reference<css::text::XNumberingFormatter> xFormatter; diff --git a/include/svx/pagectrl.hxx b/include/svx/pagectrl.hxx index 64123cf0be8a..438018e08fbd 100644 --- a/include/svx/pagectrl.hxx +++ b/include/svx/pagectrl.hxx @@ -70,14 +70,14 @@ private: SvxPageUsage eUsage; protected: - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual void DrawPage(vcl::RenderContext& rRenderContext, const Point& rPoint, const bool bSecond, const bool bEnabled); void drawFillAttributes(vcl::RenderContext& rRenderContext, const drawinglayer::attribute::SdrAllFillAttributesHelperPtr& rFillAttributes, - const Rectangle& rPaintRange, const Rectangle& rDefineRange); + const tools::Rectangle& rPaintRange, const tools::Rectangle& rDefineRange); public: SvxPageWindow(vcl::Window* pParent); diff --git a/include/svx/paraprev.hxx b/include/svx/paraprev.hxx index 7b326487c0f3..a7ac58eb1f35 100644 --- a/include/svx/paraprev.hxx +++ b/include/svx/paraprev.hxx @@ -55,10 +55,10 @@ private: sal_uInt16 nLineVal; OUString aText; - Rectangle Lines[9]; + tools::Rectangle Lines[9]; protected: - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual Size GetOptimalSize() const override; void DrawParagraph(vcl::RenderContext& rRenderContext); diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx index 048d959e0e3d..f3afb3f35868 100644 --- a/include/svx/rubydialog.hxx +++ b/include/svx/rubydialog.hxx @@ -37,7 +37,7 @@ class SvxRubyDialog; class RubyPreview : public vcl::Window { protected: - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; VclPtr<SvxRubyDialog> m_pParentDlg; public: diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx index 3babb6be0057..2059e1109387 100644 --- a/include/svx/scene3d.hxx +++ b/include/svx/scene3d.hxx @@ -118,7 +118,7 @@ public: bool GetDrawOnlySelected() const { return bDrawOnlySelected; } virtual sal_uInt16 GetObjIdentifier() const override; - virtual void NbcSetSnapRect(const Rectangle& rRect) override; + virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; virtual void NbcMove(const Size& rSize) override; virtual void NbcResize(const Point& rRef, const Fraction& rXFact, const Fraction& rYFact) override; diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx index e883b9d2a968..a2429eca7af6 100644 --- a/include/svx/sdr/contact/objectcontact.hxx +++ b/include/svx/sdr/contact/objectcontact.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/geometry/viewinformation2d.hxx> class SetOfByte; -class Rectangle; +namespace tools { class Rectangle; } class SdrPageView; class OutputDevice; diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx index 1c0e03a1dd44..970fdd7efc62 100644 --- a/include/svx/sdrpaintwindow.hxx +++ b/include/svx/sdrpaintwindow.hxx @@ -41,7 +41,7 @@ namespace sdr /// paint the transparent children of rWin that overlap rPixelRect /// (for example, transparent form controls like check boxes) void SVX_DLLPUBLIC -PaintTransparentChildren(vcl::Window & rWindow, Rectangle const& rPixelRect); +PaintTransparentChildren(vcl::Window & rWindow, tools::Rectangle const& rPixelRect); class SdrPreRenderDevice { @@ -105,7 +105,7 @@ public: void DrawOverlay(const vcl::Region& rRegion); // calculate visible area and return - Rectangle GetVisibleArea() const; + tools::Rectangle GetVisibleArea() const; // Is OutDev a printer? bool OutputToPrinter() const { return (OUTDEV_PRINTER == mpOutputDevice->GetOutDevType()); } diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx index c66b05488d3e..928006172ee2 100644 --- a/include/svx/svdcrtv.hxx +++ b/include/svx/svdcrtv.hxx @@ -61,7 +61,7 @@ private: protected: bool ImpBegCreateObj(SdrInventor nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut, - sal_Int16 nMinMov, const Rectangle& rLogRect, SdrObject* pPreparedFactoryObject); + sal_Int16 nMinMov, const tools::Rectangle& rLogRect, SdrObject* pPreparedFactoryObject); void ShowCreateObj(/*OutputDevice* pOut, bool bFull*/); void HideCreateObj(/*OutputDevice* pOut, bool bFull*/); @@ -78,7 +78,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 bool MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) override; diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx index ef48ccf692fa..6764e71b0cf7 100644 --- a/include/svx/svddrag.hxx +++ b/include/svx/svddrag.hxx @@ -51,7 +51,7 @@ protected: Point aRef2; // axis of reflection, ...) Point aPos0; // Position at the last Event Point aRealNow; // Current dragging position without Snap, Ortho and Limit - Rectangle aActionRect; + tools::Rectangle aActionRect; bool bEndDragChangesAttributes; bool bEndDragChangesGeoAndAttributes; @@ -156,11 +156,11 @@ public: SdrDragMethod* GetDragMethod() const { return pDragMethod; } void SetDragMethod(SdrDragMethod* pMth) { pDragMethod=pMth; } - const Rectangle& GetActionRect() const { return aActionRect; } - void SetActionRect(const Rectangle& rR) { aActionRect=rR; } + const tools::Rectangle& GetActionRect() const { return aActionRect; } + void SetActionRect(const tools::Rectangle& rR) { aActionRect=rR; } // Also considering 1stPointAsCenter - void TakeCreateRect(Rectangle& rRect) const; + void TakeCreateRect(tools::Rectangle& rRect) const; }; #endif // INCLUDED_SVX_SVDDRAG_HXX diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index e3286291b534..c484c8736625 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -156,11 +156,11 @@ protected: const SdrHdlList& GetHdlList() const { return getSdrDragView().GetHdlList(); } void AddUndo(SdrUndoAction* pUndo) { getSdrDragView().AddUndo(pUndo); } bool IsDragLimit() { return getSdrDragView().mbDragLimit; } - const Rectangle& GetDragLimitRect() { return getSdrDragView().maDragLimit; } + const tools::Rectangle& GetDragLimitRect() { return getSdrDragView().maDragLimit; } const SdrMarkList& GetMarkedObjectList() { return getSdrDragView().GetMarkedObjectList(); } Point GetSnapPos(const Point& rPt) const { return getSdrDragView().GetSnapPos(rPt,getSdrDragView().mpMarkedPV); } SdrSnap SnapPos(Point& rPt) const { return getSdrDragView().SnapPos(rPt,getSdrDragView().mpMarkedPV); } - inline const Rectangle& GetMarkedRect() const; + inline const tools::Rectangle& GetMarkedRect() const; SdrPageView* GetDragPV() const; SdrObject* GetDragObj() const; bool IsDraggingPoints() const { return getSdrDragView().IsDraggingPoints(); } @@ -203,7 +203,7 @@ public: bool getSolidDraggingActive() const { return mbSolidDraggingActive; } }; -inline const Rectangle& SdrDragMethod::GetMarkedRect() const +inline const tools::Rectangle& SdrDragMethod::GetMarkedRect() const { return getSdrDragView().meDragHdl==SdrHdlKind::Poly ? getSdrDragView().GetMarkedPointsRect() : getSdrDragView().meDragHdl==SdrHdlKind::Glue ? getSdrDragView().GetMarkedGluePointsRect() : diff --git a/include/svx/svddrgv.hxx b/include/svx/svddrgv.hxx index 0ca6445122df..5da66b5eaa90 100644 --- a/include/svx/svddrgv.hxx +++ b/include/svx/svddrgv.hxx @@ -34,7 +34,7 @@ protected: SdrHdl* mpDragHdl; SdrDragMethod* mpCurrentSdrDragMethod; SdrUndoGeoObj* mpInsPointUndo; - Rectangle maDragLimit; + tools::Rectangle maDragLimit; OUString maInsPointUndoStr; SdrHdlKind meDragHdl; @@ -77,7 +77,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; // special implementation for Writer: // TakeDragObjAnchorPos() returns the position at which an object @@ -205,8 +205,8 @@ public: // errors,... // Default=EmptyRect=no limitation // only partially implemented - void SetWorkArea(const Rectangle& rRect) { maMaxWorkArea=rRect; } - const Rectangle& GetWorkArea() const { return maMaxWorkArea; } + void SetWorkArea(const tools::Rectangle& rRect) { maMaxWorkArea=rRect; } + const tools::Rectangle& GetWorkArea() const { return maMaxWorkArea; } // The DragLimit refers to the Page of the object. @@ -221,7 +221,7 @@ public: // occur, because of which the LimitRect might be exceeded by a // very small extent.... // Implemented for Move and Resize - virtual bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const; + virtual bool TakeDragLimit(SdrDragMode eMode, tools::Rectangle& rRect) const; }; #endif // INCLUDED_SVX_SVDDRGV_HXX diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index 15a331697568..1275adbca56a 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -153,8 +153,8 @@ protected: static bool ImpCanDismantle(const SdrObject* pObj, bool bMakeLines); void ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, size_t& rPos, SdrPageView* pPV, bool bMakeLines); static void ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRad, SdrCrookMode eMode, - bool bVertical, bool bNoContortion, bool bRotate, const Rectangle& rMarkRect); - static void ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion); + bool bVertical, bool bNoContortion, bool bRotate, const tools::Rectangle& rMarkRect); + static void ImpDistortObj(SdrObject* pO, const tools::Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion); bool ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const; void ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID); @@ -206,7 +206,7 @@ public: // Set a logical enclosing rectangle for all marked objects. // It is not guaranteed if this succeeds, as a horizontal // line has always a height of 0 - void SetMarkedObjRect(const Rectangle& rRect); + void SetMarkedObjRect(const tools::Rectangle& rRect); void MoveMarkedObj(const Size& rSiz, bool bCopy=false); void ResizeMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false); void ResizeMultMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, const bool bCopy, const bool bWdh, const bool bHgt); @@ -218,11 +218,11 @@ public: long GetMarkedObjShear() const; void ShearMarkedObj(const Point& rRef, long nAngle, bool bVShear=false, bool bCopy=false); void CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookMode eMode, bool bVertical, bool bNoContortion, bool bCopy=false); - void DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion, bool bCopy=false); + void DistortMarkedObj(const tools::Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion, bool bCopy=false); // copy marked objects and mark them instead of the old ones void CopyMarkedObj(); - void SetAllMarkedRect(const Rectangle& rRect) { SetMarkedObjRect(rRect); } + void SetAllMarkedRect(const tools::Rectangle& rRect) { SetMarkedObjRect(rRect); } void MoveAllMarked(const Size& rSiz, bool bCopy=false) { MoveMarkedObj(rSiz,bCopy); } void ResizeAllMarked(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { ResizeMarkedObj(rRef,xFact,yFact); } void RotateAllMarked(const Point& rRef, long nAngle) { RotateMarkedObj(rRef,nAngle); } diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index 211594aa9e89..d35e398301b6 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -75,8 +75,8 @@ protected: SdrPageView* pMacroPV; VclPtr<vcl::Window> pMacroWin; - Rectangle aTextEditArea; - Rectangle aMinTextEditArea; + tools::Rectangle aTextEditArea; + tools::Rectangle aMinTextEditArea; Link<EditFieldInfo*,void> aOldCalcFieldValueLink; // for call the old handler Point aMacroDownPos; @@ -112,7 +112,7 @@ protected: // Create a new OutlinerView at the heap and initialize all required parameters. // pTextEditObj, pTextEditPV and pTextEditOutliner have to be initialized OutlinerView* ImpMakeOutlinerView(vcl::Window* pWin, bool bNoPaint, OutlinerView* pGivenView, SfxViewShell* pViewShell = nullptr) const; - void ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectangle& rRect, OutputDevice& rTargetDevice) const; + void ImpPaintOutlinerView(OutlinerView& rOutlView, const tools::Rectangle& rRect, OutputDevice& rTargetDevice) const; void ImpInvalidateOutlinerView(OutlinerView& rOutlView) const; // Chaining @@ -155,7 +155,7 @@ public: virtual void EndAction() override; virtual void BrkAction() override; virtual void BckAction() override; - virtual void TakeActionRect(Rectangle& rRect) const override; + virtual void TakeActionRect(tools::Rectangle& rRect) const override; SdrPageView* ShowSdrPage(SdrPage* pPage) override; void HideSdrPage() override; diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 413164c9f592..010c73b84c6d 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -401,13 +401,13 @@ public: class ImpTextframeHdl: public SdrHdl { - const Rectangle maRect; + const tools::Rectangle maRect; // create marker for this kind virtual void CreateB2dIAObject() override; public: - explicit ImpTextframeHdl(const Rectangle& rRect); + explicit ImpTextframeHdl(const tools::Rectangle& rRect); }; diff --git a/include/svx/svdhlpln.hxx b/include/svx/svdhlpln.hxx index fafab5a4d427..86890979f91d 100644 --- a/include/svx/svdhlpln.hxx +++ b/include/svx/svdhlpln.hxx @@ -52,7 +52,7 @@ public: Pointer GetPointer() const; bool IsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const; // OutputDevice is required because capture points have a fixed pixel size - Rectangle GetBoundRect(const OutputDevice& rOut) const; + tools::Rectangle GetBoundRect(const OutputDevice& rOut) const; }; #define SDRHELPLINE_NOTFOUND 0xFFFF diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx index 39a5eb3f6c7a..f8c74d23a81c 100644 --- a/include/svx/svdmark.hxx +++ b/include/svx/svdmark.hxx @@ -28,7 +28,7 @@ #include <set> #include <vector> -class Rectangle; +namespace tools { class Rectangle; } class SdrPage; class SdrObjList; class SdrObject; @@ -217,8 +217,8 @@ public: } // pPage=0L: Selection of everything! Respect Pages - bool TakeBoundRect(SdrPageView* pPageView, Rectangle& rRect) const; - bool TakeSnapRect(SdrPageView* pPageView, Rectangle& rRect) const; + bool TakeBoundRect(SdrPageView* pPageView, tools::Rectangle& rRect) const; + bool TakeSnapRect(SdrPageView* pPageView, tools::Rectangle& rRect) const; // All Entries are copied! SdrMarkList& operator=(const SdrMarkList& rLst); 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. diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index 43c9c1bf4394..483455aa2d25 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -106,7 +106,7 @@ public: SVX_DLLPRIVATE void DragCreateObject( SdrDragStat& rDrag ); - SVX_DLLPRIVATE void DragResizeCustomShape( const Rectangle& rNewRect ); + SVX_DLLPRIVATE void DragResizeCustomShape( const tools::Rectangle& rNewRect ); SVX_DLLPRIVATE void DragMoveCustomShapeHdl( const Point& rDestination, const sal_uInt16 nCustomShapeHdlNum, bool bMoveCalloutRectangle ); @@ -117,13 +117,13 @@ public: void ImpCheckCustomGluePointsAreAdded(); // returns the new text rect that corresponds to the current logic rect, the return value can be empty if nothing changed. - Rectangle ImpCalculateTextFrame( const bool bHgt, const bool bWdt ); + tools::Rectangle ImpCalculateTextFrame( const bool bHgt, const bool bWdt ); public: // #i37011# const SdrObject* GetSdrObjectFromCustomShape() const; const SdrObject* GetSdrObjectShadowFromCustomShape() const; - bool GetTextBounds( Rectangle& rTextBound ) const; + bool GetTextBounds( tools::Rectangle& rTextBound ) const; bool IsTextPath() const; basegfx::B2DPolyPolygon GetLineGeometry( const bool bBezierAllowed ) const; @@ -176,16 +176,16 @@ public: virtual void Move(const Size& rSiz) override; virtual void Shear(const Point& rRef, long nAngle, double tn, bool bVShear) override; - virtual void SetSnapRect(const Rectangle& rRect) override; - virtual void SetLogicRect(const Rectangle& rRect) override; + virtual void SetSnapRect(const tools::Rectangle& rRect) override; + virtual void SetLogicRect(const tools::Rectangle& rRect) override; virtual void NbcMove(const Size& rSiz) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) override; virtual void NbcMirror(const Point& rRef1, const Point& rRef2) override; virtual void NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear) override; - virtual void NbcSetSnapRect(const Rectangle& rRect) override; - virtual void NbcSetLogicRect(const Rectangle& rRect) override; + virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; + virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override; virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const override; @@ -205,17 +205,17 @@ public: * text. */ void SuggestTextFrameSize(Size aSuggestedTextFrameSize); - virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const override; + virtual bool AdjustTextFrameWidthAndHeight(tools::Rectangle& rR, bool bHgt = true, bool bWdt = true) const override; virtual bool NbcAdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true) override; virtual bool AdjustTextFrameWidthAndHeight() override; virtual bool IsAutoGrowHeight() const override; virtual bool IsAutoGrowWidth() const override; virtual void SetVerticalWriting( bool bVertical ) override; - virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const override; + virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, tools::Rectangle* pViewInit, tools::Rectangle* pViewMin) const override; virtual void EndTextEdit( SdrOutliner& rOutl ) override; - virtual void TakeTextAnchorRect( Rectangle& rAnchorRect ) const override; - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, - Rectangle* pAnchorRect, bool bLineWidth = true ) const override; + virtual void TakeTextAnchorRect( tools::Rectangle& rAnchorRect ) const override; + virtual void TakeTextRect( SdrOutliner& rOutliner, tools::Rectangle& rTextRect, bool bNoEditText, + tools::Rectangle* pAnchorRect, bool bLineWidth = true ) const override; virtual SdrObjCustomShape* Clone() const override; SdrObjCustomShape& operator=(const SdrObjCustomShape& rObj); diff --git a/include/svx/svdoattr.hxx b/include/svx/svdoattr.hxx index 8ec8673d5648..10c163b3b9b0 100644 --- a/include/svx/svdoattr.hxx +++ b/include/svx/svdoattr.hxx @@ -50,7 +50,7 @@ private: protected: virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override; - Rectangle maSnapRect; + tools::Rectangle maSnapRect; protected: /// Detects the width of the line. No line ->0. @@ -70,7 +70,7 @@ public: // Detects if Line != LineNone bool HasLine() const; - virtual const Rectangle& GetSnapRect() const override; + virtual const tools::Rectangle& GetSnapRect() const override; virtual void SetModel(SdrModel* pNewModel) override; }; diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index f35f1d0fd5db..5ca83078913c 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -172,7 +172,7 @@ class SVX_DLLPUBLIC SdrObjUserCall { public: virtual ~SdrObjUserCall(); - virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect); + virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const tools::Rectangle& rOldBoundRect); }; class SVX_DLLPUBLIC SdrObjMacroHitRec @@ -221,7 +221,7 @@ public: class SVX_DLLPUBLIC SdrObjGeoData { public: - Rectangle aBoundRect; + tools::Rectangle aBoundRect; Point aAnchor; std::unique_ptr<SdrGluePointList> pGPL; @@ -343,7 +343,7 @@ public: // renaming GetLayerSet -> getMergedHierarchyLayerSet to make clear what happens here. rSet needs to be empty. void getMergedHierarchyLayerSet(SetOfByte& rSet) const; - void SendUserCall(SdrUserCallType eUserCall, const Rectangle& rBoundRect) const; + void SendUserCall(SdrUserCallType eUserCall, const tools::Rectangle& rBoundRect) const; // #i68101# // An object may have a user-set Name (Get/SetName()), e.g SdrGrafObj, SdrObjGroup @@ -390,13 +390,13 @@ public: // expensive and sometimes problematic (inside a bigger object change You will get // non-useful BoundRects sometimes) i rename that method from GetBoundRect() to // GetCurrentBoundRect(). - virtual const Rectangle& GetCurrentBoundRect() const; + virtual const tools::Rectangle& GetCurrentBoundRect() const; // To have a possibility to get the last calculated BoundRect e.g for producing // the first rectangle for repaints (old and new need to be used) without forcing // a RecalcBoundRect (which may be problematical and expensive sometimes) i add here // a new method for accessing the last BoundRect. - virtual const Rectangle& GetLastBoundRect() const; + virtual const tools::Rectangle& GetLastBoundRect() const; virtual void RecalcBoundRect(); @@ -534,21 +534,21 @@ public: /// SetSnapRect() tries to size the Object so that it fits into the /// passed Rect (without stroke width, ...) virtual void RecalcSnapRect(); - virtual const Rectangle& GetSnapRect() const; - virtual void SetSnapRect(const Rectangle& rRect); - virtual void NbcSetSnapRect(const Rectangle& rRect); + virtual const tools::Rectangle& GetSnapRect() const; + virtual void SetSnapRect(const tools::Rectangle& rRect); + virtual void NbcSetSnapRect(const tools::Rectangle& rRect); // Logic Rect: for the Rect for instance without regard to rotation angle, shear, ... - virtual const Rectangle& GetLogicRect() const; - virtual void SetLogicRect(const Rectangle& rRect); - virtual void NbcSetLogicRect(const Rectangle& rRect); + virtual const tools::Rectangle& GetLogicRect() const; + virtual void SetLogicRect(const tools::Rectangle& rRect); + virtual void NbcSetLogicRect(const tools::Rectangle& rRect); // the default is to set the logic rect to the given rectangle rMaxRect. If the shape // has an intrinsic aspect ratio it may set the logic rect so the aspect // ratio is kept but still inside the rectangle rMaxRect. // If bShrinkOnly is set to true, the size of the current logic rect will not // be changed if it is smaller than the given rectangle rMaxRect. - virtual void AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false ); + virtual void AdjustToMaxRect( const tools::Rectangle& rMaxRect, bool bShrinkOnly = false ); // rotation and shear angle virtual long GetRotateAngle() const; @@ -614,7 +614,7 @@ public: virtual bool HasMacro() const; virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const; virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const; - virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const; + virtual void PaintMacro (OutputDevice& rOut, const tools::Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const; virtual bool DoMacro (const SdrObjMacroHitRec& rRec); virtual OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; bool IsMacroHit(const SdrObjMacroHitRec& rRec) const; @@ -784,8 +784,8 @@ public: // the following methods are used to control it; // usually this data makes no sense after the import is finished, since the object // might be resized - const Rectangle& GetBLIPSizeRectangle() const { return maBLIPSizeRectangle;} - void SetBLIPSizeRectangle( const Rectangle& aRect ); + const tools::Rectangle& GetBLIPSizeRectangle() const { return maBLIPSizeRectangle;} + void SetBLIPSizeRectangle( const tools::Rectangle& aRect ); // #i121917# virtual bool HasText() const; @@ -834,7 +834,7 @@ public: const css::uno::WeakReference< css::uno::XInterface >& getWeakUnoShape() const { return maWeakUnoShape; } protected: - Rectangle aOutRect; // surrounding rectangle for Paint (incl. LineWdt, ...) + tools::Rectangle aOutRect; // surrounding rectangle for Paint (incl. LineWdt, ...) Point aAnchor; // anchor position (Writer) SdrPage* pPage; SdrModel* pModel; @@ -871,7 +871,7 @@ protected: virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); - Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const; + tools::Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const; // for GetDragComment void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr) const; @@ -928,7 +928,7 @@ private: bool bMarkProt : 1; // marking forbidden, persistent // on import of OLE object from MS documents the BLIP size might be retrieved, // in this case the following member is initialized as nonempty rectangle - Rectangle maBLIPSizeRectangle; + tools::Rectangle maBLIPSizeRectangle; sdr::properties::BaseProperties* mpProperties; sdr::contact::ViewContact* mpViewContact; bool mbDelayBroadcastObjectChange : 1; @@ -989,7 +989,7 @@ class SVX_DLLPUBLIC SdrObjFactory { public: static SdrObject* MakeNewObject(SdrInventor nInventor, sal_uInt16 nObjIdentifier, SdrPage* pPage, SdrModel* pModel=nullptr); - static SdrObject* MakeNewObject(SdrInventor nInventor, sal_uInt16 nObjIdentifier, const Rectangle& rSnapRect, SdrPage* pPage); + static SdrObject* MakeNewObject(SdrInventor nInventor, sal_uInt16 nObjIdentifier, const tools::Rectangle& rSnapRect, SdrPage* pPage); static void InsertMakeObjectHdl(Link<SdrObjCreatorParams, SdrObject*> const & rLink); static void RemoveMakeObjectHdl(Link<SdrObjCreatorParams, SdrObject*> const & rLink); static void InsertMakeUserDataHdl(Link<SdrObjUserDataCreatorParams, SdrObjUserData*> const & rLink); diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx index bd0034030258..d1b0680010e9 100644 --- a/include/svx/svdocapt.hxx +++ b/include/svx/svdocapt.hxx @@ -66,15 +66,15 @@ private: private: SVX_DLLPRIVATE void ImpGetCaptParams(ImpCaptParams& rPara) const; - SVX_DLLPRIVATE static void ImpCalcTail1(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect); - SVX_DLLPRIVATE static void ImpCalcTail2(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect); - SVX_DLLPRIVATE static void ImpCalcTail3(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect); - SVX_DLLPRIVATE static void ImpCalcTail (const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect); + SVX_DLLPRIVATE static void ImpCalcTail1(const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle& rRect); + SVX_DLLPRIVATE static void ImpCalcTail2(const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle& rRect); + SVX_DLLPRIVATE static void ImpCalcTail3(const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle& rRect); + SVX_DLLPRIVATE static void ImpCalcTail (const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle& rRect); SVX_DLLPRIVATE void ImpRecalcTail(); public: SdrCaptionObj(); - SdrCaptionObj(const Rectangle& rRect, const Point& rTail); + SdrCaptionObj(const tools::Rectangle& rRect, const Point& rTail); virtual ~SdrCaptionObj() override; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; @@ -118,8 +118,8 @@ public: virtual void NbcSetRelativePos(const Point& rPnt) override; virtual Point GetRelativePos() const override; - virtual const Rectangle& GetLogicRect() const override; - virtual void NbcSetLogicRect(const Rectangle& rRect) override; + virtual const tools::Rectangle& GetLogicRect() const override; + virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override; virtual sal_uInt32 GetSnapPointCount() const override; virtual Point GetSnapPoint(sal_uInt32 i) const override; diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx index fc640860ec23..8385cd96ca97 100644 --- a/include/svx/svdocirc.hxx +++ b/include/svx/svdocirc.hxx @@ -55,7 +55,7 @@ protected: long nStartAngle; long nEndAngle; private: - SVX_DLLPRIVATE basegfx::B2DPolygon ImpCalcXPolyCirc(const SdrObjKind eKind, const Rectangle& rRect1, long nStart, long nEnd) const; + SVX_DLLPRIVATE basegfx::B2DPolygon ImpCalcXPolyCirc(const SdrObjKind eKind, const tools::Rectangle& rRect1, long nStart, long nEnd) const; SVX_DLLPRIVATE static void ImpSetCreateParams(SdrDragStat& rStat); SVX_DLLPRIVATE void ImpSetAttrToCircInfo(); // copy values from pool SVX_DLLPRIVATE void ImpSetCircInfoToAttr(); // copy values into pool @@ -69,25 +69,25 @@ protected: public: SdrCircObj(SdrObjKind eNewKind); // Circ, CArc, Sect or CCut - SdrCircObj(SdrObjKind eNewKind, const Rectangle& rRect); + SdrCircObj(SdrObjKind eNewKind, const tools::Rectangle& rRect); // 0=0.00Deg=3h 9000=90.00Deg=12h 18000=180.00Deg=9h 27000=270.00Deg=6h // The circle is build up from StartAngle to EndWink anti-clockwise. // If nNewStartAngle==nNewEndWink, then arc has an angle of 0 degrees. // If nNewStartAngle+36000==nNewEndWink, then the arc has angle of 360 degrees. - SdrCircObj(SdrObjKind eNewKind, const Rectangle& rRect, long nNewStartAngle, long nNewEndWink); + SdrCircObj(SdrObjKind eNewKind, const tools::Rectangle& rRect, long nNewStartAngle, long nNewEndWink); virtual ~SdrCircObj() override; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; virtual sal_uInt16 GetObjIdentifier() const override; - virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const override; + virtual void TakeUnrotatedSnapRect(tools::Rectangle& rRect) const override; virtual OUString TakeObjNameSingul() const override; virtual OUString TakeObjNamePlural() const override; virtual SdrCircObj* Clone() const override; virtual void RecalcSnapRect() override; - virtual void NbcSetSnapRect(const Rectangle& rRect) override; + virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; virtual basegfx::B2DPolyPolygon TakeXorPoly() const override; virtual sal_uInt32 GetSnapPointCount() const override; diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx index 15e476e33e89..5f685276c8d7 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -174,11 +174,11 @@ public: protected: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; - static XPolygon ImpCalcObjToCenter(const Point& rStPt, long nEscAngle, const Rectangle& rRect, const Point& rCenter); + static XPolygon ImpCalcObjToCenter(const Point& rStPt, long nEscAngle, const tools::Rectangle& rRect, const Point& rCenter); void ImpRecalcEdgeTrack(); // recalculation of the connection track XPolygon ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& rCon1, SdrObjConnection& rCon2, SdrEdgeInfoRec* pInfo) const; - XPolygon ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rectangle& rBoundRect1, const Rectangle& rBewareRect1, - const Point& rPt2, long nAngle2, const Rectangle& rBoundRect2, const Rectangle& rBewareRect2, + XPolygon ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const tools::Rectangle& rBoundRect1, const tools::Rectangle& rBewareRect1, + const Point& rPt2, long nAngle2, const tools::Rectangle& rBoundRect2, const tools::Rectangle& rBewareRect2, sal_uIntPtr* pnQuality, SdrEdgeInfoRec* pInfo) const; static bool ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut=nullptr); static SdrEscapeDirection ImpCalcEscAngle(SdrObject* pObj, const Point& aPt2); @@ -196,8 +196,8 @@ public: SdrObjConnection& GetConnection(bool bTail1) { return *(bTail1 ? &aCon1 : &aCon2); } virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; virtual sal_uInt16 GetObjIdentifier() const override; - virtual const Rectangle& GetCurrentBoundRect() const override; - virtual const Rectangle& GetSnapRect() const override; + virtual const tools::Rectangle& GetCurrentBoundRect() const override; + virtual const tools::Rectangle& GetSnapRect() const override; virtual bool IsNode() const override; virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const override; virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const override; @@ -215,7 +215,7 @@ public: bool CheckNodeConnection(bool bTail1) const; virtual void RecalcSnapRect() override; - virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const override; + virtual void TakeUnrotatedSnapRect(tools::Rectangle& rRect) const override; virtual SdrEdgeObj* Clone() const override; SdrEdgeObj& operator=(const SdrEdgeObj& rObj); virtual OUString TakeObjNameSingul() const override; @@ -237,7 +237,7 @@ public: // FullDrag support virtual SdrObject* getFullDragClone() const override; - virtual void NbcSetSnapRect(const Rectangle& rRect) override; + virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; virtual void NbcMove(const Size& aSize) override; virtual void NbcResize(const Point& rRefPnt, const Fraction& aXFact, const Fraction& aYFact) override; diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index 30c564342e9e..07532267e8be 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -119,7 +119,7 @@ public: SdrGrafObj(); SdrGrafObj(const Graphic& rGrf); - SdrGrafObj(const Graphic& rGrf, const Rectangle& rRect); + SdrGrafObj(const Graphic& rGrf, const tools::Rectangle& rRect); virtual ~SdrGrafObj() override; void SetGraphicObject( const GraphicObject& rGrfObj ); @@ -190,7 +190,7 @@ public: virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const override; - virtual void AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false ) override; + virtual void AdjustToMaxRect( const tools::Rectangle& rMaxRect, bool bShrinkOnly = false ) override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx index 8d10e75de5b6..ea2988093d2f 100644 --- a/include/svx/svdogrp.hxx +++ b/include/svx/svdogrp.hxx @@ -59,8 +59,8 @@ public: virtual void SetModel(SdrModel* pNewModel) override; virtual SdrObjList* GetSubList() const override; - virtual const Rectangle& GetCurrentBoundRect() const override; - virtual const Rectangle& GetSnapRect() const override; + virtual const tools::Rectangle& GetCurrentBoundRect() const override; + virtual const tools::Rectangle& GetSnapRect() const override; virtual SdrObjGroup* Clone() const override; SdrObjGroup& operator=(const SdrObjGroup& rObj); @@ -86,8 +86,8 @@ public: virtual void Shear(const Point& rRef, long nAngle, double tn, bool bVShear) override; virtual void SetAnchorPos(const Point& rPnt) override; virtual void SetRelativePos(const Point& rPnt) override; - virtual void SetSnapRect(const Rectangle& rRect) override; - virtual void SetLogicRect(const Rectangle& rRect) override; + virtual void SetSnapRect(const tools::Rectangle& rRect) override; + virtual void SetLogicRect(const tools::Rectangle& rRect) override; virtual void NbcMove(const Size& rSiz) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; @@ -96,8 +96,8 @@ public: virtual void NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear) override; virtual void NbcSetAnchorPos(const Point& rPnt) override; virtual void NbcSetRelativePos(const Point& rPnt) override; - virtual void NbcSetSnapRect(const Rectangle& rRect) override; - virtual void NbcSetLogicRect(const Rectangle& rRect) override; + virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; + virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override; virtual void NbcReformatText() override; virtual void ReformatText() override; diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx index f2da911ddb57..bcc445702001 100644 --- a/include/svx/svdomeas.hxx +++ b/include/svx/svdomeas.hxx @@ -91,7 +91,7 @@ public: virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; virtual sal_uInt16 GetObjIdentifier() const override; - virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const override; + virtual void TakeUnrotatedSnapRect(tools::Rectangle& rRect) const override; virtual SdrMeasureObj* Clone() const override; virtual OUString TakeObjNameSingul() const override; @@ -135,10 +135,10 @@ public: virtual bool BegTextEdit(SdrOutliner& rOutl) override; virtual const Size& GetTextSize() const override; - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, - Rectangle* pAnchorRect, bool bLineWidth = true ) const override; - virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const override; - virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const override; + virtual void TakeTextRect( SdrOutliner& rOutliner, tools::Rectangle& rTextRect, bool bNoEditText, + tools::Rectangle* pAnchorRect, bool bLineWidth = true ) const override; + virtual void TakeTextAnchorRect(tools::Rectangle& rAnchorRect) const override; + virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, tools::Rectangle* pViewInit, tools::Rectangle* pViewMin) const override; virtual sal_uInt16 GetOutlinerViewAnchorMode() const override; virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) override; virtual OutlinerParaObject* GetOutlinerParaObject() const override; diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx index 5b69ed6ea67c..4a96e9ac6c3f 100644 --- a/include/svx/svdomedia.hxx +++ b/include/svx/svdomedia.hxx @@ -37,7 +37,7 @@ public: SdrMediaObj(); - SdrMediaObj( const Rectangle& rRect ); + SdrMediaObj( const tools::Rectangle& rRect ); virtual ~SdrMediaObj() override; @@ -52,7 +52,7 @@ public: virtual SdrMediaObj* Clone() const override; SdrMediaObj& operator=(const SdrMediaObj& rObj); - virtual void AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false ) override; + virtual void AdjustToMaxRect( const tools::Rectangle& rMaxRect, bool bShrinkOnly = false ) override; public: diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx index 345f6ebba16b..d1a471db2f48 100644 --- a/include/svx/svdoole2.hxx +++ b/include/svx/svdoole2.hxx @@ -68,7 +68,7 @@ public: OUString GetStyleString(); SdrOle2Obj( bool bFrame_ = false ); - SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const OUString& rNewObjName, const Rectangle& rNewRect ); + SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const OUString& rNewObjName, const tools::Rectangle& rNewRect ); virtual ~SdrOle2Obj() override; const svt::EmbeddedObjectRef& getEmbeddedObjectRef() const; @@ -135,8 +135,8 @@ public: virtual void NbcMove(const Size& rSize) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; - virtual void NbcSetSnapRect(const Rectangle& rRect) override; - virtual void NbcSetLogicRect(const Rectangle& rRect) override; + virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; + virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override; virtual void SetGeoData(const SdrObjGeoData& rGeo) override; static bool CanUnloadRunningObj( const css::uno::Reference< css::embed::XEmbeddedObject >& xObj, diff --git a/include/svx/svdopage.hxx b/include/svx/svdopage.hxx index 5f2947fc0702..8893e812d783 100644 --- a/include/svx/svdopage.hxx +++ b/include/svx/svdopage.hxx @@ -42,7 +42,7 @@ protected: public: SdrPageObj(SdrPage* pNewPage = nullptr); - SdrPageObj(const Rectangle& rRect, SdrPage* pNewPage = nullptr); + SdrPageObj(const tools::Rectangle& rRect, SdrPage* pNewPage = nullptr); virtual ~SdrPageObj() override; SdrPage* GetReferencedPage() const { return mpShownPage;} diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx index 85eca76899a9..f4ad038f1e22 100644 --- a/include/svx/svdopath.hxx +++ b/include/svx/svdopath.hxx @@ -74,7 +74,7 @@ public: virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; virtual sal_uInt16 GetObjIdentifier() const override; - virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const override; + virtual void TakeUnrotatedSnapRect(tools::Rectangle& rRect) const override; virtual SdrPathObj* Clone() const override; SdrPathObj& operator=(const SdrPathObj& rObj); @@ -82,7 +82,7 @@ public: virtual OUString TakeObjNamePlural() const override; virtual basegfx::B2DPolyPolygon TakeXorPoly() const override; virtual void RecalcSnapRect() override; - virtual void NbcSetSnapRect(const Rectangle& rRect) override; + virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; virtual sal_uInt32 GetHdlCount() const override; virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const override; virtual sal_uInt32 GetPlusHdlCount(const SdrHdl& rHdl) const override; diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx index 11d6b7d7d55d..367ea1737f19 100644 --- a/include/svx/svdorect.hxx +++ b/include/svx/svdorect.hxx @@ -49,7 +49,7 @@ protected: std::unique_ptr<XPolygon> mpXPoly; protected: - XPolygon ImpCalcXPoly(const Rectangle& rRect1, long nRad1) const; + XPolygon ImpCalcXPoly(const tools::Rectangle& rRect1, long nRad1) const; void SetXPolyDirty(); /// Subclasses should override RecalcXPoly() by creating an XPolygon @@ -66,26 +66,26 @@ public: * Constructor of a rectangular drawing object */ SdrRectObj(); - SdrRectObj(const Rectangle& rRect); + SdrRectObj(const tools::Rectangle& rRect); SdrRectObj& operator=(const SdrRectObj& rCopy); // Constructor of a text frame SdrRectObj(SdrObjKind eNewTextKind); - SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect); + SdrRectObj(SdrObjKind eNewTextKind, const tools::Rectangle& rRect); virtual ~SdrRectObj() override; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; virtual sal_uInt16 GetObjIdentifier() const override; - virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const override; + virtual void TakeUnrotatedSnapRect(tools::Rectangle& rRect) const override; virtual OUString TakeObjNameSingul() const override; virtual OUString TakeObjNamePlural() const override; virtual SdrRectObj* Clone() const override; virtual void RecalcSnapRect() override; - virtual void NbcSetSnapRect(const Rectangle& rRect) override; - virtual void NbcSetLogicRect(const Rectangle& rRect) override; + virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; + virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override; virtual basegfx::B2DPolyPolygon TakeXorPoly() const override; virtual sal_uInt32 GetHdlCount() const override; diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index 3de0a341246a..9cfb42cfa337 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -99,7 +99,7 @@ class SVX_DLLPUBLIC SdrTableObj : public ::SdrTextObj public: SdrTableObj(SdrModel* _pModel); - SdrTableObj(SdrModel* _pModel, const ::Rectangle& rNewRect, sal_Int32 nColumns, sal_Int32 nRows); + SdrTableObj(SdrModel* _pModel, const ::tools::Rectangle& rNewRect, sal_Int32 nColumns, sal_Int32 nRows); virtual ~SdrTableObj() override; @@ -138,7 +138,7 @@ public: void setActiveCell( const sdr::table::CellPos& rPos ); void getActiveCellPos( sdr::table::CellPos& rPos ) const; sal_Int32 getColumnCount() const; - void getCellBounds( const sdr::table::CellPos& rPos, ::Rectangle& rCellRect ); + void getCellBounds( const sdr::table::CellPos& rPos, ::tools::Rectangle& rCellRect ); const SfxItemSet& GetActiveCellItemSet() const; void SetMergedItemSetAndBroadcastOnActiveCell(const SfxItemSet& rSet, bool bClearAllItems); @@ -175,10 +175,10 @@ public: /** At the same time, we set the text in the outliner (if applicable the EditOutliners') * as well as the PaperSize */ - void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, bool bNoEditText, ::Rectangle* pAnchorRect=nullptr, bool bLineWidth = true ) const; - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, Rectangle* pAnchorRect, bool bLineWidth = true ) const override; - void TakeTextAnchorRect(const sdr::table::CellPos& rPos, ::Rectangle& rAnchorRect ) const; - virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const override; + void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::tools::Rectangle& rTextRect, bool bNoEditText, ::tools::Rectangle* pAnchorRect=nullptr, bool bLineWidth = true ) const; + virtual void TakeTextRect( SdrOutliner& rOutliner, tools::Rectangle& rTextRect, bool bNoEditText, tools::Rectangle* pAnchorRect, bool bLineWidth = true ) const override; + void TakeTextAnchorRect(const sdr::table::CellPos& rPos, ::tools::Rectangle& rAnchorRect ) const; + virtual void TakeTextAnchorRect(::tools::Rectangle& rAnchorRect) const override; virtual bool IsAutoGrowHeight() const override; virtual bool IsAutoGrowWidth() const override; @@ -190,19 +190,19 @@ public: virtual sal_uInt16 GetObjIdentifier() const override; virtual void SetChanged() override; - virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const override; + virtual bool AdjustTextFrameWidthAndHeight(tools::Rectangle& rR, bool bHgt = true, bool bWdt = true) const override; virtual bool AdjustTextFrameWidthAndHeight() override; virtual OUString TakeObjNameSingul() const override; virtual OUString TakeObjNamePlural() const override; virtual SdrTableObj* Clone() const override; SdrTableObj& operator=(const SdrTableObj& rObj); virtual void RecalcSnapRect() override; - virtual const Rectangle& GetSnapRect() const override; - virtual void NbcSetSnapRect(const Rectangle& rRect) override; + virtual const tools::Rectangle& GetSnapRect() const override; + virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; - virtual const Rectangle& GetLogicRect() const override; - virtual void NbcSetLogicRect(const Rectangle& rRect) override; - virtual void AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false ) override; + virtual const tools::Rectangle& GetLogicRect() const override; + virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override; + virtual void AdjustToMaxRect( const tools::Rectangle& rMaxRect, bool bShrinkOnly = false ) override; virtual sal_uInt32 GetHdlCount() const override; virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const override; @@ -227,8 +227,8 @@ public: virtual bool BegTextEdit(SdrOutliner& rOutl) override; virtual void EndTextEdit(SdrOutliner& rOutl) override; - virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const override; - void TakeTextEditArea(const sdr::table::CellPos& rPos, Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; + virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, tools::Rectangle* pViewInit, tools::Rectangle* pViewMin) const override; + void TakeTextEditArea(const sdr::table::CellPos& rPos, Size* pPaperMin, Size* pPaperMax, tools::Rectangle* pViewInit, tools::Rectangle* pViewMin) const; virtual sal_uInt16 GetOutlinerViewAnchorMode() const override; virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) override; @@ -277,7 +277,7 @@ private: friend class sdr::contact::ViewContactOfTableObj; const TableLayouter& getTableLayouter() const; - Rectangle maLogicRect; + tools::Rectangle maLogicRect; private: rtl::Reference<SdrTableObjImpl> mpImpl; }; diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 2c2a4ab00f6a..ae1d77fcf202 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -90,7 +90,7 @@ namespace sdr { namespace table { class SdrTextObjGeoData : public SdrObjGeoData { public: - Rectangle aRect; + tools::Rectangle aRect; GeoStat aGeo; }; @@ -184,7 +184,7 @@ protected: // The "aRect" is also the rect of RectObj and CircObj. // When bTextFrame=sal_True the text will be formatted into this rect // When bTextFrame=sal_False the text will be centered around its middle - Rectangle maRect; + tools::Rectangle maRect; // The GeoStat contains the rotation and shear angles GeoStat aGeo; @@ -266,9 +266,9 @@ private: // #101029#: Extracted from Paint() SVX_DLLPRIVATE void ImpSetupDrawOutlinerForPaint( bool bContourFrame, SdrOutliner& rOutliner, - Rectangle& rTextRect, - Rectangle& rAnchorRect, - Rectangle& rPaintRect, + tools::Rectangle& rTextRect, + tools::Rectangle& rAnchorRect, + tools::Rectangle& rPaintRect, Fraction& aFitXKorreg ) const; void ImpAutoFitText( SdrOutliner& rOutliner ) const; static void ImpAutoFitText( SdrOutliner& rOutliner, const Size& rShapeSize, bool bIsVerticalWriting ); @@ -290,14 +290,14 @@ protected: SdrObject* ImpConvertAddText(SdrObject* pObj, bool bBezier) const; void ImpSetTextStyleSheetListeners(); static void ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextSize, const Size& rShapeSize, Fraction& rFitXKorreg); - static void ImpJustifyRect(Rectangle& rRect); + static void ImpJustifyRect(tools::Rectangle& rRect); void ImpCheckShear(); - Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const; + tools::Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const; void ImpSetTextEditParams() const; void SetTextSizeDirty() { bTextSizeDirty=true; } // rAnchorRect ist InOut-Parameter! - void ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, bool bLineWidth ) const; + void ImpSetContourPolygon( SdrOutliner& rOutliner, tools::Rectangle& rAnchorRect, bool bLineWidth ) const; virtual SdrObjGeoData* NewGeoData() const override; virtual void SaveGeoData(SdrObjGeoData& rGeo) const override; @@ -311,11 +311,11 @@ protected: // constructors for labeled graphical objects SdrTextObj(); - SdrTextObj(const Rectangle& rNewRect); + SdrTextObj(const tools::Rectangle& rNewRect); // constructors for text frames SdrTextObj(SdrObjKind eNewTextKind); - SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect); + SdrTextObj(SdrObjKind eNewTextKind, const tools::Rectangle& rNewRect); virtual ~SdrTextObj() override; @@ -340,7 +340,7 @@ public: bool ReloadLinkedText(bool bForceLoad); bool LoadText(const OUString& rFileName, const OUString& rFilterName, rtl_TextEncoding eCharSet); - virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const; + virtual bool AdjustTextFrameWidthAndHeight(tools::Rectangle& rR, bool bHgt = true, bool bWdt = true) const; virtual bool NbcAdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true); virtual bool AdjustTextFrameWidthAndHeight(); bool IsTextFrame() const { return bTextFrame; } @@ -395,9 +395,9 @@ public: // Simultaneously sets the text into the Outliner (possibly // the one of the EditOutliner) and sets the PaperSize. - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, - Rectangle* pAnchorRect, bool bLineWidth = true ) const; - virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const; + virtual void TakeTextRect( SdrOutliner& rOutliner, tools::Rectangle& rTextRect, bool bNoEditText, + tools::Rectangle* pAnchorRect, bool bLineWidth = true ) const; + virtual void TakeTextAnchorRect(::tools::Rectangle& rAnchorRect) const; const GeoStat& GetGeoStat() const { return aGeo; } // get corner radius @@ -410,7 +410,7 @@ public: long GetMaxTextFrameWidth() const; SdrFitToSizeType GetFitToSize() const; - const Rectangle &GetGeoRect() const; + const tools::Rectangle &GetGeoRect() const; // check if it's a TextFontwork virtual bool IsFontwork() const; @@ -444,7 +444,7 @@ public: virtual sal_uInt16 GetObjIdentifier() const override; // needed to determine text anchor area - virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const; + virtual void TakeUnrotatedSnapRect(tools::Rectangle& rRect) const; virtual OUString TakeObjNameSingul() const override; virtual OUString TakeObjNamePlural() const override; virtual SdrTextObj* Clone() const override; @@ -452,9 +452,9 @@ public: virtual basegfx::B2DPolyPolygon TakeXorPoly() const override; virtual basegfx::B2DPolyPolygon TakeContour() const override; virtual void RecalcSnapRect() override; - virtual void NbcSetSnapRect(const Rectangle& rRect) override; - virtual void NbcSetLogicRect(const Rectangle& rRect) override; - virtual const Rectangle& GetLogicRect() const override; + virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; + virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override; + virtual const tools::Rectangle& GetLogicRect() const override; virtual long GetRotateAngle() const override; virtual long GetShearAngle(bool bVertical = false) const override; @@ -485,7 +485,7 @@ public: virtual bool HasTextEdit() const override; virtual bool BegTextEdit(SdrOutliner& rOutl) override; - virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; + virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, tools::Rectangle* pViewInit, tools::Rectangle* pViewMin) const; virtual void EndTextEdit(SdrOutliner& rOutl) override; virtual sal_uInt16 GetOutlinerViewAnchorMode() const; @@ -520,7 +520,7 @@ public: The region to paint the outliner content into. This is useful to e.g. determine the top, left position of text in shapes. */ - void SetupOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaintRect ) const; + void SetupOutlinerFormatting( SdrOutliner& rOutl, tools::Rectangle& rPaintRect ) const; /** Update given Outliner equivalently to SdrTextObj::Paint() @@ -534,7 +534,7 @@ public: The region to paint the outliner content into. This is useful to e.g. determine the top, left position of text in shapes. */ - void UpdateOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaintRect ) const; + void UpdateOutlinerFormatting( SdrOutliner& rOutl, tools::Rectangle& rPaintRect ) const; void ForceOutlinerParaObject(); virtual bool IsVerticalWriting() const; virtual void SetVerticalWriting(bool bVertical); @@ -568,7 +568,7 @@ public: // Get necessary data for text scroll animation. ATM base it on a Text-Metafile and a // painting rectangle. Rotation is taken from the object. - GDIMetaFile* GetTextScrollMetaFileAndRectangle(Rectangle& rScrollRectangle, Rectangle& rPaintRectangle); + GDIMetaFile* GetTextScrollMetaFileAndRectangle(tools::Rectangle& rScrollRectangle, tools::Rectangle& rPaintRectangle); // Access to TextAnimationAllowed flag void SetTextAnimationAllowed(bool bNew); diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx index 3484671d5557..a6223975572d 100644 --- a/include/svx/svdovirt.hxx +++ b/include/svx/svdovirt.hxx @@ -37,7 +37,7 @@ protected: virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override; SdrObject& rRefObj; // Referenced drawing object - Rectangle aSnapRect; + tools::Rectangle aSnapRect; protected: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; @@ -59,8 +59,8 @@ public: virtual sal_uInt16 GetObjIdentifier() const override; virtual SdrObjList* GetSubList() const 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; virtual void RecalcBoundRect() override; virtual SdrVirtObj* Clone() const override; SdrVirtObj& operator=(const SdrVirtObj& rObj); @@ -106,13 +106,13 @@ public: 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 tools::Rectangle& GetSnapRect() const override; + virtual void SetSnapRect(const tools::Rectangle& rRect) override; + virtual void NbcSetSnapRect(const tools::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& GetLogicRect() const override; + virtual void SetLogicRect(const tools::Rectangle& rRect) override; + virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override; virtual long GetRotateAngle() const override; virtual long GetShearAngle(bool bVertical = false) const override; @@ -134,7 +134,7 @@ public: virtual bool HasMacro() const override; virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const override; virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const override; - virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const override; + virtual void PaintMacro (OutputDevice& rOut, const tools::Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const override; virtual bool DoMacro (const SdrObjMacroHitRec& rRec) override; virtual OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const override; diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index be9dc8bafa7a..11db722b0acf 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -69,8 +69,8 @@ friend class SdrEditView; SdrModel* pModel; /// model to which the list belongs (Layer,ItemPool,Storage) SdrPage* pPage; /// Page containing the list, may be "this". SdrObject* pOwnerObj; /// OwnerObject, if it's list of a Group object. - Rectangle aOutRect; - Rectangle aSnapRect; + tools::Rectangle aOutRect; + tools::Rectangle aSnapRect; SdrObjListKind eListKind; bool bObjOrdNumsDirty; bool bRectsDirty; @@ -120,8 +120,8 @@ public: void SetRectsDirty(); - const Rectangle& GetAllObjSnapRect() const; - const Rectangle& GetAllObjBoundRect() const; + const tools::Rectangle& GetAllObjSnapRect() const; + const tools::Rectangle& GetAllObjBoundRect() const; /// reformat all text objects, e.g. when changing printer void NbcReformatAllTextObjects(); @@ -278,12 +278,12 @@ private: /// for the snap-to-grid in Writer class SdrPageGridFrame { - Rectangle aPaper; - Rectangle aUserArea; + tools::Rectangle aPaper; + tools::Rectangle aUserArea; public: - SdrPageGridFrame(const Rectangle& rPaper, const Rectangle& rUser): aPaper(rPaper), aUserArea(rUser) {} - const Rectangle& GetPaperRect() const { return aPaper; } - const Rectangle& GetUserArea() const { return aUserArea; } + SdrPageGridFrame(const tools::Rectangle& rPaper, const tools::Rectangle& rUser): aPaper(rPaper), aUserArea(rUser) {} + const tools::Rectangle& GetPaperRect() const { return aPaper; } + const tools::Rectangle& GetUserArea() const { return aUserArea; } }; class SVX_DLLPUBLIC SdrPageGridFrameList { @@ -485,7 +485,7 @@ public: /// for snap-to-grid in Writer, also for AlignObjects if 1 object is marked /// if pRect != null, then the pages that are intersected by this Rect, /// otherwise the visible pages - virtual const SdrPageGridFrameList* GetGridFrameList(const SdrPageView* pPV, const Rectangle* pRect) const; + virtual const SdrPageGridFrameList* GetGridFrameList(const SdrPageView* pPV, const tools::Rectangle* pRect) const; css::uno::Reference< css::uno::XInterface > const & getUnoPage(); diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index 039dcd4dc025..44a0000beb86 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -64,8 +64,8 @@ private: SdrPage* mpPage; Point aPgOrg; // The Page's point of origin - Rectangle aMarkBound; - Rectangle aMarkSnap; + tools::Rectangle aMarkBound; + tools::Rectangle aMarkSnap; bool mbHasMarked; bool mbVisible; @@ -162,11 +162,11 @@ public: void setPreparedPageWindow(SdrPageWindow* pKnownTarget); void DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget, sdr::contact::ViewObjectContactRedirector* pRedirector = nullptr, - const Rectangle& rRect = Rectangle(), + const tools::Rectangle& rRect = tools::Rectangle(), basegfx::B2IRange const* pPageFrame = nullptr); - void DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, Color aColor = Color( COL_BLACK ) ); + void DrawPageViewGrid(OutputDevice& rOut, const tools::Rectangle& rRect, Color aColor = Color( COL_BLACK ) ); - Rectangle GetPageRect() const; + tools::Rectangle GetPageRect() const; SdrPage* GetPage() const { return mpPage; } /// Return current List @@ -181,10 +181,10 @@ public: bool HasMarkedObjPageView() const { return mbHasMarked; } void SetHasMarkedObj(bool bOn) { mbHasMarked = bOn; } - const Rectangle& MarkBound() const { return aMarkBound; } - const Rectangle& MarkSnap() const { return aMarkSnap; } - Rectangle& MarkBound() { return aMarkBound; } - Rectangle& MarkSnap() { return aMarkSnap; } + const tools::Rectangle& MarkBound() const { return aMarkBound; } + const tools::Rectangle& MarkSnap() const { return aMarkSnap; } + tools::Rectangle& MarkBound() { return aMarkBound; } + tools::Rectangle& MarkSnap() { return aMarkSnap; } void SetLayerVisible(const OUString& rName, bool bShow) { SetLayer(rName, aLayerVisi, bShow); @@ -207,7 +207,7 @@ public: void SetPageOrigin(const Point& rOrg); void LogicToPagePos(Point& rPnt) const { rPnt-=aPgOrg; } - void LogicToPagePos(Rectangle& rRect) const { rRect.Move(-aPgOrg.X(),-aPgOrg.Y()); } + void LogicToPagePos(tools::Rectangle& rRect) const { rRect.Move(-aPgOrg.X(),-aPgOrg.Y()); } void PagePosToLogic(Point& rPnt) const { rPnt+=aPgOrg; } void SetVisibleLayers(const SetOfByte& rSet) { aLayerVisi=rSet; } diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 726d3f78956a..b660297d573c 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -135,7 +135,7 @@ protected: Size maGridBig; // FIXME: We need to get rid of this eventually Size maGridFin; // FIXME: We need to get rid of this eventually SdrDragStat maDragStat; - Rectangle maMaxWorkArea; + tools::Rectangle maMaxWorkArea; SfxItemSet maDefaultAttr; Idle maComeBackIdle; @@ -260,7 +260,7 @@ public: virtual void EndAction(); virtual void BckAction(); virtual void BrkAction(); // Cancel all Actions (e.g. cancel dragging) - virtual void TakeActionRect(Rectangle& rRect) const; + virtual void TakeActionRect(tools::Rectangle& rRect) const; // Info about TextEdit. Default is sal_False. virtual bool IsTextEdit() const; @@ -407,12 +407,12 @@ public: const Size& GetGridFine() const { return maGridFin; } void InvalidateAllWin(); - void InvalidateAllWin(const Rectangle& rRect); + void InvalidateAllWin(const tools::Rectangle& rRect); /// If the View should not call Invalidate() on the windows, override /// the following 2 methods and do something else. virtual void InvalidateOneWin(vcl::Window& rWin); - virtual void InvalidateOneWin(vcl::Window& rWin, const Rectangle& rRect); + virtual void InvalidateOneWin(vcl::Window& rWin, const tools::Rectangle& rRect); void SetActiveLayer(const OUString& rName) { maActualLayer=rName; } const OUString& GetActiveLayer() const { return maActualLayer; } @@ -455,7 +455,7 @@ public: SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(bool& rOk) const; bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr); - virtual void MakeVisible(const Rectangle& rRect, vcl::Window& rWin); + virtual void MakeVisible(const tools::Rectangle& rRect, vcl::Window& rWin); /// For Plugins /// Is called by the Paint of the OLE object diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx index 57a73610d8f7..a90bdf34d392 100644 --- a/include/svx/svdsnpv.hxx +++ b/include/svx/svdsnpv.hxx @@ -136,7 +136,7 @@ public: virtual void EndAction() override; virtual void BckAction() override; virtual void BrkAction() override; // break actions for derived classes e.g. interrupt dragging. - virtual void TakeActionRect(Rectangle& rRect) const override; + virtual void TakeActionRect(tools::Rectangle& rRect) const override; void SetSnapGridWidth(const Fraction& rX, const Fraction& rY) { aSnapWdtX=rX; aSnapWdtY=rY; } const Fraction& GetSnapGridWidthX() const { return aSnapWdtX; } diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx index 6570a6bee099..6ad879d3a822 100644 --- a/include/svx/svdtrans.hxx +++ b/include/svx/svdtrans.hxx @@ -54,12 +54,12 @@ namespace svx inline long Round(double a) { return a>0.0 ? (long)(a+0.5) : -(long)((-a)+0.5); } } -inline void MoveRect(Rectangle& rRect, const Size& S) { rRect.Move(S.Width(),S.Height()); } +inline void MoveRect(tools::Rectangle& rRect, const Size& S) { rRect.Move(S.Width(),S.Height()); } inline void MovePoint(Point& rPnt, const Size& S) { rPnt.X()+=S.Width(); rPnt.Y()+=S.Height(); } inline void MovePoly(tools::Polygon& rPoly, const Size& S) { rPoly.Move(S.Width(),S.Height()); } void MoveXPoly(XPolygon& rPoly, const Size& S); -SVX_DLLPUBLIC void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& xFact, const Fraction& yFact); +SVX_DLLPUBLIC void ResizeRect(tools::Rectangle& rRect, const Point& rRef, const Fraction& xFact, const Fraction& yFact); inline void ResizePoint(Point& rPnt, const Point& rRef, const Fraction& xFract, const Fraction& yFract); void ResizePoly(tools::Polygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact); void ResizeXPoly(XPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact); @@ -97,15 +97,15 @@ double CrookSlantXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCente const Point& rRad, double& rSin, double& rCos, bool bVert); double CrookStretchXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCenter, const Point& rRad, double& rSin, double& rCos, bool bVert, - const Rectangle& rRefRect); + const tools::Rectangle& rRefRect); void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert); void CrookSlantPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert); -void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert, const Rectangle& rRefRect); +void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert, const tools::Rectangle& rRefRect); void CrookRotatePoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert); void CrookSlantPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert); -void CrookStretchPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert, const Rectangle& rRefRect); +void CrookStretchPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert, const tools::Rectangle& rRefRect); /**************************************************************************************************/ /* Inline */ @@ -232,8 +232,8 @@ public: void RecalcTan(); }; -tools::Polygon Rect2Poly(const Rectangle& rRect, const GeoStat& rGeo); -void Poly2Rect(const tools::Polygon& rPol, Rectangle& rRect, GeoStat& rGeo); +tools::Polygon Rect2Poly(const tools::Rectangle& rRect, const GeoStat& rGeo); +void Poly2Rect(const tools::Polygon& rPol, tools::Rectangle& rRect, GeoStat& rGeo); SVX_DLLPUBLIC void OrthoDistance8(const Point& rPt0, Point& rPt, bool bBigOrtho); SVX_DLLPUBLIC void OrthoDistance4(const Point& rPt0, Point& rPt, bool bBigOrtho); diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx index 3caee8e84dda..1beb5e7d93b3 100644 --- a/include/svx/svdview.hxx +++ b/include/svx/svdview.hxx @@ -144,7 +144,7 @@ class SVX_DLLPUBLIC SdrDropMarkerOverlay public: SdrDropMarkerOverlay(const SdrView& rView, const SdrObject& rObject); - SdrDropMarkerOverlay(const SdrView& rView, const Rectangle& rRectangle); + SdrDropMarkerOverlay(const SdrView& rView, const tools::Rectangle& rRectangle); SdrDropMarkerOverlay(const SdrView& rView, const Point& rStart, const Point& rEnd); ~SdrDropMarkerOverlay(); }; @@ -227,7 +227,7 @@ public: void MarkAll(); void UnmarkAll(); - const Rectangle& GetMarkedRect() const; + const tools::Rectangle& GetMarkedRect() const; virtual void DeleteMarked(); diff --git a/include/svx/swframeexample.hxx b/include/svx/swframeexample.hxx index 8b17f6290da4..bc1928029e18 100644 --- a/include/svx/swframeexample.hxx +++ b/include/svx/swframeexample.hxx @@ -39,14 +39,14 @@ class SVX_DLLPUBLIC SvxSwFrameExample : public vcl::Window Color m_aBlankCol; // area of symbol for blank Color m_aBlankFrameCol; // frame of symbol for blank - Rectangle aPage; - Rectangle aPagePrtArea; - Rectangle aTextLine; - Rectangle aPara; - Rectangle aParaPrtArea; - Rectangle aFrameAtFrame; - Rectangle aDrawObj; - Rectangle aAutoCharFrame; + tools::Rectangle aPage; + tools::Rectangle aPagePrtArea; + tools::Rectangle aTextLine; + tools::Rectangle aPara; + tools::Rectangle aParaPrtArea; + tools::Rectangle aFrameAtFrame; + tools::Rectangle aDrawObj; + tools::Rectangle aAutoCharFrame; Size aFrmSize; short nHAlign; @@ -63,10 +63,10 @@ class SVX_DLLPUBLIC SvxSwFrameExample : public vcl::Window void InitColors_Impl(); void InitAllRects_Impl(vcl::RenderContext& rRenderContext); - void CalcBoundRect_Impl(Rectangle &rRect); - Rectangle DrawInnerFrame_Impl(vcl::RenderContext& rRenderContext, const Rectangle &rRect, const Color &rFillColor, const Color &rBorderColor); + void CalcBoundRect_Impl(tools::Rectangle &rRect); + tools::Rectangle DrawInnerFrame_Impl(vcl::RenderContext& rRenderContext, const tools::Rectangle &rRect, const Color &rFillColor, const Color &rBorderColor); - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override; virtual Size GetOptimalSize() const override; protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; diff --git a/include/svx/tbxcolorupdate.hxx b/include/svx/tbxcolorupdate.hxx index 0077eb84f0d4..4dc21b9b45ce 100644 --- a/include/svx/tbxcolorupdate.hxx +++ b/include/svx/tbxcolorupdate.hxx @@ -59,7 +59,7 @@ namespace svx sal_uInt16 mnSlotId; VclPtr<ToolBox> mpTbx; Color maCurColor; - Rectangle maUpdRect; + tools::Rectangle maUpdRect; Size maBmpSize; bool mbWasHiContrastMode; }; diff --git a/include/svx/unoshtxt.hxx b/include/svx/unoshtxt.hxx index fbd214df6cf7..f38cf8a62d0f 100644 --- a/include/svx/unoshtxt.hxx +++ b/include/svx/unoshtxt.hxx @@ -73,7 +73,7 @@ public: // the SvxViewForwarder interface virtual bool IsValid() const override; - virtual Rectangle GetVisArea() const override; + virtual tools::Rectangle GetVisArea() const override; virtual Point LogicToPixel( const Point&, const MapMode& ) const override; virtual Point PixelToLogic( const Point&, const MapMode& ) const override; diff --git a/include/svx/viewpt3d.hxx b/include/svx/viewpt3d.hxx index 61157fe79569..d344f0d11923 100644 --- a/include/svx/viewpt3d.hxx +++ b/include/svx/viewpt3d.hxx @@ -56,7 +56,7 @@ class SVX_DLLPUBLIC Viewport3D double fVPD; // View Plane Distance ProjectionType eProjection; // kind of the projection - Rectangle aDeviceRect; // position and size of the output area + tools::Rectangle aDeviceRect; // position and size of the output area struct { @@ -88,8 +88,8 @@ class SVX_DLLPUBLIC Viewport3D void SetViewWindow(double fX, double fY, double fW, double fH); - void SetDeviceWindow(const Rectangle& rRect); - const Rectangle& GetDeviceWindow() const { return aDeviceRect; } + void SetDeviceWindow(const tools::Rectangle& rRect); + const tools::Rectangle& GetDeviceWindow() const { return aDeviceRect; } // returns observers position in world coordinates const basegfx::B3DPoint& GetViewPoint(); diff --git a/include/svx/xoutbmp.hxx b/include/svx/xoutbmp.hxx index 4163be681d92..28748cb0cd2f 100644 --- a/include/svx/xoutbmp.hxx +++ b/include/svx/xoutbmp.hxx @@ -71,7 +71,7 @@ public: static tools::Polygon GetCountour( const Bitmap& rBmp, const XOutFlags nContourFlags, const sal_uInt8 cEdgeDetectThreshold, - const Rectangle* pWorkRect ); + const tools::Rectangle* pWorkRect ); }; SVX_DLLPUBLIC bool DitherBitmap( Bitmap& rBitmap ); diff --git a/include/svx/xpoly.hxx b/include/svx/xpoly.hxx index 430df7b6ffb2..ac5dbd8ac812 100644 --- a/include/svx/xpoly.hxx +++ b/include/svx/xpoly.hxx @@ -25,7 +25,7 @@ #include <tools/poly.hxx> class Point; -class Rectangle; +namespace tools { class Rectangle; } class SvStream; namespace tools { class Polygon; @@ -58,7 +58,7 @@ public: XPolygon( const XPolygon& rXPoly ); XPolygon( XPolygon&& rXPoly ); XPolygon( const tools::Polygon& rPoly ); - XPolygon( const Rectangle& rRect, long nRx = 0, long nRy = 0 ); + XPolygon( const tools::Rectangle& rRect, long nRx = 0, long nRy = 0 ); XPolygon( const Point& rCenter, long nRx, long nRy, sal_uInt16 nStartAngle = 0, sal_uInt16 nEndAngle = 3600, bool bClose = true ); @@ -74,7 +74,7 @@ public: void Insert( sal_uInt16 nPos, const XPolygon& rXPoly ); void Remove( sal_uInt16 nPos, sal_uInt16 nCount ); void Move( long nHorzMove, long nVertMove ); - Rectangle GetBoundRect() const; + tools::Rectangle GetBoundRect() const; const Point& operator[]( sal_uInt16 nPos ) const; Point& operator[]( sal_uInt16 nPos ); @@ -97,7 +97,7 @@ public: // transformations void Scale(double fSx, double fSy); - void Distort(const Rectangle& rRefRect, const XPolygon& rDistortedRect); + void Distort(const tools::Rectangle& rRefRect, const XPolygon& rDistortedRect); // #116512# convert to basegfx::B2DPolygon and return basegfx::B2DPolygon getB2DPolygon() const; @@ -131,7 +131,7 @@ public: void Clear(); sal_uInt16 Count() const; - Rectangle GetBoundRect() const; + tools::Rectangle GetBoundRect() const; const XPolygon& operator[]( sal_uInt16 nPos ) const { return GetObject( nPos ); } @@ -141,7 +141,7 @@ public: XPolyPolygon& operator=( XPolyPolygon&& rXPolyPoly ); // transformations - void Distort(const Rectangle& rRefRect, const XPolygon& rDistortedRect); + void Distort(const tools::Rectangle& rRefRect, const XPolygon& rDistortedRect); // #116512# convert to basegfx::B2DPolyPolygon and return basegfx::B2DPolyPolygon getB2DPolyPolygon() const; diff --git a/include/toolkit/helper/convert.hxx b/include/toolkit/helper/convert.hxx index a189f8562519..3e4d23696249 100644 --- a/include/toolkit/helper/convert.hxx +++ b/include/toolkit/helper/convert.hxx @@ -46,14 +46,14 @@ inline ::Point VCLPoint( const css::awt::Point& rAWTPoint ) return ::Point( rAWTPoint.X, rAWTPoint.Y ); } -inline css::awt::Rectangle AWTRectangle( const ::Rectangle& rVCLRect ) +inline css::awt::Rectangle AWTRectangle( const ::tools::Rectangle& rVCLRect ) { return css::awt::Rectangle( rVCLRect.Left(), rVCLRect.Top(), rVCLRect.GetWidth(), rVCLRect.GetHeight() ); } -inline ::Rectangle VCLRectangle( const css::awt::Rectangle& rAWTRect ) +inline ::tools::Rectangle VCLRectangle( const css::awt::Rectangle& rAWTRect ) { - return ::Rectangle( ::Point( rAWTRect.X, rAWTRect.Y ), ::Size( rAWTRect.Width, rAWTRect.Height ) ); + return ::tools::Rectangle( ::Point( rAWTRect.X, rAWTRect.Y ), ::Size( rAWTRect.Width, rAWTRect.Height ) ); } #endif // INCLUDED_TOOLKIT_HELPER_CONVERT_HXX diff --git a/include/toolkit/helper/vclunohelper.hxx b/include/toolkit/helper/vclunohelper.hxx index 24747523f947..2dbf25320a24 100644 --- a/include/toolkit/helper/vclunohelper.hxx +++ b/include/toolkit/helper/vclunohelper.hxx @@ -138,8 +138,8 @@ public: static ::Point /* VCLPoint */ ConvertToVCLPoint(css::awt::Point const& _aPoint); static css::awt::Point ConvertToAWTPoint(::Point /* VCLPoint */ const& _aPoint); - static ::Rectangle ConvertToVCLRect( css::awt::Rectangle const & _rRect ); - static css::awt::Rectangle ConvertToAWTRect( ::Rectangle const & _rRect ); + static ::tools::Rectangle ConvertToVCLRect( css::awt::Rectangle const & _rRect ); + static css::awt::Rectangle ConvertToAWTRect( ::tools::Rectangle const & _rRect ); static css::awt::MouseEvent createMouseEvent( diff --git a/include/tools/b3dtrans.hxx b/include/tools/b3dtrans.hxx index ae50f4596ac6..eca70105b248 100644 --- a/include/tools/b3dtrans.hxx +++ b/include/tools/b3dtrans.hxx @@ -68,13 +68,13 @@ private: double mfRatio; // Viewport area in logical coordinates - Rectangle maViewportRectangle; + tools::Rectangle maViewportRectangle; // Visible area within viewport - Rectangle maVisibleRectangle; + tools::Rectangle maVisibleRectangle; // Actual coordinates as set by CalcViewport // of visible viewport area (logical coordinates) - Rectangle maSetBound; + tools::Rectangle maSetBound; // Flags bool mbPerspective : 1; @@ -109,8 +109,8 @@ public: void SetPerspective(bool bNew); - void SetViewportRectangle(Rectangle const & rRect, Rectangle const & rVisible); - void SetViewportRectangle(Rectangle const & rRect) { SetViewportRectangle(rRect, rRect); } + void SetViewportRectangle(tools::Rectangle const & rRect, tools::Rectangle const & rVisible); + void SetViewportRectangle(tools::Rectangle const & rRect) { SetViewportRectangle(rRect, rRect); } void CalcViewport(); diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx index bebc35015e82..079ada40e2e6 100644 --- a/include/tools/gen.hxx +++ b/include/tools/gen.hxx @@ -339,6 +339,8 @@ inline std::basic_ostream<charT, traits> & operator <<( /// etc. methods interpret the interval as closed, while the lowercase /// getWidth() / getHeight() etc. methods interpret the interval as half-open. /// Ok, now is the time for despair. +namespace tools +{ class SAL_WARN_UNUSED TOOLS_DLLPUBLIC Rectangle { public: @@ -379,31 +381,31 @@ public: /// Returns the difference between bottom and top, assuming the range is inclusive. inline long GetHeight() const; - Rectangle& Union( const Rectangle& rRect ); - Rectangle& Intersection( const Rectangle& rRect ); - inline Rectangle GetUnion( const Rectangle& rRect ) const; - inline Rectangle GetIntersection( const Rectangle& rRect ) const; + tools::Rectangle& Union( const tools::Rectangle& rRect ); + tools::Rectangle& Intersection( const tools::Rectangle& rRect ); + inline tools::Rectangle GetUnion( const tools::Rectangle& rRect ) const; + inline tools::Rectangle GetIntersection( const tools::Rectangle& rRect ) const; void Justify(); bool IsInside( const Point& rPOINT ) const; - bool IsInside( const Rectangle& rRect ) const; - bool IsOver( const Rectangle& rRect ) const; + bool IsInside( const tools::Rectangle& rRect ) const; + bool IsOver( const tools::Rectangle& rRect ) const; void SetEmpty() { nRight = nBottom = RECT_EMPTY; } inline bool IsEmpty() const; - inline bool operator == ( const Rectangle& rRect ) const; - inline bool operator != ( const Rectangle& rRect ) const; + inline bool operator == ( const tools::Rectangle& rRect ) const; + inline bool operator != ( const tools::Rectangle& rRect ) const; - inline Rectangle& operator += ( const Point& rPt ); - inline Rectangle& operator -= ( const Point& rPt ); + inline tools::Rectangle& operator += ( const Point& rPt ); + inline tools::Rectangle& operator -= ( const Point& rPt ); - friend inline Rectangle operator + ( const Rectangle& rRect, const Point& rPt ); - friend inline Rectangle operator - ( const Rectangle& rRect, const Point& rPt ); + friend inline tools::Rectangle operator + ( const tools::Rectangle& rRect, const Point& rPt ); + friend inline tools::Rectangle operator - ( const tools::Rectangle& rRect, const Point& rPt ); - TOOLS_DLLPUBLIC friend SvStream& ReadRectangle( SvStream& rIStream, Rectangle& rRect ); - TOOLS_DLLPUBLIC friend SvStream& WriteRectangle( SvStream& rOStream, const Rectangle& rRect ); + TOOLS_DLLPUBLIC friend SvStream& ReadRectangle( SvStream& rIStream, tools::Rectangle& rRect ); + TOOLS_DLLPUBLIC friend SvStream& WriteRectangle( SvStream& rOStream, const tools::Rectangle& rRect ); // ONE long getX() const { return nLeft; } @@ -433,14 +435,15 @@ private: long nRight; long nBottom; }; +} -inline Rectangle::Rectangle() +inline tools::Rectangle::Rectangle() { nLeft = nTop = 0; nRight = nBottom = RECT_EMPTY; } -inline Rectangle::Rectangle( const Point& rLT, const Point& rRB ) +inline tools::Rectangle::Rectangle( const Point& rLT, const Point& rRB ) { nLeft = rLT.X(); nTop = rLT.Y(); @@ -448,7 +451,7 @@ inline Rectangle::Rectangle( const Point& rLT, const Point& rRB ) nBottom = rRB.Y(); } -inline Rectangle::Rectangle( long _nLeft, long _nTop, +inline tools::Rectangle::Rectangle( long _nLeft, long _nTop, long _nRight, long _nBottom ) { nLeft = _nLeft; @@ -457,7 +460,7 @@ inline Rectangle::Rectangle( long _nLeft, long _nTop, nBottom = _nBottom; } -inline Rectangle::Rectangle( const Point& rLT, const Size& rSize ) +inline tools::Rectangle::Rectangle( const Point& rLT, const Size& rSize ) { nLeft = rLT.X(); nTop = rLT.Y(); @@ -465,33 +468,33 @@ inline Rectangle::Rectangle( const Point& rLT, const Size& rSize ) nBottom = rSize.Height() ? nTop+rSize.Height()-1 : RECT_EMPTY; } -inline bool Rectangle::IsEmpty() const +inline bool tools::Rectangle::IsEmpty() const { return (nRight == RECT_EMPTY) || (nBottom == RECT_EMPTY); } -inline Point Rectangle::TopLeft() const +inline Point tools::Rectangle::TopLeft() const { return Point( nLeft, nTop ); } -inline Point Rectangle::TopRight() const +inline Point tools::Rectangle::TopRight() const { return Point( (nRight == RECT_EMPTY) ? nLeft : nRight, nTop ); } -inline Point Rectangle::BottomLeft() const +inline Point tools::Rectangle::BottomLeft() const { return Point( nLeft, (nBottom == RECT_EMPTY) ? nTop : nBottom ); } -inline Point Rectangle::BottomRight() const +inline Point tools::Rectangle::BottomRight() const { return Point( (nRight == RECT_EMPTY) ? nLeft : nRight, (nBottom == RECT_EMPTY) ? nTop : nBottom ); } -inline Point Rectangle::TopCenter() const +inline Point tools::Rectangle::TopCenter() const { if ( IsEmpty() ) return Point( nLeft, nTop ); @@ -500,7 +503,7 @@ inline Point Rectangle::TopCenter() const std::min( nTop, nBottom) ); } -inline Point Rectangle::BottomCenter() const +inline Point tools::Rectangle::BottomCenter() const { if ( IsEmpty() ) return Point( nLeft, nTop ); @@ -509,7 +512,7 @@ inline Point Rectangle::BottomCenter() const std::max( nTop, nBottom) ); } -inline Point Rectangle::LeftCenter() const +inline Point tools::Rectangle::LeftCenter() const { if ( IsEmpty() ) return Point( nLeft, nTop ); @@ -517,7 +520,7 @@ inline Point Rectangle::LeftCenter() const return Point( std::min( nLeft, nRight ), nTop + (nBottom - nTop)/2 ); } -inline Point Rectangle::RightCenter() const +inline Point tools::Rectangle::RightCenter() const { if ( IsEmpty() ) return Point( nLeft, nTop ); @@ -525,7 +528,7 @@ inline Point Rectangle::RightCenter() const return Point( std::max( nLeft, nRight ), nTop + (nBottom - nTop)/2 ); } -inline Point Rectangle::Center() const +inline Point tools::Rectangle::Center() const { if ( IsEmpty() ) return Point( nLeft, nTop ); @@ -533,7 +536,7 @@ inline Point Rectangle::Center() const return Point( nLeft+(nRight-nLeft)/2 , nTop+(nBottom-nTop)/2 ); } -inline void Rectangle::Move( long nHorzMove, long nVertMove ) +inline void tools::Rectangle::Move( long nHorzMove, long nVertMove ) { nLeft += nHorzMove; nTop += nVertMove; @@ -543,7 +546,7 @@ inline void Rectangle::Move( long nHorzMove, long nVertMove ) nBottom += nVertMove; } -inline void Rectangle::SetPos( const Point& rPoint ) +inline void tools::Rectangle::SetPos( const Point& rPoint ) { if ( nRight != RECT_EMPTY ) nRight += rPoint.X() - nLeft; @@ -553,7 +556,7 @@ inline void Rectangle::SetPos( const Point& rPoint ) nTop = rPoint.Y(); } -inline long Rectangle::GetWidth() const +inline long tools::Rectangle::GetWidth() const { long n; if ( nRight == RECT_EMPTY ) @@ -570,7 +573,7 @@ inline long Rectangle::GetWidth() const return n; } -inline long Rectangle::GetHeight() const +inline long tools::Rectangle::GetHeight() const { long n; if ( nBottom == RECT_EMPTY ) @@ -587,24 +590,24 @@ inline long Rectangle::GetHeight() const return n; } -inline Size Rectangle::GetSize() const +inline Size tools::Rectangle::GetSize() const { return Size( GetWidth(), GetHeight() ); } -inline Rectangle Rectangle::GetUnion( const Rectangle& rRect ) const +inline tools::Rectangle tools::Rectangle::GetUnion( const tools::Rectangle& rRect ) const { - Rectangle aTmpRect( *this ); + tools::Rectangle aTmpRect( *this ); return aTmpRect.Union( rRect ); } -inline Rectangle Rectangle::GetIntersection( const Rectangle& rRect ) const +inline tools::Rectangle tools::Rectangle::GetIntersection( const tools::Rectangle& rRect ) const { - Rectangle aTmpRect( *this ); + tools::Rectangle aTmpRect( *this ); return aTmpRect.Intersection( rRect ); } -inline bool Rectangle::operator == ( const Rectangle& rRect ) const +inline bool tools::Rectangle::operator == ( const tools::Rectangle& rRect ) const { return (nLeft == rRect.nLeft ) && (nTop == rRect.nTop ) && @@ -612,7 +615,7 @@ inline bool Rectangle::operator == ( const Rectangle& rRect ) const (nBottom == rRect.nBottom ); } -inline bool Rectangle::operator != ( const Rectangle& rRect ) const +inline bool tools::Rectangle::operator != ( const tools::Rectangle& rRect ) const { return (nLeft != rRect.nLeft ) || (nTop != rRect.nTop ) || @@ -620,7 +623,7 @@ inline bool Rectangle::operator != ( const Rectangle& rRect ) const (nBottom != rRect.nBottom ); } -inline Rectangle& Rectangle::operator +=( const Point& rPt ) +inline tools::Rectangle& tools::Rectangle::operator +=( const Point& rPt ) { nLeft += rPt.X(); nTop += rPt.Y(); @@ -631,7 +634,7 @@ inline Rectangle& Rectangle::operator +=( const Point& rPt ) return *this; } -inline Rectangle& Rectangle::operator -= ( const Point& rPt ) +inline tools::Rectangle& tools::Rectangle::operator -= ( const Point& rPt ) { nLeft -= rPt.X(); nTop -= rPt.Y(); @@ -642,6 +645,8 @@ inline Rectangle& Rectangle::operator -= ( const Point& rPt ) return *this; } +namespace tools +{ inline Rectangle operator + ( const Rectangle& rRect, const Point& rPt ) { Rectangle aRect( rRect.nLeft + rPt.X(), rRect.nTop + rPt.Y(), @@ -658,8 +663,9 @@ inline Rectangle operator - ( const Rectangle& rRect, const Point& rPt ) (rRect.nBottom == RECT_EMPTY) ? RECT_EMPTY : rRect.nBottom - rPt.Y() ); return aRect; } +} -inline void Rectangle::expand(long nExpandBy) +inline void tools::Rectangle::expand(long nExpandBy) { nLeft -= nExpandBy; nTop -= nExpandBy; @@ -667,7 +673,7 @@ inline void Rectangle::expand(long nExpandBy) nBottom += nExpandBy; } -inline void Rectangle::shrink(long nShrinkBy) +inline void tools::Rectangle::shrink(long nShrinkBy) { nLeft += nShrinkBy; nTop += nShrinkBy; @@ -677,7 +683,7 @@ inline void Rectangle::shrink(long nShrinkBy) template< typename charT, typename traits > inline std::basic_ostream<charT, traits> & operator <<( - std::basic_ostream<charT, traits> & stream, const Rectangle& rectangle ) + std::basic_ostream<charT, traits> & stream, const tools::Rectangle& rectangle ) { if (rectangle.IsEmpty()) return stream << "EMPTY"; diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx index e1f34a2f8c31..40a129414a38 100644 --- a/include/tools/poly.hxx +++ b/include/tools/poly.hxx @@ -87,12 +87,12 @@ public: Polygon( sal_uInt16 nSize ); Polygon( sal_uInt16 nPoints, const Point* pPtAry, const PolyFlags* pFlagAry = nullptr ); - Polygon( const Rectangle& rRect ); - Polygon( const Rectangle& rRect, + Polygon( const tools::Rectangle& rRect ); + Polygon( const tools::Rectangle& rRect, sal_uInt32 nHorzRound, sal_uInt32 nVertRound ); Polygon( const Point& rCenter, long nRadX, long nRadY ); - Polygon( const Rectangle& rBound, + Polygon( const tools::Rectangle& rBound, const Point& rStart, const Point& rEnd, PolyStyle ePolyStyle = PolyStyle::Arc, bool bWholeCircle = false ); @@ -117,10 +117,10 @@ public: void Clear(); - Rectangle GetBoundRect() const; + tools::Rectangle GetBoundRect() const; bool IsInside( const Point& rPt ) const; double CalcDistance( sal_uInt16 nPt1, sal_uInt16 nPt2 ); - void Clip( const Rectangle& rRect ); + void Clip( const tools::Rectangle& rRect ); void Optimize( PolyOptimizeFlags nOptimizeFlags ); /** Adaptive subdivision of polygons with curves @@ -210,8 +210,8 @@ public: void Clear(); sal_uInt16 Count() const; - Rectangle GetBoundRect() const; - void Clip( const Rectangle& rRect ); + tools::Rectangle GetBoundRect() const; + void Clip( const tools::Rectangle& rRect ); void Optimize( PolyOptimizeFlags nOptimizeFlags ); /** Adaptive subdivision of polygons with curves diff --git a/include/tools/svborder.hxx b/include/tools/svborder.hxx index 95b1ff48ca80..9eef88819847 100644 --- a/include/tools/svborder.hxx +++ b/include/tools/svborder.hxx @@ -72,7 +72,7 @@ public: long Left() const { return nLeft; } }; -TOOLS_DLLPUBLIC Rectangle & operator += ( Rectangle & rRect, const SvBorder & rBorder ); +TOOLS_DLLPUBLIC tools::Rectangle & operator += ( tools::Rectangle & rRect, const SvBorder & rBorder ); #endif diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx index abe4979058c8..3592be536d0f 100644 --- a/include/vcl/ITiledRenderable.hxx +++ b/include/vcl/ITiledRenderable.hxx @@ -155,7 +155,7 @@ public: * @param rRectangle - if not empty, then limit the output only to the area of this rectangle * @return a JSON describing position/content of rows/columns */ - virtual OUString getRowColumnHeaders(const Rectangle& rRectangle) + virtual OUString getRowColumnHeaders(const tools::Rectangle& rRectangle) { (void) rRectangle; return OUString(); @@ -201,7 +201,7 @@ public: } /// @see lok::Document::setClientVisibleArea(). - virtual void setClientVisibleArea(const Rectangle& /*rRectangle*/) + virtual void setClientVisibleArea(const tools::Rectangle& /*rRectangle*/) { } diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index f1b950052526..cca13188f58d 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -315,7 +315,7 @@ public: nothing had to be cropped, because e.g. the crop rectangle included the bitmap, false is returned, too! */ - bool Crop( const Rectangle& rRectPixel ); + bool Crop( const tools::Rectangle& rRectPixel ); /** Expand the bitmap by pixel padding @@ -359,13 +359,13 @@ public: empty. */ bool CopyPixel( - const Rectangle& rRectDst, - const Rectangle& rRectSrc, + const tools::Rectangle& rRectDst, + const tools::Rectangle& rRectSrc, const Bitmap* pBmpSrc = nullptr ); bool CopyPixel_AlphaOptimized( - const Rectangle& rRectDst, - const Rectangle& rRectSrc, + const tools::Rectangle& rRectDst, + const tools::Rectangle& rRectSrc, const Bitmap* pBmpSrc ); /** Perform boolean operations with another bitmap @@ -510,7 +510,7 @@ public: @return the generated region. */ - vcl::Region CreateRegion( const Color& rColor, const Rectangle& rRect ) const; + vcl::Region CreateRegion( const Color& rColor, const tools::Rectangle& rRect ) const; /** Replace all pixel where the given mask is on with the specified color diff --git a/include/vcl/bitmapaccess.hxx b/include/vcl/bitmapaccess.hxx index b215aa08ca01..d20b9b1abd54 100644 --- a/include/vcl/bitmapaccess.hxx +++ b/include/vcl/bitmapaccess.hxx @@ -343,8 +343,8 @@ public: void DrawLine(const Point& rStart, const Point& rEnd); - void FillRect(const Rectangle& rRect); - void DrawRect(const Rectangle& rRect); + void FillRect(const tools::Rectangle& rRect); + void DrawRect(const tools::Rectangle& rRect); private: diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx index c3e566b860dc..a9bf00bfc36c 100644 --- a/include/vcl/bitmapex.hxx +++ b/include/vcl/bitmapex.hxx @@ -134,7 +134,7 @@ public: nothing had to be cropped, because e.g. the crop rectangle included the bitmap, false is returned, too! */ - bool Crop( const Rectangle& rRectPixel ); + bool Crop( const tools::Rectangle& rRectPixel ); /** Expand the bitmap by pixel padding @@ -178,8 +178,8 @@ public: empty. */ bool CopyPixel( - const Rectangle& rRectDst, - const Rectangle& rRectSrc, + const tools::Rectangle& rRectDst, + const tools::Rectangle& rRectSrc, const BitmapEx* pBmpExSrc ); /** Fill the entire bitmap with the given color diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index ef5f23cfed63..1c9fd19f421f 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -54,9 +54,9 @@ public: SAL_DLLPRIVATE DrawTextFlags ImplGetTextStyle( OUString& rText, WinBits nWinStyle, DrawFlags nDrawFlags ); SAL_DLLPRIVATE void ImplDrawAlignedImage(OutputDevice* pDev, Point& rPos, Size& rSize, sal_uLong nImageSep, DrawFlags nDrawFlags, - DrawTextFlags nTextStyle, Rectangle *pSymbolRect=nullptr, bool bAddImageSep = false ); - SAL_DLLPRIVATE void ImplSetFocusRect( const Rectangle &rFocusRect ); - SAL_DLLPRIVATE const Rectangle& ImplGetFocusRect() const; + DrawTextFlags nTextStyle, tools::Rectangle *pSymbolRect=nullptr, bool bAddImageSep = false ); + SAL_DLLPRIVATE void ImplSetFocusRect( const tools::Rectangle &rFocusRect ); + SAL_DLLPRIVATE const tools::Rectangle& ImplGetFocusRect() const; SAL_DLLPRIVATE void ImplSetSymbolAlign( SymbolAlign eAlign ); /// The x-coordinate of the vertical separator line, use in MenuButton subclass only. SAL_DLLPRIVATE long ImplGetSeparatorX() const; @@ -89,7 +89,7 @@ public: void EnableImageDisplay( bool bEnable ); void EnableTextDisplay( bool bEnable ); - void SetFocusRect( const Rectangle& rFocusRect ); + void SetFocusRect( const tools::Rectangle& rFocusRect ); bool IsSmallSymbol() const; void SetSmallSymbol(); virtual bool set_property(const OString &rKey, const OString &rValue) override; @@ -117,7 +117,7 @@ class VCL_DLLPUBLIC PushButton : public Button { public: SAL_DLLPRIVATE void ImplSetDefButton( bool bSet ); - SAL_DLLPRIVATE void ImplDrawPushButtonFrame(vcl::RenderContext& rRenderContext, Rectangle& rRect, DrawButtonFlags nStyle); + SAL_DLLPRIVATE void ImplDrawPushButtonFrame(vcl::RenderContext& rRenderContext, tools::Rectangle& rRect, DrawButtonFlags nStyle); SAL_DLLPRIVATE static bool ImplHitTestPushButton(vcl::Window* pDev, const Point& rPos); SAL_DLLPRIVATE bool ImplIsDefButton() const; @@ -127,7 +127,7 @@ public: virtual void Tracking( const TrackingEvent& rTEvt ) override; virtual void KeyInput( const KeyEvent& rKEvt ) override; virtual void KeyUp( 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 Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; virtual void Resize() override; virtual void GetFocus() override; @@ -163,7 +163,7 @@ public: virtual Size GetOptimalSize() const override; virtual bool set_property(const OString &rKey, const OString &rValue) override; - virtual void ShowFocus(const Rectangle& rRect) override; + virtual void ShowFocus(const tools::Rectangle& rRect) override; protected: PushButtonDropdownStyle mnDDStyle; @@ -173,7 +173,7 @@ protected: SAL_DLLPRIVATE static WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDrawPushButtonContent(OutputDevice* pDev, DrawFlags nDrawFlags, - const Rectangle& rRect, bool bMenuBtnSep); + const tools::Rectangle& rRect, bool bMenuBtnSep); SAL_DLLPRIVATE void ImplDrawPushButton(vcl::RenderContext& rRenderContext); using Button::ImplGetTextStyle; SAL_DLLPRIVATE DrawTextFlags ImplGetTextStyle( DrawFlags nDrawFlags ) const; @@ -271,8 +271,8 @@ class VCL_DLLPUBLIC RadioButton : public Button { private: std::shared_ptr< std::vector< VclPtr< RadioButton > > > m_xGroup; - Rectangle maStateRect; - Rectangle maMouseRect; + tools::Rectangle maStateRect; + tools::Rectangle maMouseRect; Image maImage; bool mbChecked; bool mbSaveValue; @@ -290,8 +290,8 @@ private: SAL_DLLPRIVATE void ImplDrawRadioButtonState(vcl::RenderContext& rRenderContext); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags, const Point& rPos, const Size& rSize, - const Size& rImageSize, Rectangle& rStateRect, - Rectangle& rMouseRect ); + const Size& rImageSize, tools::Rectangle& rStateRect, + tools::Rectangle& rMouseRect ); SAL_DLLPRIVATE void ImplDrawRadioButton(vcl::RenderContext& rRenderContext ); SAL_DLLPRIVATE void ImplUncheckAllOther(); SAL_DLLPRIVATE Size ImplGetRadioImageSize() const; @@ -316,8 +316,8 @@ protected: virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const override; - void SetMouseRect( const Rectangle& _rMouseRect ) { maMouseRect = _rMouseRect; } - void SetStateRect( const Rectangle& _rStateRect ) { maStateRect = _rStateRect; } + void SetMouseRect( const tools::Rectangle& _rMouseRect ) { maMouseRect = _rMouseRect; } + void SetStateRect( const tools::Rectangle& _rStateRect ) { maStateRect = _rStateRect; } // draws the radio button (the knob image), in its current state (pressed/checked) // at the usual location, which can be overridden with SetStateRect @@ -332,7 +332,7 @@ public: virtual void Tracking( const TrackingEvent& rTEvt ) override; virtual void KeyInput( const KeyEvent& rKEvt ) override; virtual void KeyUp( 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 Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; virtual void Resize() override; virtual void GetFocus() override; @@ -387,7 +387,7 @@ public: * Group this RadioButton with another */ void group(RadioButton &rOther); - virtual void ShowFocus(const Rectangle& rRect) override; + virtual void ShowFocus(const tools::Rectangle& rRect) override; virtual FactoryFunction GetUITestFactory() const override; }; @@ -395,8 +395,8 @@ public: class VCL_DLLPUBLIC CheckBox : public Button { private: - Rectangle maStateRect; - Rectangle maMouseRect; + tools::Rectangle maStateRect; + tools::Rectangle maMouseRect; TriState meState; TriState meSaveValue; bool mbTriState; @@ -411,8 +411,8 @@ private: SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags, const Point& rPos, const Size& rSize, - const Size& rImageSize, Rectangle& rStateRect, - Rectangle& rMouseRect ); + const Size& rImageSize, tools::Rectangle& rStateRect, + tools::Rectangle& rMouseRect ); SAL_DLLPRIVATE void ImplDrawCheckBox(vcl::RenderContext& rRenderContext ); SAL_DLLPRIVATE long ImplGetImageToTextDistance() const; SAL_DLLPRIVATE Size ImplGetCheckImageSize() const; @@ -429,8 +429,8 @@ protected: virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const override; virtual void ImplDrawCheckBoxState(vcl::RenderContext& rRenderContext); - SAL_DLLPRIVATE const Rectangle& GetStateRect() const { return maStateRect; } - SAL_DLLPRIVATE const Rectangle& GetMouseRect() const { return maMouseRect; } + SAL_DLLPRIVATE const tools::Rectangle& GetStateRect() const { return maStateRect; } + SAL_DLLPRIVATE const tools::Rectangle& GetMouseRect() const { return maMouseRect; } public: SAL_DLLPRIVATE void ImplCheck(); @@ -442,7 +442,7 @@ public: virtual void Tracking( const TrackingEvent& rTEvt ) override; virtual void KeyInput( const KeyEvent& rKEvt ) override; virtual void KeyUp( 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 Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; virtual void Resize() override; virtual void GetFocus() override; @@ -475,7 +475,7 @@ public: void SetLegacyNoTextAlign( bool bVal ) { mbLegacyNoTextAlign = bVal; } virtual bool set_property(const OString &rKey, const OString &rValue) override; - virtual void ShowFocus(const Rectangle& rRect) override; + virtual void ShowFocus(const tools::Rectangle& rRect) override; virtual FactoryFunction GetUITestFactory() const override; }; diff --git a/include/vcl/canvastools.hxx b/include/vcl/canvastools.hxx index aedcff7a2227..e2abfb32bbe1 100644 --- a/include/vcl/canvastools.hxx +++ b/include/vcl/canvastools.hxx @@ -30,7 +30,7 @@ class Point; class Size; -class Rectangle; +namespace tools { class Rectangle; } namespace tools { class Polygon; class PolyPolygon; @@ -152,22 +152,22 @@ namespace vcl Size VCL_DLLPUBLIC sizeFromIntegerSize2D( const css::geometry::IntegerSize2D& ); Point VCL_DLLPUBLIC pointFromIntegerPoint2D( const css::geometry::IntegerPoint2D& ); - Rectangle VCL_DLLPUBLIC rectangleFromIntegerRectangle2D( const css::geometry::IntegerRectangle2D& ); + tools::Rectangle VCL_DLLPUBLIC rectangleFromIntegerRectangle2D( const css::geometry::IntegerRectangle2D& ); // basegfx::B2D Size VCL_DLLPUBLIC sizeFromB2DSize( const basegfx::B2DVector& ); Point VCL_DLLPUBLIC pointFromB2DPoint( const basegfx::B2DPoint& ); - Rectangle VCL_DLLPUBLIC rectangleFromB2DRectangle( const basegfx::B2DRange& ); + tools::Rectangle VCL_DLLPUBLIC rectangleFromB2DRectangle( const basegfx::B2DRange& ); basegfx::B2DVector VCL_DLLPUBLIC b2DSizeFromSize( const Size& ); basegfx::B2DPoint VCL_DLLPUBLIC b2DPointFromPoint( const Point& ); - basegfx::B2DRange VCL_DLLPUBLIC b2DRectangleFromRectangle( const Rectangle& ); + basegfx::B2DRange VCL_DLLPUBLIC b2DRectangleFromRectangle( const tools::Rectangle& ); // basegfx::B2I Point VCL_DLLPUBLIC pointFromB2IPoint( const basegfx::B2IPoint& ); - Rectangle VCL_DLLPUBLIC rectangleFromB2IRectangle( const basegfx::B2IRange& ); + tools::Rectangle VCL_DLLPUBLIC rectangleFromB2IRectangle( const basegfx::B2IRange& ); basegfx::B2IPoint VCL_DLLPUBLIC b2IPointFromPoint(const Point&); - basegfx::B2IRectangle VCL_DLLPUBLIC b2IRectangleFromRectangle(const Rectangle&); + basegfx::B2IRectangle VCL_DLLPUBLIC b2IRectangleFromRectangle(const tools::Rectangle&); } } diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index afe4d61d072e..ccacd3cd65e2 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -68,7 +68,7 @@ public: virtual void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All ) override; - Rectangle GetDropDownPosSizePixel() const; + tools::Rectangle GetDropDownPosSizePixel() const; void AdaptDropDownLineCountToMaximum(); void SetDropDownLineCount( sal_uInt16 nLines ); @@ -146,7 +146,7 @@ public: bool IsEntryPosSelected( sal_Int32 nPos ) const; void SelectEntryPos( sal_Int32 nPos, bool bSelect = true ); void SetNoSelection(); - Rectangle GetBoundingRectangle( sal_Int32 nItem ) const; + tools::Rectangle GetBoundingRectangle( sal_Int32 nItem ) const; /** checks whether a certain point lies within the bounds of a list item and returns the item as well as the character position diff --git a/include/vcl/controllayout.hxx b/include/vcl/controllayout.hxx index ea85d379a792..13dd67d4cec0 100644 --- a/include/vcl/controllayout.hxx +++ b/include/vcl/controllayout.hxx @@ -37,7 +37,7 @@ struct VCL_DLLPUBLIC ControlLayoutData OUString m_aDisplayText; // the bounding rectangle of every character // where one character may consist of many glyphs - std::vector< Rectangle > m_aUnicodeBoundRects; + std::vector< tools::Rectangle > m_aUnicodeBoundRects; // start indices of lines std::vector< long > m_aLineIndices; // notify parent control on destruction @@ -46,7 +46,7 @@ struct VCL_DLLPUBLIC ControlLayoutData ControlLayoutData(); ~ControlLayoutData(); - Rectangle GetCharacterBounds( long nIndex ) const; + tools::Rectangle GetCharacterBounds( long nIndex ) const; // returns the character index for corresponding to rPoint (in control coordinates) // -1 is returned if no character is at that point long GetIndexForPoint( const Point& rPoint ) const; diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index c6b60ef48ace..522ab4a7fa84 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -84,12 +84,12 @@ protected: at the target device, or taking the reference device into account) when returning. */ - Rectangle DrawControlText( OutputDevice& _rTargetDevice, const Rectangle& _rRect, + tools::Rectangle DrawControlText( OutputDevice& _rTargetDevice, const tools::Rectangle& _rRect, const OUString& _rStr, DrawTextFlags _nStyle, MetricVector* _pVector, OUString* _pDisplayText, const Size* i_pDeviceSize = nullptr ) const; - Rectangle GetControlTextRect( OutputDevice& _rTargetDevice, const Rectangle & rRect, + tools::Rectangle GetControlTextRect( OutputDevice& _rTargetDevice, const tools::Rectangle & rRect, const OUString& _rStr, DrawTextFlags _nStyle, Size* o_pDeviceSize = nullptr ) const; @@ -122,7 +122,7 @@ public: the rect for drawing the frame. Upon returning from the call, the rect will be inflated by the space occupied by the drawn pixels. */ - SAL_DLLPRIVATE void ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect ); + SAL_DLLPRIVATE void ImplDrawFrame( OutputDevice* pDev, tools::Rectangle& rRect ); public: explicit Control( vcl::Window* pParent, WinBits nWinStyle = 0 ); @@ -140,7 +140,7 @@ public: // gets the displayed text virtual OUString GetDisplayText() const override; // returns the bounding box for the character at index nIndex (in control coordinates) - Rectangle GetCharacterBounds( long nIndex ) const; + tools::Rectangle GetCharacterBounds( long nIndex ) const; // returns the character index for corresponding to rPoint (in control coordinates) // -1 is returned if no character is at that point long GetIndexForPoint( const Point& rPoint ) const; diff --git a/include/vcl/decoview.hxx b/include/vcl/decoview.hxx index e7aa4a0643c9..1cb36bb8d723 100644 --- a/include/vcl/decoview.hxx +++ b/include/vcl/decoview.hxx @@ -25,7 +25,7 @@ #include <rsc/rsc-vcl-shared-types.hxx> #include <o3tl/typed_flags_set.hxx> -class Rectangle; +namespace tools { class Rectangle; } class Point; class Color; class OutputDevice; @@ -105,17 +105,17 @@ private: public: DecorationView(OutputDevice* pOutDev); - void DrawSymbol( const Rectangle& rRect, SymbolType eType, + void DrawSymbol( const tools::Rectangle& rRect, SymbolType eType, const Color& rColor, DrawSymbolFlags nStyle = DrawSymbolFlags::NONE ); - void DrawFrame( const Rectangle& rRect, + void DrawFrame( const tools::Rectangle& rRect, const Color& rLeftTopColor, const Color& rRightBottomColor ); - void DrawHighlightFrame( const Rectangle& rRect, + void DrawHighlightFrame( const tools::Rectangle& rRect, DrawHighlightFrameStyle nStyle ); - Rectangle DrawFrame( const Rectangle& rRect, DrawFrameStyle nStyle = DrawFrameStyle::Out, DrawFrameFlags nFlags = DrawFrameFlags::NONE ); - Rectangle DrawButton( const Rectangle& rRect, DrawButtonFlags nStyle ); + tools::Rectangle DrawFrame( const tools::Rectangle& rRect, DrawFrameStyle nStyle = DrawFrameStyle::Out, DrawFrameFlags nFlags = DrawFrameFlags::NONE ); + tools::Rectangle DrawButton( const tools::Rectangle& rRect, DrawButtonFlags nStyle ); void DrawSeparator( const Point& rStart, const Point& rStop, bool bVertical = true ); - void DrawHandle(const Rectangle& rRectangle); + void DrawHandle(const tools::Rectangle& rRectangle); }; #endif // INCLUDED_VCL_DECOVIEW_HXX diff --git a/include/vcl/dockingarea.hxx b/include/vcl/dockingarea.hxx index b2935bf6a7e3..2a178f530e5d 100644 --- a/include/vcl/dockingarea.hxx +++ b/include/vcl/dockingarea.hxx @@ -44,7 +44,7 @@ public: bool IsHorizontal() const; virtual void ApplySettings(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 Resize() override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual void StateChanged( StateChangedType nType ) override; diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 4d9c48963e93..d4622a07ff7b 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -30,21 +30,21 @@ struct DockingData { Point maMousePos; // in - Rectangle maTrackRect; // in/out + tools::Rectangle maTrackRect; // in/out bool mbFloating; // out - DockingData( const Point& rPt, const Rectangle& rRect, bool b) : + DockingData( const Point& rPt, const tools::Rectangle& rRect, bool b) : maMousePos( rPt ), maTrackRect( rRect ), mbFloating( b ) {}; }; struct EndDockingData { - Rectangle maWindowRect; // in + tools::Rectangle maWindowRect; // in bool mbFloating; // in bool mbCancelled; // in - EndDockingData( const Rectangle& rRect, bool b, bool bCancelled ) : + EndDockingData( const tools::Rectangle& rRect, bool b, bool bCancelled ) : maWindowRect( rRect ), mbFloating( b ), mbCancelled( bCancelled ) {}; }; @@ -88,7 +88,7 @@ private: Size maRollUpOutSize; Size maMinOutSize; Size maMaxOutSize; - Rectangle maDragArea; + tools::Rectangle maDragArea; long mnTrackX; long mnTrackY; long mnTrackWidth; @@ -120,14 +120,14 @@ public: bool ImplStartDocking( const Point& rPos ); // those methods actually call the corresponding handlers - void StartDocking( const Point& rPos, Rectangle& rRect ); - bool Docking( const Point& rPos, Rectangle& rRect ); - void EndDocking( const Rectangle& rRect, bool bFloatMode ); + void StartDocking( const Point& rPos, tools::Rectangle& rRect ); + bool Docking( const Point& rPos, tools::Rectangle& rRect ); + void EndDocking( const tools::Rectangle& rRect, bool bFloatMode ); bool PrepareToggleFloatingMode(); void ToggleFloatingMode(); - void SetDragArea( const Rectangle& rRect ); - const Rectangle& GetDragArea() const { return maDragArea;} + void SetDragArea( const tools::Rectangle& rRect ); + const tools::Rectangle& GetDragArea() const { return maDragArea;} void Lock(); void Unlock(); @@ -195,7 +195,7 @@ public: void SetPosSizePixel( vcl::Window *pWin, long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags ); - Rectangle GetPosSizePixel( const vcl::Window *pWin ); + tools::Rectangle GetPosSizePixel( const vcl::Window *pWin ); }; @@ -277,8 +277,8 @@ public: virtual void dispose() override; virtual void StartDocking(); - virtual bool Docking( const Point& rPos, Rectangle& rRect ); - virtual void EndDocking( const Rectangle& rRect, bool bFloatMode ); + virtual bool Docking( const Point& rPos, tools::Rectangle& rRect ); + virtual void EndDocking( const tools::Rectangle& rRect, bool bFloatMode ); virtual bool PrepareToggleFloatingMode(); virtual void ToggleFloatingMode(); diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index c29fe97ecbb9..e588869ea429 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -104,13 +104,13 @@ private: SAL_DLLPRIVATE void ImplInitEditData(); SAL_DLLPRIVATE void ImplModified(); SAL_DLLPRIVATE OUString ImplGetText() const; - SAL_DLLPRIVATE void ImplRepaint(vcl::RenderContext& rRenderContext, const Rectangle& rRectangle); + SAL_DLLPRIVATE void ImplRepaint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRectangle); SAL_DLLPRIVATE void ImplInvalidateOrRepaint(); SAL_DLLPRIVATE void ImplDelete( const Selection& rSelection, sal_uInt8 nDirection, sal_uInt8 nMode ); SAL_DLLPRIVATE void ImplSetText( const OUString& rStr, const Selection* pNewSelection ); SAL_DLLPRIVATE void ImplInsertText( const OUString& rStr, const Selection* pNewSelection = nullptr, bool bIsUserInput = false ); SAL_DLLPRIVATE static OUString ImplGetValidString( const OUString& rString ); - SAL_DLLPRIVATE void ImplClearBackground(vcl::RenderContext& rRenderContext, const Rectangle& rRectangle, long nXStart, long nXEnd); + SAL_DLLPRIVATE void ImplClearBackground(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRectangle, long nXStart, long nXEnd); SAL_DLLPRIVATE void ImplPaintBorder(vcl::RenderContext& rRenderContext, long nXStart, long nXEnd); SAL_DLLPRIVATE void ImplShowCursor( bool bOnlyIfVisible = true ); SAL_DLLPRIVATE void ImplAlign(); @@ -167,7 +167,7 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void MouseButtonUp( const MouseEvent& 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 Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; virtual void GetFocus() override; diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx index 3dfdf649b390..7c58ac620c01 100644 --- a/include/vcl/event.hxx +++ b/include/vcl/event.hxx @@ -221,23 +221,23 @@ private: /// RenderContext to which we should draw - can be a VirtualDevice or anything. VclPtr<vcl::RenderContext> mpRenderContext; - Rectangle maOutRect; + tools::Rectangle maOutRect; sal_uInt16 mnItemId; sal_uInt16 mnStyle; public: UserDrawEvent(vcl::Window* pWindow, vcl::RenderContext* pRenderContext, - const Rectangle& rOutRect, sal_uInt16 nId, sal_uInt16 nStyle = 0); + const tools::Rectangle& rOutRect, sal_uInt16 nId, sal_uInt16 nStyle = 0); vcl::Window* GetWindow() const { return mpWindow; } vcl::RenderContext* GetRenderContext() const { return mpRenderContext; } - const Rectangle& GetRect() const { return maOutRect; } + const tools::Rectangle& GetRect() const { return maOutRect; } sal_uInt16 GetItemId() const { return mnItemId; } sal_uInt16 GetStyle() const { return mnStyle; } }; inline UserDrawEvent::UserDrawEvent(vcl::Window* pWindow, vcl::RenderContext* pRenderContext, - const Rectangle& rOutRect, sal_uInt16 nId, sal_uInt16 nStyle) + const tools::Rectangle& rOutRect, sal_uInt16 nId, sal_uInt16 nStyle) : mpWindow(pWindow) , mpRenderContext(pRenderContext) , maOutRect( rOutRect ) diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index b7e3774214bf..5cb5102632bc 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -61,7 +61,7 @@ public: virtual void ApplySettings(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 Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; virtual void Resize() override; virtual void StateChanged( StateChangedType nType ) override; @@ -109,7 +109,7 @@ public: virtual void ApplySettings(vcl::RenderContext&) 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 StateChanged( StateChangedType nType ) override; @@ -135,7 +135,7 @@ public: virtual void ApplySettings(vcl::RenderContext&) 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 StateChanged( StateChangedType nType ) override; @@ -165,7 +165,7 @@ public: virtual void ApplySettings(vcl::RenderContext&) 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 StateChanged( StateChangedType nType ) override; diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index 9279f5e3a50e..fc7df3ada424 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -87,7 +87,7 @@ private: VclPtr<vcl::Window> mpFirstPopupModeWin; VclPtr<vcl::Window> mxPrevFocusWin; ImplData* mpImplData; - Rectangle maFloatRect; + tools::Rectangle maFloatRect; ImplSVEvent * mnPostId; FloatWinPopupFlags mnPopupModeFlags; FloatWinTitleType mnTitle; @@ -121,12 +121,12 @@ public: SAL_DLLPRIVATE void ImplSetMouseDown() { mbMouseDown = true; } SAL_DLLPRIVATE bool ImplIsMouseDown() const { return mbMouseDown; } static Point ImplCalcPos( vcl::Window* pWindow, - const Rectangle& rRect, FloatWinPopupFlags nFlags, + const tools::Rectangle& rRect, FloatWinPopupFlags nFlags, sal_uInt16& rArrangeIndex ); static Point ImplConvertToAbsPos(vcl::Window* pReference, const Point& rPos); - static Rectangle ImplConvertToAbsPos(vcl::Window* pReference, const Rectangle& rRect); + static tools::Rectangle ImplConvertToAbsPos(vcl::Window* pReference, const tools::Rectangle& rRect); SAL_DLLPRIVATE void ImplEndPopupMode( FloatWinPopupEndFlags nFlags, const VclPtr<vcl::Window>& xFocusId ); - SAL_DLLPRIVATE Rectangle& ImplGetItemEdgeClipRect(); + SAL_DLLPRIVATE tools::Rectangle& ImplGetItemEdgeClipRect(); SAL_DLLPRIVATE bool ImplIsInPrivatePopupMode() const { return mbInPopupMode; } virtual void doDeferredInit(WinBits nBits) override; @@ -146,7 +146,7 @@ public: void SetTitleType( FloatWinTitleType nTitle ); FloatWinTitleType GetTitleType() const { return mnTitle; } - void StartPopupMode( const Rectangle& rRect, FloatWinPopupFlags nFlags ); + void StartPopupMode( const tools::Rectangle& rRect, FloatWinPopupFlags nFlags ); void StartPopupMode( ToolBox* pBox, FloatWinPopupFlags nFlags = FloatWinPopupFlags::NONE ); void EndPopupMode( FloatWinPopupEndFlags nFlags = FloatWinPopupEndFlags::NONE ); void AddPopupModeWindow( vcl::Window* pWindow ); @@ -161,7 +161,7 @@ public: bool GrabsFocus() const { return mbGrabFocus; } - static Point CalcFloatingPosition( vcl::Window* pWindow, const Rectangle& rRect, FloatWinPopupFlags nFlags, sal_uInt16& rArrangeIndex ); + static Point CalcFloatingPosition( vcl::Window* pWindow, const tools::Rectangle& rRect, FloatWinPopupFlags nFlags, sal_uInt16& rArrangeIndex ); }; #endif // INCLUDED_VCL_FLOATWIN_HXX diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index 735babcf9f88..5ce2f9514afb 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -116,7 +116,7 @@ public: void Scale( double fScaleX, double fScaleY ); void Scale( const Fraction& rScaleX, const Fraction& rScaleY ); void Rotate( long nAngle10 ); - void Clip( const Rectangle& ); + void Clip( const tools::Rectangle& ); /* get the bound rect of the contained actions * caveats: * - clip actions will limit the contained actions, @@ -124,7 +124,7 @@ public: * - coordinates of actions will be transformed to preferred mapmode * - the returned rectangle is relative to the preferred mapmode of the metafile */ - Rectangle GetBoundRect( OutputDevice& i_rReference, Rectangle* pHairline = nullptr ) const; + tools::Rectangle GetBoundRect( OutputDevice& i_rReference, tools::Rectangle* pHairline = nullptr ) const; void Adjust( short nLuminancePercent, short nContrastPercent, short nChannelRPercent = 0, short nChannelGPercent = 0, diff --git a/include/vcl/gradient.hxx b/include/vcl/gradient.hxx index 6563b51abf69..b3b2d1a9abef 100644 --- a/include/vcl/gradient.hxx +++ b/include/vcl/gradient.hxx @@ -28,7 +28,10 @@ #include <o3tl/cow_wrapper.hxx> +namespace tools +{ class Rectangle; +} class Point; class SvStream; @@ -93,7 +96,7 @@ public: void SetSteps( sal_uInt16 nSteps ); sal_uInt16 GetSteps() const { return mpImplGradient->mnStepCount; } - void GetBoundRect( const Rectangle& rRect, Rectangle &rBoundRect, Point& rCenter ) const; + void GetBoundRect( const tools::Rectangle& rRect, tools::Rectangle &rBoundRect, Point& rCenter ) const; Gradient& operator=( const Gradient& rGradient ); Gradient& operator=( Gradient&& rGradient ); diff --git a/include/vcl/group.hxx b/include/vcl/group.hxx index 3c68a4cdb5a6..1669cfe1cf91 100644 --- a/include/vcl/group.hxx +++ b/include/vcl/group.hxx @@ -45,7 +45,7 @@ private: public: explicit GroupBox( vcl::Window* pParent, WinBits nStyle ); - 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 StateChanged( StateChangedType nType ) override; diff --git a/include/vcl/help.hxx b/include/vcl/help.hxx index f89de301aaed..cd64b4f669db 100644 --- a/include/vcl/help.hxx +++ b/include/vcl/help.hxx @@ -26,7 +26,7 @@ #include <o3tl/typed_flags_set.hxx> class Point; -class Rectangle; +namespace tools { class Rectangle; } namespace vcl { class Window; } @@ -81,19 +81,19 @@ public: static bool IsBalloonHelpEnabled(); static bool ShowBalloon( vcl::Window* pParent, const Point& rScreenPos, - const Rectangle&, + const tools::Rectangle&, const OUString& rHelpText ); static void EnableQuickHelp(); static void DisableQuickHelp(); static bool IsQuickHelpEnabled(); static bool ShowQuickHelp( vcl::Window* pParent, - const Rectangle& rScreenRect, + const tools::Rectangle& rScreenRect, const OUString& rHelpText, const OUString& rLongHelpText, QuickHelpFlags nStyle ); static bool ShowQuickHelp( vcl::Window* pParent, - const Rectangle& rScreenRect, + const tools::Rectangle& rScreenRect, const OUString& rHelpText, QuickHelpFlags nStyle = QuickHelpFlags::NONE ) { return Help::ShowQuickHelp( pParent, rScreenRect, rHelpText, OUString(), nStyle ); } @@ -101,12 +101,12 @@ public: static void HideBalloonAndQuickHelp(); static sal_uLong ShowPopover(vcl::Window* pParent, - const Rectangle& rScreenRect, + const tools::Rectangle& rScreenRect, const OUString& rText, QuickHelpFlags nStyle); static void UpdatePopover(sal_uLong nId, vcl::Window* pParent, - const Rectangle& rScreenRect, + const tools::Rectangle& rScreenRect, const OUString& rText); static void HidePopover(vcl::Window* pParent, sal_uLong nId); }; diff --git a/include/vcl/imgctrl.hxx b/include/vcl/imgctrl.hxx index 14fe5e60b7a9..f1aa5f3225d6 100644 --- a/include/vcl/imgctrl.hxx +++ b/include/vcl/imgctrl.hxx @@ -40,7 +40,7 @@ public: virtual void Resize() override; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) 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/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index add63a49e544..c5f3bf0c6eb4 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -137,7 +137,7 @@ public: virtual void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All ) override; - Rectangle GetDropDownPosSizePixel() const; + tools::Rectangle GetDropDownPosSizePixel() const; void AdaptDropDownLineCountToMaximum(); void SetDropDownLineCount( sal_uInt16 nLines ); @@ -214,7 +214,7 @@ public: void SetReadOnly( bool bReadOnly = true ); bool IsReadOnly() const; - Rectangle GetBoundingRectangle( sal_Int32 nItem ) const; + tools::Rectangle GetBoundingRectangle( sal_Int32 nItem ) const; void EnableUserDraw( bool bUserDraw ); diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index b5912a5a1765..5c15022e6424 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -39,7 +39,7 @@ struct ImplSVEvent; struct MenuItemData; class Point; class Size; -class Rectangle; +namespace tools { class Rectangle; } class Menu; class MenuItemList; class HelpEvent; @@ -178,7 +178,7 @@ protected: SAL_DLLPRIVATE void ImplPaint(vcl::RenderContext& rRenderContext, sal_uInt16 nBorder, long nOffY = 0, MenuItemData* pThisDataOnly = nullptr, bool bHighlighted = false, bool bLayout = false, bool bRollover = false ) const; - SAL_DLLPRIVATE void ImplPaintMenuTitle(vcl::RenderContext&, const Rectangle& rRect) const; + SAL_DLLPRIVATE void ImplPaintMenuTitle(vcl::RenderContext&, const tools::Rectangle& rRect) const; SAL_DLLPRIVATE void ImplSelect(); SAL_DLLPRIVATE void ImplCallHighlight( sal_uInt16 nHighlightItem ); SAL_DLLPRIVATE void ImplCallEventListeners( VclEventId nEvent, sal_uInt16 nPos ); @@ -367,12 +367,12 @@ public: // returns the bounding box for the character at index nIndex // where nIndex is relative to the starting index of the item // with id nItemId (in coordinates of the displaying window) - Rectangle GetCharacterBounds( sal_uInt16 nItemId, long nIndex ) const; + tools::Rectangle GetCharacterBounds( sal_uInt16 nItemId, long nIndex ) const; // -1 is returned if no character is at that point // if an index is found the corresponding item id is filled in (else 0) long GetIndexForPoint( const Point& rPoint, sal_uInt16& rItemID ) const; // returns the bounding rectangle for an item at pos nItemPos - Rectangle GetBoundingRectangle( sal_uInt16 nItemPos ) const; + tools::Rectangle GetBoundingRectangle( sal_uInt16 nItemPos ) const; css::uno::Reference<css::accessibility::XAccessible> GetAccessible(); void SetAccessible(const css::uno::Reference<css::accessibility::XAccessible >& rxAccessible); @@ -472,7 +472,7 @@ public: // returns the rectangle occupied by the additional button named nId // coordinates are relative to the systemwindow the menubar is attached to // if the menubar is unattached an empty rectangle is returned - Rectangle GetMenuBarButtonRectPixel( sal_uInt16 nId ); + tools::Rectangle GetMenuBarButtonRectPixel( sal_uInt16 nId ); void RemoveMenuBarButton( sal_uInt16 nId ); void LayoutChanged(); }; @@ -496,7 +496,7 @@ private: SAL_DLLPRIVATE MenuFloatingWindow * ImplGetFloatingWindow() const; protected: - SAL_DLLPRIVATE sal_uInt16 ImplExecute( const VclPtr<vcl::Window>& pW, const Rectangle& rRect, FloatWinPopupFlags nPopupModeFlags, Menu* pSFrom, bool bPreSelectFirst ); + SAL_DLLPRIVATE sal_uInt16 ImplExecute( const VclPtr<vcl::Window>& pW, const tools::Rectangle& rRect, FloatWinPopupFlags nPopupModeFlags, Menu* pSFrom, bool bPreSelectFirst ); SAL_DLLPRIVATE void ImplFlushPendingSelect(); SAL_DLLPRIVATE long ImplCalcHeight( sal_uInt16 nEntries ) const; SAL_DLLPRIVATE sal_uInt16 ImplCalcVisEntries( long nMaxHeight, sal_uInt16 nStartEntry, sal_uInt16* pLastVisible = nullptr ) const; @@ -519,7 +519,7 @@ public: } sal_uInt16 Execute( vcl::Window* pWindow, const Point& rPopupPos ); - sal_uInt16 Execute( vcl::Window* pWindow, const Rectangle& rRect, PopupMenuFlags nFlags = PopupMenuFlags::NONE ); + sal_uInt16 Execute( vcl::Window* pWindow, const tools::Rectangle& rRect, PopupMenuFlags nFlags = PopupMenuFlags::NONE ); // Fuer das TestTool void EndExecute(); diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index 5041f3a954ee..09eb534f4621 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -173,7 +173,7 @@ class VCL_DLLPUBLIC MetaRectAction : public MetaAction { private: - Rectangle maRect; + tools::Rectangle maRect; public: MetaRectAction(); @@ -185,19 +185,19 @@ public: virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; - explicit MetaRectAction( const Rectangle& ); + explicit MetaRectAction( const tools::Rectangle& ); virtual void Move( long nHorzMove, long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; - const Rectangle& GetRect() const { return maRect; } + const tools::Rectangle& GetRect() const { return maRect; } }; class VCL_DLLPUBLIC MetaRoundRectAction : public MetaAction { private: - Rectangle maRect; + tools::Rectangle maRect; sal_uInt32 mnHorzRound; sal_uInt32 mnVertRound; @@ -211,13 +211,13 @@ public: virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; - MetaRoundRectAction( const Rectangle& rRect, + MetaRoundRectAction( const tools::Rectangle& rRect, sal_uInt32 nHorzRound, sal_uInt32 nVertRound ); virtual void Move( long nHorzMove, long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; - const Rectangle& GetRect() const { return maRect; } + const tools::Rectangle& GetRect() const { return maRect; } sal_uInt32 GetHorzRound() const { return mnHorzRound; } sal_uInt32 GetVertRound() const { return mnVertRound; } }; @@ -226,7 +226,7 @@ class VCL_DLLPUBLIC MetaEllipseAction : public MetaAction { private: - Rectangle maRect; + tools::Rectangle maRect; public: MetaEllipseAction(); @@ -238,19 +238,19 @@ public: virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; - explicit MetaEllipseAction( const Rectangle& ); + explicit MetaEllipseAction( const tools::Rectangle& ); virtual void Move( long nHorzMove, long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; - const Rectangle& GetRect() const { return maRect; } + const tools::Rectangle& GetRect() const { return maRect; } }; class VCL_DLLPUBLIC MetaArcAction : public MetaAction { private: - Rectangle maRect; + tools::Rectangle maRect; Point maStartPt; Point maEndPt; @@ -264,13 +264,13 @@ public: virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; - MetaArcAction( const Rectangle& rRect, + MetaArcAction( const tools::Rectangle& rRect, const Point& rStart, const Point& rEnd ); virtual void Move( long nHorzMove, long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; - const Rectangle& GetRect() const { return maRect; } + const tools::Rectangle& GetRect() const { return maRect; } const Point& GetStartPoint() const { return maStartPt; } const Point& GetEndPoint() const { return maEndPt; } }; @@ -279,7 +279,7 @@ class VCL_DLLPUBLIC MetaPieAction : public MetaAction { private: - Rectangle maRect; + tools::Rectangle maRect; Point maStartPt; Point maEndPt; @@ -293,13 +293,13 @@ public: virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; - MetaPieAction( const Rectangle& rRect, + MetaPieAction( const tools::Rectangle& rRect, const Point& rStart, const Point& rEnd ); virtual void Move( long nHorzMove, long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; - const Rectangle& GetRect() const { return maRect; } + const tools::Rectangle& GetRect() const { return maRect; } const Point& GetStartPoint() const { return maStartPt; } const Point& GetEndPoint() const { return maEndPt; } }; @@ -308,7 +308,7 @@ class VCL_DLLPUBLIC MetaChordAction : public MetaAction { private: - Rectangle maRect; + tools::Rectangle maRect; Point maStartPt; Point maEndPt; @@ -322,13 +322,13 @@ public: virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; - MetaChordAction( const Rectangle& rRect, + MetaChordAction( const tools::Rectangle& rRect, const Point& rStart, const Point& rEnd ); virtual void Move( long nHorzMove, long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; - const Rectangle& GetRect() const { return maRect; } + const tools::Rectangle& GetRect() const { return maRect; } const Point& GetStartPoint() const { return maStartPt; } const Point& GetEndPoint() const { return maEndPt; } }; @@ -515,7 +515,7 @@ class VCL_DLLPUBLIC MetaTextRectAction : public MetaAction { private: - Rectangle maRect; + tools::Rectangle maRect; OUString maStr; DrawTextFlags mnStyle; @@ -529,13 +529,13 @@ public: virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; - MetaTextRectAction( const Rectangle& rRect, + MetaTextRectAction( const tools::Rectangle& rRect, const OUString& rStr, DrawTextFlags nStyle ); virtual void Move( long nHorzMove, long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; - const Rectangle& GetRect() const { return maRect; } + const tools::Rectangle& GetRect() const { return maRect; } const OUString& GetText() const { return maStr; } DrawTextFlags GetStyle() const { return mnStyle; } }; @@ -855,7 +855,7 @@ class VCL_DLLPUBLIC MetaGradientAction : public MetaAction { private: - Rectangle maRect; + tools::Rectangle maRect; Gradient maGradient; public: @@ -868,12 +868,12 @@ public: virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; - MetaGradientAction( const Rectangle& rRect, const Gradient& rGradient ); + MetaGradientAction( const tools::Rectangle& rRect, const Gradient& rGradient ); virtual void Move( long nHorzMove, long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; - const Rectangle& GetRect() const { return maRect; } + const tools::Rectangle& GetRect() const { return maRect; } const Gradient& GetGradient() const { return maGradient; } }; @@ -933,7 +933,7 @@ class VCL_DLLPUBLIC MetaWallpaperAction : public MetaAction { private: - Rectangle maRect; + tools::Rectangle maRect; Wallpaper maWallpaper; public: @@ -946,13 +946,13 @@ public: virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; - MetaWallpaperAction( const Rectangle& rRect, + MetaWallpaperAction( const tools::Rectangle& rRect, const Wallpaper& rPaper ); virtual void Move( long nHorzMove, long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; - const Rectangle& GetRect() const { return maRect; } + const tools::Rectangle& GetRect() const { return maRect; } const Wallpaper& GetWallpaper() const { return maWallpaper; } }; @@ -986,7 +986,7 @@ class VCL_DLLPUBLIC MetaISectRectClipRegionAction : public MetaAction { private: - Rectangle maRect; + tools::Rectangle maRect; public: MetaISectRectClipRegionAction(); @@ -998,12 +998,12 @@ public: virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; - explicit MetaISectRectClipRegionAction( const Rectangle& ); + explicit MetaISectRectClipRegionAction( const tools::Rectangle& ); virtual void Move( long nHorzMove, long nVertMove ) override; virtual void Scale( double fScaleX, double fScaleY ) override; - const Rectangle& GetRect() const { return maRect; } + const tools::Rectangle& GetRect() const { return maRect; } }; class VCL_DLLPUBLIC MetaISectRegionClipRegionAction : public MetaAction diff --git a/include/vcl/openglwin.hxx b/include/vcl/openglwin.hxx index 00a964323706..354a061fed96 100644 --- a/include/vcl/openglwin.hxx +++ b/include/vcl/openglwin.hxx @@ -41,7 +41,7 @@ public: void setRenderer(IRenderer* pRenderer); - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 90591a9c00a0..2c8017c97b54 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -146,7 +146,7 @@ namespace o3tl template<> struct typed_flags<SalLayoutFlags> : is_typed_flags<SalLayoutFlags, 0x2e77> {}; } -typedef std::vector< Rectangle > MetricVector; +typedef std::vector< tools::Rectangle > MetricVector; // OutputDevice-Types @@ -301,7 +301,7 @@ enum class OutDevViewType { DontKnow, PrintPreview, SlideShow }; typedef tools::SvRef<FontCharMap> FontCharMapRef; BmpMirrorFlags AdjustTwoRect( SalTwoRect& rTwoRect, const Size& rSizePix ); -void AdjustTwoRect( SalTwoRect& rTwoRect, const Rectangle& rValidSrcRect ); +void AdjustTwoRect( SalTwoRect& rTwoRect, const tools::Rectangle& rValidSrcRect ); class OutputDevice; @@ -678,7 +678,7 @@ public: bool IsClipRegion() const { return mbClipRegion; } void MoveClipRegion( long nHorzMove, long nVertMove ); - void IntersectClipRegion( const Rectangle& rRect ); + void IntersectClipRegion( const tools::Rectangle& rRect ); void IntersectClipRegion( const vcl::Region& rRegion ); virtual vcl::Region GetActiveClipRegion() const; @@ -686,7 +686,7 @@ public: protected: virtual void InitClipRegion(); - virtual void ClipToPaintRegion ( Rectangle& rDstRect ); + virtual void ClipToPaintRegion ( tools::Rectangle& rDstRect ); private: @@ -715,8 +715,8 @@ public: public: - void DrawRect( const Rectangle& rRect ); - void DrawRect( const Rectangle& rRect, + void DrawRect( const tools::Rectangle& rRect ); + void DrawRect( const tools::Rectangle& rRect, sal_uLong nHorzRount, sal_uLong nVertRound ); /// Fill the given rectangle with checkered rectangles of size nLen x nLen using the colors aStart and aEnd @@ -727,7 +727,7 @@ public: Color aStart = Color(COL_WHITE), Color aEnd = Color(COL_BLACK)); - void DrawGrid( const Rectangle& rRect, const Size& rDist, DrawGridFlags nFlags ); + void DrawGrid( const tools::Rectangle& rRect, const Size& rDist, DrawGridFlags nFlags ); ///@} @@ -735,7 +735,7 @@ public: */ ///@{ public: - void Invert( const Rectangle& rRect, InvertFlags nFlags = InvertFlags::NONE ); + void Invert( const tools::Rectangle& rRect, InvertFlags nFlags = InvertFlags::NONE ); void Invert( const tools::Polygon& rPoly, InvertFlags nFlags = InvertFlags::NONE ); ///@} @@ -865,18 +865,18 @@ private: public: - void DrawEllipse( const Rectangle& rRect ); + void DrawEllipse( const tools::Rectangle& rRect ); void DrawArc( - const Rectangle& rRect, + const tools::Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ); void DrawPie( - const Rectangle& rRect, + const tools::Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ); void DrawChord( - const Rectangle& rRect, + const tools::Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ); ///@} @@ -887,11 +887,11 @@ public: ///@{ public: - void DrawGradient( const Rectangle& rRect, const Gradient& rGradient ); + void DrawGradient( const tools::Rectangle& rRect, const Gradient& rGradient ); void DrawGradient( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient ); void AddGradientActions( - const Rectangle& rRect, + const tools::Rectangle& rRect, const Gradient& rGradient, GDIMetaFile& rMtf ); @@ -903,14 +903,14 @@ protected: private: - SAL_DLLPRIVATE void DrawLinearGradient( const Rectangle& rRect, const Gradient& rGradient, const tools::PolyPolygon* pClipPolyPoly ); - SAL_DLLPRIVATE void DrawComplexGradient( const Rectangle& rRect, const Gradient& rGradient, const tools::PolyPolygon* pClipPolyPoly ); + SAL_DLLPRIVATE void DrawLinearGradient( const tools::Rectangle& rRect, const Gradient& rGradient, const tools::PolyPolygon* pClipPolyPoly ); + SAL_DLLPRIVATE void DrawComplexGradient( const tools::Rectangle& rRect, const Gradient& rGradient, const tools::PolyPolygon* pClipPolyPoly ); SAL_DLLPRIVATE void DrawGradientToMetafile( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient ); - SAL_DLLPRIVATE void DrawLinearGradientToMetafile( const Rectangle& rRect, const Gradient& rGradient ); - SAL_DLLPRIVATE void DrawComplexGradientToMetafile( const Rectangle& rRect, const Gradient& rGradient ); + SAL_DLLPRIVATE void DrawLinearGradientToMetafile( const tools::Rectangle& rRect, const Gradient& rGradient ); + SAL_DLLPRIVATE void DrawComplexGradientToMetafile( const tools::Rectangle& rRect, const Gradient& rGradient ); - SAL_DLLPRIVATE long GetGradientSteps( const Gradient& rGradient, const Rectangle& rRect, bool bMtf, bool bComplex=false ); + SAL_DLLPRIVATE long GetGradientSteps( const Gradient& rGradient, const tools::Rectangle& rRect, bool bMtf, bool bComplex=false ); SAL_DLLPRIVATE Color GetSingleColorGradientFill(); SAL_DLLPRIVATE void SetGrayscaleColors( Gradient &rGradient ); @@ -939,7 +939,7 @@ public: private: - SAL_DLLPRIVATE void CalcHatchValues( const Rectangle& rRect, long nDist, sal_uInt16 nAngle10, Point& rPt1, Point& rPt2, Size& rInc, Point& rEndPt1 ); + SAL_DLLPRIVATE void CalcHatchValues( const tools::Rectangle& rRect, long nDist, sal_uInt16 nAngle10, Point& rPt1, Point& rPt2, Size& rInc, Point& rEndPt1 ); SAL_DLLPRIVATE void DrawHatchLine( const tools::Line& rLine, const tools::PolyPolygon& rPolyPoly, Point* pPtBuffer, bool bMtf ); ///@} @@ -949,10 +949,10 @@ private: ///@{ public: - void DrawWallpaper( const Rectangle& rRect, const Wallpaper& rWallpaper ); + void DrawWallpaper( const tools::Rectangle& rRect, const Wallpaper& rWallpaper ); void Erase(); - void Erase( const Rectangle& rRect ) { DrawWallpaper( rRect, GetBackground() ); } + void Erase( const tools::Rectangle& rRect ) { DrawWallpaper( rRect, GetBackground() ); } protected: void DrawGradientWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper ); @@ -974,12 +974,12 @@ public: sal_Int32 nIndex = 0, sal_Int32 nLen = -1, MetricVector* pVector = nullptr, OUString* pDisplayText = nullptr ); - void DrawText( const Rectangle& rRect, + void DrawText( const tools::Rectangle& rRect, const OUString& rStr, DrawTextFlags nStyle = DrawTextFlags::NONE, MetricVector* pVector = nullptr, OUString* pDisplayText = nullptr, vcl::ITextLayout* _pTextLayout = nullptr ); - static void ImplDrawText( OutputDevice& rTargetDevice, const Rectangle& rRect, + static void ImplDrawText( OutputDevice& rTargetDevice, const tools::Rectangle& rRect, const OUString& rOrigStr, DrawTextFlags nStyle, MetricVector* pVector, OUString* pDisplayText, vcl::ITextLayout& _rLayout ); @@ -1008,7 +1008,7 @@ public: bool ImplDrawRotateText( SalLayout& ); - Rectangle GetTextRect( const Rectangle& rRect, + tools::Rectangle GetTextRect( const tools::Rectangle& rRect, const OUString& rStr, DrawTextFlags nStyle = DrawTextFlags::WordBreak, TextRectInfo* pInfo = nullptr, const vcl::ITextLayout* _pTextLayout = nullptr ) const; @@ -1062,11 +1062,11 @@ public: Bitmap aBitmap(aDevice.GetBitmap(Point(0, 0), aDevice.GetOutputSize())); </code> */ - bool GetTextBoundRect( Rectangle& rRect, + bool GetTextBoundRect( tools::Rectangle& rRect, const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, sal_uLong nLayoutWidth = 0, const long* pDXArray = nullptr ) const; - Rectangle ImplGetTextBoundRect( const SalLayout& ); + tools::Rectangle ImplGetTextBoundRect( const SalLayout& ); bool GetTextOutline( tools::PolyPolygon&, const OUString& rStr, @@ -1102,7 +1102,7 @@ public: constituent polygons. Parameter semantics fully compatible to DrawText(). */ - void AddTextRectActions( const Rectangle& rRect, + void AddTextRectActions( const tools::Rectangle& rRect, const OUString& rOrigStr, DrawTextFlags nStyle, GDIMetaFile& rMtf ); @@ -1225,7 +1225,7 @@ public: */ SystemFontData GetSysFontData( int nFallbacklevel ) const; - SAL_DLLPRIVATE void ImplGetEmphasisMark( tools::PolyPolygon& rPolyPoly, bool& rPolyLine, Rectangle& rRect1, Rectangle& rRect2, + SAL_DLLPRIVATE void ImplGetEmphasisMark( tools::PolyPolygon& rPolyPoly, bool& rPolyLine, tools::Rectangle& rRect1, tools::Rectangle& rRect2, long& rYOff, long& rWidth, FontEmphasisMark eEmphasis, long nHeight, short nOrient ); SAL_DLLPRIVATE static FontEmphasisMark ImplGetEmphasisMarkStyle( const vcl::Font& rFont ); @@ -1294,7 +1294,7 @@ private: SAL_DLLPRIVATE OUString ImplGetEllipsisString( const OutputDevice& rTargetDevice, const OUString& rStr, long nMaxWidth, DrawTextFlags nStyle, const vcl::ITextLayout& _rLayout ); - SAL_DLLPRIVATE void ImplDrawEmphasisMark( long nBaseX, long nX, long nY, const tools::PolyPolygon& rPolyPoly, bool bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 ); + SAL_DLLPRIVATE void ImplDrawEmphasisMark( long nBaseX, long nX, long nY, const tools::PolyPolygon& rPolyPoly, bool bPolyLine, const tools::Rectangle& rRect1, const tools::Rectangle& rRect2 ); SAL_DLLPRIVATE void ImplDrawEmphasisMarks( SalLayout& ); ///@} @@ -1311,7 +1311,7 @@ public: SAL_DLLPRIVATE bool ImplIsAntiparallel() const ; SAL_DLLPRIVATE void ReMirror( Point &rPoint ) const; - SAL_DLLPRIVATE void ReMirror( Rectangle &rRect ) const; + SAL_DLLPRIVATE void ReMirror( tools::Rectangle &rRect ) const; SAL_DLLPRIVATE void ReMirror( vcl::Region &rRegion ) const; SAL_DLLPRIVATE bool ImplIsRecordLayout() const; virtual bool HasMirroredGraphics() const; @@ -1505,7 +1505,7 @@ private: SAL_DLLPRIVATE void DrawDeviceAlphaBitmapSlowPath( const Bitmap& rBitmap, const AlphaMask& rAlpha, - Rectangle aDstRect, Rectangle aBmpRect, + tools::Rectangle aDstRect, tools::Rectangle aBmpRect, Size& aOutSz, Point& aOutPt); @@ -1521,7 +1521,7 @@ private: const sal_Int32 nDstHeight, const sal_Int32 nOffX, const sal_Int32 nDstWidth, - const Rectangle& aBmpRect, + const tools::Rectangle& aBmpRect, const Size& aOutSz, const bool bHMirr, const bool bVMirr, @@ -1532,7 +1532,7 @@ private: Bitmap& aBmp, BitmapReadAccess* pP, BitmapReadAccess* pA, - const Rectangle& aDstRect, + const tools::Rectangle& aDstRect, const sal_Int32 nOffY, const sal_Int32 nDstHeight, const sal_Int32 nOffX, @@ -1689,7 +1689,7 @@ public: Point LogicToPixel( const Point& rLogicPt ) const; Size LogicToPixel( const Size& rLogicSize ) const; - Rectangle LogicToPixel( const Rectangle& rLogicRect ) const; + tools::Rectangle LogicToPixel( const tools::Rectangle& rLogicRect ) const; tools::Polygon LogicToPixel( const tools::Polygon& rLogicPoly ) const; tools::PolyPolygon LogicToPixel( const tools::PolyPolygon& rLogicPolyPoly ) const; basegfx::B2DPolyPolygon LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly ) const; @@ -1698,7 +1698,7 @@ public: const MapMode& rMapMode ) const; Size LogicToPixel( const Size& rLogicSize, const MapMode& rMapMode ) const; - Rectangle LogicToPixel( const Rectangle& rLogicRect, + tools::Rectangle LogicToPixel( const tools::Rectangle& rLogicRect, const MapMode& rMapMode ) const; tools::Polygon LogicToPixel( const tools::Polygon& rLogicPoly, const MapMode& rMapMode ) const; @@ -1707,7 +1707,7 @@ public: Point PixelToLogic( const Point& rDevicePt ) const; Size PixelToLogic( const Size& rDeviceSize ) const; - Rectangle PixelToLogic( const Rectangle& rDeviceRect ) const; + tools::Rectangle PixelToLogic( const tools::Rectangle& rDeviceRect ) const; tools::Polygon PixelToLogic( const tools::Polygon& rDevicePoly ) const; tools::PolyPolygon PixelToLogic( const tools::PolyPolygon& rDevicePolyPoly ) const; basegfx::B2DPolyPolygon PixelToLogic( const basegfx::B2DPolyPolygon& rDevicePolyPoly ) const; @@ -1716,7 +1716,7 @@ public: const MapMode& rMapMode ) const; Size PixelToLogic( const Size& rDeviceSize, const MapMode& rMapMode ) const; - Rectangle PixelToLogic( const Rectangle& rDeviceRect, + tools::Rectangle PixelToLogic( const tools::Rectangle& rDeviceRect, const MapMode& rMapMode ) const; tools::Polygon PixelToLogic( const tools::Polygon& rDevicePoly, const MapMode& rMapMode ) const; @@ -1731,7 +1731,7 @@ public: Size LogicToLogic( const Size& rSzSource, const MapMode* pMapModeSource, const MapMode* pMapModeDest ) const; - Rectangle LogicToLogic( const Rectangle& rRectSource, + tools::Rectangle LogicToLogic( const tools::Rectangle& rRectSource, const MapMode* pMapModeSource, const MapMode* pMapModeDest ) const; static Point LogicToLogic( const Point& rPtSource, @@ -1740,7 +1740,7 @@ public: static Size LogicToLogic( const Size& rSzSource, const MapMode& rMapModeSource, const MapMode& rMapModeDest ); - static Rectangle LogicToLogic( const Rectangle& rRectSource, + static tools::Rectangle LogicToLogic( const tools::Rectangle& rRectSource, const MapMode& rMapModeSource, const MapMode& rMapModeDest ); static long LogicToLogic( long nLongSource, @@ -1761,7 +1761,7 @@ public: @returns Rectangle based on physical device pixel coordinates and units. */ - SAL_DLLPRIVATE Rectangle ImplLogicToDevicePixel( const Rectangle& rLogicRect ) const; + SAL_DLLPRIVATE tools::Rectangle ImplLogicToDevicePixel( const tools::Rectangle& rLogicRect ) const; /** Convert a logical point to a physical point on the device. @@ -1791,7 +1791,7 @@ protected: * * @param pRectangle If 0, that means the whole area, otherwise the area in logic coordinates. */ - virtual void LogicInvalidate(const Rectangle* pRectangle) { (void)pRectangle; } + virtual void LogicInvalidate(const tools::Rectangle* pRectangle) { (void)pRectangle; } private: @@ -1880,7 +1880,7 @@ private: @returns Rectangle based on logical coordinates and units. */ - SAL_DLLPRIVATE Rectangle ImplDevicePixelToLogic( const Rectangle& rPixelRect ) const; + SAL_DLLPRIVATE tools::Rectangle ImplDevicePixelToLogic( const tools::Rectangle& rPixelRect ) const; /** Convert a logical polygon to a polygon in physical device pixel units. @@ -1944,7 +1944,7 @@ public: */ bool HitTestNativeScrollbar( ControlPart nPart, - const Rectangle& rControlRegion, + const tools::Rectangle& rControlRegion, const Point& aPos, bool& rIsInside ) const; @@ -1953,7 +1953,7 @@ public: bool DrawNativeControl( ControlType nType, ControlPart nPart, - const Rectangle& rControlRegion, + const tools::Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& aCaption ); @@ -1963,12 +1963,12 @@ public: bool GetNativeControlRegion( ControlType nType, ControlPart nPart, - const Rectangle& rControlRegion, + const tools::Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& aCaption, - Rectangle &rNativeBoundingRegion, - Rectangle &rNativeContentRegion ) const; + tools::Rectangle &rNativeBoundingRegion, + tools::Rectangle &rNativeContentRegion ) const; ///@} /** @name EPS functions diff --git a/include/vcl/pdfextoutdevdata.hxx b/include/vcl/pdfextoutdevdata.hxx index 23058141756a..c28663ae8232 100644 --- a/include/vcl/pdfextoutdevdata.hxx +++ b/include/vcl/pdfextoutdevdata.hxx @@ -183,13 +183,13 @@ public: */ void EndGroup( const Graphic& rGraphic, sal_uInt8 nTransparency, - const Rectangle& rOutputRect, - const Rectangle& rVisibleOutputRect ); + const tools::Rectangle& rOutputRect, + const tools::Rectangle& rVisibleOutputRect ); /// Detect if stream is compressed enough to avoid de-compress / scale & re-compress bool HasAdequateCompression( const Graphic &rGraphic, - const Rectangle &rOutputRect, - const Rectangle &rVisibleOutputRect ) const; + const tools::Rectangle &rOutputRect, + const tools::Rectangle &rVisibleOutputRect ) const; //--->i56629 /** Create a new named destination to be used in a link to this document from another PDF document @@ -209,7 +209,7 @@ public: the destination id (to be used in SetLinkDest) or -1 if page id does not exist */ - sal_Int32 CreateNamedDest( const OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr = -1 ); + sal_Int32 CreateNamedDest( const OUString& sDestName, const tools::Rectangle& rRect, sal_Int32 nPageNr = -1 ); /** registers a destination for which a destination ID needs to be known immediately, instead of later on setting it via SetLinkDest. @@ -226,7 +226,7 @@ public: /** provides detailed information about a destination range which previously has been registered using RegisterDest. */ - void DescribeRegisteredDest( sal_Int32 nDestId, const Rectangle& rRect, sal_Int32 nPageNr, PDFWriter::DestAreaType eType = PDFWriter::DestAreaType::XYZ ); + void DescribeRegisteredDest( sal_Int32 nDestId, const tools::Rectangle& rRect, sal_Int32 nPageNr, PDFWriter::DestAreaType eType = PDFWriter::DestAreaType::XYZ ); //<---i56629 @@ -246,7 +246,7 @@ public: the destination id (to be used in SetLinkDest) or -1 if page id does not exist */ - sal_Int32 CreateDest( const Rectangle& rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::DestAreaType::XYZ ); + sal_Int32 CreateDest( const tools::Rectangle& rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::DestAreaType::XYZ ); /** Create a new link on a page @param rRect @@ -261,10 +261,10 @@ public: the link id (to be used in SetLinkDest, SetLinkURL) or -1 if page id does not exist */ - sal_Int32 CreateLink( const Rectangle& rRect, sal_Int32 nPageNr = -1 ); + sal_Int32 CreateLink( const tools::Rectangle& rRect, sal_Int32 nPageNr = -1 ); /// Create a Screen annotation. - sal_Int32 CreateScreen(const Rectangle& rRect, sal_Int32 nPageNr); + sal_Int32 CreateScreen(const tools::Rectangle& rRect, sal_Int32 nPageNr); /** Set the destination for a link <p>will change a URL type link to a dest link if necessary</p> @@ -334,7 +334,7 @@ public: number of page the note is on (as returned by NewPage) or -1 in which case the current page is used */ - void CreateNote( const Rectangle& rRect, const PDFNote& rNote, sal_Int32 nPageNr = -1 ); + void CreateNote( const tools::Rectangle& rRect, const PDFNote& rNote, sal_Int32 nPageNr = -1 ); /** begin a new logical structure element @@ -450,7 +450,7 @@ public: @param rRect the new bounding box for the structural element */ - void SetStructureBoundingBox( const Rectangle& rRect ); + void SetStructureBoundingBox( const tools::Rectangle& rRect ); /** set the ActualText attribute of a structural element diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx index 7fbcebf7d149..147ffec67288 100644 --- a/include/vcl/pdfwriter.hxx +++ b/include/vcl/pdfwriter.hxx @@ -229,7 +229,7 @@ public: OUString Text; // user text to appear on the control DrawTextFlags TextStyle; // style flags bool ReadOnly; - Rectangle Location; // describes the area filled by the control + tools::Rectangle Location; // describes the area filled by the control bool Border; // true: widget should have a border, false: no border Color BorderColor;// COL_TRANSPARENT and Border=true means get color from application settings bool Background; // true: widget shall draw its background, false: no background @@ -737,7 +737,7 @@ The following structure describes the permissions used in PDF security void SetClipRegion(); void SetClipRegion( const basegfx::B2DPolyPolygon& rRegion ); void MoveClipRegion( long nHorzMove, long nVertMove ); - void IntersectClipRegion( const Rectangle& rRect ); + void IntersectClipRegion( const tools::Rectangle& rRect ); void IntersectClipRegion( const basegfx::B2DPolyPolygon& rRegion ); void SetLayoutMode( ComplexTextLayoutFlags nMode ); @@ -777,7 +777,7 @@ The following structure describes the permissions used in PDF security void DrawStretchText( const Point& rStartPt, sal_uLong nWidth, const OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen ); - void DrawText( const Rectangle& rRect, + void DrawText( const tools::Rectangle& rRect, const OUString& rStr, DrawTextFlags nStyle ); void DrawPixel( const Point& rPt, const Color& rColor ); @@ -793,15 +793,15 @@ The following structure describes the permissions used in PDF security void DrawPolyLine( const tools::Polygon& rPoly, const ExtLineInfo& rInfo ); void DrawPolygon( const tools::Polygon& rPoly ); void DrawPolyPolygon( const tools::PolyPolygon& rPolyPoly ); - void DrawRect( const Rectangle& rRect ); - void DrawRect( const Rectangle& rRect, + void DrawRect( const tools::Rectangle& rRect ); + void DrawRect( const tools::Rectangle& rRect, sal_uLong nHorzRount, sal_uLong nVertRound ); - void DrawEllipse( const Rectangle& rRect ); - void DrawArc( const Rectangle& rRect, + void DrawEllipse( const tools::Rectangle& rRect ); + void DrawArc( const tools::Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ); - void DrawPie( const Rectangle& rRect, + void DrawPie( const tools::Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ); - void DrawChord( const Rectangle& rRect, + void DrawChord( const tools::Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ); void DrawBitmap( const Point& rDestPt, const Size& rDestSize, @@ -810,12 +810,12 @@ The following structure describes the permissions used in PDF security void DrawBitmapEx( const Point& rDestPt, const Size& rDestSize, const BitmapEx& rBitmapEx ); - void DrawGradient( const Rectangle& rRect, const Gradient& rGradient ); + void DrawGradient( const tools::Rectangle& rRect, const Gradient& rGradient ); void DrawGradient( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient ); void DrawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch ); - void DrawWallpaper( const Rectangle& rRect, const Wallpaper& rWallpaper ); + void DrawWallpaper( const tools::Rectangle& rRect, const Wallpaper& rWallpaper ); void DrawTransparent( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ); @@ -850,7 +850,7 @@ The following structure describes the permissions used in PDF security @param nTransparencePercent The transparency factor */ - void EndTransparencyGroup( const Rectangle& rBoundRect, sal_uInt16 nTransparencePercent ); + void EndTransparencyGroup( const tools::Rectangle& rBoundRect, sal_uInt16 nTransparencePercent ); /** Insert a JPG encoded image (optionally with mask) @@ -871,7 +871,7 @@ The following structure describes the permissions used in PDF security the same pixel size as the image and be either 1 bit black&white or 8 bit grey */ - void DrawJPGBitmap( SvStream& rJPGData, bool bIsTrueColor, const Size& rSrcSizePixel, const Rectangle& rTargetArea, const Bitmap& rMask, const Graphic& rGraphic ); + void DrawJPGBitmap( SvStream& rJPGData, bool bIsTrueColor, const Size& rSrcSizePixel, const tools::Rectangle& rTargetArea, const Bitmap& rMask, const Graphic& rGraphic ); /** Create a new named destination to be used in a link from another PDF document @@ -892,7 +892,7 @@ The following structure describes the permissions used in PDF security the destination id (to be used in SetLinkDest) or -1 if page id does not exist */ - sal_Int32 CreateNamedDest( const OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr, DestAreaType eType ); + sal_Int32 CreateNamedDest( const OUString& sDestName, const tools::Rectangle& rRect, sal_Int32 nPageNr, DestAreaType eType ); /** Create a new destination to be used in a link @param rRect @@ -909,7 +909,7 @@ The following structure describes the permissions used in PDF security the destination id (to be used in SetLinkDest) or -1 if page id does not exist */ - sal_Int32 CreateDest( const Rectangle& rRect, sal_Int32 nPageNr, DestAreaType eType ); + sal_Int32 CreateDest( const tools::Rectangle& rRect, sal_Int32 nPageNr, DestAreaType eType ); /** Create a new link on a page @param rRect @@ -924,10 +924,10 @@ The following structure describes the permissions used in PDF security the link id (to be used in SetLinkDest, SetLinkURL) or -1 if page id does not exist */ - sal_Int32 CreateLink( const Rectangle& rRect, sal_Int32 nPageNr ); + sal_Int32 CreateLink( const tools::Rectangle& rRect, sal_Int32 nPageNr ); /// Creates a screen annotation. - sal_Int32 CreateScreen(const Rectangle& rRect, sal_Int32 nPageNr); + sal_Int32 CreateScreen(const tools::Rectangle& rRect, sal_Int32 nPageNr); /** creates a destination which is not intended to be referred to by a link, but by a public destination Id. @@ -951,7 +951,7 @@ The following structure describes the permissions used in PDF security @returns the internal destination Id. */ - sal_Int32 RegisterDestReference( sal_Int32 nDestId, const Rectangle& rRect, sal_Int32 nPageNr, DestAreaType eType ); + sal_Int32 RegisterDestReference( sal_Int32 nDestId, const tools::Rectangle& rRect, sal_Int32 nPageNr, DestAreaType eType ); /** Set the destination for a link @@ -1039,7 +1039,7 @@ The following structure describes the permissions used in PDF security number of page the note is on (as returned by NewPage) or -1 in which case the current page is used */ - void CreateNote( const Rectangle& rRect, const PDFNote& rNote, sal_Int32 nPageNr ); + void CreateNote( const tools::Rectangle& rRect, const PDFNote& rNote, sal_Int32 nPageNr ); /** begin a new logical structure element @@ -1157,7 +1157,7 @@ The following structure describes the permissions used in PDF security @param rRect the new bounding box for the structural element */ - void SetStructureBoundingBox( const Rectangle& rRect ); + void SetStructureBoundingBox( const tools::Rectangle& rRect ); /** set the ActualText attribute of a structural element diff --git a/include/vcl/prgsbar.hxx b/include/vcl/prgsbar.hxx index 364c6ea312e7..fcdad3fac97f 100644 --- a/include/vcl/prgsbar.hxx +++ b/include/vcl/prgsbar.hxx @@ -65,7 +65,7 @@ private: public: ProgressBar( vcl::Window* pParent, WinBits nWinBits ); - 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; diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 24fd13bafa61..a5ccedd4f3e6 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -242,7 +242,7 @@ protected: void ScaleBitmap ( Bitmap&, SalTwoRect& ) override { }; public: - void DrawGradientEx( OutputDevice* pOut, const Rectangle& rRect, + void DrawGradientEx( OutputDevice* pOut, const tools::Rectangle& rRect, const Gradient& rGradient ); virtual Bitmap GetBitmap( const Point& rSrcPt, const Size& rSize ) const override; diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx index 1235b3dddcec..a7458358127c 100644 --- a/include/vcl/region.hxx +++ b/include/vcl/region.hxx @@ -37,7 +37,7 @@ namespace vcl { class Window; } class OutputDevice; class Bitmap; -typedef std::vector< Rectangle > RectangleVector; +typedef std::vector< tools::Rectangle > RectangleVector; namespace vcl { @@ -68,7 +68,7 @@ private: public: explicit Region(bool bIsNull = false); // default creates empty region, with true a null region is created - explicit Region(const Rectangle& rRect); + explicit Region(const tools::Rectangle& rRect); explicit Region(const tools::Polygon& rPolygon); explicit Region(const tools::PolyPolygon& rPolyPoly); explicit Region(const basegfx::B2DPolyPolygon&); @@ -90,10 +90,10 @@ public: // manipulators void Move( long nHorzMove, long nVertMove ); void Scale( double fScaleX, double fScaleY ); - bool Union( const Rectangle& rRegion ); - bool Intersect( const Rectangle& rRegion ); - bool Exclude( const Rectangle& rRegion ); - bool XOr( const Rectangle& rRegion ); + bool Union( const tools::Rectangle& rRegion ); + bool Intersect( const tools::Rectangle& rRegion ); + bool Exclude( const tools::Rectangle& rRegion ); + bool XOr( const tools::Rectangle& rRegion ); bool Union( const vcl::Region& rRegion ); bool Intersect( const vcl::Region& rRegion ); bool Exclude( const vcl::Region& rRegion ); @@ -107,16 +107,16 @@ public: bool IsRectangle() const; - Rectangle GetBoundRect() const; + tools::Rectangle GetBoundRect() const; bool HasPolyPolygonOrB2DPolyPolygon() const { return (getB2DPolyPolygon() || getPolyPolygon()); } void GetRegionRectangles(RectangleVector& rTarget) const; bool IsInside( const Point& rPoint ) const; - bool IsOver( const Rectangle& rRect ) const; + bool IsOver( const tools::Rectangle& rRect ) const; vcl::Region& operator=( const vcl::Region& rRegion ); vcl::Region& operator=( vcl::Region&& rRegion ); - vcl::Region& operator=( const Rectangle& rRect ); + vcl::Region& operator=( const tools::Rectangle& rRect ); bool operator==( const vcl::Region& rRegion ) const; bool operator!=( const vcl::Region& rRegion ) const { return !(Region::operator==( rRegion )); } diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx index 2d392b596897..98cbc1953f5f 100644 --- a/include/vcl/salnativewidgets.hxx +++ b/include/vcl/salnativewidgets.hxx @@ -291,9 +291,9 @@ class VCL_DLLPUBLIC ScrollbarValue : public ImplControlValue long mnMax; long mnCur; long mnVisibleSize; - Rectangle maThumbRect; - Rectangle maButton1Rect; - Rectangle maButton2Rect; + tools::Rectangle maThumbRect; + tools::Rectangle maButton1Rect; + tools::Rectangle maButton2Rect; ControlState mnButton1State; ControlState mnButton2State; ControlState mnThumbState; @@ -317,7 +317,7 @@ class VCL_DLLPUBLIC SliderValue : public ImplControlValue long mnMin; long mnMax; long mnCur; - Rectangle maThumbRect; + tools::Rectangle maThumbRect; ControlState mnThumbState; SliderValue() @@ -351,9 +351,9 @@ class VCL_DLLPUBLIC TabitemValue : public ImplControlValue { public: TabitemFlags mnAlignment; - Rectangle maContentRect; + tools::Rectangle maContentRect; - TabitemValue(const Rectangle &rContentRect) + TabitemValue(const tools::Rectangle &rContentRect) : ImplControlValue( ControlType::TabItem, 0 ) , mnAlignment(TabitemFlags::NONE) , maContentRect(rContentRect) @@ -368,7 +368,7 @@ class VCL_DLLPUBLIC TabitemValue : public ImplControlValue bool isNotAligned() const { return !(mnAlignment & (TabitemFlags::LeftAligned | TabitemFlags::RightAligned)); } bool isFirst() const { return bool(mnAlignment & TabitemFlags::FirstInGroup); } bool isLast() const { return bool(mnAlignment & TabitemFlags::LastInGroup); } - const Rectangle& getContentRect() const { return maContentRect; } + const tools::Rectangle& getContentRect() const { return maContentRect; } }; /* SpinbuttonValue: @@ -380,8 +380,8 @@ class VCL_DLLPUBLIC TabitemValue : public ImplControlValue class VCL_DLLPUBLIC SpinbuttonValue : public ImplControlValue { public: - Rectangle maUpperRect; - Rectangle maLowerRect; + tools::Rectangle maUpperRect; + tools::Rectangle maLowerRect; ControlState mnUpperState; ControlState mnLowerState; ControlPart mnUpperPart; @@ -411,7 +411,7 @@ public: { mbIsTopDockingArea = false; } virtual ~ToolbarValue() override; virtual ToolbarValue* clone() const override; - Rectangle maGripRect; + tools::Rectangle maGripRect; bool mbIsTopDockingArea; // indicates that this is the top aligned dockingarea // adjacent to the menubar }; @@ -438,13 +438,13 @@ public: class VCL_DLLPUBLIC MenupopupValue : public ImplControlValue { public: - MenupopupValue( long i_nGutterWidth, const Rectangle& i_rItemRect ) + MenupopupValue( long i_nGutterWidth, const tools::Rectangle& i_rItemRect ) : ImplControlValue( ControlType::MenuPopup, i_nGutterWidth ) , maItemRect( i_rItemRect ) {} virtual ~MenupopupValue() override; virtual MenupopupValue* clone() const override; - Rectangle maItemRect; + tools::Rectangle maItemRect; }; /* PushButtonValue: diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index 110ef9f9aff2..73d4cc69ddf7 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -41,12 +41,12 @@ struct ImplScrollBarData; class VCL_DLLPUBLIC ScrollBar : public Control { private: - Rectangle maBtn1Rect; - Rectangle maBtn2Rect; - Rectangle maPage1Rect; - Rectangle maPage2Rect; - Rectangle maThumbRect; - Rectangle maTrackRect; + tools::Rectangle maBtn1Rect; + tools::Rectangle maBtn2Rect; + tools::Rectangle maPage1Rect; + tools::Rectangle maPage2Rect; + tools::Rectangle maThumbRect; + tools::Rectangle maTrackRect; ImplScrollBarData* mpData; long mnStartPos; long mnMouseOff; @@ -68,7 +68,7 @@ private: Link<ScrollBar*,void> maScrollHdl; Link<ScrollBar*,void> maEndScrollHdl; - SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt ); + SAL_DLLPRIVATE tools::Rectangle* ImplFindPartRect( const Point& rPt ); using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitStyle( WinBits nStyle ); @@ -95,7 +95,7 @@ public: virtual void MouseButtonDown(const MouseEvent& rMEvt) override; virtual void Tracking(const TrackingEvent& rTEvt) 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 Draw(OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags) override; virtual void Resize() override; virtual void StateChanged(StateChangedType nType) override; diff --git a/include/vcl/seleng.hxx b/include/vcl/seleng.hxx index 430fe3af03fe..9b1c269e2582 100644 --- a/include/vcl/seleng.hxx +++ b/include/vcl/seleng.hxx @@ -79,7 +79,7 @@ class VCL_DLLPUBLIC SelectionEngine private: FunctionSet* pFunctionSet; VclPtr<vcl::Window> pWin; - Rectangle aArea; + tools::Rectangle aArea; Timer aWTimer; // generate fake mouse moves MouseEvent aLastMove; SelectionMode eSelMode; @@ -113,7 +113,7 @@ public: // is needed to generate a Move event via a Timer // when the mouse is outside the area - void SetVisibleArea( const Rectangle& rNewArea ) + void SetVisibleArea( const tools::Rectangle& rNewArea ) { aArea = rNewArea; } void SetAddMode( bool); diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx index 72d4bc9c313a..996fc136b125 100644 --- a/include/vcl/slider.hxx +++ b/include/vcl/slider.hxx @@ -28,9 +28,9 @@ class VCL_DLLPUBLIC Slider : public Control { private: - Rectangle maChannel1Rect; - Rectangle maChannel2Rect; - Rectangle maThumbRect; + tools::Rectangle maChannel1Rect; + tools::Rectangle maChannel2Rect; + tools::Rectangle maThumbRect; long mnStartPos; long mnMouseOff; long mnThumbPixOffset; @@ -86,7 +86,7 @@ public: virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; virtual void Tracking( const TrackingEvent& rTEvt ) 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 StateChanged( StateChangedType nType ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index 95655b7b9192..3d77fa5c1f06 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -30,9 +30,9 @@ class VCL_DLLPUBLIC SpinButton : public Control { private: AutoTimer maRepeatTimer; - Rectangle maUpperRect; - Rectangle maLowerRect; - Rectangle maFocusRect; + tools::Rectangle maUpperRect; + tools::Rectangle maLowerRect; + tools::Rectangle maFocusRect; bool mbRepeat : 1; bool mbUpperIn : 1; bool mbLowerIn : 1; @@ -45,7 +45,7 @@ private: long mnValue; long mnValueStep; - SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt ); + SAL_DLLPRIVATE tools::Rectangle* ImplFindPartRect( const Point& rPt ); using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); DECL_DLLPRIVATE_LINK( ImplTimeout, Timer*, void ); @@ -57,7 +57,7 @@ public: void Down(); 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 MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx index 7549aa5fb46f..50c6afc3d748 100644 --- a/include/vcl/spinfld.hxx +++ b/include/vcl/spinfld.hxx @@ -43,7 +43,7 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; virtual void MouseMove( 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 Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; virtual void Resize() override; virtual void StateChanged( StateChangedType nType ) override; @@ -64,9 +64,9 @@ public: virtual FactoryFunction GetUITestFactory() const override; protected: - Rectangle maUpperRect; - Rectangle maLowerRect; - Rectangle maDropDownRect; // noch nicht angebunden... + tools::Rectangle maUpperRect; + tools::Rectangle maLowerRect; + tools::Rectangle maDropDownRect; // noch nicht angebunden... using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); @@ -76,12 +76,12 @@ protected: void EndDropDown(); virtual void FillLayoutData() const override; - Rectangle * ImplFindPartRect( const Point& rPt ); + tools::Rectangle * ImplFindPartRect( const Point& rPt ); private: DECL_DLLPRIVATE_LINK( ImplTimeout, Timer*, void ); SAL_DLLPRIVATE void ImplInitSpinFieldData(); - SAL_DLLPRIVATE void ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rectangle& rDDArea, Rectangle& rSpinUpArea, Rectangle& rSpinDownArea ); + SAL_DLLPRIVATE void ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, tools::Rectangle& rDDArea, tools::Rectangle& rSpinUpArea, tools::Rectangle& rSpinDownArea ); VclPtr<Edit> mpEdit; AutoTimer maRepeatTimer; diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx index 853163d2aace..448894d746ec 100644 --- a/include/vcl/split.hxx +++ b/include/vcl/split.hxx @@ -33,7 +33,7 @@ private: long mnLastSplitPos; long mnStartSplitPos; Point maDragPos; - Rectangle maDragRect; + tools::Rectangle maDragRect; bool mbHorzSplit; bool mbDragFull; bool mbKbdSplitting; @@ -74,14 +74,14 @@ public: virtual void GetFocus() override; virtual void LoseFocus() override; virtual void KeyInput( const KeyEvent& rKEvt ) override; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rPaintRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rPaintRect ) override; virtual Size GetOptimalSize() const override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; void StartDrag(); - void SetDragRectPixel( const Rectangle& rDragRect, + void SetDragRectPixel( const tools::Rectangle& rDragRect, vcl::Window* pRefWin = nullptr ); void SetSplitPosPixel( long nPos ); diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx index e32c999fac43..18d40e6431bc 100644 --- a/include/vcl/splitwin.hxx +++ b/include/vcl/splitwin.hxx @@ -51,7 +51,7 @@ private: ImplSplitSet* mpBaseSet; ImplSplitSet* mpSplitSet; long* mpLastSizes; - Rectangle maDragRect; + tools::Rectangle maDragRect; long mnDX; long mnDY; long mnLeftBorder; @@ -89,13 +89,13 @@ private: SAL_DLLPRIVATE void ImplUpdate(); SAL_DLLPRIVATE void ImplSetWindowSize( long nDelta ); SAL_DLLPRIVATE void ImplSplitMousePos( Point& rMousePos ); - SAL_DLLPRIVATE void ImplGetButtonRect( Rectangle& rRect, long nEx, bool bTest ) const; - SAL_DLLPRIVATE void ImplGetFadeInRect( Rectangle& rRect, bool bTest = false ) const; - SAL_DLLPRIVATE void ImplGetFadeOutRect( Rectangle& rRect, bool bTest = false ) const; + SAL_DLLPRIVATE void ImplGetButtonRect( tools::Rectangle& rRect, long nEx, bool bTest ) const; + SAL_DLLPRIVATE void ImplGetFadeInRect( tools::Rectangle& rRect, bool bTest = false ) const; + SAL_DLLPRIVATE void ImplGetFadeOutRect( tools::Rectangle& rRect, bool bTest = false ) const; SAL_DLLPRIVATE void ImplDrawFadeIn(vcl::RenderContext& rRenderContext); SAL_DLLPRIVATE void ImplDrawFadeOut(vcl::RenderContext& rRenderContext); SAL_DLLPRIVATE void ImplNewAlign(); - SAL_DLLPRIVATE void ImplDrawGrip(vcl::RenderContext& rRenderContext, const Rectangle& rRect, bool bHorz, bool bLeft); + SAL_DLLPRIVATE void ImplDrawGrip(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect, bool bHorz, bool bLeft); SAL_DLLPRIVATE void ImplStartSplit( const MouseEvent& rMEvt ); SAL_DLLPRIVATE void ImplDrawBorder(vcl::RenderContext& rRenderContext); @@ -103,7 +103,7 @@ private: static SAL_DLLPRIVATE void ImplCalcSet2( SplitWindow* pWindow, ImplSplitSet* pSet, bool bHide, bool bRows, bool bDown = true ); SAL_DLLPRIVATE void ImplDrawBack(vcl::RenderContext& rRenderContext, ImplSplitSet* pSet ); - SAL_DLLPRIVATE static void ImplDrawBack(vcl::RenderContext& rRenderContext, const Rectangle& rRect, + SAL_DLLPRIVATE static void ImplDrawBack(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect, const Wallpaper* pWall, const Bitmap* pBitmap ); static SAL_DLLPRIVATE sal_uInt16 ImplTestSplit( ImplSplitSet* pSet, const Point& rPos, long& rMouseOff, ImplSplitSet** ppFoundSet, sal_uInt16& rFoundPos, @@ -128,7 +128,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 RequestHelp( const HelpEvent& rHEvt ) override; virtual void StateChanged( StateChangedType nType ) override; diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index 518ba6ab4a62..1b27844b318b 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -31,7 +31,7 @@ struct ImplStatusItem; void VCL_DLLPUBLIC DrawProgress(vcl::Window* pWindow, vcl::RenderContext& rRenderContext, const Point& rPos, long nOffset, long nPrgsWidth, long nPrgsHeight, sal_uInt16 nPercent1, sal_uInt16 nPercent2, sal_uInt16 nPercentCount, - const Rectangle& rFramePosSize); + const tools::Rectangle& rFramePosSize); enum class StatusBarItemBits { @@ -63,7 +63,7 @@ private: ImplData* mpImplData; OUString maPrgsTxt; Point maPrgsTxtPos; - Rectangle maPrgsFrameRect; + tools::Rectangle maPrgsFrameRect; long mnPrgsSize; long mnItemsWidth; long mnDX; @@ -93,7 +93,7 @@ private: sal_uInt16 nPos); SAL_DLLPRIVATE void ImplDrawProgress(vcl::RenderContext& rRenderContext, sal_uInt16 nNewPerc); SAL_DLLPRIVATE void ImplCalcProgressRect(); - SAL_DLLPRIVATE Rectangle ImplGetItemRectPos( sal_uInt16 nPos ) const; + SAL_DLLPRIVATE tools::Rectangle ImplGetItemRectPos( sal_uInt16 nPos ) const; SAL_DLLPRIVATE sal_uInt16 ImplGetFirstVisiblePos() const; protected: @@ -108,7 +108,7 @@ public: void AdjustItemWidthsForHiDPI(); virtual void MouseButtonDown( 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 nType ) override; @@ -138,7 +138,7 @@ public: sal_uInt16 GetItemId( sal_uInt16 nPos ) const; sal_uInt16 GetItemId( const Point& rPos ) const; sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const; - Rectangle GetItemRect( sal_uInt16 nItemId ) const; + tools::Rectangle GetItemRect( sal_uInt16 nItemId ) const; Point GetItemTextPos( sal_uInt16 nItemId ) const; sal_uInt16 GetCurItemId() const { return mnCurItemId; } diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 0af0d3862488..0891859c79e1 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -982,7 +982,7 @@ public: @see GetScreenCount */ - static Rectangle GetScreenPosSizePixel( unsigned int nScreen ); + static tools::Rectangle GetScreenPosSizePixel( unsigned int nScreen ); /** Determines if the screens that make up a display are separate or form one large display area. @@ -1006,7 +1006,7 @@ public: @see IsUnifiedDisplay, GetDisplayBuiltInScreen */ - SAL_DLLPRIVATE static unsigned int GetBestScreen( const Rectangle& ); + SAL_DLLPRIVATE static unsigned int GetBestScreen( const tools::Rectangle& ); /** Get the built-in screen. diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index bdc1d3289a58..2032b7eb1bce 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -66,13 +66,13 @@ protected: SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE ImplTabItem* ImplGetItem( sal_uInt16 nId ) const; SAL_DLLPRIVATE Size ImplGetItemSize( ImplTabItem* pItem, long nMaxWidth ); - SAL_DLLPRIVATE Rectangle ImplGetTabRect( sal_uInt16 nPos, long nWidth = -1, long nHeight = -1 ); + SAL_DLLPRIVATE tools::Rectangle ImplGetTabRect( sal_uInt16 nPos, long nWidth = -1, long nHeight = -1 ); SAL_DLLPRIVATE void ImplChangeTabPage( sal_uInt16 nId, sal_uInt16 nOldId ); SAL_DLLPRIVATE bool ImplPosCurTabPage(); virtual void ImplActivateTabPage( bool bNext ); SAL_DLLPRIVATE void ImplShowFocus(); SAL_DLLPRIVATE void ImplDrawItem(vcl::RenderContext& rRenderContext, ImplTabItem* pItem, - const Rectangle& rCurRect, bool bFirstInGroup, + const tools::Rectangle& rCurRect, bool bFirstInGroup, bool bLastInGroup, bool bIsCurrentItem); SAL_DLLPRIVATE void ImplFreeLayoutData(); SAL_DLLPRIVATE bool ImplHandleKeyEvent( const KeyEvent& rKeyEvent ); @@ -86,9 +86,9 @@ protected: virtual void FillLayoutData() const override; virtual const vcl::Font& GetCanonicalFont( const StyleSettings& _rStyle ) const override; virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const override; - SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt ); + SAL_DLLPRIVATE tools::Rectangle* ImplFindPartRect( const Point& rPt ); virtual bool ImplPlaceTabs( long nWidth ); - virtual void ImplPaint(vcl::RenderContext& rRenderContext, const Rectangle& rRect); + virtual void ImplPaint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect); public: TabControl( vcl::Window* pParent, @@ -98,7 +98,7 @@ public: virtual void MouseButtonDown( const MouseEvent& 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; @@ -165,7 +165,7 @@ public: // returns (control relative) bounding rectangle for the // character at index nIndex relative to the text of page nPageId using Control::GetCharacterBounds; - Rectangle GetCharacterBounds( sal_uInt16 nPageId, long nIndex ) const; + tools::Rectangle GetCharacterBounds( sal_uInt16 nPageId, long nIndex ) const; // returns the index relative to the text of page nPageId (also returned) // at position rPoint (control relative) @@ -173,7 +173,7 @@ public: long GetIndexForPoint( const Point& rPoint, sal_uInt16& rPageId ) const; // returns the rectangle of the tab for page nPageId - Rectangle GetTabBounds( sal_uInt16 nPageId ) const; + tools::Rectangle GetTabBounds( sal_uInt16 nPageId ) const; virtual void SetPosPixel(const Point& rPos) override; virtual void SetSizePixel(const Size& rNewSize) override; @@ -212,7 +212,7 @@ public: protected: virtual bool ImplPlaceTabs( long nWidth ) override; - virtual void ImplPaint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void ImplPaint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual void ImplActivateTabPage( bool bNext ) override; private: diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx index edf9da15d52f..a837ee2761e4 100644 --- a/include/vcl/tabpage.hxx +++ b/include/vcl/tabpage.hxx @@ -43,7 +43,7 @@ public: virtual ~TabPage() override; virtual void dispose() 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 StateChanged( StateChangedType nStateChange ) override; diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx index 9e2a74b68785..e8751bbf096f 100644 --- a/include/vcl/texteng.hxx +++ b/include/vcl/texteng.hxx @@ -110,7 +110,7 @@ private: css::uno::Reference< css::i18n::XBreakIterator > mxBreakIterator; css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > mxISC; - Rectangle maInvalidRect; + tools::Rectangle maInvalidRect; LocaleDataWrapper* mpLocaleDataWrapper; @@ -189,12 +189,12 @@ protected: bool IsFormatting() const { return mbIsFormatting; } void UpdateViews( TextView* pCurView = nullptr ); - void ImpPaint( OutputDevice* pOut, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pSelection = nullptr ); + void ImpPaint( OutputDevice* pOut, const Point& rStartPos, tools::Rectangle const* pPaintArea, TextSelection const* pSelection = nullptr ); bool IsFormatted() const { return mbFormatted; } sal_Int32 GetCharPos( sal_uInt32 nPara, std::vector<TextLine>::size_type nLine, long nDocPosX, bool bSmart = false ); - Rectangle GetEditCursor( const TextPaM& rPaM, bool bSpecial, bool bPreferPortionStart = false ); + tools::Rectangle GetEditCursor( const TextPaM& rPaM, bool bSpecial, bool bPreferPortionStart = false ); sal_Int32 ImpFindIndex( sal_uInt32 nPortion, const Point& rPosInPara, bool bSmart ); long ImpGetPortionXOffset( sal_uInt32 nPara, TextLine* pLine, std::size_t nTextPortion ); long ImpGetXPos( sal_uInt32 nPara, TextLine* pLine, sal_Int32 nIndex, bool bPreferPortionStart = false ); @@ -290,7 +290,7 @@ public: bool Write( SvStream& rOutput, const TextSelection* pSel = nullptr, bool bHTML = false ); TextPaM GetPaM( const Point& rDocPos, bool bSmart = true ); - Rectangle PaMtoEditCursor( const TextPaM& rPaM, bool bSpecial = false ); + tools::Rectangle PaMtoEditCursor( const TextPaM& rPaM, bool bSpecial = false ); OUString GetWord( const TextPaM& rCursorPos, TextPaM* pStartOfWord = nullptr ); bool HasAttrib( sal_uInt16 nWhich ) const; diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx index 61f59be6a41c..347f02d8b667 100644 --- a/include/vcl/textview.hxx +++ b/include/vcl/textview.hxx @@ -75,8 +75,8 @@ protected: TextPaM ImpDelete( sal_uInt8 nMode, sal_uInt8 nDelMode ); bool IsInSelection( const TextPaM& rPaM ); - void ImpPaint(vcl::RenderContext& rRenderContext, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pSelection); - void ImpPaint(vcl::RenderContext& rRenderContext, const Rectangle& rRect); + void ImpPaint(vcl::RenderContext& rRenderContext, const Point& rStartPos, tools::Rectangle const* pPaintArea, TextSelection const* pSelection); + void ImpPaint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect); void ImpShowCursor( bool bGotoCursor, bool bForceVisCursor, bool bEndKey ); void ImpHighlight( const TextSelection& rSel ); void ImpSetSelection( const TextSelection& rSelection ); @@ -129,7 +129,7 @@ public: void InsertText( const OUString& rNew ); bool KeyInput( const KeyEvent& rKeyEvent ); - void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect); + void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect); void MouseButtonUp( const MouseEvent& rMouseEvent ); void MouseButtonDown( const MouseEvent& rMouseEvent ); void MouseMove( const MouseEvent& rMouseEvent ); diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 864f3ab13d7a..a200557a4a2f 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -101,11 +101,11 @@ private: ImplToolBoxPrivateData* mpData; std::vector<ImplToolSize> maFloatSizes; Idle *mpIdle; - Rectangle maUpperRect; - Rectangle maLowerRect; - Rectangle maOutDockRect; - Rectangle maInDockRect; - Rectangle maPaintRect; + tools::Rectangle maUpperRect; + tools::Rectangle maLowerRect; + tools::Rectangle maOutDockRect; + tools::Rectangle maInDockRect; + tools::Rectangle maPaintRect; VclPtr<FloatingWindow> mpFloatWin; sal_uInt16 mnKeyModifier; long mnDX; @@ -186,7 +186,7 @@ private: SAL_DLLPRIVATE ImplToolItems::size_type ImplCalcBreaks( long nWidth, long* pMaxLineWidth, bool bCalcHorz ) const; SAL_DLLPRIVATE void ImplFormat( bool bResize = false ); SAL_DLLPRIVATE void ImplDrawSpin(vcl::RenderContext& rRenderContext); - SAL_DLLPRIVATE void ImplDrawSeparator(vcl::RenderContext& rRenderContext, ImplToolItems::size_type nPos, const Rectangle& rRect); + SAL_DLLPRIVATE void ImplDrawSeparator(vcl::RenderContext& rRenderContext, ImplToolItems::size_type nPos, const tools::Rectangle& rRect); SAL_DLLPRIVATE void ImplDrawItem(vcl::RenderContext& rRenderContext, ImplToolItems::size_type nPos, sal_uInt16 nHighlight ); using Window::ImplInvalidate; SAL_DLLPRIVATE void ImplInvalidate( bool bNewCalc = false, bool bFullPaint = false ); @@ -204,7 +204,7 @@ private: SAL_DLLPRIVATE void ImplUpdateInputEnable(); SAL_DLLPRIVATE void ImplFillLayoutData(); SAL_DLLPRIVATE bool ImplHasClippedItems(); - SAL_DLLPRIVATE Point ImplGetPopupPosition( const Rectangle& rRect, const Size& rSize ) const; + SAL_DLLPRIVATE Point ImplGetPopupPosition( const tools::Rectangle& rRect, const Size& rSize ) const; SAL_DLLPRIVATE bool ImplIsFloatingMode() const; SAL_DLLPRIVATE bool ImplIsInPopupMode() const; SAL_DLLPRIVATE const OUString& ImplGetHelpText( sal_uInt16 nItemId ) const; @@ -232,7 +232,7 @@ public: long& rRight, long& rBottom ) const; SAL_DLLPRIVATE void ImplCheckUpdate(); static SAL_DLLPRIVATE void ImplDrawGrip(vcl::RenderContext& rRenderContext, - const Rectangle &aDragArea, int nDragWidth, + const tools::Rectangle &aDragArea, int nDragWidth, WindowAlign eAlign, bool bHorz); SAL_DLLPRIVATE void ImplDrawGrip(vcl::RenderContext& rRenderContext); @@ -240,9 +240,9 @@ public: SAL_DLLPRIVATE bool ImplDrawNativeBackground(vcl::RenderContext& rRenderContext, const vcl::Region &rRegion); SAL_DLLPRIVATE void ImplDrawTransparentBackground(vcl::RenderContext& rRenderContext, const vcl::Region &rRegion); SAL_DLLPRIVATE static void ImplDrawConstantBackground(vcl::RenderContext& rRenderContext, const vcl::Region &rRegion, bool bIsInPopupMode); - SAL_DLLPRIVATE void ImplDrawBackground(vcl::RenderContext& rRenderContext, const Rectangle &rRect); + SAL_DLLPRIVATE void ImplDrawBackground(vcl::RenderContext& rRenderContext, const tools::Rectangle &rRect); - SAL_DLLPRIVATE void ImplErase(vcl::RenderContext& rRenderContext, const Rectangle &rRect, bool bHighlight, bool bHasOpenPopup = false ); + SAL_DLLPRIVATE void ImplErase(vcl::RenderContext& rRenderContext, const tools::Rectangle &rRect, bool bHighlight, bool bHasOpenPopup = false ); SAL_DLLPRIVATE void ImplDrawBorder(vcl::RenderContext& rRenderContext); SAL_DLLPRIVATE const ImplToolItem *ImplGetFirstClippedItem() const; @@ -253,10 +253,10 @@ public: SAL_DLLPRIVATE void ImplSetMinMaxFloatSize(); SAL_DLLPRIVATE ImplToolItems::size_type ImplCalcLines( long nToolSize ) const; SAL_DLLPRIVATE sal_uInt16 ImplTestLineSize( const Point& rPos ) const; - SAL_DLLPRIVATE void ImplLineSizing( const Point& rPos, Rectangle& rRect, sal_uInt16 nLineMode ); + SAL_DLLPRIVATE void ImplLineSizing( const Point& rPos, tools::Rectangle& rRect, sal_uInt16 nLineMode ); static SAL_DLLPRIVATE ImplToolItems::size_type ImplFindItemPos( const ImplToolItem* pItem, const ImplToolItems& rList ); SAL_DLLPRIVATE void ImplDrawMenuButton(vcl::RenderContext& rRenderContext, bool bHighlight); - SAL_DLLPRIVATE void ImplDrawButton(vcl::RenderContext& rRenderContext, const Rectangle &rRect, sal_uInt16 highlight, bool bChecked, bool bEnabled, bool bIsWindow); + SAL_DLLPRIVATE void ImplDrawButton(vcl::RenderContext& rRenderContext, const tools::Rectangle &rRect, sal_uInt16 highlight, bool bChecked, bool bEnabled, bool bIsWindow); SAL_DLLPRIVATE ImplToolItems::size_type ImplCountLineBreaks() const; SAL_DLLPRIVATE ImplToolBoxPrivateData* ImplGetToolBoxPrivateData() const { return mpData; } @@ -285,7 +285,7 @@ public: virtual void MouseButtonUp( 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 RequestHelp( const HelpEvent& rHEvt ) override; virtual bool EventNotify( NotifyEvent& rNEvt ) override; @@ -298,8 +298,8 @@ public: virtual void ToggleFloatingMode() override; virtual void StartDocking() override; - virtual bool Docking( const Point& rPos, Rectangle& rRect ) override; - virtual void EndDocking( const Rectangle& rRect, bool bFloatMode ) override; + virtual bool Docking( const Point& rPos, tools::Rectangle& rRect ) override; + virtual void EndDocking( const tools::Rectangle& rRect, bool bFloatMode ) override; virtual void Resizing( Size& rSize ) override; virtual Size GetOptimalSize() const override; virtual void doDeferredInit(WinBits nBits) override; @@ -355,9 +355,9 @@ public: sal_uInt16 GetItemId( const Point& rPos ) const; /// Map the command name (like .uno:Save) back to item id. sal_uInt16 GetItemId( const OUString& rCommand ) const; - Rectangle GetItemRect( sal_uInt16 nItemId ); - Rectangle GetItemPosRect( ImplToolItems::size_type nPos ); - Rectangle GetOverflowRect() const; + tools::Rectangle GetItemRect( sal_uInt16 nItemId ); + tools::Rectangle GetItemPosRect( ImplToolItems::size_type nPos ); + tools::Rectangle GetOverflowRect() const; /// Returns size of the bitmap / text that is inside this toolbox item. Size GetItemContentSize( sal_uInt16 nItemId ); @@ -487,7 +487,7 @@ public: void SetMenuExecuteHdl( const Link<ToolBox *, void>& rLink ); // open custommenu - void ExecuteCustomMenu( const Rectangle& rRect = Rectangle() ); + void ExecuteCustomMenu( const tools::Rectangle& rRect = tools::Rectangle() ); // allow Click Handler to distinguish between mouse and key input bool IsKeyEvent() const { return mbIsKeyEvent; } @@ -503,7 +503,7 @@ public: // returns the bounding box for the character at index nIndex // where nIndex is relative to the starting index of the item // with id nItemId (in coordinates of the displaying window) - Rectangle GetCharacterBounds( sal_uInt16 nItemId, long nIndex ); + tools::Rectangle GetCharacterBounds( sal_uInt16 nItemId, long nIndex ); // -1 is returned if no character is at that point // if an index is found the corresponding item id is filled in (else 0) long GetIndexForPoint( const Point& rPoint, sal_uInt16& rItemID ); diff --git a/include/vcl/unowrap.hxx b/include/vcl/unowrap.hxx index 44c86f2cc041..090fb8c4242f 100644 --- a/include/vcl/unowrap.hxx +++ b/include/vcl/unowrap.hxx @@ -31,7 +31,7 @@ class OutputDevice; class MouseEvent; class CommandEvent; class KeyEvent; -class Rectangle; +namespace tools { class Rectangle; } class Menu; namespace com { diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx index 9184ef8af0f1..cf7c82140392 100644 --- a/include/vcl/virdev.hxx +++ b/include/vcl/virdev.hxx @@ -66,7 +66,7 @@ private: @since \#i32109# */ - SAL_DLLPRIVATE void ImplFillOpaqueRectangle( const Rectangle& rRect ); + SAL_DLLPRIVATE void ImplFillOpaqueRectangle( const tools::Rectangle& rRect ); protected: virtual bool AcquireGraphics() const override; diff --git a/include/vcl/wall.hxx b/include/vcl/wall.hxx index bd9fa295a693..d63fabf83e1d 100644 --- a/include/vcl/wall.hxx +++ b/include/vcl/wall.hxx @@ -84,8 +84,8 @@ public: Gradient GetGradient() const; bool IsGradient() const; - void SetRect( const Rectangle& rRect ); - Rectangle GetRect() const; + void SetRect( const tools::Rectangle& rRect ); + tools::Rectangle GetRect() const; bool IsRect() const; bool IsFixed() const; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 75f5a24f337f..16c7abd21e7f 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -472,7 +472,7 @@ public: // + selection Color with a text color complementing the selection background // + rounded edge static void DrawSelectionBackground(vcl::RenderContext& rRenderContext, vcl::Window& rWindow, - const Rectangle& rRect, sal_uInt16 nHighlight, + const tools::Rectangle& rRect, sal_uInt16 nHighlight, bool bChecked, bool bDrawBorder, bool bDrawExtBorderOnly, Color* pSelectionTextColor = nullptr, long nCornerRadius = 0, Color* pPaintColor = nullptr); @@ -564,7 +564,7 @@ public: SAL_DLLPRIVATE void ImplGrabFocus( GetFocusFlags nFlags ); SAL_DLLPRIVATE void ImplGrabFocusToDocument( GetFocusFlags nFlags ); - SAL_DLLPRIVATE void ImplInvertFocus( const Rectangle& rRect ); + SAL_DLLPRIVATE void ImplInvertFocus( const tools::Rectangle& rRect ); SAL_DLLPRIVATE PointerStyle ImplGetMousePointer() const; SAL_DLLPRIVATE void ImplCallMouseMove( sal_uInt16 nMouseCode, bool bModChanged = false ); @@ -587,7 +587,7 @@ public: SAL_DLLPRIVATE void ImplIncModalCount(); SAL_DLLPRIVATE void ImplDecModalCount(); - SAL_DLLPRIVATE static void ImplCalcSymbolRect( Rectangle& rRect ); + SAL_DLLPRIVATE static void ImplCalcSymbolRect( tools::Rectangle& rRect ); protected: @@ -601,8 +601,8 @@ protected: SAL_DLLPRIVATE void ImplInvalidateParentFrameRegion( vcl::Region& rRegion ); SAL_DLLPRIVATE void ImplValidateFrameRegion( const vcl::Region* rRegion, ValidateFlags nFlags ); SAL_DLLPRIVATE void ImplValidate(); - SAL_DLLPRIVATE void ImplMoveInvalidateRegion( const Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren ); - SAL_DLLPRIVATE void ImplMoveAllInvalidateRegions( const Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren ); + SAL_DLLPRIVATE void ImplMoveInvalidateRegion( const tools::Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren ); + SAL_DLLPRIVATE void ImplMoveAllInvalidateRegions( const tools::Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren ); SAL_DLLPRIVATE vcl::Window* ImplGetBorderWindow() const; @@ -612,7 +612,7 @@ protected: SAL_DLLPRIVATE void ImplSetMouseTransparent( bool bTransparent ); - SAL_DLLPRIVATE void ImplScroll( const Rectangle& rRect, long nHorzScroll, long nVertScroll, ScrollFlags nFlags ); + SAL_DLLPRIVATE void ImplScroll( const tools::Rectangle& rRect, long nHorzScroll, long nVertScroll, ScrollFlags nFlags ); SAL_DLLPRIVATE bool ImplSetClipFlagChildren( bool bSysObjOnlySmaller ); SAL_DLLPRIVATE bool ImplSetClipFlagOverlapWindows( bool bSysObjOnlySmaller = false ); @@ -670,7 +670,7 @@ private: SAL_DLLPRIVATE void ImplIntersectAndUnionOverlapWindows( const vcl::Region& rInterRegion, vcl::Region& rRegion ); SAL_DLLPRIVATE void ImplIntersectAndUnionOverlapWindows2( const vcl::Region& rInterRegion, vcl::Region& rRegion ); SAL_DLLPRIVATE void ImplCalcOverlapRegionOverlaps( const vcl::Region& rInterRegion, vcl::Region& rRegion ); - SAL_DLLPRIVATE void ImplCalcOverlapRegion( const Rectangle& rSourceRect, vcl::Region& rRegion, + SAL_DLLPRIVATE void ImplCalcOverlapRegion( const tools::Rectangle& rSourceRect, vcl::Region& rRegion, bool bChildren, bool bSiblings ); /** Invoke the actual painting. @@ -715,7 +715,7 @@ private: SAL_DLLPRIVATE static void ImplHandleScroll( ScrollBar* pHScrl, long nX, ScrollBar* pVScrl, long nY ); - SAL_DLLPRIVATE Rectangle ImplOutputToUnmirroredAbsoluteScreenPixel( const Rectangle& rRect ) const; + SAL_DLLPRIVATE tools::Rectangle ImplOutputToUnmirroredAbsoluteScreenPixel( const tools::Rectangle& rRect ) const; SAL_DLLPRIVATE long ImplGetUnmirroredOutOffX(); // retrieves the list of owner draw decorated windows for this window hiearchy @@ -723,7 +723,7 @@ private: SAL_DLLPRIVATE vcl::Window* ImplGetTopmostFrameWindow(); - SAL_DLLPRIVATE Rectangle ImplGetWindowExtentsRelative( vcl::Window *pRelativeWindow, bool bClientOnly ) const; + SAL_DLLPRIVATE tools::Rectangle ImplGetWindowExtentsRelative( vcl::Window *pRelativeWindow, bool bClientOnly ) const; SAL_DLLPRIVATE bool ImplStopDnd(); SAL_DLLPRIVATE void ImplStartDnd(); @@ -754,7 +754,7 @@ protected: SAL_DLLPRIVATE void ImplAdjustNWFSizes(); virtual void CopyDeviceArea( SalTwoRect& aPosAry, bool bWindowInvalidate) override; - virtual void ClipToPaintRegion( Rectangle& rDstRect ) override; + virtual void ClipToPaintRegion( tools::Rectangle& rDstRect ) override; virtual bool UsePolyPolygonForComplexGradient() override; virtual void ApplySettings(vcl::RenderContext& rRenderContext); @@ -777,7 +777,7 @@ public: virtual void KeyInput( const KeyEvent& rKEvt ); virtual void KeyUp( const KeyEvent& rKEvt ); virtual void PrePaint(vcl::RenderContext& rRenderContext); - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect); + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect); virtual void PostPaint(vcl::RenderContext& rRenderContext); using OutputDevice::Erase; @@ -878,11 +878,11 @@ public: void SetInputContext( const InputContext& rInputContext ); const InputContext& GetInputContext() const; void EndExtTextInput(); - void SetCursorRect( const Rectangle* pRect = nullptr, long nExtTextInputWidth = 0 ); - const Rectangle* GetCursorRect() const; + void SetCursorRect( const tools::Rectangle* pRect = nullptr, long nExtTextInputWidth = 0 ); + const tools::Rectangle* GetCursorRect() const; long GetCursorExtTextInputWidth() const; - void SetCompositionCharRect( const Rectangle* pRect, long nCompositionLength, bool bVertical = false ); + void SetCompositionCharRect( const tools::Rectangle* pRect, long nCompositionLength, bool bVertical = false ); using ::OutputDevice::SetSettings; virtual void SetSettings( const AllSettings& rSettings ) override; @@ -1041,19 +1041,19 @@ public: Point NormalizedScreenToOutputPixel( const Point& rPos ) const; Point OutputToAbsoluteScreenPixel( const Point& rPos ) const; Point AbsoluteScreenToOutputPixel( const Point& rPos ) const; - Rectangle GetDesktopRectPixel() const; + tools::Rectangle GetDesktopRectPixel() const; // window extents including border and decoration - Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const; + tools::Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const; // window extents of the client window, coordinates to be used in SetPosPixel - Rectangle GetClientWindowExtentsRelative() const; + tools::Rectangle GetClientWindowExtentsRelative() const; bool IsScrollable() const; virtual void Scroll( long nHorzScroll, long nVertScroll, ScrollFlags nFlags = ScrollFlags::NONE ); void Scroll( long nHorzScroll, long nVertScroll, - const Rectangle& rRect, ScrollFlags nFlags = ScrollFlags::NONE ); + const tools::Rectangle& rRect, ScrollFlags nFlags = ScrollFlags::NONE ); virtual void Invalidate( InvalidateFlags nFlags = InvalidateFlags::NONE ); - virtual void Invalidate( const Rectangle& rRect, InvalidateFlags nFlags = InvalidateFlags::NONE ); + virtual void Invalidate( const tools::Rectangle& rRect, InvalidateFlags nFlags = InvalidateFlags::NONE ); virtual void Invalidate( const vcl::Region& rRegion, InvalidateFlags nFlags = InvalidateFlags::NONE ); void Validate(); bool HasPaintEvent() const; @@ -1157,16 +1157,16 @@ public: /// Add all children to rAllChildren recursively. SAL_DLLPRIVATE void CollectChildren(::std::vector<vcl::Window *>& rAllChildren ); - virtual void ShowFocus(const Rectangle& rRect); + virtual void ShowFocus(const tools::Rectangle& rRect); void HideFocus(); // transparent background for selected or checked items in toolboxes etc. - void DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, bool bChecked, bool bDrawBorder ); + void DrawSelectionBackground( const tools::Rectangle& rRect, sal_uInt16 highlight, bool bChecked, bool bDrawBorder ); - void ShowTracking( const Rectangle& rRect, + void ShowTracking( const tools::Rectangle& rRect, ShowTrackFlags nFlags = ShowTrackFlags::Small ); void HideTracking(); - void InvertTracking( const Rectangle& rRect, ShowTrackFlags nFlags ); + void InvertTracking( const tools::Rectangle& rRect, ShowTrackFlags nFlags ); void InvertTracking( const tools::Polygon& rPoly, ShowTrackFlags nFlags ); void StartTracking( StartTrackingFlags nFlags = StartTrackingFlags::NONE ); @@ -1296,7 +1296,7 @@ public: /* records all DrawText operations within the passed rectangle; * a synchronous paint is sent to achieve this */ - void RecordLayoutData( vcl::ControlLayoutData* pLayout, const Rectangle& rRect ); + void RecordLayoutData( vcl::ControlLayoutData* pLayout, const tools::Rectangle& rRect ); // set and retrieve for Toolkit VCLXWindow* GetWindowPeer() const; |