summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/controller/accessibility/AccessibleBase.cxx2
-rw-r--r--chart2/source/controller/accessibility/AccessibleViewForwarder.cxx4
-rw-r--r--chart2/source/controller/accessibility/AccessibleViewForwarder.hxx2
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.cxx2
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.hxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx6
-rw-r--r--chart2/source/controller/drawinglayer/DrawViewWrapper.cxx4
-rw-r--r--chart2/source/controller/inc/ChartController.hxx2
-rw-r--r--chart2/source/controller/inc/ChartWindow.hxx4
-rw-r--r--chart2/source/controller/main/ChartController_Tools.cxx2
-rw-r--r--chart2/source/controller/main/ChartController_Window.cxx8
-rw-r--r--chart2/source/controller/main/ChartWindow.cxx8
-rw-r--r--chart2/source/controller/main/DragMethod_RotateDiagram.hxx2
-rw-r--r--chart2/source/controller/main/DrawCommandDispatch.cxx4
-rw-r--r--chart2/source/controller/main/PositionAndSizeHelper.cxx4
-rw-r--r--chart2/source/view/main/ChartView.cxx2
-rw-r--r--chart2/source/view/main/DummyXShape.cxx2
17 files changed, 30 insertions, 30 deletions
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 3a283d2e48bf..832f48bac59d 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -650,7 +650,7 @@ awt::Rectangle SAL_CALL AccessibleBase::getBounds()
awt::Rectangle aLogicRect( pExplicitValueProvider->getRectangleOfObject( m_aAccInfo.m_aOID.getObjectCID() ));
if( pWindow )
{
- Rectangle aRect( aLogicRect.X, aLogicRect.Y,
+ tools::Rectangle aRect( aLogicRect.X, aLogicRect.Y,
aLogicRect.X + aLogicRect.Width,
aLogicRect.Y + aLogicRect.Height );
SolarMutexGuard aSolarGuard;
diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
index 22dff81d646a..6e7a3abc10c3 100644
--- a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
+++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
@@ -40,9 +40,9 @@ AccessibleViewForwarder::~AccessibleViewForwarder()
// ________ IAccessibleViewforwarder ________
-Rectangle AccessibleViewForwarder::GetVisibleArea() const
+tools::Rectangle AccessibleViewForwarder::GetVisibleArea() const
{
- Rectangle aVisibleArea;
+ tools::Rectangle aVisibleArea;
if ( m_pWindow )
{
aVisibleArea.SetPos( Point( 0, 0 ) );
diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx
index b1fbeb6ce756..7aa21fe600d1 100644
--- a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx
+++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx
@@ -37,7 +37,7 @@ public:
virtual ~AccessibleViewForwarder() override;
// ________ IAccessibleViewforwarder ________
- virtual Rectangle GetVisibleArea() const override;
+ virtual tools::Rectangle GetVisibleArea() const override;
virtual Point LogicToPixel( const Point& rPoint ) const override;
virtual Size LogicToPixel( const Size& rSize ) const override;
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 0d9b6d983afb..1661e0aa1365 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -1021,7 +1021,7 @@ void DataBrowser::SetCursorMovedHdl( const Link<DataBrowser*,void>& rLink )
// implementations for ::svt::EditBrowseBox (pure virtual methods)
void DataBrowser::PaintCell(
- OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const
+ OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId ) const
{
Point aPos( rRect.TopLeft());
aPos.X() += 1;
diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx
index 8eb8fbac53af..0be7b531cafe 100644
--- a/chart2/source/controller/dialogs/DataBrowser.hxx
+++ b/chart2/source/controller/dialogs/DataBrowser.hxx
@@ -50,7 +50,7 @@ class DataBrowser : public ::svt::EditBrowseBox
{
protected:
// EditBrowseBox overridables
- virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const override;
+ virtual void PaintCell( OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId ) const override;
virtual bool SeekRow( long nRow ) override;
virtual bool IsTabAllowed( bool bForward ) const override;
virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol ) override;
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index a41830d2063f..5ca2b85758b3 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -281,7 +281,7 @@ void SAL_CALL CreationWizardUnoDlg::setPropertyValue( const OUString& rPropertyN
if( m_pDialog )
{
m_pDialog->SetPosPixel( Point(0,0) );
- Rectangle aRect( m_pDialog->GetWindowExtentsRelative( nullptr ) );
+ tools::Rectangle aRect( m_pDialog->GetWindowExtentsRelative( nullptr ) );
Point aNewOuterPos = Point( aPos.X - aRect.Left(), aPos.Y - aRect.Top() );
m_pDialog->SetPosPixel( aNewOuterPos );
@@ -311,7 +311,7 @@ uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const OUString& rPrope
createDialogOnDemand();
if( m_pDialog )
{
- Rectangle aRect( m_pDialog->GetWindowExtentsRelative( nullptr ) );
+ tools::Rectangle aRect( m_pDialog->GetWindowExtentsRelative( nullptr ) );
awt::Point aPoint(aRect.Left(),aRect.Top());
aRet <<= aPoint;
}
@@ -324,7 +324,7 @@ uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const OUString& rPrope
createDialogOnDemand();
if( m_pDialog )
{
- Rectangle aRect( m_pDialog->GetWindowExtentsRelative( nullptr ) );
+ tools::Rectangle aRect( m_pDialog->GetWindowExtentsRelative( nullptr ) );
awt::Size aSize(aRect.GetWidth(),aRect.GetHeight());
aRet <<= aSize;
}
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index 11939212e5cd..47932bb49d82 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -147,7 +147,7 @@ void DrawViewWrapper::ReInit()
this->SetNoDragXorPolys(true);//for interactive 3D resize-dragging: paint only a single rectangle (not a simulated 3D object)
//a correct work area is at least necessary for correct values in the position and size dialog
- Rectangle aRect(Point(0,0), aOutputSize);
+ tools::Rectangle aRect(Point(0,0), aOutputSize);
this->SetWorkArea(aRect);
this->ShowSdrPage(this->GetModel()->GetPage(0));
@@ -306,7 +306,7 @@ bool DrawViewWrapper::IsObjectHit( SdrObject* pObj, const Point& rPnt )
{
if(pObj)
{
- Rectangle aRect(pObj->GetCurrentBoundRect());
+ tools::Rectangle aRect(pObj->GetCurrentBoundRect());
return aRect.IsInside(rPnt);
}
return false;
diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx
index 02a3468365b2..ae579cf14b3d 100644
--- a/chart2/source/controller/inc/ChartController.hxx
+++ b/chart2/source/controller/inc/ChartController.hxx
@@ -281,7 +281,7 @@ public:
// WindowController stuff
void PrePaint(vcl::RenderContext& rRenderContext);
- void execute_Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect);
+ void execute_Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect);
void execute_MouseButtonDown( const MouseEvent& rMEvt );
void execute_MouseMove( const MouseEvent& rMEvt );
void execute_MouseButtonUp( const MouseEvent& rMEvt );
diff --git a/chart2/source/controller/inc/ChartWindow.hxx b/chart2/source/controller/inc/ChartWindow.hxx
index 5a407fdac85c..95a029698e9c 100644
--- a/chart2/source/controller/inc/ChartWindow.hxx
+++ b/chart2/source/controller/inc/ChartWindow.hxx
@@ -39,7 +39,7 @@ public:
//from base class Window:
virtual void PrePaint(vcl::RenderContext& rRenderContext) override;
- virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
+ virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override;
virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
virtual void MouseMove( const MouseEvent& rMEvt ) override;
virtual void Tracking( const TrackingEvent& rTEvt ) override;
@@ -56,7 +56,7 @@ public:
void ForceInvalidate();
virtual void Invalidate( InvalidateFlags nFlags = InvalidateFlags::NONE ) override;
- virtual void Invalidate( const Rectangle& rRect, InvalidateFlags nFlags = InvalidateFlags::NONE ) override;
+ virtual void Invalidate( const tools::Rectangle& rRect, InvalidateFlags nFlags = InvalidateFlags::NONE ) override;
virtual void Invalidate( const vcl::Region& rRegion, InvalidateFlags nFlags = InvalidateFlags::NONE ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 502c649ab6bd..2b049ab616b1 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -255,7 +255,7 @@ void ChartController::executeDispatch_Paste()
Graphic aGraphic;
// paste location: center of window
Point aPos;
- aPos = pChartWindow->PixelToLogic( Rectangle( aPos, pChartWindow->GetSizePixel()).Center());
+ aPos = pChartWindow->PixelToLogic( tools::Rectangle( aPos, pChartWindow->GetSizePixel()).Center());
// handle different formats
TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pChartWindow ));
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index dd08a7ef99c1..11dd2d832ab4 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -262,7 +262,7 @@ void SAL_CALL ChartController::setPosSize(
//a correct work area is at least necessary for correct values in the position and size dialog and for dragging area
if(m_pDrawViewWrapper)
{
- Rectangle aRect(Point(0,0), pChartWindow->GetOutputSize());
+ tools::Rectangle aRect(Point(0,0), pChartWindow->GetOutputSize());
m_pDrawViewWrapper->SetWorkArea( aRect );
}
pChartWindow->Invalidate();
@@ -440,7 +440,7 @@ void ChartController::PrePaint(vcl::RenderContext& /*rRenderContext*/)
}
}
-void ChartController::execute_Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
+void ChartController::execute_Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect)
{
try
{
@@ -792,9 +792,9 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt )
SdrObject* pObj = pDrawViewWrapper->getSelectedObject();
if( pObj )
{
- Rectangle aObjectRect = pObj->GetSnapRect();
+ tools::Rectangle aObjectRect = pObj->GetSnapRect();
awt::Size aPageSize( ChartModelHelper::getPageSize( getModel() ) );
- Rectangle aPageRect( 0,0,aPageSize.Width,aPageSize.Height );
+ tools::Rectangle aPageRect( 0,0,aPageSize.Width,aPageSize.Height );
const E3dObject* pE3dObject = dynamic_cast< const E3dObject*>( pObj );
if( pE3dObject )
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx
index b8c602b308be..4ffb92fde111 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -32,9 +32,9 @@ using namespace ::com::sun::star;
namespace
{
-::Rectangle lcl_AWTRectToVCLRect( const css::awt::Rectangle & rAWTRect )
+::tools::Rectangle lcl_AWTRectToVCLRect( const css::awt::Rectangle & rAWTRect )
{
- ::Rectangle aResult;
+ ::tools::Rectangle aResult;
aResult.setX( rAWTRect.X );
aResult.setY( rAWTRect.Y );
aResult.setWidth( rAWTRect.Width );
@@ -106,7 +106,7 @@ void ChartWindow::PrePaint(vcl::RenderContext& rRenderContext)
}
}
-void ChartWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
+void ChartWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect)
{
m_bInPaint = true;
if (m_pOpenGLWindow && m_pOpenGLWindow->IsVisible())
@@ -280,7 +280,7 @@ void ChartWindow::Invalidate( InvalidateFlags nFlags )
m_pOpenGLWindow->Invalidate( nFlags );
}
}
-void ChartWindow::Invalidate( const Rectangle& rRect, InvalidateFlags nFlags )
+void ChartWindow::Invalidate( const tools::Rectangle& rRect, InvalidateFlags nFlags )
{
if( m_bInPaint ) // #i101928# superfluous paint calls while entering and editing charts"
return;
diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
index f89ab3682816..286078ebfcc7 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
@@ -55,7 +55,7 @@ public:
private:
E3dScene* m_pScene;
- Rectangle m_aReferenceRect;
+ tools::Rectangle m_aReferenceRect;
Point m_aStartPos;
basegfx::B3DPolyPolygon m_aWireframePolyPolygon;
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 9519df44556c..22f3bb95ad29 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -444,11 +444,11 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const sal_uInt16 nID )
long nDefaultObjectSizeWidth = 4000;
long nDefaultObjectSizeHeight = 2500;
Size aObjectSize( nDefaultObjectSizeWidth, nDefaultObjectSizeHeight );
- Rectangle aPageRect( Rectangle( Point( 0, 0 ), pPage->GetSize() ) );
+ tools::Rectangle aPageRect( tools::Rectangle( Point( 0, 0 ), pPage->GetSize() ) );
Point aObjectPos = aPageRect.Center();
aObjectPos.X() -= aObjectSize.Width() / 2;
aObjectPos.Y() -= aObjectSize.Height() / 2;
- Rectangle aRect( aObjectPos, aObjectSize );
+ tools::Rectangle aRect( aObjectPos, aObjectSize );
switch ( nID )
{
diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx
index 6280ecb2be56..076789eaa0ca 100644
--- a/chart2/source/controller/main/PositionAndSizeHelper.cxx
+++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx
@@ -43,8 +43,8 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType
{
if(!xObjectProp.is())
return false;
- Rectangle aObjectRect( Point(rNewPositionAndSize.X,rNewPositionAndSize.Y), Size(rNewPositionAndSize.Width,rNewPositionAndSize.Height) );
- Rectangle aPageRect( Point(rPageRectangle.X,rPageRectangle.Y), Size(rPageRectangle.Width,rPageRectangle.Height) );
+ tools::Rectangle aObjectRect( Point(rNewPositionAndSize.X,rNewPositionAndSize.Y), Size(rNewPositionAndSize.Width,rNewPositionAndSize.Height) );
+ tools::Rectangle aPageRect( Point(rPageRectangle.X,rPageRectangle.Y), Size(rPageRectangle.Width,rPageRectangle.Height) );
if( OBJECTTYPE_TITLE==eObjectType )
{
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 1e0f0d48d437..2053ab09eaea 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1963,7 +1963,7 @@ awt::Rectangle ChartView::getRectangleOfObject( const OUString& rObjectCID, bool
SdrObject* pSdrObject = pShape->GetSdrObject();
if( pSdrObject )
{
- Rectangle aSnapRect( pSdrObject->GetSnapRect() );
+ tools::Rectangle aSnapRect( pSdrObject->GetSnapRect() );
aRet = awt::Rectangle(aSnapRect.Left(),aSnapRect.Top(),aSnapRect.GetWidth(),aSnapRect.GetHeight());
}
}
diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index 4d7291c03646..b066f39a2d2d 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -786,7 +786,7 @@ DummyText::DummyText(const OUString& rText, const tNameSequence& rNames,
ScopedVclPtrInstance< VirtualDevice > pDevice(*Application::GetDefaultDevice(),
DeviceFormat::DEFAULT, DeviceFormat::DEFAULT);
pDevice->Erase();
- Rectangle aRect;
+ tools::Rectangle aRect;
pDevice->SetFont(aFont);
pDevice->GetTextBoundRect(aRect, rText);
int screenWidth = (aRect.BottomRight().X());
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 07:33:26 +0000