diff options
Diffstat (limited to 'include/svx')
64 files changed, 282 insertions, 282 deletions
diff --git a/include/svx/CommonStylePreviewRenderer.hxx b/include/svx/CommonStylePreviewRenderer.hxx index fe30c2277eb3..717ccb2cc785 100644 --- a/include/svx/CommonStylePreviewRenderer.hxx +++ b/include/svx/CommonStylePreviewRenderer.hxx @@ -41,7 +41,7 @@ public: virtual bool recalculate() override; virtual Size getRenderSize() override; - virtual bool render(const Rectangle& aRectangle, RenderAlign eRenderAlign = RenderAlign::CENTER) override; + virtual bool render(const tools::Rectangle& aRectangle, RenderAlign eRenderAlign = RenderAlign::CENTER) override; }; } // end namespace svx diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx index e0db73fdc36b..87b21855aaf7 100644 --- a/include/svx/EnhancedCustomShape2d.hxx +++ b/include/svx/EnhancedCustomShape2d.hxx @@ -81,7 +81,7 @@ class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet sal_Int32 nCoordHeightG; sal_Int32 nCoordWidth; sal_Int32 nCoordHeight; - Rectangle aLogicRect; + tools::Rectangle aLogicRect; double fXScale; double fYScale; @@ -178,8 +178,8 @@ class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet SdrObject* CreateLineGeometry(); SdrObject* CreateObject( bool bLineGeometryNeededOnly ); void ApplyGluePoints( SdrObject* pObj ); - Rectangle GetTextRect() const; - const Rectangle& GetLogicRect() const { return aLogicRect; } + tools::Rectangle GetTextRect() const; + const tools::Rectangle& GetLogicRect() const { return aLogicRect; } sal_uInt32 GetHdlCount() const; bool GetHandlePosition( const sal_uInt32 nIndex, Point& rReturnPosition ) const; diff --git a/include/svx/IAccessibleViewForwarder.hxx b/include/svx/IAccessibleViewForwarder.hxx index 35d1fd77ad7f..eb89854fe1fe 100644 --- a/include/svx/IAccessibleViewForwarder.hxx +++ b/include/svx/IAccessibleViewForwarder.hxx @@ -61,7 +61,7 @@ public: are, contrary to the base class, in internal coordinates of 100th of mm. */ - virtual Rectangle GetVisibleArea() const = 0; + virtual tools::Rectangle GetVisibleArea() const = 0; /** Transform the specified point from internal coordinates in 100th of mm to an absolute screen position. diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index ca48018229f4..ade653b697be 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -93,7 +93,7 @@ public: virtual FactoryFunction GetUITestFactory() const override; protected: - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& ) override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; virtual void MouseMove( const MouseEvent& rMEvt ) override; @@ -139,7 +139,7 @@ private: DECL_LINK(VscrollHdl, ScrollBar*, void); void init(); - Rectangle getGridRectangle(const Point &rPointUL, const Size &rOutputSize); + tools::Rectangle getGridRectangle(const Point &rPointUL, const Size &rOutputSize); }; #endif diff --git a/include/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx index 4499b190777d..d36e71a54a77 100644 --- a/include/svx/compressgraphicdialog.hxx +++ b/include/svx/compressgraphicdialog.hxx @@ -69,7 +69,7 @@ private: SdrGrafObj* m_pGraphicObj; Graphic m_aGraphic; Size m_aViewSize100mm; - Rectangle m_aCropRectangle; + tools::Rectangle m_aCropRectangle; SfxBindings& m_rBindings; double m_dResolution; @@ -102,14 +102,14 @@ private: public: CompressGraphicsDialog( vcl::Window* pParent, SdrGrafObj* pGraphicObj, SfxBindings& rBindings ); - CompressGraphicsDialog( vcl::Window* pParent, Graphic& rGraphic, Size rViewSize100mm, Rectangle& rCropRectangle, SfxBindings& rBindings ); + CompressGraphicsDialog( vcl::Window* pParent, Graphic& rGraphic, Size rViewSize100mm, tools::Rectangle& rCropRectangle, SfxBindings& rBindings ); virtual ~CompressGraphicsDialog() override; virtual void dispose() override; SdrGrafObj* GetCompressedSdrGrafObj(); Graphic GetCompressedGraphic(); - Rectangle GetScaledCropRectangle(); + tools::Rectangle GetScaledCropRectangle(); }; #endif diff --git a/include/svx/connctrl.hxx b/include/svx/connctrl.hxx index b3b1b54da9f1..360ff38522da 100644 --- a/include/svx/connctrl.hxx +++ b/include/svx/connctrl.hxx @@ -55,7 +55,7 @@ public: virtual ~SvxXConnectionPreview() override; virtual void dispose() override; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; virtual void Resize() override; virtual Size GetOptimalSize() const override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; diff --git a/include/svx/contdlg.hxx b/include/svx/contdlg.hxx index 15cc8a9ca895..2664a656f002 100644 --- a/include/svx/contdlg.hxx +++ b/include/svx/contdlg.hxx @@ -80,7 +80,7 @@ public: const tools::PolyPolygon* pPolyPoly, void* pEditingObj ); static tools::PolyPolygon CreateAutoContour( const Graphic& rGraphic, - const Rectangle* pRect = nullptr, + const tools::Rectangle* pRect = nullptr, const sal_uIntPtr nFlags = 0L ); }; diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index 90815338d57d..c12f3c97652b 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -43,7 +43,7 @@ public: void DrawElements( const OUString& rText, sal_Int32 nAngle ); protected: - Rectangle maRect; + tools::Rectangle maRect; bool mbEnabled; private: @@ -79,7 +79,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC DialControl : public Control public: explicit DialControl( vcl::Window* pParent, WinBits nBits ); - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual void StateChanged( StateChangedType nStateChange ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx index 056056db8d86..57edb8a46fe9 100644 --- a/include/svx/dlgctl3d.hxx +++ b/include/svx/dlgctl3d.hxx @@ -52,7 +52,7 @@ public: virtual ~Svx3DPreviewControl() override; virtual void dispose() override; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void Resize() override; virtual Size GetOptimalSize() const override; @@ -100,7 +100,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC Svx3DLightControl : public Svx3DPreviewContr public: Svx3DLightControl(vcl::Window* pParent, WinBits nStyle); - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual void MouseButtonDown(const MouseEvent& rMEvt) override; virtual void Tracking( const TrackingEvent& rTEvt ) override; virtual void Resize() override; diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 98e7ecac0673..2cb800216f39 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -113,7 +113,7 @@ public: virtual ~SvxRectCtl() override; virtual void dispose() override; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void KeyInput( const KeyEvent& rKeyEvt ) override; virtual void StateChanged( StateChangedType nStateChange ) override; @@ -129,8 +129,8 @@ public: static const sal_uInt8 NO_CHILDREN = 9; // returns number of usable radio buttons - Rectangle CalculateFocusRectangle() const; - Rectangle CalculateFocusRectangle( RectPoint eRectPoint ) const; + tools::Rectangle CalculateFocusRectangle() const; + tools::Rectangle CalculateFocusRectangle( RectPoint eRectPoint ) const; virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; @@ -161,7 +161,7 @@ protected: Point aFocusPosition; rtl::Reference<SvxPixelCtlAccessible> m_xAccess; - Rectangle implCalFocusRect( const Point& aPosition ); + tools::Rectangle implCalFocusRect( const Point& aPosition ); void ChangePixel( sal_uInt16 nPixel ); public: @@ -170,7 +170,7 @@ public: virtual ~SvxPixelCtl() override; virtual void dispose() override; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void Resize() override; virtual Size GetOptimalSize() const override; @@ -357,7 +357,7 @@ public: void SetSymbol( Graphic* p, const Size& s ); void ResizeSymbol( const Size& s ); - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; virtual void Resize() override; virtual Size GetOptimalSize() const override; }; @@ -380,7 +380,7 @@ public: void SetAttributes(const SfxItemSet& rItemSet); - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; virtual void Resize() override; }; @@ -408,7 +408,7 @@ public: void SetShadowAttributes(const SfxItemSet& rItemSet); void SetShadowPosition(const Point& rPos); - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; }; #endif // INCLUDED_SVX_DLGCTRL_HXX diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx index 758f1eb6bddc..e753970341af 100644 --- a/include/svx/fntctrl.hxx +++ b/include/svx/fntctrl.hxx @@ -62,7 +62,7 @@ public: void ResetColor(); void SetBackColor( const Color& rColor ); void UseResourceText(); - void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override; + void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& ) override; bool IsTwoLines() const; void SetTwoLines(bool bSet); diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx index eacf64633d73..20ef1dbc6dcc 100644 --- a/include/svx/framelink.hxx +++ b/include/svx/framelink.hxx @@ -30,7 +30,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> class Point; -class Rectangle; +namespace tools { class Rectangle; } class OutputDevice; namespace svx { @@ -218,7 +218,7 @@ SVX_DLLPUBLIC double GetHorDiagAngle( long nWidth, long nHeight ); The returned values represents the inner angle between the diagonals and horizontal borders, and is therefore in the range [0,PI/2] (inclusive). */ -inline double GetHorDiagAngle( const Rectangle& rRect ) +inline double GetHorDiagAngle( const tools::Rectangle& rRect ) { return GetHorDiagAngle( rRect.GetWidth(), rRect.GetHeight() ); } @@ -236,7 +236,7 @@ inline double GetVerDiagAngle( long nWidth, long nHeight ) The returned values represents the inner angle between the diagonals and vertical borders, and is therefore in the range [0,PI/2] (inclusive). */ -inline double GetVerDiagAngle( const Rectangle& rRect ) +inline double GetVerDiagAngle( const tools::Rectangle& rRect ) { return GetVerDiagAngle( rRect.GetWidth(), rRect.GetHeight() ); } @@ -471,7 +471,7 @@ SVX_DLLPUBLIC drawinglayer::primitive2d::Primitive2DContainer CreateBorderPrimit SVX_DLLPUBLIC drawinglayer::primitive2d::Primitive2DContainer CreateClippedBorderPrimitives ( const Point& rStart, const Point& rEnd, const Style& rBorder, - const Rectangle& rClipRect ); + const tools::Rectangle& rClipRect ); /** Draws a horizontal frame border, regards all connected frame styles. @@ -610,7 +610,7 @@ SVX_DLLPUBLIC void DrawVerFrameBorder( SVX_DLLPUBLIC void DrawDiagFrameBorders( OutputDevice& rDev, /// The output device used to draw the frame border. - const Rectangle& rRect, /// Rectangle for both diagonal frame borders. + const tools::Rectangle& rRect, /// Rectangle for both diagonal frame borders. const Style& rTLBR, /// Style of the processed top-left to bottom-right diagonal frame border. const Style& rBLTR, /// Style of the processed bottom-left to top-right diagonal frame border. diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx index d48fbf8c98c0..a899caa7ee40 100644 --- a/include/svx/framelinkarray.hxx +++ b/include/svx/framelinkarray.hxx @@ -247,7 +247,7 @@ public: void SetClipRange( size_t nFirstCol, size_t nFirstRow, size_t nLastCol, size_t nLastRow ); /** Returns the rectangle (output coordinates) of the current clipping range. */ - Rectangle GetClipRangeRectangle() const; + tools::Rectangle GetClipRangeRectangle() const; // cell coordinates ------------------------------------------------------- @@ -301,7 +301,7 @@ public: /** Returns the output rectangle of the cell (nCol,nRow). Returns total output rectangle of merged ranges. */ - Rectangle GetCellRect( size_t nCol, size_t nRow ) const; + tools::Rectangle GetCellRect( size_t nCol, size_t nRow ) const; // diagonal frame borders ------------------------------------------------- diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx index 3221512f8c44..c91241b69653 100644 --- a/include/svx/frmsel.hxx +++ b/include/svx/frmsel.hxx @@ -171,11 +171,11 @@ public: /** Returns true, if the passed point is inside the click area of any enabled frame border. */ bool ContainsClickPoint( const Point& rPos ) const; /** Returns the bounding rectangle of the specified frame border (if enabled). */ - Rectangle GetClickBoundRect( FrameBorderType eBorder ) const; + tools::Rectangle GetClickBoundRect( FrameBorderType eBorder ) const; protected: - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void KeyInput( const KeyEvent& rKEvt ) override; virtual void GetFocus() override; diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx index 63e8a8932e91..6c1091c420c7 100644 --- a/include/svx/galctrl.hxx +++ b/include/svx/galctrl.hxx @@ -45,14 +45,14 @@ class SVX_DLLPUBLIC GalleryPreview : public vcl::Window, public DropTargetHelper private: GraphicObject aGraphicObj; - Rectangle aPreviewRect; + tools::Rectangle aPreviewRect; GalleryTheme* mpTheme; - SVX_DLLPRIVATE bool ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const; + SVX_DLLPRIVATE bool ImplGetGraphicCenterRect( const Graphic& rGraphic, tools::Rectangle& rResultRect ) const; SVX_DLLPRIVATE void InitSettings(); // Window - SVX_DLLPRIVATE virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + SVX_DLLPRIVATE virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; SVX_DLLPRIVATE virtual Size GetOptimalSize() const override; SVX_DLLPRIVATE virtual void MouseButtonDown(const MouseEvent& rMEvt) override; SVX_DLLPRIVATE virtual void Command(const CommandEvent& rCEvt) override; @@ -124,7 +124,7 @@ private: // BrowseBox virtual bool SeekRow( long nRow ) override; - virtual void PaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const override; + virtual void PaintField( OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId ) const override; virtual void DoubleClick( const BrowserMouseEvent& rEvt ) override; virtual void Select() override; virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt ) override; @@ -155,7 +155,7 @@ public: virtual OUString GetCellText(long _nRow, sal_uInt16 _nColId) const override; // from IAccessibleTableProvider - virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) override; + virtual tools::Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) override; virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) override; }; diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx index 1cf1c9cb419e..ff89fd40b468 100644 --- a/include/svx/graphctl.hxx +++ b/include/svx/graphctl.hxx @@ -63,7 +63,7 @@ protected: SdrModel* pModel; SdrView* pView; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; virtual void Resize() override; virtual void KeyInput(const KeyEvent& rKEvt) override; virtual void MouseButtonDown(const MouseEvent& rMEvt) override; @@ -125,7 +125,7 @@ public: : rWin(rGraphWin) {} - virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect) override; + virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const tools::Rectangle& rOldBoundRect) override; }; SdrObjUserCall* GraphCtrl::GetSdrUserCall() diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 2bd8f90b72ba..43a6a12ee059 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -214,7 +214,7 @@ public: protected: virtual void Resize() override; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual void StateChanged( StateChangedType nType ) override; private: @@ -307,7 +307,7 @@ protected: protected: virtual bool SeekRow(long nRow) override; virtual void VisibleRowsChanged( long nNewTopRow, sal_uInt16 nNumRows) override; - virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId) const override; + virtual void PaintCell(OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColId) const override; virtual RowStatus GetRowStatus(long nRow) const override; virtual bool CursorMoving(long nNewRow, sal_uInt16 nNewCol) override; virtual void CursorMoved() override; diff --git a/include/svx/measctrl.hxx b/include/svx/measctrl.hxx index 118ea02ba764..09b861703ee4 100644 --- a/include/svx/measctrl.hxx +++ b/include/svx/measctrl.hxx @@ -39,7 +39,7 @@ public: virtual ~SvxXMeasurePreview() override; virtual void dispose() override; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual void Resize() override; virtual void MouseButtonDown(const MouseEvent& rMEvt) override; virtual Size GetOptimalSize() const override; diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx index 1c2da29a55ee..eaba4507685e 100644 --- a/include/svx/numvset.hxx +++ b/include/svx/numvset.hxx @@ -58,7 +58,7 @@ enum class NumberingPageType class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet { NumberingPageType ePageType; - Rectangle aOrgRect; + tools::Rectangle aOrgRect; VclPtr<VirtualDevice> pVDev; css::uno::Reference<css::text::XNumberingFormatter> xFormatter; diff --git a/include/svx/pagectrl.hxx b/include/svx/pagectrl.hxx index 64123cf0be8a..438018e08fbd 100644 --- a/include/svx/pagectrl.hxx +++ b/include/svx/pagectrl.hxx @@ -70,14 +70,14 @@ private: SvxPageUsage eUsage; protected: - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual void DrawPage(vcl::RenderContext& rRenderContext, const Point& rPoint, const bool bSecond, const bool bEnabled); void drawFillAttributes(vcl::RenderContext& rRenderContext, const drawinglayer::attribute::SdrAllFillAttributesHelperPtr& rFillAttributes, - const Rectangle& rPaintRange, const Rectangle& rDefineRange); + const tools::Rectangle& rPaintRange, const tools::Rectangle& rDefineRange); public: SvxPageWindow(vcl::Window* pParent); diff --git a/include/svx/paraprev.hxx b/include/svx/paraprev.hxx index 7b326487c0f3..a7ac58eb1f35 100644 --- a/include/svx/paraprev.hxx +++ b/include/svx/paraprev.hxx @@ -55,10 +55,10 @@ private: sal_uInt16 nLineVal; OUString aText; - Rectangle Lines[9]; + tools::Rectangle Lines[9]; protected: - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual Size GetOptimalSize() const override; void DrawParagraph(vcl::RenderContext& rRenderContext); diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx index 048d959e0e3d..f3afb3f35868 100644 --- a/include/svx/rubydialog.hxx +++ b/include/svx/rubydialog.hxx @@ -37,7 +37,7 @@ class SvxRubyDialog; class RubyPreview : public vcl::Window { protected: - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; VclPtr<SvxRubyDialog> m_pParentDlg; public: diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx index 3babb6be0057..2059e1109387 100644 --- a/include/svx/scene3d.hxx +++ b/include/svx/scene3d.hxx @@ -118,7 +118,7 @@ public: bool GetDrawOnlySelected() const { return bDrawOnlySelected; } virtual sal_uInt16 GetObjIdentifier() const override; - virtual void NbcSetSnapRect(const Rectangle& rRect) override; + virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; virtual void NbcMove(const Size& rSize) override; virtual void NbcResize(const Point& rRef, const Fraction& rXFact, const Fraction& rYFact) override; diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx index e883b9d2a968..a2429eca7af6 100644 --- a/include/svx/sdr/contact/objectcontact.hxx +++ b/include/svx/sdr/contact/objectcontact.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/geometry/viewinformation2d.hxx> class SetOfByte; -class Rectangle; +namespace tools { class Rectangle; } class SdrPageView; class OutputDevice; diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx index 1c0e03a1dd44..970fdd7efc62 100644 --- a/include/svx/sdrpaintwindow.hxx +++ b/include/svx/sdrpaintwindow.hxx @@ -41,7 +41,7 @@ namespace sdr /// paint the transparent children of rWin that overlap rPixelRect /// (for example, transparent form controls like check boxes) void SVX_DLLPUBLIC -PaintTransparentChildren(vcl::Window & rWindow, Rectangle const& rPixelRect); +PaintTransparentChildren(vcl::Window & rWindow, tools::Rectangle const& rPixelRect); class SdrPreRenderDevice { @@ -105,7 +105,7 @@ public: void DrawOverlay(const vcl::Region& rRegion); // calculate visible area and return - Rectangle GetVisibleArea() const; + tools::Rectangle GetVisibleArea() const; // Is OutDev a printer? bool OutputToPrinter() const { return (OUTDEV_PRINTER == mpOutputDevice->GetOutDevType()); } diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx index c66b05488d3e..928006172ee2 100644 --- a/include/svx/svdcrtv.hxx +++ b/include/svx/svdcrtv.hxx @@ -61,7 +61,7 @@ private: protected: bool ImpBegCreateObj(SdrInventor nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut, - sal_Int16 nMinMov, const Rectangle& rLogRect, SdrObject* pPreparedFactoryObject); + sal_Int16 nMinMov, const tools::Rectangle& rLogRect, SdrObject* pPreparedFactoryObject); void ShowCreateObj(/*OutputDevice* pOut, bool bFull*/); void HideCreateObj(/*OutputDevice* pOut, bool bFull*/); @@ -78,7 +78,7 @@ public: virtual void EndAction() override; virtual void BckAction() override; virtual void BrkAction() override; - virtual void TakeActionRect(Rectangle& rRect) const override; + virtual void TakeActionRect(tools::Rectangle& rRect) const override; virtual bool MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) override; diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx index ef48ccf692fa..6764e71b0cf7 100644 --- a/include/svx/svddrag.hxx +++ b/include/svx/svddrag.hxx @@ -51,7 +51,7 @@ protected: Point aRef2; // axis of reflection, ...) Point aPos0; // Position at the last Event Point aRealNow; // Current dragging position without Snap, Ortho and Limit - Rectangle aActionRect; + tools::Rectangle aActionRect; bool bEndDragChangesAttributes; bool bEndDragChangesGeoAndAttributes; @@ -156,11 +156,11 @@ public: SdrDragMethod* GetDragMethod() const { return pDragMethod; } void SetDragMethod(SdrDragMethod* pMth) { pDragMethod=pMth; } - const Rectangle& GetActionRect() const { return aActionRect; } - void SetActionRect(const Rectangle& rR) { aActionRect=rR; } + const tools::Rectangle& GetActionRect() const { return aActionRect; } + void SetActionRect(const tools::Rectangle& rR) { aActionRect=rR; } // Also considering 1stPointAsCenter - void TakeCreateRect(Rectangle& rRect) const; + void TakeCreateRect(tools::Rectangle& rRect) const; }; #endif // INCLUDED_SVX_SVDDRAG_HXX diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index e3286291b534..c484c8736625 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -156,11 +156,11 @@ protected: const SdrHdlList& GetHdlList() const { return getSdrDragView().GetHdlList(); } void AddUndo(SdrUndoAction* pUndo) { getSdrDragView().AddUndo(pUndo); } bool IsDragLimit() { return getSdrDragView().mbDragLimit; } - const Rectangle& GetDragLimitRect() { return getSdrDragView().maDragLimit; } + const tools::Rectangle& GetDragLimitRect() { return getSdrDragView().maDragLimit; } const SdrMarkList& GetMarkedObjectList() { return getSdrDragView().GetMarkedObjectList(); } Point GetSnapPos(const Point& rPt) const { return getSdrDragView().GetSnapPos(rPt,getSdrDragView().mpMarkedPV); } SdrSnap SnapPos(Point& rPt) const { return getSdrDragView().SnapPos(rPt,getSdrDragView().mpMarkedPV); } - inline const Rectangle& GetMarkedRect() const; + inline const tools::Rectangle& GetMarkedRect() const; SdrPageView* GetDragPV() const; SdrObject* GetDragObj() const; bool IsDraggingPoints() const { return getSdrDragView().IsDraggingPoints(); } @@ -203,7 +203,7 @@ public: bool getSolidDraggingActive() const { return mbSolidDraggingActive; } }; -inline const Rectangle& SdrDragMethod::GetMarkedRect() const +inline const tools::Rectangle& SdrDragMethod::GetMarkedRect() const { return getSdrDragView().meDragHdl==SdrHdlKind::Poly ? getSdrDragView().GetMarkedPointsRect() : getSdrDragView().meDragHdl==SdrHdlKind::Glue ? getSdrDragView().GetMarkedGluePointsRect() : diff --git a/include/svx/svddrgv.hxx b/include/svx/svddrgv.hxx index 0ca6445122df..5da66b5eaa90 100644 --- a/include/svx/svddrgv.hxx +++ b/include/svx/svddrgv.hxx @@ -34,7 +34,7 @@ protected: SdrHdl* mpDragHdl; SdrDragMethod* mpCurrentSdrDragMethod; SdrUndoGeoObj* mpInsPointUndo; - Rectangle maDragLimit; + tools::Rectangle maDragLimit; OUString maInsPointUndoStr; SdrHdlKind meDragHdl; @@ -77,7 +77,7 @@ public: virtual void EndAction() override; virtual void BckAction() override; virtual void BrkAction() override; - virtual void TakeActionRect(Rectangle& rRect) const override; + virtual void TakeActionRect(tools::Rectangle& rRect) const override; // special implementation for Writer: // TakeDragObjAnchorPos() returns the position at which an object @@ -205,8 +205,8 @@ public: // errors,... // Default=EmptyRect=no limitation // only partially implemented - void SetWorkArea(const Rectangle& rRect) { maMaxWorkArea=rRect; } - const Rectangle& GetWorkArea() const { return maMaxWorkArea; } + void SetWorkArea(const tools::Rectangle& rRect) { maMaxWorkArea=rRect; } + const tools::Rectangle& GetWorkArea() const { return maMaxWorkArea; } // The DragLimit refers to the Page of the object. @@ -221,7 +221,7 @@ public: // occur, because of which the LimitRect might be exceeded by a // very small extent.... // Implemented for Move and Resize - virtual bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const; + virtual bool TakeDragLimit(SdrDragMode eMode, tools::Rectangle& rRect) const; }; #endif // INCLUDED_SVX_SVDDRGV_HXX diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index 15a331697568..1275adbca56a 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -153,8 +153,8 @@ protected: static bool ImpCanDismantle(const SdrObject* pObj, bool bMakeLines); void ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, size_t& rPos, SdrPageView* pPV, bool bMakeLines); static void ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRad, SdrCrookMode eMode, - bool bVertical, bool bNoContortion, bool bRotate, const Rectangle& rMarkRect); - static void ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion); + bool bVertical, bool bNoContortion, bool bRotate, const tools::Rectangle& rMarkRect); + static void ImpDistortObj(SdrObject* pO, const tools::Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion); bool ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const; void ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID); @@ -206,7 +206,7 @@ public: // Set a logical enclosing rectangle for all marked objects. // It is not guaranteed if this succeeds, as a horizontal // line has always a height of 0 - void SetMarkedObjRect(const Rectangle& rRect); + void SetMarkedObjRect(const tools::Rectangle& rRect); void MoveMarkedObj(const Size& rSiz, bool bCopy=false); void ResizeMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false); void ResizeMultMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, const bool bCopy, const bool bWdh, const bool bHgt); @@ -218,11 +218,11 @@ public: long GetMarkedObjShear() const; void ShearMarkedObj(const Point& rRef, long nAngle, bool bVShear=false, bool bCopy=false); void CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookMode eMode, bool bVertical, bool bNoContortion, bool bCopy=false); - void DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion, bool bCopy=false); + void DistortMarkedObj(const tools::Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion, bool bCopy=false); // copy marked objects and mark them instead of the old ones void CopyMarkedObj(); - void SetAllMarkedRect(const Rectangle& rRect) { SetMarkedObjRect(rRect); } + void SetAllMarkedRect(const tools::Rectangle& rRect) { SetMarkedObjRect(rRect); } void MoveAllMarked(const Size& rSiz, bool bCopy=false) { MoveMarkedObj(rSiz,bCopy); } void ResizeAllMarked(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { ResizeMarkedObj(rRef,xFact,yFact); } void RotateAllMarked(const Point& rRef, long nAngle) { RotateMarkedObj(rRef,nAngle); } diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index 211594aa9e89..d35e398301b6 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -75,8 +75,8 @@ protected: SdrPageView* pMacroPV; VclPtr<vcl::Window> pMacroWin; - Rectangle aTextEditArea; - Rectangle aMinTextEditArea; + tools::Rectangle aTextEditArea; + tools::Rectangle aMinTextEditArea; Link<EditFieldInfo*,void> aOldCalcFieldValueLink; // for call the old handler Point aMacroDownPos; @@ -112,7 +112,7 @@ protected: // Create a new OutlinerView at the heap and initialize all required parameters. // pTextEditObj, pTextEditPV and pTextEditOutliner have to be initialized OutlinerView* ImpMakeOutlinerView(vcl::Window* pWin, bool bNoPaint, OutlinerView* pGivenView, SfxViewShell* pViewShell = nullptr) const; - void ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectangle& rRect, OutputDevice& rTargetDevice) const; + void ImpPaintOutlinerView(OutlinerView& rOutlView, const tools::Rectangle& rRect, OutputDevice& rTargetDevice) const; void ImpInvalidateOutlinerView(OutlinerView& rOutlView) const; // Chaining @@ -155,7 +155,7 @@ public: virtual void EndAction() override; virtual void BrkAction() override; virtual void BckAction() override; - virtual void TakeActionRect(Rectangle& rRect) const override; + virtual void TakeActionRect(tools::Rectangle& rRect) const override; SdrPageView* ShowSdrPage(SdrPage* pPage) override; void HideSdrPage() override; diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 413164c9f592..010c73b84c6d 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -401,13 +401,13 @@ public: class ImpTextframeHdl: public SdrHdl { - const Rectangle maRect; + const tools::Rectangle maRect; // create marker for this kind virtual void CreateB2dIAObject() override; public: - explicit ImpTextframeHdl(const Rectangle& rRect); + explicit ImpTextframeHdl(const tools::Rectangle& rRect); }; diff --git a/include/svx/svdhlpln.hxx b/include/svx/svdhlpln.hxx index fafab5a4d427..86890979f91d 100644 --- a/include/svx/svdhlpln.hxx +++ b/include/svx/svdhlpln.hxx @@ -52,7 +52,7 @@ public: Pointer GetPointer() const; bool IsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const; // OutputDevice is required because capture points have a fixed pixel size - Rectangle GetBoundRect(const OutputDevice& rOut) const; + tools::Rectangle GetBoundRect(const OutputDevice& rOut) const; }; #define SDRHELPLINE_NOTFOUND 0xFFFF diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx index 39a5eb3f6c7a..f8c74d23a81c 100644 --- a/include/svx/svdmark.hxx +++ b/include/svx/svdmark.hxx @@ -28,7 +28,7 @@ #include <set> #include <vector> -class Rectangle; +namespace tools { class Rectangle; } class SdrPage; class SdrObjList; class SdrObject; @@ -217,8 +217,8 @@ public: } // pPage=0L: Selection of everything! Respect Pages - bool TakeBoundRect(SdrPageView* pPageView, Rectangle& rRect) const; - bool TakeSnapRect(SdrPageView* pPageView, Rectangle& rRect) const; + bool TakeBoundRect(SdrPageView* pPageView, tools::Rectangle& rRect) const; + bool TakeSnapRect(SdrPageView* pPageView, tools::Rectangle& rRect) const; // All Entries are copied! SdrMarkList& operator=(const SdrMarkList& rLst); diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index 7a2b1e30c42e..8afceb7e2082 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -109,10 +109,10 @@ protected: SdrHdlList maHdlList; sdr::ViewSelection* mpSdrViewSelection; - Rectangle maMarkedObjRect; - Rectangle maMarkedObjRectNoOffset; - Rectangle maMarkedPointsRect; - Rectangle maMarkedGluePointsRect; + tools::Rectangle maMarkedObjRect; + tools::Rectangle maMarkedObjRectNoOffset; + tools::Rectangle maMarkedPointsRect; + tools::Rectangle maMarkedGluePointsRect; sal_uInt16 mnFrameHandlesLimit; sal_uIntPtr mnInsPointNum; // Number of the InsPoint @@ -162,8 +162,8 @@ protected: // Generates a string including degrees symbol, from an angel specification in 1/100deg bool ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark); - virtual bool MarkPoints(const Rectangle* pRect, bool bUnmark); - bool MarkGluePoints(const Rectangle* pRect, bool bUnmark); + virtual bool MarkPoints(const tools::Rectangle* pRect, bool bUnmark); + bool MarkGluePoints(const tools::Rectangle* pRect, bool bUnmark); void SetMoveOutside(bool bOn); @@ -178,7 +178,7 @@ public: virtual void EndAction() override; virtual void BckAction() override; virtual void BrkAction() override; - virtual void TakeActionRect(Rectangle& rRect) const override; + virtual void TakeActionRect(tools::Rectangle& rRect) const override; virtual void ClearPageView() override; virtual void HideSdrPage() override; @@ -291,7 +291,7 @@ public: // Mark all objects within a rectangular area // Just objects are marked which are inclosed completely - void MarkObj(const Rectangle& rRect, bool bUnmark); + void MarkObj(const tools::Rectangle& rRect, bool bUnmark); void MarkObj(SdrObject* pObj, SdrPageView* pPV, bool bUnmark=false, bool bImpNoSetMarkHdl=false); void MarkAllObj(SdrPageView* pPV=nullptr); // pPage=NULL => all displayed pages void UnmarkAllObj(SdrPageView* pPV=nullptr); // pPage=NULL => all displayed pages @@ -403,12 +403,12 @@ public: // The purpose is to avoid unnecessary flickering. -> This does not yet work, that's why sal_True! void AdjustMarkHdl(SfxViewShell* pOtherShell = nullptr); //HMHBOOL bRestraintPaint=sal_True); - const Rectangle& GetMarkedObjRect() const; // SnapRects of Objects, without line width - Rectangle GetMarkedObjBoundRect() const; // incl. line width, overlapping rags, ... - const Rectangle& GetMarkedPointsRect() const; // Enclosing rectangle of all marked points - const Rectangle& GetMarkedGluePointsRect() const; // Enclosing rectangle of all marked glue points - const Rectangle& GetAllMarkedRect() const { return GetMarkedObjRect(); } - Rectangle GetAllMarkedBoundRect() const { return GetMarkedObjBoundRect(); } + const tools::Rectangle& GetMarkedObjRect() const; // SnapRects of Objects, without line width + tools::Rectangle GetMarkedObjBoundRect() const; // incl. line width, overlapping rags, ... + const tools::Rectangle& GetMarkedPointsRect() const; // Enclosing rectangle of all marked points + const tools::Rectangle& GetMarkedGluePointsRect() const; // Enclosing rectangle of all marked glue points + const tools::Rectangle& GetAllMarkedRect() const { return GetMarkedObjRect(); } + tools::Rectangle GetAllMarkedBoundRect() const { return GetMarkedObjBoundRect(); } Point GetGridOffset() const; // Will be always called, if the list of marked objects might be changed. diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index 43c9c1bf4394..483455aa2d25 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -106,7 +106,7 @@ public: SVX_DLLPRIVATE void DragCreateObject( SdrDragStat& rDrag ); - SVX_DLLPRIVATE void DragResizeCustomShape( const Rectangle& rNewRect ); + SVX_DLLPRIVATE void DragResizeCustomShape( const tools::Rectangle& rNewRect ); SVX_DLLPRIVATE void DragMoveCustomShapeHdl( const Point& rDestination, const sal_uInt16 nCustomShapeHdlNum, bool bMoveCalloutRectangle ); @@ -117,13 +117,13 @@ public: void ImpCheckCustomGluePointsAreAdded(); // returns the new text rect that corresponds to the current logic rect, the return value can be empty if nothing changed. - Rectangle ImpCalculateTextFrame( const bool bHgt, const bool bWdt ); + tools::Rectangle ImpCalculateTextFrame( const bool bHgt, const bool bWdt ); public: // #i37011# const SdrObject* GetSdrObjectFromCustomShape() const; const SdrObject* GetSdrObjectShadowFromCustomShape() const; - bool GetTextBounds( Rectangle& rTextBound ) const; + bool GetTextBounds( tools::Rectangle& rTextBound ) const; bool IsTextPath() const; basegfx::B2DPolyPolygon GetLineGeometry( const bool bBezierAllowed ) const; @@ -176,16 +176,16 @@ public: virtual void Move(const Size& rSiz) override; virtual void Shear(const Point& rRef, long nAngle, double tn, bool bVShear) override; - virtual void SetSnapRect(const Rectangle& rRect) override; - virtual void SetLogicRect(const Rectangle& rRect) override; + virtual void SetSnapRect(const tools::Rectangle& rRect) override; + virtual void SetLogicRect(const tools::Rectangle& rRect) override; virtual void NbcMove(const Size& rSiz) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) override; virtual void NbcMirror(const Point& rRef1, const Point& rRef2) override; virtual void NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear) override; - virtual void NbcSetSnapRect(const Rectangle& rRect) override; - virtual void NbcSetLogicRect(const Rectangle& rRect) override; + virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; + virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override; virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const override; @@ -205,17 +205,17 @@ public: * text. */ void SuggestTextFrameSize(Size aSuggestedTextFrameSize); - virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const override; + virtual bool AdjustTextFrameWidthAndHeight(tools::Rectangle& rR, bool bHgt = true, bool bWdt = true) const override; virtual bool NbcAdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true) override; virtual bool AdjustTextFrameWidthAndHeight() override; virtual bool IsAutoGrowHeight() const override; virtual bool IsAutoGrowWidth() const override; virtual void SetVerticalWriting( bool bVertical ) override; - virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const override; + virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, tools::Rectangle* pViewInit, tools::Rectangle* pViewMin) const override; virtual void EndTextEdit( SdrOutliner& rOutl ) override; - virtual void TakeTextAnchorRect( Rectangle& rAnchorRect ) const override; - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, - Rectangle* pAnchorRect, bool bLineWidth = true ) const override; + virtual void TakeTextAnchorRect( tools::Rectangle& rAnchorRect ) const override; + virtual void TakeTextRect( SdrOutliner& rOutliner, tools::Rectangle& rTextRect, bool bNoEditText, + tools::Rectangle* pAnchorRect, bool bLineWidth = true ) const override; virtual SdrObjCustomShape* Clone() const override; SdrObjCustomShape& operator=(const SdrObjCustomShape& rObj); diff --git a/include/svx/svdoattr.hxx b/include/svx/svdoattr.hxx index 8ec8673d5648..10c163b3b9b0 100644 --- a/include/svx/svdoattr.hxx +++ b/include/svx/svdoattr.hxx @@ -50,7 +50,7 @@ private: protected: virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override; - Rectangle maSnapRect; + tools::Rectangle maSnapRect; protected: /// Detects the width of the line. No line ->0. @@ -70,7 +70,7 @@ public: // Detects if Line != LineNone bool HasLine() const; - virtual const Rectangle& GetSnapRect() const override; + virtual const tools::Rectangle& GetSnapRect() const override; virtual void SetModel(SdrModel* pNewModel) override; }; diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index f35f1d0fd5db..5ca83078913c 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -172,7 +172,7 @@ class SVX_DLLPUBLIC SdrObjUserCall { public: virtual ~SdrObjUserCall(); - virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect); + virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const tools::Rectangle& rOldBoundRect); }; class SVX_DLLPUBLIC SdrObjMacroHitRec @@ -221,7 +221,7 @@ public: class SVX_DLLPUBLIC SdrObjGeoData { public: - Rectangle aBoundRect; + tools::Rectangle aBoundRect; Point aAnchor; std::unique_ptr<SdrGluePointList> pGPL; @@ -343,7 +343,7 @@ public: // renaming GetLayerSet -> getMergedHierarchyLayerSet to make clear what happens here. rSet needs to be empty. void getMergedHierarchyLayerSet(SetOfByte& rSet) const; - void SendUserCall(SdrUserCallType eUserCall, const Rectangle& rBoundRect) const; + void SendUserCall(SdrUserCallType eUserCall, const tools::Rectangle& rBoundRect) const; // #i68101# // An object may have a user-set Name (Get/SetName()), e.g SdrGrafObj, SdrObjGroup @@ -390,13 +390,13 @@ public: // expensive and sometimes problematic (inside a bigger object change You will get // non-useful BoundRects sometimes) i rename that method from GetBoundRect() to // GetCurrentBoundRect(). - virtual const Rectangle& GetCurrentBoundRect() const; + virtual const tools::Rectangle& GetCurrentBoundRect() const; // To have a possibility to get the last calculated BoundRect e.g for producing // the first rectangle for repaints (old and new need to be used) without forcing // a RecalcBoundRect (which may be problematical and expensive sometimes) i add here // a new method for accessing the last BoundRect. - virtual const Rectangle& GetLastBoundRect() const; + virtual const tools::Rectangle& GetLastBoundRect() const; virtual void RecalcBoundRect(); @@ -534,21 +534,21 @@ public: /// SetSnapRect() tries to size the Object so that it fits into the /// passed Rect (without stroke width, ...) virtual void RecalcSnapRect(); - virtual const Rectangle& GetSnapRect() const; - virtual void SetSnapRect(const Rectangle& rRect); - virtual void NbcSetSnapRect(const Rectangle& rRect); + virtual const tools::Rectangle& GetSnapRect() const; + virtual void SetSnapRect(const tools::Rectangle& rRect); + virtual void NbcSetSnapRect(const tools::Rectangle& rRect); // Logic Rect: for the Rect for instance without regard to rotation angle, shear, ... - virtual const Rectangle& GetLogicRect() const; - virtual void SetLogicRect(const Rectangle& rRect); - virtual void NbcSetLogicRect(const Rectangle& rRect); + virtual const tools::Rectangle& GetLogicRect() const; + virtual void SetLogicRect(const tools::Rectangle& rRect); + virtual void NbcSetLogicRect(const tools::Rectangle& rRect); // the default is to set the logic rect to the given rectangle rMaxRect. If the shape // has an intrinsic aspect ratio it may set the logic rect so the aspect // ratio is kept but still inside the rectangle rMaxRect. // If bShrinkOnly is set to true, the size of the current logic rect will not // be changed if it is smaller than the given rectangle rMaxRect. - virtual void AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false ); + virtual void AdjustToMaxRect( const tools::Rectangle& rMaxRect, bool bShrinkOnly = false ); // rotation and shear angle virtual long GetRotateAngle() const; @@ -614,7 +614,7 @@ public: virtual bool HasMacro() const; virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const; virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const; - virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const; + virtual void PaintMacro (OutputDevice& rOut, const tools::Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const; virtual bool DoMacro (const SdrObjMacroHitRec& rRec); virtual OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; bool IsMacroHit(const SdrObjMacroHitRec& rRec) const; @@ -784,8 +784,8 @@ public: // the following methods are used to control it; // usually this data makes no sense after the import is finished, since the object // might be resized - const Rectangle& GetBLIPSizeRectangle() const { return maBLIPSizeRectangle;} - void SetBLIPSizeRectangle( const Rectangle& aRect ); + const tools::Rectangle& GetBLIPSizeRectangle() const { return maBLIPSizeRectangle;} + void SetBLIPSizeRectangle( const tools::Rectangle& aRect ); // #i121917# virtual bool HasText() const; @@ -834,7 +834,7 @@ public: const css::uno::WeakReference< css::uno::XInterface >& getWeakUnoShape() const { return maWeakUnoShape; } protected: - Rectangle aOutRect; // surrounding rectangle for Paint (incl. LineWdt, ...) + tools::Rectangle aOutRect; // surrounding rectangle for Paint (incl. LineWdt, ...) Point aAnchor; // anchor position (Writer) SdrPage* pPage; SdrModel* pModel; @@ -871,7 +871,7 @@ protected: virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); - Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const; + tools::Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const; // for GetDragComment void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr) const; @@ -928,7 +928,7 @@ private: bool bMarkProt : 1; // marking forbidden, persistent // on import of OLE object from MS documents the BLIP size might be retrieved, // in this case the following member is initialized as nonempty rectangle - Rectangle maBLIPSizeRectangle; + tools::Rectangle maBLIPSizeRectangle; sdr::properties::BaseProperties* mpProperties; sdr::contact::ViewContact* mpViewContact; bool mbDelayBroadcastObjectChange : 1; @@ -989,7 +989,7 @@ class SVX_DLLPUBLIC SdrObjFactory { public: static SdrObject* MakeNewObject(SdrInventor nInventor, sal_uInt16 nObjIdentifier, SdrPage* pPage, SdrModel* pModel=nullptr); - static SdrObject* MakeNewObject(SdrInventor nInventor, sal_uInt16 nObjIdentifier, const Rectangle& rSnapRect, SdrPage* pPage); + static SdrObject* MakeNewObject(SdrInventor nInventor, sal_uInt16 nObjIdentifier, const tools::Rectangle& rSnapRect, SdrPage* pPage); static void InsertMakeObjectHdl(Link<SdrObjCreatorParams, SdrObject*> const & rLink); static void RemoveMakeObjectHdl(Link<SdrObjCreatorParams, SdrObject*> const & rLink); static void InsertMakeUserDataHdl(Link<SdrObjUserDataCreatorParams, SdrObjUserData*> const & rLink); diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx index bd0034030258..d1b0680010e9 100644 --- a/include/svx/svdocapt.hxx +++ b/include/svx/svdocapt.hxx @@ -66,15 +66,15 @@ private: private: SVX_DLLPRIVATE void ImpGetCaptParams(ImpCaptParams& rPara) const; - SVX_DLLPRIVATE static void ImpCalcTail1(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect); - SVX_DLLPRIVATE static void ImpCalcTail2(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect); - SVX_DLLPRIVATE static void ImpCalcTail3(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect); - SVX_DLLPRIVATE static void ImpCalcTail (const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect); + SVX_DLLPRIVATE static void ImpCalcTail1(const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle& rRect); + SVX_DLLPRIVATE static void ImpCalcTail2(const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle& rRect); + SVX_DLLPRIVATE static void ImpCalcTail3(const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle& rRect); + SVX_DLLPRIVATE static void ImpCalcTail (const ImpCaptParams& rPara, tools::Polygon& rPoly, tools::Rectangle& rRect); SVX_DLLPRIVATE void ImpRecalcTail(); public: SdrCaptionObj(); - SdrCaptionObj(const Rectangle& rRect, const Point& rTail); + SdrCaptionObj(const tools::Rectangle& rRect, const Point& rTail); virtual ~SdrCaptionObj() override; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; @@ -118,8 +118,8 @@ public: virtual void NbcSetRelativePos(const Point& rPnt) override; virtual Point GetRelativePos() const override; - virtual const Rectangle& GetLogicRect() const override; - virtual void NbcSetLogicRect(const Rectangle& rRect) override; + virtual const tools::Rectangle& GetLogicRect() const override; + virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override; virtual sal_uInt32 GetSnapPointCount() const override; virtual Point GetSnapPoint(sal_uInt32 i) const override; diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx index fc640860ec23..8385cd96ca97 100644 --- a/include/svx/svdocirc.hxx +++ b/include/svx/svdocirc.hxx @@ -55,7 +55,7 @@ protected: long nStartAngle; long nEndAngle; private: - SVX_DLLPRIVATE basegfx::B2DPolygon ImpCalcXPolyCirc(const SdrObjKind eKind, const Rectangle& rRect1, long nStart, long nEnd) const; + SVX_DLLPRIVATE basegfx::B2DPolygon ImpCalcXPolyCirc(const SdrObjKind eKind, const tools::Rectangle& rRect1, long nStart, long nEnd) const; SVX_DLLPRIVATE static void ImpSetCreateParams(SdrDragStat& rStat); SVX_DLLPRIVATE void ImpSetAttrToCircInfo(); // copy values from pool SVX_DLLPRIVATE void ImpSetCircInfoToAttr(); // copy values into pool @@ -69,25 +69,25 @@ protected: public: SdrCircObj(SdrObjKind eNewKind); // Circ, CArc, Sect or CCut - SdrCircObj(SdrObjKind eNewKind, const Rectangle& rRect); + SdrCircObj(SdrObjKind eNewKind, const tools::Rectangle& rRect); // 0=0.00Deg=3h 9000=90.00Deg=12h 18000=180.00Deg=9h 27000=270.00Deg=6h // The circle is build up from StartAngle to EndWink anti-clockwise. // If nNewStartAngle==nNewEndWink, then arc has an angle of 0 degrees. // If nNewStartAngle+36000==nNewEndWink, then the arc has angle of 360 degrees. - SdrCircObj(SdrObjKind eNewKind, const Rectangle& rRect, long nNewStartAngle, long nNewEndWink); + SdrCircObj(SdrObjKind eNewKind, const tools::Rectangle& rRect, long nNewStartAngle, long nNewEndWink); virtual ~SdrCircObj() override; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; virtual sal_uInt16 GetObjIdentifier() const override; - virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const override; + virtual void TakeUnrotatedSnapRect(tools::Rectangle& rRect) const override; virtual OUString TakeObjNameSingul() const override; virtual OUString TakeObjNamePlural() const override; virtual SdrCircObj* Clone() const override; virtual void RecalcSnapRect() override; - virtual void NbcSetSnapRect(const Rectangle& rRect) override; + virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; virtual basegfx::B2DPolyPolygon TakeXorPoly() const override; virtual sal_uInt32 GetSnapPointCount() const override; diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx index 15e476e33e89..5f685276c8d7 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -174,11 +174,11 @@ public: protected: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; - static XPolygon ImpCalcObjToCenter(const Point& rStPt, long nEscAngle, const Rectangle& rRect, const Point& rCenter); + static XPolygon ImpCalcObjToCenter(const Point& rStPt, long nEscAngle, const tools::Rectangle& rRect, const Point& rCenter); void ImpRecalcEdgeTrack(); // recalculation of the connection track XPolygon ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& rCon1, SdrObjConnection& rCon2, SdrEdgeInfoRec* pInfo) const; - XPolygon ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rectangle& rBoundRect1, const Rectangle& rBewareRect1, - const Point& rPt2, long nAngle2, const Rectangle& rBoundRect2, const Rectangle& rBewareRect2, + XPolygon ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const tools::Rectangle& rBoundRect1, const tools::Rectangle& rBewareRect1, + const Point& rPt2, long nAngle2, const tools::Rectangle& rBoundRect2, const tools::Rectangle& rBewareRect2, sal_uIntPtr* pnQuality, SdrEdgeInfoRec* pInfo) const; static bool ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut=nullptr); static SdrEscapeDirection ImpCalcEscAngle(SdrObject* pObj, const Point& aPt2); @@ -196,8 +196,8 @@ public: SdrObjConnection& GetConnection(bool bTail1) { return *(bTail1 ? &aCon1 : &aCon2); } virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; virtual sal_uInt16 GetObjIdentifier() const override; - virtual const Rectangle& GetCurrentBoundRect() const override; - virtual const Rectangle& GetSnapRect() const override; + virtual const tools::Rectangle& GetCurrentBoundRect() const override; + virtual const tools::Rectangle& GetSnapRect() const override; virtual bool IsNode() const override; virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const override; virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const override; @@ -215,7 +215,7 @@ public: bool CheckNodeConnection(bool bTail1) const; virtual void RecalcSnapRect() override; - virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const override; + virtual void TakeUnrotatedSnapRect(tools::Rectangle& rRect) const override; virtual SdrEdgeObj* Clone() const override; SdrEdgeObj& operator=(const SdrEdgeObj& rObj); virtual OUString TakeObjNameSingul() const override; @@ -237,7 +237,7 @@ public: // FullDrag support virtual SdrObject* getFullDragClone() const override; - virtual void NbcSetSnapRect(const Rectangle& rRect) override; + virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; virtual void NbcMove(const Size& aSize) override; virtual void NbcResize(const Point& rRefPnt, const Fraction& aXFact, const Fraction& aYFact) override; diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index 30c564342e9e..07532267e8be 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -119,7 +119,7 @@ public: SdrGrafObj(); SdrGrafObj(const Graphic& rGrf); - SdrGrafObj(const Graphic& rGrf, const Rectangle& rRect); + SdrGrafObj(const Graphic& rGrf, const tools::Rectangle& rRect); virtual ~SdrGrafObj() override; void SetGraphicObject( const GraphicObject& rGrfObj ); @@ -190,7 +190,7 @@ public: virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const override; - virtual void AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false ) override; + virtual void AdjustToMaxRect( const tools::Rectangle& rMaxRect, bool bShrinkOnly = false ) override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx index 8d10e75de5b6..ea2988093d2f 100644 --- a/include/svx/svdogrp.hxx +++ b/include/svx/svdogrp.hxx @@ -59,8 +59,8 @@ public: virtual void SetModel(SdrModel* pNewModel) override; virtual SdrObjList* GetSubList() const override; - virtual const Rectangle& GetCurrentBoundRect() const override; - virtual const Rectangle& GetSnapRect() const override; + virtual const tools::Rectangle& GetCurrentBoundRect() const override; + virtual const tools::Rectangle& GetSnapRect() const override; virtual SdrObjGroup* Clone() const override; SdrObjGroup& operator=(const SdrObjGroup& rObj); @@ -86,8 +86,8 @@ public: virtual void Shear(const Point& rRef, long nAngle, double tn, bool bVShear) override; virtual void SetAnchorPos(const Point& rPnt) override; virtual void SetRelativePos(const Point& rPnt) override; - virtual void SetSnapRect(const Rectangle& rRect) override; - virtual void SetLogicRect(const Rectangle& rRect) override; + virtual void SetSnapRect(const tools::Rectangle& rRect) override; + virtual void SetLogicRect(const tools::Rectangle& rRect) override; virtual void NbcMove(const Size& rSiz) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; @@ -96,8 +96,8 @@ public: virtual void NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear) override; virtual void NbcSetAnchorPos(const Point& rPnt) override; virtual void NbcSetRelativePos(const Point& rPnt) override; - virtual void NbcSetSnapRect(const Rectangle& rRect) override; - virtual void NbcSetLogicRect(const Rectangle& rRect) override; + virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; + virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override; virtual void NbcReformatText() override; virtual void ReformatText() override; diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx index f2da911ddb57..bcc445702001 100644 --- a/include/svx/svdomeas.hxx +++ b/include/svx/svdomeas.hxx @@ -91,7 +91,7 @@ public: virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; virtual sal_uInt16 GetObjIdentifier() const override; - virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const override; + virtual void TakeUnrotatedSnapRect(tools::Rectangle& rRect) const override; virtual SdrMeasureObj* Clone() const override; virtual OUString TakeObjNameSingul() const override; @@ -135,10 +135,10 @@ public: virtual bool BegTextEdit(SdrOutliner& rOutl) override; virtual const Size& GetTextSize() const override; - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, - Rectangle* pAnchorRect, bool bLineWidth = true ) const override; - virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const override; - virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const override; + virtual void TakeTextRect( SdrOutliner& rOutliner, tools::Rectangle& rTextRect, bool bNoEditText, + tools::Rectangle* pAnchorRect, bool bLineWidth = true ) const override; + virtual void TakeTextAnchorRect(tools::Rectangle& rAnchorRect) const override; + virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, tools::Rectangle* pViewInit, tools::Rectangle* pViewMin) const override; virtual sal_uInt16 GetOutlinerViewAnchorMode() const override; virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) override; virtual OutlinerParaObject* GetOutlinerParaObject() const override; diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx index 5b69ed6ea67c..4a96e9ac6c3f 100644 --- a/include/svx/svdomedia.hxx +++ b/include/svx/svdomedia.hxx @@ -37,7 +37,7 @@ public: SdrMediaObj(); - SdrMediaObj( const Rectangle& rRect ); + SdrMediaObj( const tools::Rectangle& rRect ); virtual ~SdrMediaObj() override; @@ -52,7 +52,7 @@ public: virtual SdrMediaObj* Clone() const override; SdrMediaObj& operator=(const SdrMediaObj& rObj); - virtual void AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false ) override; + virtual void AdjustToMaxRect( const tools::Rectangle& rMaxRect, bool bShrinkOnly = false ) override; public: diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx index 345f6ebba16b..d1a471db2f48 100644 --- a/include/svx/svdoole2.hxx +++ b/include/svx/svdoole2.hxx @@ -68,7 +68,7 @@ public: OUString GetStyleString(); SdrOle2Obj( bool bFrame_ = false ); - SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const OUString& rNewObjName, const Rectangle& rNewRect ); + SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const OUString& rNewObjName, const tools::Rectangle& rNewRect ); virtual ~SdrOle2Obj() override; const svt::EmbeddedObjectRef& getEmbeddedObjectRef() const; @@ -135,8 +135,8 @@ public: virtual void NbcMove(const Size& rSize) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; - virtual void NbcSetSnapRect(const Rectangle& rRect) override; - virtual void NbcSetLogicRect(const Rectangle& rRect) override; + virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; + virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override; virtual void SetGeoData(const SdrObjGeoData& rGeo) override; static bool CanUnloadRunningObj( const css::uno::Reference< css::embed::XEmbeddedObject >& xObj, diff --git a/include/svx/svdopage.hxx b/include/svx/svdopage.hxx index 5f2947fc0702..8893e812d783 100644 --- a/include/svx/svdopage.hxx +++ b/include/svx/svdopage.hxx @@ -42,7 +42,7 @@ protected: public: SdrPageObj(SdrPage* pNewPage = nullptr); - SdrPageObj(const Rectangle& rRect, SdrPage* pNewPage = nullptr); + SdrPageObj(const tools::Rectangle& rRect, SdrPage* pNewPage = nullptr); virtual ~SdrPageObj() override; SdrPage* GetReferencedPage() const { return mpShownPage;} diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx index 85eca76899a9..f4ad038f1e22 100644 --- a/include/svx/svdopath.hxx +++ b/include/svx/svdopath.hxx @@ -74,7 +74,7 @@ public: virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; virtual sal_uInt16 GetObjIdentifier() const override; - virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const override; + virtual void TakeUnrotatedSnapRect(tools::Rectangle& rRect) const override; virtual SdrPathObj* Clone() const override; SdrPathObj& operator=(const SdrPathObj& rObj); @@ -82,7 +82,7 @@ public: virtual OUString TakeObjNamePlural() const override; virtual basegfx::B2DPolyPolygon TakeXorPoly() const override; virtual void RecalcSnapRect() override; - virtual void NbcSetSnapRect(const Rectangle& rRect) override; + virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; virtual sal_uInt32 GetHdlCount() const override; virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const override; virtual sal_uInt32 GetPlusHdlCount(const SdrHdl& rHdl) const override; diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx index 11d6b7d7d55d..367ea1737f19 100644 --- a/include/svx/svdorect.hxx +++ b/include/svx/svdorect.hxx @@ -49,7 +49,7 @@ protected: std::unique_ptr<XPolygon> mpXPoly; protected: - XPolygon ImpCalcXPoly(const Rectangle& rRect1, long nRad1) const; + XPolygon ImpCalcXPoly(const tools::Rectangle& rRect1, long nRad1) const; void SetXPolyDirty(); /// Subclasses should override RecalcXPoly() by creating an XPolygon @@ -66,26 +66,26 @@ public: * Constructor of a rectangular drawing object */ SdrRectObj(); - SdrRectObj(const Rectangle& rRect); + SdrRectObj(const tools::Rectangle& rRect); SdrRectObj& operator=(const SdrRectObj& rCopy); // Constructor of a text frame SdrRectObj(SdrObjKind eNewTextKind); - SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect); + SdrRectObj(SdrObjKind eNewTextKind, const tools::Rectangle& rRect); virtual ~SdrRectObj() override; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; virtual sal_uInt16 GetObjIdentifier() const override; - virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const override; + virtual void TakeUnrotatedSnapRect(tools::Rectangle& rRect) const override; virtual OUString TakeObjNameSingul() const override; virtual OUString TakeObjNamePlural() const override; virtual SdrRectObj* Clone() const override; virtual void RecalcSnapRect() override; - virtual void NbcSetSnapRect(const Rectangle& rRect) override; - virtual void NbcSetLogicRect(const Rectangle& rRect) override; + virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; + virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override; virtual basegfx::B2DPolyPolygon TakeXorPoly() const override; virtual sal_uInt32 GetHdlCount() const override; diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index 3de0a341246a..9cfb42cfa337 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -99,7 +99,7 @@ class SVX_DLLPUBLIC SdrTableObj : public ::SdrTextObj public: SdrTableObj(SdrModel* _pModel); - SdrTableObj(SdrModel* _pModel, const ::Rectangle& rNewRect, sal_Int32 nColumns, sal_Int32 nRows); + SdrTableObj(SdrModel* _pModel, const ::tools::Rectangle& rNewRect, sal_Int32 nColumns, sal_Int32 nRows); virtual ~SdrTableObj() override; @@ -138,7 +138,7 @@ public: void setActiveCell( const sdr::table::CellPos& rPos ); void getActiveCellPos( sdr::table::CellPos& rPos ) const; sal_Int32 getColumnCount() const; - void getCellBounds( const sdr::table::CellPos& rPos, ::Rectangle& rCellRect ); + void getCellBounds( const sdr::table::CellPos& rPos, ::tools::Rectangle& rCellRect ); const SfxItemSet& GetActiveCellItemSet() const; void SetMergedItemSetAndBroadcastOnActiveCell(const SfxItemSet& rSet, bool bClearAllItems); @@ -175,10 +175,10 @@ public: /** At the same time, we set the text in the outliner (if applicable the EditOutliners') * as well as the PaperSize */ - void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, bool bNoEditText, ::Rectangle* pAnchorRect=nullptr, bool bLineWidth = true ) const; - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, Rectangle* pAnchorRect, bool bLineWidth = true ) const override; - void TakeTextAnchorRect(const sdr::table::CellPos& rPos, ::Rectangle& rAnchorRect ) const; - virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const override; + void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::tools::Rectangle& rTextRect, bool bNoEditText, ::tools::Rectangle* pAnchorRect=nullptr, bool bLineWidth = true ) const; + virtual void TakeTextRect( SdrOutliner& rOutliner, tools::Rectangle& rTextRect, bool bNoEditText, tools::Rectangle* pAnchorRect, bool bLineWidth = true ) const override; + void TakeTextAnchorRect(const sdr::table::CellPos& rPos, ::tools::Rectangle& rAnchorRect ) const; + virtual void TakeTextAnchorRect(::tools::Rectangle& rAnchorRect) const override; virtual bool IsAutoGrowHeight() const override; virtual bool IsAutoGrowWidth() const override; @@ -190,19 +190,19 @@ public: virtual sal_uInt16 GetObjIdentifier() const override; virtual void SetChanged() override; - virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const override; + virtual bool AdjustTextFrameWidthAndHeight(tools::Rectangle& rR, bool bHgt = true, bool bWdt = true) const override; virtual bool AdjustTextFrameWidthAndHeight() override; virtual OUString TakeObjNameSingul() const override; virtual OUString TakeObjNamePlural() const override; virtual SdrTableObj* Clone() const override; SdrTableObj& operator=(const SdrTableObj& rObj); virtual void RecalcSnapRect() override; - virtual const Rectangle& GetSnapRect() const override; - virtual void NbcSetSnapRect(const Rectangle& rRect) override; + virtual const tools::Rectangle& GetSnapRect() const override; + virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; - virtual const Rectangle& GetLogicRect() const override; - virtual void NbcSetLogicRect(const Rectangle& rRect) override; - virtual void AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false ) override; + virtual const tools::Rectangle& GetLogicRect() const override; + virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override; + virtual void AdjustToMaxRect( const tools::Rectangle& rMaxRect, bool bShrinkOnly = false ) override; virtual sal_uInt32 GetHdlCount() const override; virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const override; @@ -227,8 +227,8 @@ public: virtual bool BegTextEdit(SdrOutliner& rOutl) override; virtual void EndTextEdit(SdrOutliner& rOutl) override; - virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const override; - void TakeTextEditArea(const sdr::table::CellPos& rPos, Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; + virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, tools::Rectangle* pViewInit, tools::Rectangle* pViewMin) const override; + void TakeTextEditArea(const sdr::table::CellPos& rPos, Size* pPaperMin, Size* pPaperMax, tools::Rectangle* pViewInit, tools::Rectangle* pViewMin) const; virtual sal_uInt16 GetOutlinerViewAnchorMode() const override; virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) override; @@ -277,7 +277,7 @@ private: friend class sdr::contact::ViewContactOfTableObj; const TableLayouter& getTableLayouter() const; - Rectangle maLogicRect; + tools::Rectangle maLogicRect; private: rtl::Reference<SdrTableObjImpl> mpImpl; }; diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 2c2a4ab00f6a..ae1d77fcf202 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -90,7 +90,7 @@ namespace sdr { namespace table { class SdrTextObjGeoData : public SdrObjGeoData { public: - Rectangle aRect; + tools::Rectangle aRect; GeoStat aGeo; }; @@ -184,7 +184,7 @@ protected: // The "aRect" is also the rect of RectObj and CircObj. // When bTextFrame=sal_True the text will be formatted into this rect // When bTextFrame=sal_False the text will be centered around its middle - Rectangle maRect; + tools::Rectangle maRect; // The GeoStat contains the rotation and shear angles GeoStat aGeo; @@ -266,9 +266,9 @@ private: // #101029#: Extracted from Paint() SVX_DLLPRIVATE void ImpSetupDrawOutlinerForPaint( bool bContourFrame, SdrOutliner& rOutliner, - Rectangle& rTextRect, - Rectangle& rAnchorRect, - Rectangle& rPaintRect, + tools::Rectangle& rTextRect, + tools::Rectangle& rAnchorRect, + tools::Rectangle& rPaintRect, Fraction& aFitXKorreg ) const; void ImpAutoFitText( SdrOutliner& rOutliner ) const; static void ImpAutoFitText( SdrOutliner& rOutliner, const Size& rShapeSize, bool bIsVerticalWriting ); @@ -290,14 +290,14 @@ protected: SdrObject* ImpConvertAddText(SdrObject* pObj, bool bBezier) const; void ImpSetTextStyleSheetListeners(); static void ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextSize, const Size& rShapeSize, Fraction& rFitXKorreg); - static void ImpJustifyRect(Rectangle& rRect); + static void ImpJustifyRect(tools::Rectangle& rRect); void ImpCheckShear(); - Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const; + tools::Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const; void ImpSetTextEditParams() const; void SetTextSizeDirty() { bTextSizeDirty=true; } // rAnchorRect ist InOut-Parameter! - void ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, bool bLineWidth ) const; + void ImpSetContourPolygon( SdrOutliner& rOutliner, tools::Rectangle& rAnchorRect, bool bLineWidth ) const; virtual SdrObjGeoData* NewGeoData() const override; virtual void SaveGeoData(SdrObjGeoData& rGeo) const override; @@ -311,11 +311,11 @@ protected: // constructors for labeled graphical objects SdrTextObj(); - SdrTextObj(const Rectangle& rNewRect); + SdrTextObj(const tools::Rectangle& rNewRect); // constructors for text frames SdrTextObj(SdrObjKind eNewTextKind); - SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect); + SdrTextObj(SdrObjKind eNewTextKind, const tools::Rectangle& rNewRect); virtual ~SdrTextObj() override; @@ -340,7 +340,7 @@ public: bool ReloadLinkedText(bool bForceLoad); bool LoadText(const OUString& rFileName, const OUString& rFilterName, rtl_TextEncoding eCharSet); - virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const; + virtual bool AdjustTextFrameWidthAndHeight(tools::Rectangle& rR, bool bHgt = true, bool bWdt = true) const; virtual bool NbcAdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true); virtual bool AdjustTextFrameWidthAndHeight(); bool IsTextFrame() const { return bTextFrame; } @@ -395,9 +395,9 @@ public: // Simultaneously sets the text into the Outliner (possibly // the one of the EditOutliner) and sets the PaperSize. - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, - Rectangle* pAnchorRect, bool bLineWidth = true ) const; - virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const; + virtual void TakeTextRect( SdrOutliner& rOutliner, tools::Rectangle& rTextRect, bool bNoEditText, + tools::Rectangle* pAnchorRect, bool bLineWidth = true ) const; + virtual void TakeTextAnchorRect(::tools::Rectangle& rAnchorRect) const; const GeoStat& GetGeoStat() const { return aGeo; } // get corner radius @@ -410,7 +410,7 @@ public: long GetMaxTextFrameWidth() const; SdrFitToSizeType GetFitToSize() const; - const Rectangle &GetGeoRect() const; + const tools::Rectangle &GetGeoRect() const; // check if it's a TextFontwork virtual bool IsFontwork() const; @@ -444,7 +444,7 @@ public: virtual sal_uInt16 GetObjIdentifier() const override; // needed to determine text anchor area - virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const; + virtual void TakeUnrotatedSnapRect(tools::Rectangle& rRect) const; virtual OUString TakeObjNameSingul() const override; virtual OUString TakeObjNamePlural() const override; virtual SdrTextObj* Clone() const override; @@ -452,9 +452,9 @@ public: virtual basegfx::B2DPolyPolygon TakeXorPoly() const override; virtual basegfx::B2DPolyPolygon TakeContour() const override; virtual void RecalcSnapRect() override; - virtual void NbcSetSnapRect(const Rectangle& rRect) override; - virtual void NbcSetLogicRect(const Rectangle& rRect) override; - virtual const Rectangle& GetLogicRect() const override; + virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; + virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override; + virtual const tools::Rectangle& GetLogicRect() const override; virtual long GetRotateAngle() const override; virtual long GetShearAngle(bool bVertical = false) const override; @@ -485,7 +485,7 @@ public: virtual bool HasTextEdit() const override; virtual bool BegTextEdit(SdrOutliner& rOutl) override; - virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; + virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, tools::Rectangle* pViewInit, tools::Rectangle* pViewMin) const; virtual void EndTextEdit(SdrOutliner& rOutl) override; virtual sal_uInt16 GetOutlinerViewAnchorMode() const; @@ -520,7 +520,7 @@ public: The region to paint the outliner content into. This is useful to e.g. determine the top, left position of text in shapes. */ - void SetupOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaintRect ) const; + void SetupOutlinerFormatting( SdrOutliner& rOutl, tools::Rectangle& rPaintRect ) const; /** Update given Outliner equivalently to SdrTextObj::Paint() @@ -534,7 +534,7 @@ public: The region to paint the outliner content into. This is useful to e.g. determine the top, left position of text in shapes. */ - void UpdateOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaintRect ) const; + void UpdateOutlinerFormatting( SdrOutliner& rOutl, tools::Rectangle& rPaintRect ) const; void ForceOutlinerParaObject(); virtual bool IsVerticalWriting() const; virtual void SetVerticalWriting(bool bVertical); @@ -568,7 +568,7 @@ public: // Get necessary data for text scroll animation. ATM base it on a Text-Metafile and a // painting rectangle. Rotation is taken from the object. - GDIMetaFile* GetTextScrollMetaFileAndRectangle(Rectangle& rScrollRectangle, Rectangle& rPaintRectangle); + GDIMetaFile* GetTextScrollMetaFileAndRectangle(tools::Rectangle& rScrollRectangle, tools::Rectangle& rPaintRectangle); // Access to TextAnimationAllowed flag void SetTextAnimationAllowed(bool bNew); diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx index 3484671d5557..a6223975572d 100644 --- a/include/svx/svdovirt.hxx +++ b/include/svx/svdovirt.hxx @@ -37,7 +37,7 @@ protected: virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override; SdrObject& rRefObj; // Referenced drawing object - Rectangle aSnapRect; + tools::Rectangle aSnapRect; protected: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; @@ -59,8 +59,8 @@ public: virtual sal_uInt16 GetObjIdentifier() const override; virtual SdrObjList* GetSubList() const override; - virtual const Rectangle& GetCurrentBoundRect() const override; - virtual const Rectangle& GetLastBoundRect() const override; + virtual const tools::Rectangle& GetCurrentBoundRect() const override; + virtual const tools::Rectangle& GetLastBoundRect() const override; virtual void RecalcBoundRect() override; virtual SdrVirtObj* Clone() const override; SdrVirtObj& operator=(const SdrVirtObj& rObj); @@ -106,13 +106,13 @@ public: virtual void Shear(const Point& rRef, long nAngle, double tn, bool bVShear) override; virtual void RecalcSnapRect() override; - virtual const Rectangle& GetSnapRect() const override; - virtual void SetSnapRect(const Rectangle& rRect) override; - virtual void NbcSetSnapRect(const Rectangle& rRect) override; + virtual const tools::Rectangle& GetSnapRect() const override; + virtual void SetSnapRect(const tools::Rectangle& rRect) override; + virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; - virtual const Rectangle& GetLogicRect() const override; - virtual void SetLogicRect(const Rectangle& rRect) override; - virtual void NbcSetLogicRect(const Rectangle& rRect) override; + virtual const tools::Rectangle& GetLogicRect() const override; + virtual void SetLogicRect(const tools::Rectangle& rRect) override; + virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override; virtual long GetRotateAngle() const override; virtual long GetShearAngle(bool bVertical = false) const override; @@ -134,7 +134,7 @@ public: virtual bool HasMacro() const override; virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const override; virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const override; - virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const override; + virtual void PaintMacro (OutputDevice& rOut, const tools::Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const override; virtual bool DoMacro (const SdrObjMacroHitRec& rRec) override; virtual OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const override; diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index be9dc8bafa7a..11db722b0acf 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -69,8 +69,8 @@ friend class SdrEditView; SdrModel* pModel; /// model to which the list belongs (Layer,ItemPool,Storage) SdrPage* pPage; /// Page containing the list, may be "this". SdrObject* pOwnerObj; /// OwnerObject, if it's list of a Group object. - Rectangle aOutRect; - Rectangle aSnapRect; + tools::Rectangle aOutRect; + tools::Rectangle aSnapRect; SdrObjListKind eListKind; bool bObjOrdNumsDirty; bool bRectsDirty; @@ -120,8 +120,8 @@ public: void SetRectsDirty(); - const Rectangle& GetAllObjSnapRect() const; - const Rectangle& GetAllObjBoundRect() const; + const tools::Rectangle& GetAllObjSnapRect() const; + const tools::Rectangle& GetAllObjBoundRect() const; /// reformat all text objects, e.g. when changing printer void NbcReformatAllTextObjects(); @@ -278,12 +278,12 @@ private: /// for the snap-to-grid in Writer class SdrPageGridFrame { - Rectangle aPaper; - Rectangle aUserArea; + tools::Rectangle aPaper; + tools::Rectangle aUserArea; public: - SdrPageGridFrame(const Rectangle& rPaper, const Rectangle& rUser): aPaper(rPaper), aUserArea(rUser) {} - const Rectangle& GetPaperRect() const { return aPaper; } - const Rectangle& GetUserArea() const { return aUserArea; } + SdrPageGridFrame(const tools::Rectangle& rPaper, const tools::Rectangle& rUser): aPaper(rPaper), aUserArea(rUser) {} + const tools::Rectangle& GetPaperRect() const { return aPaper; } + const tools::Rectangle& GetUserArea() const { return aUserArea; } }; class SVX_DLLPUBLIC SdrPageGridFrameList { @@ -485,7 +485,7 @@ public: /// for snap-to-grid in Writer, also for AlignObjects if 1 object is marked /// if pRect != null, then the pages that are intersected by this Rect, /// otherwise the visible pages - virtual const SdrPageGridFrameList* GetGridFrameList(const SdrPageView* pPV, const Rectangle* pRect) const; + virtual const SdrPageGridFrameList* GetGridFrameList(const SdrPageView* pPV, const tools::Rectangle* pRect) const; css::uno::Reference< css::uno::XInterface > const & getUnoPage(); diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index 039dcd4dc025..44a0000beb86 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -64,8 +64,8 @@ private: SdrPage* mpPage; Point aPgOrg; // The Page's point of origin - Rectangle aMarkBound; - Rectangle aMarkSnap; + tools::Rectangle aMarkBound; + tools::Rectangle aMarkSnap; bool mbHasMarked; bool mbVisible; @@ -162,11 +162,11 @@ public: void setPreparedPageWindow(SdrPageWindow* pKnownTarget); void DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget, sdr::contact::ViewObjectContactRedirector* pRedirector = nullptr, - const Rectangle& rRect = Rectangle(), + const tools::Rectangle& rRect = tools::Rectangle(), basegfx::B2IRange const* pPageFrame = nullptr); - void DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, Color aColor = Color( COL_BLACK ) ); + void DrawPageViewGrid(OutputDevice& rOut, const tools::Rectangle& rRect, Color aColor = Color( COL_BLACK ) ); - Rectangle GetPageRect() const; + tools::Rectangle GetPageRect() const; SdrPage* GetPage() const { return mpPage; } /// Return current List @@ -181,10 +181,10 @@ public: bool HasMarkedObjPageView() const { return mbHasMarked; } void SetHasMarkedObj(bool bOn) { mbHasMarked = bOn; } - const Rectangle& MarkBound() const { return aMarkBound; } - const Rectangle& MarkSnap() const { return aMarkSnap; } - Rectangle& MarkBound() { return aMarkBound; } - Rectangle& MarkSnap() { return aMarkSnap; } + const tools::Rectangle& MarkBound() const { return aMarkBound; } + const tools::Rectangle& MarkSnap() const { return aMarkSnap; } + tools::Rectangle& MarkBound() { return aMarkBound; } + tools::Rectangle& MarkSnap() { return aMarkSnap; } void SetLayerVisible(const OUString& rName, bool bShow) { SetLayer(rName, aLayerVisi, bShow); @@ -207,7 +207,7 @@ public: void SetPageOrigin(const Point& rOrg); void LogicToPagePos(Point& rPnt) const { rPnt-=aPgOrg; } - void LogicToPagePos(Rectangle& rRect) const { rRect.Move(-aPgOrg.X(),-aPgOrg.Y()); } + void LogicToPagePos(tools::Rectangle& rRect) const { rRect.Move(-aPgOrg.X(),-aPgOrg.Y()); } void PagePosToLogic(Point& rPnt) const { rPnt+=aPgOrg; } void SetVisibleLayers(const SetOfByte& rSet) { aLayerVisi=rSet; } diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 726d3f78956a..b660297d573c 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -135,7 +135,7 @@ protected: Size maGridBig; // FIXME: We need to get rid of this eventually Size maGridFin; // FIXME: We need to get rid of this eventually SdrDragStat maDragStat; - Rectangle maMaxWorkArea; + tools::Rectangle maMaxWorkArea; SfxItemSet maDefaultAttr; Idle maComeBackIdle; @@ -260,7 +260,7 @@ public: virtual void EndAction(); virtual void BckAction(); virtual void BrkAction(); // Cancel all Actions (e.g. cancel dragging) - virtual void TakeActionRect(Rectangle& rRect) const; + virtual void TakeActionRect(tools::Rectangle& rRect) const; // Info about TextEdit. Default is sal_False. virtual bool IsTextEdit() const; @@ -407,12 +407,12 @@ public: const Size& GetGridFine() const { return maGridFin; } void InvalidateAllWin(); - void InvalidateAllWin(const Rectangle& rRect); + void InvalidateAllWin(const tools::Rectangle& rRect); /// If the View should not call Invalidate() on the windows, override /// the following 2 methods and do something else. virtual void InvalidateOneWin(vcl::Window& rWin); - virtual void InvalidateOneWin(vcl::Window& rWin, const Rectangle& rRect); + virtual void InvalidateOneWin(vcl::Window& rWin, const tools::Rectangle& rRect); void SetActiveLayer(const OUString& rName) { maActualLayer=rName; } const OUString& GetActiveLayer() const { return maActualLayer; } @@ -455,7 +455,7 @@ public: SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(bool& rOk) const; bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr); - virtual void MakeVisible(const Rectangle& rRect, vcl::Window& rWin); + virtual void MakeVisible(const tools::Rectangle& rRect, vcl::Window& rWin); /// For Plugins /// Is called by the Paint of the OLE object diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx index 57a73610d8f7..a90bdf34d392 100644 --- a/include/svx/svdsnpv.hxx +++ b/include/svx/svdsnpv.hxx @@ -136,7 +136,7 @@ public: virtual void EndAction() override; virtual void BckAction() override; virtual void BrkAction() override; // break actions for derived classes e.g. interrupt dragging. - virtual void TakeActionRect(Rectangle& rRect) const override; + virtual void TakeActionRect(tools::Rectangle& rRect) const override; void SetSnapGridWidth(const Fraction& rX, const Fraction& rY) { aSnapWdtX=rX; aSnapWdtY=rY; } const Fraction& GetSnapGridWidthX() const { return aSnapWdtX; } diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx index 6570a6bee099..6ad879d3a822 100644 --- a/include/svx/svdtrans.hxx +++ b/include/svx/svdtrans.hxx @@ -54,12 +54,12 @@ namespace svx inline long Round(double a) { return a>0.0 ? (long)(a+0.5) : -(long)((-a)+0.5); } } -inline void MoveRect(Rectangle& rRect, const Size& S) { rRect.Move(S.Width(),S.Height()); } +inline void MoveRect(tools::Rectangle& rRect, const Size& S) { rRect.Move(S.Width(),S.Height()); } inline void MovePoint(Point& rPnt, const Size& S) { rPnt.X()+=S.Width(); rPnt.Y()+=S.Height(); } inline void MovePoly(tools::Polygon& rPoly, const Size& S) { rPoly.Move(S.Width(),S.Height()); } void MoveXPoly(XPolygon& rPoly, const Size& S); -SVX_DLLPUBLIC void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& xFact, const Fraction& yFact); +SVX_DLLPUBLIC void ResizeRect(tools::Rectangle& rRect, const Point& rRef, const Fraction& xFact, const Fraction& yFact); inline void ResizePoint(Point& rPnt, const Point& rRef, const Fraction& xFract, const Fraction& yFract); void ResizePoly(tools::Polygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact); void ResizeXPoly(XPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact); @@ -97,15 +97,15 @@ double CrookSlantXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCente const Point& rRad, double& rSin, double& rCos, bool bVert); double CrookStretchXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCenter, const Point& rRad, double& rSin, double& rCos, bool bVert, - const Rectangle& rRefRect); + const tools::Rectangle& rRefRect); void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert); void CrookSlantPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert); -void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert, const Rectangle& rRefRect); +void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert, const tools::Rectangle& rRefRect); void CrookRotatePoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert); void CrookSlantPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert); -void CrookStretchPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert, const Rectangle& rRefRect); +void CrookStretchPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert, const tools::Rectangle& rRefRect); /**************************************************************************************************/ /* Inline */ @@ -232,8 +232,8 @@ public: void RecalcTan(); }; -tools::Polygon Rect2Poly(const Rectangle& rRect, const GeoStat& rGeo); -void Poly2Rect(const tools::Polygon& rPol, Rectangle& rRect, GeoStat& rGeo); +tools::Polygon Rect2Poly(const tools::Rectangle& rRect, const GeoStat& rGeo); +void Poly2Rect(const tools::Polygon& rPol, tools::Rectangle& rRect, GeoStat& rGeo); SVX_DLLPUBLIC void OrthoDistance8(const Point& rPt0, Point& rPt, bool bBigOrtho); SVX_DLLPUBLIC void OrthoDistance4(const Point& rPt0, Point& rPt, bool bBigOrtho); diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx index 3caee8e84dda..1beb5e7d93b3 100644 --- a/include/svx/svdview.hxx +++ b/include/svx/svdview.hxx @@ -144,7 +144,7 @@ class SVX_DLLPUBLIC SdrDropMarkerOverlay public: SdrDropMarkerOverlay(const SdrView& rView, const SdrObject& rObject); - SdrDropMarkerOverlay(const SdrView& rView, const Rectangle& rRectangle); + SdrDropMarkerOverlay(const SdrView& rView, const tools::Rectangle& rRectangle); SdrDropMarkerOverlay(const SdrView& rView, const Point& rStart, const Point& rEnd); ~SdrDropMarkerOverlay(); }; @@ -227,7 +227,7 @@ public: void MarkAll(); void UnmarkAll(); - const Rectangle& GetMarkedRect() const; + const tools::Rectangle& GetMarkedRect() const; virtual void DeleteMarked(); diff --git a/include/svx/swframeexample.hxx b/include/svx/swframeexample.hxx index 8b17f6290da4..bc1928029e18 100644 --- a/include/svx/swframeexample.hxx +++ b/include/svx/swframeexample.hxx @@ -39,14 +39,14 @@ class SVX_DLLPUBLIC SvxSwFrameExample : public vcl::Window Color m_aBlankCol; // area of symbol for blank Color m_aBlankFrameCol; // frame of symbol for blank - Rectangle aPage; - Rectangle aPagePrtArea; - Rectangle aTextLine; - Rectangle aPara; - Rectangle aParaPrtArea; - Rectangle aFrameAtFrame; - Rectangle aDrawObj; - Rectangle aAutoCharFrame; + tools::Rectangle aPage; + tools::Rectangle aPagePrtArea; + tools::Rectangle aTextLine; + tools::Rectangle aPara; + tools::Rectangle aParaPrtArea; + tools::Rectangle aFrameAtFrame; + tools::Rectangle aDrawObj; + tools::Rectangle aAutoCharFrame; Size aFrmSize; short nHAlign; @@ -63,10 +63,10 @@ class SVX_DLLPUBLIC SvxSwFrameExample : public vcl::Window void InitColors_Impl(); void InitAllRects_Impl(vcl::RenderContext& rRenderContext); - void CalcBoundRect_Impl(Rectangle &rRect); - Rectangle DrawInnerFrame_Impl(vcl::RenderContext& rRenderContext, const Rectangle &rRect, const Color &rFillColor, const Color &rBorderColor); + void CalcBoundRect_Impl(tools::Rectangle &rRect); + tools::Rectangle DrawInnerFrame_Impl(vcl::RenderContext& rRenderContext, const tools::Rectangle &rRect, const Color &rFillColor, const Color &rBorderColor); - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override; virtual Size GetOptimalSize() const override; protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; diff --git a/include/svx/tbxcolorupdate.hxx b/include/svx/tbxcolorupdate.hxx index 0077eb84f0d4..4dc21b9b45ce 100644 --- a/include/svx/tbxcolorupdate.hxx +++ b/include/svx/tbxcolorupdate.hxx @@ -59,7 +59,7 @@ namespace svx sal_uInt16 mnSlotId; VclPtr<ToolBox> mpTbx; Color maCurColor; - Rectangle maUpdRect; + tools::Rectangle maUpdRect; Size maBmpSize; bool mbWasHiContrastMode; }; diff --git a/include/svx/unoshtxt.hxx b/include/svx/unoshtxt.hxx index fbd214df6cf7..f38cf8a62d0f 100644 --- a/include/svx/unoshtxt.hxx +++ b/include/svx/unoshtxt.hxx @@ -73,7 +73,7 @@ public: // the SvxViewForwarder interface virtual bool IsValid() const override; - virtual Rectangle GetVisArea() const override; + virtual tools::Rectangle GetVisArea() const override; virtual Point LogicToPixel( const Point&, const MapMode& ) const override; virtual Point PixelToLogic( const Point&, const MapMode& ) const override; diff --git a/include/svx/viewpt3d.hxx b/include/svx/viewpt3d.hxx index 61157fe79569..d344f0d11923 100644 --- a/include/svx/viewpt3d.hxx +++ b/include/svx/viewpt3d.hxx @@ -56,7 +56,7 @@ class SVX_DLLPUBLIC Viewport3D double fVPD; // View Plane Distance ProjectionType eProjection; // kind of the projection - Rectangle aDeviceRect; // position and size of the output area + tools::Rectangle aDeviceRect; // position and size of the output area struct { @@ -88,8 +88,8 @@ class SVX_DLLPUBLIC Viewport3D void SetViewWindow(double fX, double fY, double fW, double fH); - void SetDeviceWindow(const Rectangle& rRect); - const Rectangle& GetDeviceWindow() const { return aDeviceRect; } + void SetDeviceWindow(const tools::Rectangle& rRect); + const tools::Rectangle& GetDeviceWindow() const { return aDeviceRect; } // returns observers position in world coordinates const basegfx::B3DPoint& GetViewPoint(); diff --git a/include/svx/xoutbmp.hxx b/include/svx/xoutbmp.hxx index 4163be681d92..28748cb0cd2f 100644 --- a/include/svx/xoutbmp.hxx +++ b/include/svx/xoutbmp.hxx @@ -71,7 +71,7 @@ public: static tools::Polygon GetCountour( const Bitmap& rBmp, const XOutFlags nContourFlags, const sal_uInt8 cEdgeDetectThreshold, - const Rectangle* pWorkRect ); + const tools::Rectangle* pWorkRect ); }; SVX_DLLPUBLIC bool DitherBitmap( Bitmap& rBitmap ); diff --git a/include/svx/xpoly.hxx b/include/svx/xpoly.hxx index 430df7b6ffb2..ac5dbd8ac812 100644 --- a/include/svx/xpoly.hxx +++ b/include/svx/xpoly.hxx @@ -25,7 +25,7 @@ #include <tools/poly.hxx> class Point; -class Rectangle; +namespace tools { class Rectangle; } class SvStream; namespace tools { class Polygon; @@ -58,7 +58,7 @@ public: XPolygon( const XPolygon& rXPoly ); XPolygon( XPolygon&& rXPoly ); XPolygon( const tools::Polygon& rPoly ); - XPolygon( const Rectangle& rRect, long nRx = 0, long nRy = 0 ); + XPolygon( const tools::Rectangle& rRect, long nRx = 0, long nRy = 0 ); XPolygon( const Point& rCenter, long nRx, long nRy, sal_uInt16 nStartAngle = 0, sal_uInt16 nEndAngle = 3600, bool bClose = true ); @@ -74,7 +74,7 @@ public: void Insert( sal_uInt16 nPos, const XPolygon& rXPoly ); void Remove( sal_uInt16 nPos, sal_uInt16 nCount ); void Move( long nHorzMove, long nVertMove ); - Rectangle GetBoundRect() const; + tools::Rectangle GetBoundRect() const; const Point& operator[]( sal_uInt16 nPos ) const; Point& operator[]( sal_uInt16 nPos ); @@ -97,7 +97,7 @@ public: // transformations void Scale(double fSx, double fSy); - void Distort(const Rectangle& rRefRect, const XPolygon& rDistortedRect); + void Distort(const tools::Rectangle& rRefRect, const XPolygon& rDistortedRect); // #116512# convert to basegfx::B2DPolygon and return basegfx::B2DPolygon getB2DPolygon() const; @@ -131,7 +131,7 @@ public: void Clear(); sal_uInt16 Count() const; - Rectangle GetBoundRect() const; + tools::Rectangle GetBoundRect() const; const XPolygon& operator[]( sal_uInt16 nPos ) const { return GetObject( nPos ); } @@ -141,7 +141,7 @@ public: XPolyPolygon& operator=( XPolyPolygon&& rXPolyPoly ); // transformations - void Distort(const Rectangle& rRefRect, const XPolygon& rDistortedRect); + void Distort(const tools::Rectangle& rRefRect, const XPolygon& rDistortedRect); // #116512# convert to basegfx::B2DPolyPolygon and return basegfx::B2DPolyPolygon getB2DPolyPolygon() const; |