diff options
Diffstat (limited to 'chart2/source/controller/main')
6 files changed, 14 insertions, 14 deletions
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 ) { |