diff options
Diffstat (limited to 'include/vcl')
50 files changed, 351 insertions, 348 deletions
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; |