diff options
Diffstat (limited to 'basctl')
-rw-r--r-- | basctl/source/accessibility/accessibledialogcontrolshape.cxx | 4 | ||||
-rw-r--r-- | basctl/source/accessibility/accessibledialogwindow.cxx | 8 | ||||
-rw-r--r-- | basctl/source/basicide/baside2.cxx | 6 | ||||
-rw-r--r-- | basctl/source/basicide/baside2.hxx | 12 | ||||
-rw-r--r-- | basctl/source/basicide/baside2b.cxx | 16 | ||||
-rw-r--r-- | basctl/source/basicide/baside3.cxx | 4 | ||||
-rw-r--r-- | basctl/source/basicide/bastypes.cxx | 10 | ||||
-rw-r--r-- | basctl/source/basicide/layout.cxx | 8 | ||||
-rw-r--r-- | basctl/source/basicide/linenumberwindow.cxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/linenumberwindow.hxx | 2 | ||||
-rw-r--r-- | basctl/source/dlged/dlged.cxx | 12 | ||||
-rw-r--r-- | basctl/source/dlged/dlgedfunc.cxx | 10 | ||||
-rw-r--r-- | basctl/source/dlged/dlgedobj.cxx | 10 | ||||
-rw-r--r-- | basctl/source/dlged/dlgedview.cxx | 8 | ||||
-rw-r--r-- | basctl/source/inc/baside3.hxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/bastypes.hxx | 8 | ||||
-rw-r--r-- | basctl/source/inc/dlged.hxx | 4 | ||||
-rw-r--r-- | basctl/source/inc/dlgedview.hxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/layout.hxx | 4 |
19 files changed, 66 insertions, 66 deletions
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx index cf41060c40bb..afa2a469c3c6 100644 --- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx +++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx @@ -137,7 +137,7 @@ awt::Rectangle AccessibleDialogControlShape::GetBounds() if ( m_pDlgEdObj ) { // get the bounding box of the shape in logic units - Rectangle aRect = m_pDlgEdObj->GetSnapRect(); + tools::Rectangle aRect = m_pDlgEdObj->GetSnapRect(); if ( m_pDialogWindow ) { @@ -150,7 +150,7 @@ awt::Rectangle AccessibleDialogControlShape::GetBounds() aRect = m_pDialogWindow->LogicToPixel( aRect, MapMode(MapUnit::Map100thMM) ); // clip the shape's bounding box with the bounding box of its parent - Rectangle aParentRect( Point( 0, 0 ), m_pDialogWindow->GetSizePixel() ); + tools::Rectangle aParentRect( Point( 0, 0 ), m_pDialogWindow->GetSizePixel() ); aRect = aRect.GetIntersection( aParentRect ); aBounds = AWTRectangle( aRect ); } diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index 3941ffabbd0a..1bde5e6ef245 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -215,7 +215,7 @@ bool AccessibleDialogWindow::IsChildVisible( const ChildDescriptor& rDesc ) if (rView.IsLayerVisible(aLayerName)) { // get the bounding box of the shape in logic units - Rectangle aRect = pDlgEdObj->GetSnapRect(); + tools::Rectangle aRect = pDlgEdObj->GetSnapRect(); // transform coordinates relative to the parent MapMode aMap = m_pDialogWindow->GetMapMode(); @@ -226,7 +226,7 @@ bool AccessibleDialogWindow::IsChildVisible( const ChildDescriptor& rDesc ) aRect = m_pDialogWindow->LogicToPixel( aRect, MapMode(MapUnit::Map100thMM) ); // check, if the shape's bounding box intersects with the bounding box of its parent - Rectangle aParentRect( Point( 0, 0 ), m_pDialogWindow->GetSizePixel() ); + tools::Rectangle aParentRect( Point( 0, 0 ), m_pDialogWindow->GetSizePixel() ); if ( aParentRect.IsOver( aRect ) ) bVisible = true; } @@ -463,7 +463,7 @@ awt::Rectangle AccessibleDialogWindow::implGetBounds() { awt::Rectangle aBounds; if ( m_pDialogWindow ) - aBounds = AWTRectangle( Rectangle( m_pDialogWindow->GetPosPixel(), m_pDialogWindow->GetSizePixel() ) ); + aBounds = AWTRectangle( tools::Rectangle( m_pDialogWindow->GetPosPixel(), m_pDialogWindow->GetSizePixel() ) ); return aBounds; } @@ -761,7 +761,7 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleAtPoint( const awt Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY ); if ( xComp.is() ) { - Rectangle aRect = VCLRectangle( xComp->getBounds() ); + tools::Rectangle aRect = VCLRectangle( xComp->getBounds() ); Point aPos = VCLPoint( rPoint ); if ( aRect.IsInside( aPos ) ) { diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index bce9ce80480d..9692a5e9660d 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -115,7 +115,7 @@ void lcl_PrintHeader( Printer* pPrinter, sal_uInt16 nPages, sal_uInt16 nCurPage, long nXRight = aSz.Width() - Print::nRightMargin + Print::nBorder; if( bOutput ) - pPrinter->DrawRect(Rectangle( + pPrinter->DrawRect(tools::Rectangle( Point(nXLeft, nYTop), Size(nXRight - nXLeft, aSz.Height() - nYTop - Print::nBottomMargin + Print::nBorder) )); @@ -246,7 +246,7 @@ void ModulWindow::DoInit() GetEditorWindow().InitScrollBars(); } -void ModulWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle&) +void ModulWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const tools::Rectangle&) { } @@ -1434,7 +1434,7 @@ void ModulWindowLayout::UpdateDebug (bool bBasicStopped) aStackWindow->UpdateCalls(); } -void ModulWindowLayout::Paint (vcl::RenderContext& rRenderContext, Rectangle const&) +void ModulWindowLayout::Paint (vcl::RenderContext& rRenderContext, tools::Rectangle const&) { rRenderContext.DrawText(Point(), IDEResId(RID_STR_NOMODULE).toString()); } diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 4deb7db00221..854f698e591c 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -116,7 +116,7 @@ private: TextSelection GetLastHighlightPortionTextSelection(); protected: - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& ) override; virtual void Resize() override; virtual void KeyInput( const KeyEvent& rKeyEvt ) override; virtual void MouseMove( const MouseEvent& rMEvt ) override; @@ -175,7 +175,7 @@ private: void setBackgroundColor(Color aColor); protected: - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override; BreakPoint* FindBreakPoint( const Point& rMousePos ); void ShowMarker(vcl::RenderContext& rRenderContext); virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; @@ -231,7 +231,7 @@ private: 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; DECL_LINK( ButtonHdl, Button *, void ); DECL_LINK(TreeListHdl, SvTreeListBox*, void); @@ -258,7 +258,7 @@ private: 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; public: explicit StackWindow (Layout* pParent); @@ -316,7 +316,7 @@ private: protected: virtual void Resize() override; virtual void GetFocus() override; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& ) override; virtual void DoInit() override; virtual void DoScroll( ScrollBar* pCurScrollBar ) override; @@ -432,7 +432,7 @@ public: protected: // Window: - virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Paint (vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; // Layout: virtual void OnFirstSize (long nWidth, long nHeight) override; diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 86d6afc49361..c51f5e8e4dee 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -376,7 +376,7 @@ void EditorWindow::RequestHelp( const HelpEvent& rHEvt ) } } } - Help::ShowQuickHelp( this, Rectangle( aTopLeft, Size( 1, 1 ) ), aHelpText, QuickHelpFlags::Top|QuickHelpFlags::Left); + Help::ShowQuickHelp( this, tools::Rectangle( aTopLeft, Size( 1, 1 ) ), aHelpText, QuickHelpFlags::Top|QuickHelpFlags::Left); bDone = true; } } @@ -902,7 +902,7 @@ void EditorWindow::SetupAndShowCodeCompleteWnd( const std::vector< OUString >& a pEditView->GetWindow()->GrabFocus(); } -void EditorWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) +void EditorWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) { if (!pEditEngine) // We need it now at latest CreateEditEngine(); @@ -1295,7 +1295,7 @@ void EditorWindow::ParagraphInsertedDeleted( sal_uLong nPara, bool bInserted ) long nLineHeight = GetTextHeight(); Size aSz = rModulWindow.GetBreakPointWindow().GetOutputSize(); - Rectangle aInvRect( Point( 0, 0 ), aSz ); + tools::Rectangle aInvRect( Point( 0, 0 ), aSz ); long nY = nPara*nLineHeight - rModulWindow.GetBreakPointWindow().GetCurYOffset(); aInvRect.Top() = nY; rModulWindow.GetBreakPointWindow().Invalidate( aInvRect ); @@ -1341,7 +1341,7 @@ BreakPointWindow::BreakPointWindow (vcl::Window* pParent, ModulWindow* pModulWin SetHelpId(HID_BASICIDE_BREAKPOINTWINDOW); } -void BreakPointWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) +void BreakPointWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) { if (SyncYOffset()) return; @@ -1640,7 +1640,7 @@ void WatchWindow::dispose() DockingWindow::dispose(); } -void WatchWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) +void WatchWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) { rRenderContext.DrawText(Point(DWBORDER, 7), aWatchStr); lcl_DrawIDEWindowFrame(this, rRenderContext); @@ -1861,7 +1861,7 @@ void StackWindow::dispose() DockingWindow::dispose(); } -void StackWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) +void StackWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) { rRenderContext.DrawText(Point(DWBORDER, 7), aStackStr); lcl_DrawIDEWindowFrame(this, rRenderContext); @@ -2814,7 +2814,7 @@ void CodeCompleteWindow::ResizeAndPositionListBox() if( pListBox->GetEntryCount() >= 1 ) {// if there is at least one element inside // calculate basic position: under the current line - Rectangle aRect = static_cast<TextEngine*>(pParent->GetEditEngine())->PaMtoEditCursor( pParent->GetEditView()->GetSelection().GetEnd() ); + tools::Rectangle aRect = static_cast<TextEngine*>(pParent->GetEditEngine())->PaMtoEditCursor( pParent->GetEditView()->GetSelection().GetEnd() ); long nViewYOffset = pParent->GetEditView()->GetStartDocPos().Y(); Point aPos = aRect.BottomRight();// this variable will be used later (if needed) aPos.Y() = (aPos.Y() - nViewYOffset) + nBasePad; @@ -2838,7 +2838,7 @@ void CodeCompleteWindow::ResizeAndPositionListBox() pListBox->SetSizePixel( aSize ); //calculate position - const Rectangle aVisArea( pParent->GetEditView()->GetStartDocPos(), pParent->GetOutputSizePixel() ); //the visible area + const tools::Rectangle aVisArea( pParent->GetEditView()->GetStartDocPos(), pParent->GetOutputSizePixel() ); //the visible area const Point& aBottomPoint = aVisArea.BottomRight(); if( aVisArea.TopRight().getY() + aPos.getY() + aSize.getHeight() > aBottomPoint.getY() ) diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index ffccb5e2f1cb..608ded2c1c68 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -111,7 +111,7 @@ void DialogWindow::LoseFocus() Window::LoseFocus(); } -void DialogWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) +void DialogWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) { m_pEditor->Paint(rRenderContext, rRect); } @@ -200,7 +200,7 @@ void DialogWindow::Command( const CommandEvent& rCEvt ) SdrView& rView = GetView(); if( !rCEvt.IsMouseEvent() && rView.AreObjectsMarked() ) { - Rectangle aMarkedRect( rView.GetMarkedRect() ); + tools::Rectangle aMarkedRect( rView.GetMarkedRect() ); Point MarkedCenter( aMarkedRect.Center() ); Point PosPixel( LogicToPixel( MarkedCenter ) ); SfxDispatcher::ExecutePopup( this, &PosPixel ); diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 8a2940b39288..0f4210836884 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -284,7 +284,7 @@ void DockingWindow::dispose() // when the window is floating. Called by Layout. void DockingWindow::ResizeIfDocking (Point const& rPos, Size const& rSize) { - Rectangle const rRect(rPos, rSize); + tools::Rectangle const rRect(rPos, rSize); if (rRect != aDockingRect) { // saving the position and the size @@ -332,7 +332,7 @@ void DockingWindow::Hide () Show(false); } -bool DockingWindow::Docking( const Point& rPos, Rectangle& rRect ) +bool DockingWindow::Docking( const Point& rPos, tools::Rectangle& rRect ) { if (aDockingRect.IsInside(rPos)) { @@ -347,7 +347,7 @@ bool DockingWindow::Docking( const Point& rPos, Rectangle& rRect ) } } -void DockingWindow::EndDocking( const Rectangle& rRect, bool bFloatMode ) +void DockingWindow::EndDocking( const tools::Rectangle& rRect, bool bFloatMode ) { if ( bFloatMode ) ::DockingWindow::EndDocking( rRect, bFloatMode ); @@ -376,7 +376,7 @@ bool DockingWindow::PrepareToggleFloatingMode() if (IsFloatingMode()) { // memorize position and size on the desktop... - aFloatingRect = Rectangle( + aFloatingRect = tools::Rectangle( GetParent()->OutputToScreenPixel(GetPosPixel()), GetSizePixel() ); @@ -388,7 +388,7 @@ void DockingWindow::StartDocking() { if (IsFloatingMode()) { - aFloatingRect = Rectangle( + aFloatingRect = tools::Rectangle( GetParent()->OutputToScreenPixel(GetPosPixel()), GetSizePixel() ); diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx index 6d87bf687ccb..5337adf61b3b 100644 --- a/basctl/source/basicide/layout.cxx +++ b/basctl/source/basicide/layout.cxx @@ -101,8 +101,8 @@ void Layout::ArrangeWindows () } // sides - aBottomSide.ArrangeIn(Rectangle(Point(0, 0), aSize)); - aLeftSide.ArrangeIn(Rectangle(Point(0, 0), Size(nWidth, nHeight - aBottomSide.GetSize()))); + aBottomSide.ArrangeIn(tools::Rectangle(Point(0, 0), aSize)); + aLeftSide.ArrangeIn(tools::Rectangle(Point(0, 0), Size(nWidth, nHeight - aBottomSide.GetSize()))); // child in the middle pChild->SetPosSizePixel( Point(aLeftSide.GetSize(), 0), @@ -265,7 +265,7 @@ long Layout::SplittedSide::GetSize () const // Arrange() -- arranges the docking windows // rRect: the available space -void Layout::SplittedSide::ArrangeIn (Rectangle const& rRect) +void Layout::SplittedSide::ArrangeIn (tools::Rectangle const& rRect) { // saving the rectangle aRect = rRect; @@ -333,7 +333,7 @@ void Layout::SplittedSide::ArrangeIn (Rectangle const& rRect) MakeSize(nSplitThickness, nSize - nSplitThickness) ); // the dragging rectangle - rSplit.SetDragRectPixel(Rectangle( + rSplit.SetDragRectPixel(tools::Rectangle( MakePoint(nPos2, nPos1), MakeSize(nLength, nSize - nSplitThickness) )); diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx index 2030c8734d02..0fe9517cbf98 100644 --- a/basctl/source/basicide/linenumberwindow.cxx +++ b/basctl/source/basicide/linenumberwindow.cxx @@ -36,7 +36,7 @@ void LineNumberWindow::dispose() Window::dispose(); } -void LineNumberWindow::Paint( vcl::RenderContext& rRenderContext, const Rectangle&) +void LineNumberWindow::Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle&) { if(SyncYOffset()) return; diff --git a/basctl/source/basicide/linenumberwindow.hxx b/basctl/source/basicide/linenumberwindow.hxx index df90c20af65c..81aaa8d93a00 100644 --- a/basctl/source/basicide/linenumberwindow.hxx +++ b/basctl/source/basicide/linenumberwindow.hxx @@ -26,7 +26,7 @@ private: virtual void DataChanged (DataChangedEvent const& rDCEvt) override; protected: - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; public: LineNumberWindow (vcl::Window* pParent, ModulWindow* pModulWin); diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index ecdbdf540ad1..01fe64219c1f 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -226,7 +226,7 @@ DlgEditor::DlgEditor ( pDlgEdView->ShowSdrPage(pDlgEdView->GetModel()->GetPage(0)); pDlgEdView->SetLayerVisible( "HiddenLayer", false ); pDlgEdView->SetMoveSnapOnlyTopLeft(true); - pDlgEdView->SetWorkArea( Rectangle( Point( 0, 0 ), pDlgEdPage->GetSize() ) ); + pDlgEdView->SetWorkArea( tools::Rectangle( Point( 0, 0 ), pDlgEdPage->GetSize() ) ); pDlgEdView->SetGridCoarse( aGridSize ); pDlgEdView->SetSnapGridWidth(Fraction(aGridSize.Width(), 1), Fraction(aGridSize.Height(), 1)); @@ -469,7 +469,7 @@ bool DlgEditor::KeyInput( const KeyEvent& rKEvt ) } -void DlgEditor::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) +void DlgEditor::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) { aPaintRect = rRect; mnPaintGuard++; @@ -517,7 +517,7 @@ void DlgEditor::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect } // set dialog position and size - pDlgEdForm->SetSnapRect( Rectangle( aPos, aSize ) ); + pDlgEdForm->SetSnapRect( tools::Rectangle( aPos, aSize ) ); pDlgEdForm->EndListening(false); pDlgEdForm->SetPropsFromRect(); pDlgEdForm->GetDlgEditor().SetDialogModelChanged(); @@ -621,7 +621,7 @@ void DlgEditor::CreateDefaultObject() Point aPoint = (pDlgEdForm->GetSnapRect()).Center(); aPoint.X() -= aSize.Width() / 2; aPoint.Y() -= aSize.Height() / 2; - pDlgEdObj->SetSnapRect( Rectangle( aPoint, aSize ) ); + pDlgEdObj->SetSnapRect( tools::Rectangle( aPoint, aSize ) ); // set default property values pDlgEdObj->SetDefaults(); @@ -1120,7 +1120,7 @@ void lcl_PrintHeader( Printer* pPrinter, const OUString& rTitle ) // not working long const nXLeft = Print::nLeftMargin - Print::nBorder; long const nXRight = aSz.Width() - Print::nRightMargin + Print::nBorder; - pPrinter->DrawRect(Rectangle( + pPrinter->DrawRect(tools::Rectangle( Point(nXLeft, nYTop), Size(nXRight - nXLeft, aSz.Height() - nYTop - Print::nBottomMargin + Print::nBorder) )); @@ -1237,7 +1237,7 @@ bool DlgEditor::AdjustPageSize() { Size aNewPageSize( nNewPageWidth, nNewPageHeight ); pDlgEdPage->SetSize( aNewPageSize ); - pDlgEdView->SetWorkArea( Rectangle( Point( 0, 0 ), aNewPageSize ) ); + pDlgEdView->SetWorkArea( tools::Rectangle( Point( 0, 0 ), aNewPageSize ) ); bAdjustedPageSize = true; } } diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx index 52b5434bb020..0545b7c05faf 100644 --- a/basctl/source/dlged/dlgedfunc.cxx +++ b/basctl/source/dlged/dlgedfunc.cxx @@ -43,7 +43,7 @@ void DlgEdFunc::ForceScroll( const Point& rPos ) vcl::Window& rWindow = rParent.GetWindow(); static Point aDefPoint; - Rectangle aOutRect( aDefPoint, rWindow.GetOutputSizePixel() ); + tools::Rectangle aOutRect( aDefPoint, rWindow.GetOutputSizePixel() ); aOutRect = rWindow.PixelToLogic( aOutRect ); ScrollBar* pHScroll = rParent.GetHScroll(); @@ -161,7 +161,7 @@ bool DlgEdFunc::KeyInput( const KeyEvent& rKEvt ) if (SdrHdl* pHdl = rHdlList.GetFocusHdl()) { Point aHdlPosition( pHdl->GetPos() ); - Rectangle aVisRect( aHdlPosition - Point( 100, 100 ), Size( 200, 200 ) ); + tools::Rectangle aVisRect( aHdlPosition - Point( 100, 100 ), Size( 200, 200 ) ); rView.MakeVisible( aVisRect, rWindow ); } @@ -227,11 +227,11 @@ bool DlgEdFunc::KeyInput( const KeyEvent& rKEvt ) if ( rView.IsMoveAllowed() ) { // restrict movement to work area - const Rectangle& rWorkArea = rView.GetWorkArea(); + const tools::Rectangle& rWorkArea = rView.GetWorkArea(); if ( !rWorkArea.IsEmpty() ) { - Rectangle aMarkRect( rView.GetMarkedObjRect() ); + tools::Rectangle aMarkRect( rView.GetMarkedObjRect() ); aMarkRect.Move( nX, nY ); if ( !rWorkArea.IsInside( aMarkRect ) ) @@ -291,7 +291,7 @@ bool DlgEdFunc::KeyInput( const KeyEvent& rKEvt ) } // make moved handle visible - Rectangle aVisRect( aEndPoint - Point( 100, 100 ), Size( 200, 200 ) ); + tools::Rectangle aVisRect( aEndPoint - Point( 100, 100 ), Size( 200, 200 ) ); rView.MakeVisible( aVisRect, rWindow ); } } diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index a2e19d0decaa..b02f73d7043b 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -127,7 +127,7 @@ bool DlgEdObj::TransformSdrToControlCoordinates( DlgEdForm* pForm = nullptr; if ( !lcl_getDlgEdForm( this, pForm ) ) return false; - Rectangle aFormRect = pForm->GetSnapRect(); + tools::Rectangle aFormRect = pForm->GetSnapRect(); Size aFormPos( aFormRect.Left(), aFormRect.Top() ); // convert 100th_mm to pixel @@ -345,7 +345,7 @@ void DlgEdObj::SetRectFromProps() // set rectangle position and size Point aPoint( nXOut, nYOut ); Size aSize( nWidthOut, nHeightOut ); - SetSnapRect( Rectangle( aPoint, aSize ) ); + SetSnapRect( tools::Rectangle( aPoint, aSize ) ); } } } @@ -353,7 +353,7 @@ void DlgEdObj::SetRectFromProps() void DlgEdObj::SetPropsFromRect() { // get control position and size from rectangle - Rectangle aRect_ = GetSnapRect(); + tools::Rectangle aRect_ = GetSnapRect(); sal_Int32 nXIn = aRect_.Left(); sal_Int32 nYIn = aRect_.Top(); sal_Int32 nWidthIn = aRect_.GetWidth(); @@ -1229,7 +1229,7 @@ void DlgEdForm::SetRectFromProps() // set rectangle position and size Point aPoint( nXOut, nYOut ); Size aSize( nWidthOut, nHeightOut ); - SetSnapRect( Rectangle( aPoint, aSize ) ); + SetSnapRect( tools::Rectangle( aPoint, aSize ) ); } } } @@ -1237,7 +1237,7 @@ void DlgEdForm::SetRectFromProps() void DlgEdForm::SetPropsFromRect() { // get form position and size from rectangle - Rectangle aRect_ = GetSnapRect(); + tools::Rectangle aRect_ = GetSnapRect(); sal_Int32 nXIn = aRect_.Left(); sal_Int32 nYIn = aRect_.Top(); sal_Int32 nWidthIn = aRect_.GetWidth(); diff --git a/basctl/source/dlged/dlgedview.cxx b/basctl/source/dlged/dlgedview.cxx index f5f1f733d255..d05ceb1d9a70 100644 --- a/basctl/source/dlged/dlgedview.cxx +++ b/basctl/source/dlged/dlgedview.cxx @@ -53,14 +53,14 @@ void DlgEdView::MarkListHasChanged() rDlgEditor.UpdatePropertyBrowserDelayed(); } -void DlgEdView::MakeVisible( const Rectangle& rRect, vcl::Window& rWin ) +void DlgEdView::MakeVisible( const tools::Rectangle& rRect, vcl::Window& rWin ) { // visible area MapMode aMap( rWin.GetMapMode() ); Point aOrg( aMap.GetOrigin() ); Size aVisSize( rWin.GetOutputSize() ); - Rectangle RectTmp( Point(-aOrg.X(),-aOrg.Y()), aVisSize ); - Rectangle aVisRect( RectTmp ); + tools::Rectangle RectTmp( Point(-aOrg.X(),-aOrg.Y()), aVisSize ); + tools::Rectangle aVisRect( RectTmp ); // check, if rectangle is inside visible area if ( !aVisRect.IsInside( rRect ) ) @@ -144,7 +144,7 @@ SdrObject* impLocalHitCorrection(SdrObject* pRetval, const Point& rPnt, sal_uInt { // use direct model data; it's a DlgEdObj, so GetLastBoundRect() // will access aOutRect directly - const Rectangle aOuterRectangle(pDlgEdObj->GetLastBoundRect()); + const tools::Rectangle aOuterRectangle(pDlgEdObj->GetLastBoundRect()); if(!aOuterRectangle.IsEmpty()) { diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx index c6510010b555..3f799fcdf106 100644 --- a/basctl/source/inc/baside3.hxx +++ b/basctl/source/inc/baside3.hxx @@ -63,7 +63,7 @@ private: sal_uInt16 m_nControlSlotId; protected: - 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 dispose() override; diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx index c6e0d51e9d16..4f934d7ce7d0 100644 --- a/basctl/source/inc/bastypes.hxx +++ b/basctl/source/inc/bastypes.hxx @@ -93,17 +93,17 @@ public: void Hide (); protected: - virtual bool Docking( const Point& rPos, Rectangle& rRect ) override; - virtual void EndDocking( const Rectangle& rRect, bool bFloatMode ) override; + virtual bool Docking( const Point& rPos, tools::Rectangle& rRect ) override; + virtual void EndDocking( const tools::Rectangle& rRect, bool bFloatMode ) override; virtual void ToggleFloatingMode() override; virtual bool PrepareToggleFloatingMode() override; virtual void StartDocking() override; private: // the position and the size of the floating window - Rectangle aFloatingRect; + tools::Rectangle aFloatingRect; // the position and the size of the docking window - Rectangle aDockingRect; + tools::Rectangle aDockingRect; // the parent layout window (only when docking) VclPtr<Layout> pLayout; // > 0: shown, <= 0: hidden, ++ by Show() and -- by Hide() diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx index d8e282ed93da..2fa9bb9de66e 100644 --- a/basctl/source/inc/dlged.hxx +++ b/basctl/source/inc/dlged.hxx @@ -127,7 +127,7 @@ private: bool bFirstDraw; Size aGridSize; bool bCreateOK; - Rectangle aPaintRect; + tools::Rectangle aPaintRect; bool bDialogModelChanged; Idle aMarkIdle; long mnPaintGuard; @@ -181,7 +181,7 @@ public: void MouseButtonDown( const MouseEvent& rMEvt ); void MouseButtonUp( const MouseEvent& rMEvt ); void MouseMove( const MouseEvent& rMEvt ); - void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect); + void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect); bool KeyInput( const KeyEvent& rKEvt ); void SetMode (Mode eMode); diff --git a/basctl/source/inc/dlgedview.hxx b/basctl/source/inc/dlgedview.hxx index 1440e0903a33..a370d48e16b4 100644 --- a/basctl/source/inc/dlgedview.hxx +++ b/basctl/source/inc/dlgedview.hxx @@ -43,7 +43,7 @@ public: virtual ~DlgEdView() override; virtual void MarkListHasChanged() override; - virtual void MakeVisible( const Rectangle& rRect, vcl::Window& rWin ) override; + virtual void MakeVisible( const tools::Rectangle& rRect, vcl::Window& rWin ) override; protected: /// override to handle HitTest for some objects specially diff --git a/basctl/source/inc/layout.hxx b/basctl/source/inc/layout.hxx index 5b66e4163032..0c476f0f0701 100644 --- a/basctl/source/inc/layout.hxx +++ b/basctl/source/inc/layout.hxx @@ -85,7 +85,7 @@ private: void Remove (DockingWindow*); bool IsEmpty () const; long GetSize () const; - void ArrangeIn (Rectangle const&); + void ArrangeIn (tools::Rectangle const&); void dispose(); private: @@ -96,7 +96,7 @@ private: // lower (top or left) or higher (bottom or right) strip? bool bLower; // rectangle to move in - Rectangle aRect; + tools::Rectangle aRect; // size (width or height) long nSize; // the main splitting line |