diff options
Diffstat (limited to 'sw/source/uibase')
69 files changed, 239 insertions, 239 deletions
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index eb1af4860268..2ae8a2992b2e 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -816,7 +816,7 @@ void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup, m_pDoc->getIDocumentDeviceAccess().setJobsetup( rSetup ); } - Rectangle aRect( nAspect == ASPECT_THUMBNAIL ? + tools::Rectangle aRect( nAspect == ASPECT_THUMBNAIL ? GetVisArea( nAspect ) : GetVisArea( ASPECT_CONTENT ) ); pDev->Push(); @@ -837,9 +837,9 @@ void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup, EnableSetModified(); } -void SwDocShell::SetVisArea( const Rectangle &rRect ) +void SwDocShell::SetVisArea( const tools::Rectangle &rRect ) { - Rectangle aRect( rRect ); + tools::Rectangle aRect( rRect ); if (m_pView) { Size aSz( m_pView->GetDocSz() ); @@ -861,7 +861,7 @@ void SwDocShell::SetVisArea( const Rectangle &rRect ) SfxObjectShell::SetVisArea( aRect ); } -Rectangle SwDocShell::GetVisArea( sal_uInt16 nAspect ) const +tools::Rectangle SwDocShell::GetVisArea( sal_uInt16 nAspect ) const { if ( nAspect == ASPECT_THUMBNAIL ) { @@ -870,7 +870,7 @@ Rectangle SwDocShell::GetVisArea( sal_uInt16 nAspect ) const SwContentNode* pNd = m_pDoc->GetNodes().GoNext( &aIdx ); const SwRect aPageRect = pNd->FindPageFrameRect(); - Rectangle aRect(aPageRect.SVRect()); + tools::Rectangle aRect(aPageRect.SVRect()); // tdf#81219 sanitize - nobody is interested in a thumbnail where's // nothing visible diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index 675a2e031543..5661818f9ddf 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -302,12 +302,12 @@ void SwAddressPreview::UpdateScrollBar() } } -void SwAddressPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) +void SwAddressPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) { const StyleSettings& rSettings = rRenderContext.GetSettings().GetStyleSettings(); rRenderContext.SetFillColor(rSettings.GetWindowColor()); rRenderContext.SetLineColor(Color(COL_TRANSPARENT)); - rRenderContext.DrawRect(Rectangle(Point(0, 0), GetOutputSizePixel())); + rRenderContext.DrawRect(tools::Rectangle(Point(0, 0), GetOutputSizePixel())); Color aPaintColor(IsEnabled() ? rSettings.GetWindowTextColor() : rSettings.GetDisableColor()); rRenderContext.SetLineColor(aPaintColor); vcl::Font aFont(rRenderContext.GetFont()); @@ -430,12 +430,12 @@ void SwAddressPreview::StateChanged( StateChangedType nStateChange ) void SwAddressPreview::DrawText_Impl(vcl::RenderContext& rRenderContext, const OUString& rAddress, const Point& rTopLeft, const Size& rSize, bool bIsSelected) { - rRenderContext.SetClipRegion(vcl::Region(Rectangle(rTopLeft, rSize))); + rRenderContext.SetClipRegion(vcl::Region(tools::Rectangle(rTopLeft, rSize))); if (bIsSelected) { //selection rectangle rRenderContext.SetFillColor(Color(COL_TRANSPARENT)); - rRenderContext.DrawRect(Rectangle(rTopLeft, rSize)); + rRenderContext.DrawRect(tools::Rectangle(rTopLeft, rSize)); } sal_Int32 nHeight = GetTextHeight(); Point aStart = rTopLeft; diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx index 8c564231a15e..fc9e0217105c 100644 --- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx @@ -776,7 +776,7 @@ bool SwSpellDialogChildWindow::FindNextDrawTextError_Impl(SwWrtShell& rSh) aTmpOutliner.InsertView( pOutlView.get() ); Point aPt; Size aSize(1,1); - Rectangle aRect( aPt, aSize ); + tools::Rectangle aRect( aPt, aSize ); pOutlView->SetOutputArea( aRect ); aTmpOutliner.SetText( *pParaObj ); aTmpOutliner.ClearModifyFlag(); diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx index ddaae9d1b8e2..38fe8def1a86 100644 --- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx +++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx @@ -118,7 +118,7 @@ void AnnotationMenuButton::MouseButtonDown( const MouseEvent& rMEvt ) MenuButton::MouseButtonDown(rMEvt); } -void AnnotationMenuButton::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /*rRect*/) +void AnnotationMenuButton::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& /*rRect*/) { bool bHighContrast = rRenderContext.GetSettings().GetStyleSettings().GetHighContrastMode(); @@ -127,7 +127,7 @@ void AnnotationMenuButton::Paint(vcl::RenderContext& rRenderContext, const Recta else rRenderContext.SetFillColor(mrSidebarWin.ColorDark()); rRenderContext.SetLineColor(); - const Rectangle aRect(Rectangle(Point(0, 0), rRenderContext.PixelToLogic(GetSizePixel()))); + const tools::Rectangle aRect(tools::Rectangle(Point(0, 0), rRenderContext.PixelToLogic(GetSizePixel()))); rRenderContext.DrawRect(aRect); if (bHighContrast) @@ -170,7 +170,7 @@ void AnnotationMenuButton::Paint(vcl::RenderContext& rRenderContext, const Recta } else { - Rectangle aSymbolRect(aRect); + tools::Rectangle aSymbolRect(aRect); // 25% distance to the left and right button border const long nBorderDistanceLeftAndRight = ((aSymbolRect.GetWidth() * 250) + 500) / 1000; aSymbolRect.Left() += nBorderDistanceLeftAndRight; diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.hxx b/sw/source/uibase/docvw/AnnotationMenuButton.hxx index 82b4a5f5d088..6a7694d4caae 100644 --- a/sw/source/uibase/docvw/AnnotationMenuButton.hxx +++ b/sw/source/uibase/docvw/AnnotationMenuButton.hxx @@ -40,7 +40,7 @@ class AnnotationMenuButton : public MenuButton // override vcl::Window methods virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; virtual void KeyInput( const KeyEvent& rKeyEvt ) override; private: diff --git a/sw/source/uibase/docvw/DashedLine.cxx b/sw/source/uibase/docvw/DashedLine.cxx index 7da108fb6dcc..b5a641d84672 100644 --- a/sw/source/uibase/docvw/DashedLine.cxx +++ b/sw/source/uibase/docvw/DashedLine.cxx @@ -29,14 +29,14 @@ SwDashedLine::~SwDashedLine( ) { } -void SwDashedLine::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) +void SwDashedLine::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) { const drawinglayer::geometry::ViewInformation2D aNewViewInfos; std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor( drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(rRenderContext, aNewViewInfos)); // Compute the start and end points - const Rectangle aRect(Rectangle(Point(0, 0), rRenderContext.PixelToLogic(GetSizePixel()))); + const tools::Rectangle aRect(tools::Rectangle(Point(0, 0), rRenderContext.PixelToLogic(GetSizePixel()))); double nHalfWidth = double(aRect.Top() + aRect.Bottom()) / 2.0; basegfx::B2DPoint aStart(double(aRect.Left()), nHalfWidth); diff --git a/sw/source/uibase/docvw/FrameControlsManager.cxx b/sw/source/uibase/docvw/FrameControlsManager.cxx index 15d663361d37..a16193227b1d 100644 --- a/sw/source/uibase/docvw/FrameControlsManager.cxx +++ b/sw/source/uibase/docvw/FrameControlsManager.cxx @@ -126,7 +126,7 @@ void SwFrameControlsManager::SetHeaderFooterControl( const SwPageFrame* pPageFra pControl.swap( pNewControl ); } - Rectangle aPageRect = m_pEditWin->LogicToPixel( pPageFrame->Frame().SVRect() ); + tools::Rectangle aPageRect = m_pEditWin->LogicToPixel( pPageFrame->Frame().SVRect() ); SwHeaderFooterWin* pWin = dynamic_cast<SwHeaderFooterWin *>(pControl->GetWindow()); assert( pWin != nullptr) ; diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx index b7c7fecf02c3..f686d8c4fc04 100644 --- a/sw/source/uibase/docvw/HeaderFooterWin.cxx +++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx @@ -80,7 +80,7 @@ namespace return basegfx::tools::hsl2rgb( aHslDark ); } - B2DPolygon lcl_GetPolygon( const Rectangle& rRect, bool bHeader ) + B2DPolygon lcl_GetPolygon( const ::tools::Rectangle& rRect, bool bHeader ) { const double nRadius = 3; const double nKappa((M_SQRT2 - 1.0) * 4.0 / 3.0); @@ -199,9 +199,9 @@ void SwHeaderFooterWin::SetOffset(Point aOffset, long nXLineStart, long nXLineEn m_sLabel = m_sLabel.replaceAt(nPos, 2, pDesc->GetName()); // Compute the text size and get the box position & size from it - Rectangle aTextRect; + ::tools::Rectangle aTextRect; GetTextBoundRect(aTextRect, OUString(m_sLabel)); - Rectangle aTextPxRect = LogicToPixel(aTextRect); + ::tools::Rectangle aTextPxRect = LogicToPixel(aTextRect); FontMetric aFontMetric = GetFontMetric(GetFont()); Size aBoxSize (aTextPxRect.GetWidth() + BUTTON_WIDTH + TEXT_PADDING * 2, aFontMetric.GetLineHeight() + TEXT_PADDING * 2 ); @@ -243,23 +243,23 @@ void SwHeaderFooterWin::ShowAll(bool bShow) bool SwHeaderFooterWin::Contains( const Point &rDocPt ) const { - Rectangle aRect(GetPosPixel(), GetSizePixel()); + ::tools::Rectangle aRect(GetPosPixel(), GetSizePixel()); if (aRect.IsInside(rDocPt)) return true; - Rectangle aLineRect(m_pLine->GetPosPixel(), m_pLine->GetSizePixel()); + ::tools::Rectangle aLineRect(m_pLine->GetPosPixel(), m_pLine->GetSizePixel()); if (aLineRect.IsInside(rDocPt)) return true; return false; } -void SwHeaderFooterWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) +void SwHeaderFooterWin::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle&) { // Use pixels for the rest of the drawing SetMapMode(MapMode(MapUnit::MapPixel)); - const Rectangle aRect(Rectangle(Point(0, 0), rRenderContext.PixelToLogic(GetSizePixel()))); + const ::tools::Rectangle aRect(::tools::Rectangle(Point(0, 0), rRenderContext.PixelToLogic(GetSizePixel()))); drawinglayer::primitive2d::Primitive2DContainer aSeq(3); B2DPolygon aPolygon = lcl_GetPolygon(aRect, m_bIsHeader); diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx index 2ec1f3f0dae1..dcf4b0801088 100644 --- a/sw/source/uibase/docvw/PageBreakWin.cxx +++ b/sw/source/uibase/docvw/PageBreakWin.cxx @@ -134,9 +134,9 @@ void SwPageBreakWin::dispose() SwFrameMenuButtonBase::dispose(); } -void SwPageBreakWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) +void SwPageBreakWin::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle&) { - const Rectangle aRect(Rectangle(Point(0, 0), rRenderContext.PixelToLogic(GetSizePixel()))); + const ::tools::Rectangle aRect(::tools::Rectangle(Point(0, 0), rRenderContext.PixelToLogic(GetSizePixel()))); // Properly paint the control BColor aColor = SwViewOption::GetPageBreakColor().getBColor(); @@ -342,13 +342,13 @@ void SwPageBreakWin::UpdatePosition( const Point* pEvtPt ) while ( pPrevPage && ( ( pPrevPage->Frame().Top( ) == pPageFrame->Frame().Top( ) ) || static_cast< const SwPageFrame* >( pPrevPage )->IsEmptyPage( ) ) ); - Rectangle aBoundRect = GetEditWin()->LogicToPixel( pPageFrame->GetBoundRect(GetEditWin()).SVRect() ); - Rectangle aFrameRect = GetEditWin()->LogicToPixel( pPageFrame->Frame().SVRect() ); + ::tools::Rectangle aBoundRect = GetEditWin()->LogicToPixel( pPageFrame->GetBoundRect(GetEditWin()).SVRect() ); + ::tools::Rectangle aFrameRect = GetEditWin()->LogicToPixel( pPageFrame->Frame().SVRect() ); long nYLineOffset = ( aBoundRect.Top() + aFrameRect.Top() ) / 2; if ( pPrevPage ) { - Rectangle aPrevFrameRect = GetEditWin()->LogicToPixel( pPrevPage->Frame().SVRect() ); + ::tools::Rectangle aPrevFrameRect = GetEditWin()->LogicToPixel( pPrevPage->Frame().SVRect() ); nYLineOffset = ( aPrevFrameRect.Bottom() + aFrameRect.Top() ) / 2; } @@ -369,7 +369,7 @@ void SwPageBreakWin::UpdatePosition( const Point* pEvtPt ) Size aBtnSize( BUTTON_WIDTH + ARROW_WIDTH, BUTTON_HEIGHT ); // Place the button on the left or right? - Rectangle aVisArea = GetEditWin()->LogicToPixel( GetEditWin()->GetView().GetVisArea() ); + ::tools::Rectangle aVisArea = GetEditWin()->LogicToPixel( GetEditWin()->GetView().GetVisArea() ); long nLineLeft = std::max( nPgLeft, aVisArea.Left() ); long nLineRight = std::min( nPgRight, aVisArea.Right() ); @@ -402,11 +402,11 @@ void SwPageBreakWin::ShowAll( bool bShow ) bool SwPageBreakWin::Contains( const Point &rDocPt ) const { - Rectangle aRect( GetPosPixel(), GetSizePixel() ); + ::tools::Rectangle aRect( GetPosPixel(), GetSizePixel() ); if ( aRect.IsInside( rDocPt ) ) return true; - Rectangle aLineRect( m_pLine->GetPosPixel(), m_pLine->GetSizePixel() ); + ::tools::Rectangle aLineRect( m_pLine->GetPosPixel(), m_pLine->GetSizePixel() ); if ( aLineRect.IsInside( rDocPt ) ) return true; diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index dae084be2eec..c5e3b99d5f1c 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -153,7 +153,7 @@ namespace { const SwPostItField* pField = pWin->GetPostItField(); const SwRect& aRect = pWin->GetAnchorRect(); - const Rectangle aSVRect(aRect.Pos().getX(), + const tools::Rectangle aSVRect(aRect.Pos().getX(), aRect.Pos().getY(), aRect.Pos().getX() + aRect.SSize().Width(), aRect.Pos().getY() + aRect.SSize().Height()); @@ -971,7 +971,7 @@ void SwPostItMgr::DrawNotesForPage(OutputDevice *pOutDev, sal_uInt32 nPage) } } -void SwPostItMgr::PaintTile(OutputDevice& rRenderContext, const Rectangle& /*rRect*/) +void SwPostItMgr::PaintTile(OutputDevice& rRenderContext, const tools::Rectangle& /*rRect*/) { for (SwSidebarItem* pItem : mvPostItFields) { @@ -987,7 +987,7 @@ void SwPostItMgr::PaintTile(OutputDevice& rRenderContext, const Rectangle& /*rRe aMapMode.SetOrigin(aMapMode.GetOrigin() + aOffset); rRenderContext.SetMapMode(aMapMode); Size aSize(rRenderContext.PixelToLogic(pPostIt->GetSizePixel())); - Rectangle aRectangle(Point(0, 0), aSize); + tools::Rectangle aRectangle(Point(0, 0), aSize); pPostIt->PaintTile(rRenderContext, aRectangle); @@ -1089,7 +1089,7 @@ void SwPostItMgr::MakeVisible(const SwSidebarWin* pPostIt ) } if (aPage!=-1) AutoScroll(pPostIt,aPage); - Rectangle aNoteRect (Point(pPostIt->GetPosPixel().X(),pPostIt->GetPosPixel().Y()-5),pPostIt->GetSizePixel()); + tools::Rectangle aNoteRect (Point(pPostIt->GetPosPixel().X(),pPostIt->GetPosPixel().Y()-5),pPostIt->GetSizePixel()); if (!aNoteRect.IsEmpty()) mpWrtShell->MakeVisible(SwRect(mpEditWin->PixelToLogic(aNoteRect))); } @@ -1125,7 +1125,7 @@ Color SwPostItMgr::GetArrowColor(sal_uInt16 aDirection,unsigned long aPage) cons } } -bool SwPostItMgr::LayoutByPage(std::list<SwSidebarWin*> &aVisiblePostItList, const Rectangle& rBorder, long lNeededHeight) +bool SwPostItMgr::LayoutByPage(std::list<SwSidebarWin*> &aVisiblePostItList, const tools::Rectangle& rBorder, long lNeededHeight) { /*** General layout idea:***/ // - if we have space left, we always move the current one up, @@ -1134,7 +1134,7 @@ bool SwPostItMgr::LayoutByPage(std::list<SwSidebarWin*> &aVisiblePostItList, con // - then the real layout starts //rBorder is the page rect - const Rectangle aBorder = mpEditWin->LogicToPixel(rBorder); + const tools::Rectangle aBorder = mpEditWin->LogicToPixel(rBorder); long lTopBorder = aBorder.Top() + 5; long lBottomBorder = aBorder.Bottom() - 5; const long lVisibleHeight = lBottomBorder - lTopBorder; //aBorder.GetHeight() ; @@ -1847,11 +1847,11 @@ bool SwPostItMgr::IsHit(const Point &aPointPixel) const unsigned long nPageNum = SwPostItHelper::getPageInfo( aPageFrame, pLayout, aPoint ); if( nPageNum ) { - Rectangle aRect; + tools::Rectangle aRect; OSL_ENSURE(mPages.size()>nPageNum-1,"SwPostitMgr:: page container size wrong"); aRect = mPages[nPageNum-1]->eSidebarPosition == sw::sidebarwindows::SidebarPosition::LEFT - ? Rectangle(Point(aPageFrame.Left()-GetSidebarWidth()-GetSidebarBorderWidth(),aPageFrame.Top()),Size(GetSidebarWidth(),aPageFrame.Height())) - : Rectangle( Point(aPageFrame.Right()+GetSidebarBorderWidth(),aPageFrame.Top()) , Size(GetSidebarWidth(),aPageFrame.Height())); + ? tools::Rectangle(Point(aPageFrame.Left()-GetSidebarWidth()-GetSidebarBorderWidth(),aPageFrame.Top()),Size(GetSidebarWidth(),aPageFrame.Height())) + : tools::Rectangle( Point(aPageFrame.Right()+GetSidebarBorderWidth(),aPageFrame.Top()) , Size(GetSidebarWidth(),aPageFrame.Height())); if (aRect.IsInside(aPoint)) { // we hit the note's sidebar @@ -1896,24 +1896,24 @@ vcl::Window* SwPostItMgr::IsHitSidebarWindow(const Point& rPointLogic) return pRet; } -Rectangle SwPostItMgr::GetBottomScrollRect(const unsigned long aPage) const +tools::Rectangle SwPostItMgr::GetBottomScrollRect(const unsigned long aPage) const { SwRect aPageRect = mPages[aPage-1]->mPageRect; Point aPointBottom = mPages[aPage-1]->eSidebarPosition == sw::sidebarwindows::SidebarPosition::LEFT ? Point(aPageRect.Left() - GetSidebarWidth() - GetSidebarBorderWidth() + mpEditWin->PixelToLogic(Size(2,0)).Width(),aPageRect.Bottom()- mpEditWin->PixelToLogic(Size(0,2+GetSidebarScrollerHeight())).Height()) : Point(aPageRect.Right() + GetSidebarBorderWidth() + mpEditWin->PixelToLogic(Size(2,0)).Width(),aPageRect.Bottom()- mpEditWin->PixelToLogic(Size(0,2+GetSidebarScrollerHeight())).Height()); Size aSize(GetSidebarWidth() - mpEditWin->PixelToLogic(Size(4,0)).Width(), mpEditWin->PixelToLogic(Size(0,GetSidebarScrollerHeight())).Height()) ; - return Rectangle(aPointBottom,aSize); + return tools::Rectangle(aPointBottom,aSize); } -Rectangle SwPostItMgr::GetTopScrollRect(const unsigned long aPage) const +tools::Rectangle SwPostItMgr::GetTopScrollRect(const unsigned long aPage) const { SwRect aPageRect = mPages[aPage-1]->mPageRect; Point aPointTop = mPages[aPage-1]->eSidebarPosition == sw::sidebarwindows::SidebarPosition::LEFT ? Point(aPageRect.Left() - GetSidebarWidth() -GetSidebarBorderWidth()+ mpEditWin->PixelToLogic(Size(2,0)).Width(),aPageRect.Top() + mpEditWin->PixelToLogic(Size(0,2)).Height()) : Point(aPageRect.Right() + GetSidebarBorderWidth() + mpEditWin->PixelToLogic(Size(2,0)).Width(),aPageRect.Top() + mpEditWin->PixelToLogic(Size(0,2)).Height()); Size aSize(GetSidebarWidth() - mpEditWin->PixelToLogic(Size(4,0)).Width(), mpEditWin->PixelToLogic(Size(0,GetSidebarScrollerHeight())).Height()) ; - return Rectangle(aPointTop,aSize); + return tools::Rectangle(aPointTop,aSize); } //IMPORTANT: if you change the rects here, also change SwPageFrame::PaintNotesSidebar() @@ -1928,8 +1928,8 @@ bool SwPostItMgr::ScrollbarHit(const unsigned long aPage,const Point &aPoint) ? Point(aPageRect.Left() - GetSidebarWidth()-GetSidebarBorderWidth()+ mpEditWin->PixelToLogic(Size(2,0)).Width(),aPageRect.Top() + mpEditWin->PixelToLogic(Size(0,2)).Height()) : Point(aPageRect.Right()+GetSidebarBorderWidth()+ mpEditWin->PixelToLogic(Size(2,0)).Width(),aPageRect.Top() + mpEditWin->PixelToLogic(Size(0,2)).Height()); - Rectangle aRectBottom(GetBottomScrollRect(aPage)); - Rectangle aRectTop(GetTopScrollRect(aPage)); + tools::Rectangle aRectBottom(GetBottomScrollRect(aPage)); + tools::Rectangle aRectTop(GetTopScrollRect(aPage)); if (aRectBottom.IsInside(aPoint)) { diff --git a/sw/source/uibase/docvw/SidebarScrollBar.cxx b/sw/source/uibase/docvw/SidebarScrollBar.cxx index 45e2732b0e62..bb23abe47369 100644 --- a/sw/source/uibase/docvw/SidebarScrollBar.cxx +++ b/sw/source/uibase/docvw/SidebarScrollBar.cxx @@ -30,9 +30,9 @@ SidebarScrollBar::SidebarScrollBar(SwSidebarWin& rSidebarWin, WinBits nStyle, Sw { } -void SidebarScrollBar::LogicInvalidate(const Rectangle* pRectangle) +void SidebarScrollBar::LogicInvalidate(const tools::Rectangle* pRectangle) { - Rectangle aRectangle; + tools::Rectangle aRectangle; if (!pRectangle) { @@ -41,7 +41,7 @@ void SidebarScrollBar::LogicInvalidate(const Rectangle* pRectangle) MapMode aMapMode = GetMapMode(); aMapMode.SetMapUnit(MapUnit::MapTwip); SetMapMode(aMapMode); - aRectangle = Rectangle(Point(0, 0), PixelToLogic(GetSizePixel())); + aRectangle = tools::Rectangle(Point(0, 0), PixelToLogic(GetSizePixel())); Pop(); } else diff --git a/sw/source/uibase/docvw/SidebarScrollBar.hxx b/sw/source/uibase/docvw/SidebarScrollBar.hxx index dabb6e0c508a..19dae0a8b782 100644 --- a/sw/source/uibase/docvw/SidebarScrollBar.hxx +++ b/sw/source/uibase/docvw/SidebarScrollBar.hxx @@ -29,7 +29,7 @@ class SidebarScrollBar : public ScrollBar protected: /// @see OutputDevice::LogicInvalidate(). - void LogicInvalidate(const Rectangle* pRectangle) override; + void LogicInvalidate(const tools::Rectangle* pRectangle) override; void MouseMove(const MouseEvent& rMouseEvent) override; void MouseButtonUp(const MouseEvent& rMouseEvent) override; public: diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx index 5180568227cf..32d43744524e 100644 --- a/sw/source/uibase/docvw/SidebarTxtControl.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx @@ -126,7 +126,7 @@ void SidebarTextControl::RequestHelp(const HelpEvent &rEvt) OUString sText = SW_RESSTR( nResId ) + ": " + aContentAtPos.aFnd.pRedl->GetAuthorString() + " - " + GetAppLangDateTimeString( aContentAtPos.aFnd.pRedl->GetTimeStamp() ); - Help::ShowQuickHelp( this,PixelToLogic(Rectangle(rEvt.GetMousePosPixel(),Size(50,10))),sText); + Help::ShowQuickHelp( this,PixelToLogic(tools::Rectangle(rEvt.GetMousePosPixel(),Size(50,10))),sText); } } @@ -138,7 +138,7 @@ void SidebarTextControl::Draw(OutputDevice* pDev, const Point& rPt, const Size& if ( GetTextView() ) { - GetTextView()->GetOutliner()->Draw(pDev, Rectangle(rPt, aSize)); + GetTextView()->GetOutliner()->Draw(pDev, tools::Rectangle(rPt, aSize)); } if ( mrSidebarWin.GetLayoutStatus()==SwPostItHelper::DELETED ) @@ -155,18 +155,18 @@ void SidebarTextControl::Draw(OutputDevice* pDev, const Point& rPt, const Size& } } -void SidebarTextControl::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) +void SidebarTextControl::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) { if (!rRenderContext.GetSettings().GetStyleSettings().GetHighContrastMode()) { if (mrSidebarWin.IsMouseOverSidebarWin() || HasFocus()) { - rRenderContext.DrawGradient(Rectangle(Point(0,0), rRenderContext.PixelToLogic(GetSizePixel())), + rRenderContext.DrawGradient(tools::Rectangle(Point(0,0), rRenderContext.PixelToLogic(GetSizePixel())), Gradient(GradientStyle::Linear, mrSidebarWin.ColorDark(), mrSidebarWin.ColorDark())); } else { - rRenderContext.DrawGradient(Rectangle(Point(0,0), rRenderContext.PixelToLogic(GetSizePixel())), + rRenderContext.DrawGradient(tools::Rectangle(Point(0,0), rRenderContext.PixelToLogic(GetSizePixel())), Gradient(GradientStyle::Linear, mrSidebarWin.ColorLight(), mrSidebarWin.ColorDark())); } } @@ -189,15 +189,15 @@ void SidebarTextControl::Paint(vcl::RenderContext& rRenderContext, const Rectang } } -void SidebarTextControl::LogicInvalidate(const Rectangle* pRectangle) +void SidebarTextControl::LogicInvalidate(const tools::Rectangle* pRectangle) { - Rectangle aRectangle; + tools::Rectangle aRectangle; if (!pRectangle) { Push(PushFlags::MAPMODE); EnableMapMode(); - aRectangle = Rectangle(Point(0, 0), PixelToLogic(GetSizePixel())); + aRectangle = tools::Rectangle(Point(0, 0), PixelToLogic(GetSizePixel())); Pop(); } else @@ -314,7 +314,7 @@ void SidebarTextControl::MouseMove( const MouseEvent& rMEvt ) sURL = SwViewShell::GetShellRes()->aLinkCtrlClick + ": " + sURL; else sURL = SwViewShell::GetShellRes()->aLinkClick + ": " + sURL; - Help::ShowQuickHelp( this,PixelToLogic(Rectangle(GetPosPixel(),Size(50,10))),sURL); + Help::ShowQuickHelp( this,PixelToLogic(tools::Rectangle(GetPosPixel(),Size(50,10))),sURL); } } } diff --git a/sw/source/uibase/docvw/SidebarTxtControl.hxx b/sw/source/uibase/docvw/SidebarTxtControl.hxx index f6e49a4d508a..daf9ab54fba6 100644 --- a/sw/source/uibase/docvw/SidebarTxtControl.hxx +++ b/sw/source/uibase/docvw/SidebarTxtControl.hxx @@ -39,9 +39,9 @@ class SidebarTextControl : public Control SwPostItMgr& mrPostItMgr; protected: - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; /// @see OutputDevice::LogicInvalidate(). - void LogicInvalidate(const Rectangle* pRectangle) override; + void LogicInvalidate(const tools::Rectangle* pRectangle) override; virtual void Command( const CommandEvent& rCEvt ) override; virtual void LoseFocus() override; virtual void RequestHelp(const HelpEvent &rEvt) override; diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index 330f0094a007..594a66d41c1d 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -135,7 +135,7 @@ vcl::Window* lcl_getHitWindow(sw::sidebarwindows::SwSidebarWin& rParent, const M Point aPosition(rParent.GetPosPixel()); aPosition.Move(pChild->GetPosPixel().getX(), pChild->GetPosPixel().getY()); Size aSize(rParent.GetSizePixel()); - Rectangle aRectangleLogic(rParent.EditWin().PixelToLogic(aPosition), rParent.EditWin().PixelToLogic(aSize)); + tools::Rectangle aRectangleLogic(rParent.EditWin().PixelToLogic(aPosition), rParent.EditWin().PixelToLogic(aSize)); if (aRectangleLogic.IsInside(rMouseEvent.GetPosPixel())) { pRet = pChild; @@ -276,7 +276,7 @@ void SwSidebarWin::dispose() vcl::Window::dispose(); } -void SwSidebarWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) +void SwSidebarWin::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) { Window::Paint(rRenderContext, rRect); @@ -293,7 +293,7 @@ void SwSidebarWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rR } rRenderContext.SetLineColor(); - Rectangle aRectangle(Point(mpMetadataAuthor->GetPosPixel().X() + mpMetadataAuthor->GetSizePixel().Width(), + tools::Rectangle aRectangle(Point(mpMetadataAuthor->GetPosPixel().X() + mpMetadataAuthor->GetSizePixel().Width(), mpMetadataAuthor->GetPosPixel().Y()), Size(GetMetaButtonAreaWidth(), mpMetadataAuthor->GetSizePixel().Height() + mpMetadataDate->GetSizePixel().Height())); @@ -306,7 +306,7 @@ void SwSidebarWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rR } } -void SwSidebarWin::PaintTile(vcl::RenderContext& rRenderContext, const Rectangle& rRect) +void SwSidebarWin::PaintTile(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) { Paint(rRenderContext, rRect); @@ -367,7 +367,7 @@ void SwSidebarWin::PaintTile(vcl::RenderContext& rRenderContext, const Rectangle bool SwSidebarWin::IsHitWindow(const Point& rPointLogic) { - Rectangle aRectangleLogic(EditWin().PixelToLogic(GetPosPixel()), EditWin().PixelToLogic(GetSizePixel())); + tools::Rectangle aRectangleLogic(EditWin().PixelToLogic(GetPosPixel()), EditWin().PixelToLogic(GetSizePixel())); return aRectangleLogic.IsInside(rPointLogic); } @@ -390,7 +390,7 @@ void SwSidebarWin::Draw(OutputDevice* pDev, const Point& rPt, const Size& rSz, D { pDev->SetFillColor(mColorDark); pDev->SetLineColor(); - pDev->DrawRect( Rectangle( rPt, rSz ) ); + pDev->DrawRect( tools::Rectangle( rPt, rSz ) ); } if (mpMetadataAuthor->IsVisible()) @@ -510,7 +510,7 @@ void SwSidebarWin::MouseButtonUp(const MouseEvent& rMouseEvent) void SwSidebarWin::SetPosSizePixelRect(long nX, long nY, long nWidth, long nHeight, const SwRect& aAnchorRect, const long aPageBorder) { - mPosSize = Rectangle(Point(nX,nY),Size(nWidth,nHeight)); + mPosSize = tools::Rectangle(Point(nX,nY),Size(nWidth,nHeight)); if (!mAnchorRect.IsEmpty() && mAnchorRect != aAnchorRect) mbAnchorRectChanged = true; mAnchorRect = aAnchorRect; @@ -524,7 +524,7 @@ void SwSidebarWin::SetSize( const Size& rNewSize ) void SwSidebarWin::SetVirtualPosSize( const Point& aPoint, const Size& aSize) { - mPosSize = Rectangle(aPoint,aSize); + mPosSize = tools::Rectangle(aPoint,aSize); } void SwSidebarWin::TranslateTopPosition(const long aAmount) @@ -613,7 +613,7 @@ void SwSidebarWin::InitControls() mpOutlinerView = new OutlinerView ( mpOutliner, mpSidebarTextControl ); mpOutlinerView->SetBackgroundColor(COL_TRANSPARENT); mpOutliner->InsertView(mpOutlinerView ); - mpOutlinerView->SetOutputArea( PixelToLogic( Rectangle(0,0,1,1) ) ); + mpOutlinerView->SetOutputArea( PixelToLogic( tools::Rectangle(0,0,1,1) ) ); mpOutlinerView->SetAttribs(DefaultItem()); @@ -927,7 +927,7 @@ void SwSidebarWin::SetPosAndSize() SwRects* pRects(pTmpCursorForAnnotationTextRange.get()); for(SwRect & rNextRect : *pRects) { - const Rectangle aPntRect(rNextRect.SVRect()); + const tools::Rectangle aPntRect(rNextRect.SVRect()); maAnnotationTextRanges.push_back(basegfx::B2DRange( aPntRect.Left(), aPntRect.Top(), aPntRect.Right() + 1, aPntRect.Bottom() + 1)); @@ -1004,9 +1004,9 @@ void SwSidebarWin::DoResize() mpOutliner->SetPaperSize( PixelToLogic( Size(aWidth,aHeight) ) ) ; if (!mpVScrollbar->IsVisible()) { // if we do not have a scrollbar anymore, we want to see the complete text - mpOutlinerView->SetVisArea( PixelToLogic( Rectangle(0,0,aWidth,aHeight) ) ); + mpOutlinerView->SetVisArea( PixelToLogic( tools::Rectangle(0,0,aWidth,aHeight) ) ); } - mpOutlinerView->SetOutputArea( PixelToLogic( Rectangle(0,0,aWidth,aHeight) ) ); + mpOutlinerView->SetOutputArea( PixelToLogic( tools::Rectangle(0,0,aWidth,aHeight) ) ); if (!AllSettings::GetLayoutRTL()) { @@ -1032,11 +1032,11 @@ void SwSidebarWin::DoResize() const Fraction& fy( GetMapMode().GetScaleY() ); const Point aPos( mpMetadataAuthor->GetPosPixel()); - Rectangle aRectMetaButton; + tools::Rectangle aRectMetaButton; if (IsPreview()) { aRectMetaButton = PixelToLogic( - Rectangle( Point( aPos.X()+GetSizePixel().Width()-(METABUTTON_WIDTH*4+10)*fx.GetNumerator()/fx.GetDenominator(), + tools::Rectangle( Point( aPos.X()+GetSizePixel().Width()-(METABUTTON_WIDTH*4+10)*fx.GetNumerator()/fx.GetDenominator(), aPos.Y()+5*fy.GetNumerator()/fy.GetDenominator() ), Size( METABUTTON_WIDTH*4*fx.GetNumerator()/fx.GetDenominator(), METABUTTON_HEIGHT*fy.GetNumerator()/fy.GetDenominator() ) ) ); @@ -1044,14 +1044,14 @@ void SwSidebarWin::DoResize() else { aRectMetaButton = PixelToLogic( - Rectangle( Point( aPos.X()+GetSizePixel().Width()-(METABUTTON_WIDTH+10)*fx.GetNumerator()/fx.GetDenominator(), + tools::Rectangle( Point( aPos.X()+GetSizePixel().Width()-(METABUTTON_WIDTH+10)*fx.GetNumerator()/fx.GetDenominator(), aPos.Y()+5*fy.GetNumerator()/fy.GetDenominator() ), Size( METABUTTON_WIDTH*fx.GetNumerator()/fx.GetDenominator(), METABUTTON_HEIGHT*fy.GetNumerator()/fy.GetDenominator() ) ) ); } { - const Rectangle aRectMetaButtonPixel( LogicToPixel( aRectMetaButton ) ); + const tools::Rectangle aRectMetaButtonPixel( LogicToPixel( aRectMetaButton ) ); mpMenuButton->setPosSizePixel( aRectMetaButtonPixel.Left(), aRectMetaButtonPixel.Top(), aRectMetaButtonPixel.GetWidth(), diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx index fa6c3caf8370..59badc65b7ca 100644 --- a/sw/source/uibase/docvw/edtdd.cxx +++ b/sw/source/uibase/docvw/edtdd.cxx @@ -198,7 +198,7 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt ) if( pObj && nullptr != ( pOLV = rSh.GetDrawView()->GetTextEditOutlinerView() )) { - Rectangle aRect( pOLV->GetOutputArea() ); + tools::Rectangle aRect( pOLV->GetOutputArea() ); aRect.Union( pObj->GetLogicRect() ); const Point aPos = pOLV->GetWindow()->PixelToLogic(rEvt.maPosPixel); if ( aRect.IsInside(aPos) ) @@ -258,7 +258,7 @@ SotExchangeDest SwEditWin::GetDropDestination( const Point& rPixPnt, SdrObject * OutlinerView* pOLV = rSh.GetDrawView()->GetTextEditOutlinerView(); if ( pOLV ) { - Rectangle aRect( pOLV->GetOutputArea() ); + tools::Rectangle aRect( pOLV->GetOutputArea() ); aRect.Union( pObj->GetLogicRect() ); const Point aPos = pOLV->GetWindow()->PixelToLogic( rPixPnt ); if( aRect.IsInside( aPos ) ) @@ -335,7 +335,7 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt ) // If the cursor is near the inner boundary // we attempt to scroll towards the desired direction. Point aPoint; - Rectangle aWin(aPoint,GetOutputSizePixel()); + tools::Rectangle aWin(aPoint,GetOutputSizePixel()); const int nMargin = 10; aWin.Left() += nMargin; aWin.Top() += nMargin; diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 48be93a38f96..208530981e44 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -369,7 +369,7 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier ) dynamic_cast<const SwFlyFrameFormat*>( pFormat) ) { //turn on highlight for frame - Rectangle aTmp( pRect->SVRect() ); + tools::Rectangle aTmp( pRect->SVRect() ); if ( !m_pUserMarker ) { @@ -401,7 +401,7 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier ) ? PointerStyle::ChainNotAllowed : PointerStyle::Chain; if ( nChainable == SwChainRet::OK ) { - Rectangle aTmp( aRect.SVRect() ); + tools::Rectangle aTmp( aRect.SVRect() ); if ( !m_pUserMarker ) { @@ -626,7 +626,7 @@ IMPL_LINK_NOARG(SwEditWin, TimerHandler, Timer *, void) if ( m_bInsDraw ) { const int nMaxScroll = 40; - m_rView.Scroll( Rectangle(aModPt,Size(1,1)), nMaxScroll, nMaxScroll); + m_rView.Scroll( tools::Rectangle(aModPt,Size(1,1)), nMaxScroll, nMaxScroll); bDone = true; } else if ( g_bFrameDrag ) @@ -667,7 +667,7 @@ IMPL_LINK_NOARG(SwEditWin, TimerHandler, Timer *, void) void SwEditWin::JustifyAreaTimer() { - const Rectangle &rVisArea = GetView().GetVisArea(); + const tools::Rectangle &rVisArea = GetView().GetVisArea(); #ifdef UNX const long coMinLen = 100; #else @@ -3825,7 +3825,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt) { Point aDD( SwEditWin::m_nDDStartPosX, SwEditWin::m_nDDStartPosY ); aDD = LogicToPixel( aDD ); - Rectangle aRect( aDD.X()-3, aDD.Y()-3, aDD.X()+3, aDD.Y()+3 ); + tools::Rectangle aRect( aDD.X()-3, aDD.Y()-3, aDD.X()+3, aDD.Y()+3 ); if ( !aRect.IsInside( aPixPt ) ) StopDDTimer( &rSh, aDocPt ); } @@ -4456,7 +4456,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt) if ( rMEvt.IsMod1() ) // copy and don't move. { // abort drag, use internal Copy instead - Rectangle aRect; + tools::Rectangle aRect; rSh.GetDrawView()->TakeActionRect( aRect ); if (!aRect.IsEmpty()) { @@ -5595,19 +5595,19 @@ void SwEditWin::Command( const CommandEvent& rCEvt ) { // When the composition does not exist, use Caret rect instead. SwRect aCaretRect ( rSh.GetCharRect() ); - Rectangle aRect( aCaretRect.Left(), aCaretRect.Top(), aCaretRect.Right(), aCaretRect.Bottom() ); + tools::Rectangle aRect( aCaretRect.Left(), aCaretRect.Top(), aCaretRect.Right(), aCaretRect.Bottom() ); rWin.SetCompositionCharRect( &aRect, 1, bVertical ); } else { - std::unique_ptr<Rectangle[]> aRects(new Rectangle[ nSize ]); + std::unique_ptr<tools::Rectangle[]> aRects(new tools::Rectangle[ nSize ]); int nRectIndex = 0; for ( SwIndex nIndex = rStart.nContent; nIndex < rEnd.nContent; ++nIndex ) { const SwPosition aPos( rStart.nNode, nIndex ); SwRect aRect ( rSh.GetCharRect() ); rSh.GetCharRectAt( aRect, &aPos ); - aRects[ nRectIndex ] = Rectangle( aRect.Left(), aRect.Top(), aRect.Right(), aRect.Bottom() ); + aRects[ nRectIndex ] = tools::Rectangle( aRect.Left(), aRect.Top(), aRect.Right(), aRect.Bottom() ); ++nRectIndex; } rWin.SetCompositionCharRect( aRects.get(), nSize, bVertical ); @@ -5662,7 +5662,7 @@ void SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos ) bool bVertical = pOutliner->IsVertical(); const EditEngine& rEditEng = pOutliner->GetEditEngine(); Point aEEPos(aDocPos); - const Rectangle& rOutputArea = pOLV->GetOutputArea(); + const tools::Rectangle& rOutputArea = pOLV->GetOutputArea(); // regard vertical mode if(bVertical) { @@ -5955,7 +5955,7 @@ void QuickHelpData::Start( SwWrtShell& rSh, sal_uInt16 nWrdLen ) Point aPt( rWin.OutputToScreenPixel( rWin.LogicToPixel( rSh.GetCharRect().Pos() ))); aPt.Y() -= 3; - nTipId = Help::ShowPopover(&rWin, Rectangle( aPt, Size( 1, 1 )), + nTipId = Help::ShowPopover(&rWin, tools::Rectangle( aPt, Size( 1, 1 )), m_aHelpStrings[ nCurArrPos ], QuickHelpFlags::Left | QuickHelpFlags::Bottom); } @@ -6344,7 +6344,7 @@ Selection SwEditWin::GetSurroundingTextSelection() const } } -void SwEditWin::LogicInvalidate(const Rectangle* pRectangle) +void SwEditWin::LogicInvalidate(const tools::Rectangle* pRectangle) { OString sRectangle; if (!pRectangle) diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx index 598bf0d8ba66..21b5d2484011 100644 --- a/sw/source/uibase/docvw/edtwin2.cxx +++ b/sw/source/uibase/docvw/edtwin2.cxx @@ -365,7 +365,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) } if (!sText.isEmpty()) { - Rectangle aRect( aFieldRect.SVRect() ); + tools::Rectangle aRect( aFieldRect.SVRect() ); Point aPt( OutputToScreenPixel( LogicToPixel( aRect.TopLeft() ))); aRect.Left() = aPt.X(); aRect.Top() = aPt.Y(); @@ -420,7 +420,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) { sText = SW_RESSTR(nTabRes); Size aTextSize( GetTextWidth(sText), GetTextHeight()); - Rectangle aRect(rEvt.GetMousePosPixel(), aTextSize); + tools::Rectangle aRect(rEvt.GetMousePosPixel(), aTextSize); OUString sDisplayText(ClipLongToolTip(sText)); Help::ShowQuickHelp(this, aRect, sDisplayText); } @@ -442,7 +442,7 @@ void SwEditWin::PrePaint(vcl::RenderContext& /*rRenderContext*/) } } -void SwEditWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) +void SwEditWin::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) { SwWrtShell* pWrtShell = GetView().GetWrtShellPtr(); if(!pWrtShell) @@ -450,7 +450,7 @@ void SwEditWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect bool bPaintShadowCursor = false; if( m_pShadCursor ) { - Rectangle aRect( m_pShadCursor->GetRect()); + tools::Rectangle aRect( m_pShadCursor->GetRect()); // fully resides inside? if( rRect.IsInside( aRect ) ) { diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index 71922d57bfe8..26c6d5bcde8d 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -490,7 +490,7 @@ void TextViewOutWin::KeyInput( const KeyEvent& rKEvt ) } } -void TextViewOutWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) +void TextViewOutWin::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) { pTextView->Paint(rRenderContext, rRect); } diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx index 412c0cd9b32d..96a76fe4437e 100644 --- a/sw/source/uibase/frmdlg/colex.cxx +++ b/sw/source/uibase/frmdlg/colex.cxx @@ -230,14 +230,14 @@ void SwColExample::DrawPage(vcl::RenderContext& rRenderContext, const Point& rOr } rRenderContext.SetFillColor(Color(COL_LIGHTGRAY)); - Rectangle aRect; + tools::Rectangle aRect; aRect.Right() = rOrg.X() + GetSize().Width() - nR; aRect.Left() = rOrg.X() + nL; aRect.Top() = rOrg.Y() + GetTop() + GetHdHeight() + GetHdDist(); aRect.Bottom()= rOrg.Y() + GetSize().Height() - GetBottom() - GetFtHeight() - GetFtDist(); rRenderContext.DrawRect(aRect); - const Rectangle aDefineRect(aRect); + const tools::Rectangle aDefineRect(aRect); const drawinglayer::attribute::SdrAllFillAttributesHelperPtr& rFillAttributes = getPageFillAttributes(); if (!rFillAttributes.get() || !rFillAttributes->isUsed()) @@ -373,7 +373,7 @@ SwColumnOnlyExample::SwColumnOnlyExample(vcl::Window* pParent) VCL_BUILDER_FACTORY(SwColumnOnlyExample) -void SwColumnOnlyExample::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /*rRect*/) +void SwColumnOnlyExample::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& /*rRect*/) { const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings(); const Color& rFieldColor = rStyleSettings.GetFieldColor(); @@ -384,7 +384,7 @@ void SwColumnOnlyExample::Paint(vcl::RenderContext& rRenderContext, const Rectan aGrayColor.Invert(); Size aLogSize(rRenderContext.PixelToLogic(GetOutputSizePixel())); - Rectangle aCompleteRect(Point(0,0), aLogSize); + tools::Rectangle aCompleteRect(Point(0,0), aLogSize); rRenderContext.SetLineColor(rDlgColor); rRenderContext.SetFillColor(rDlgColor); rRenderContext.DrawRect(aCompleteRect); @@ -392,11 +392,11 @@ void SwColumnOnlyExample::Paint(vcl::RenderContext& rRenderContext, const Rectan rRenderContext.SetLineColor(rFieldTextColor); Point aTL((aLogSize.Width() - m_aFrameSize.Width()) / 2, (aLogSize.Height() - m_aFrameSize.Height()) / 2); - Rectangle aRect(aTL, m_aFrameSize); + tools::Rectangle aRect(aTL, m_aFrameSize); //draw a shadow rectangle rRenderContext.SetFillColor(Color(COL_GRAY)); - Rectangle aShadowRect(aRect); + tools::Rectangle aShadowRect(aRect); aShadowRect.Move(aTL.Y(), aTL.Y()); rRenderContext.DrawRect(aShadowRect); @@ -438,7 +438,7 @@ void SwColumnOnlyExample::Paint(vcl::RenderContext& rRenderContext, const Rectan { rRenderContext.DrawRect(aRect); rRenderContext.SetFillColor(rFieldColor); - Rectangle aFrameRect(aTL, m_aFrameSize); + tools::Rectangle aFrameRect(aTL, m_aFrameSize); long nSum = aTL.X(); for (sal_uInt16 i = 0; i < nColCount; i++) { @@ -547,7 +547,7 @@ void SwPageGridExample::DrawPage(vcl::RenderContext& rRenderContext, const Point nR = GetLeft(); } - Rectangle aRect; + tools::Rectangle aRect; aRect.Right() = rOrg.X() + GetSize().Width() - nR; aRect.Left() = rOrg.X() + nL; aRect.Top() = rOrg.Y() + GetTop() + GetHdHeight() + GetHdDist(); @@ -558,11 +558,11 @@ void SwPageGridExample::DrawPage(vcl::RenderContext& rRenderContext, const Point sal_Int32 nRubyHeight = pGridItem->GetRubyHeight() * 3; //detect height of rectangles - Rectangle aRubyRect(aRect.TopLeft(), + tools::Rectangle aRubyRect(aRect.TopLeft(), m_bVertical ? Size(nRubyHeight, aRect.GetHeight()) : Size(aRect.GetWidth(), nRubyHeight)); - Rectangle aCharRect(aRect.TopLeft(), + tools::Rectangle aCharRect(aRect.TopLeft(), m_bVertical ? Size(nBaseHeight, aRect.GetHeight()) : Size(aRect.GetWidth(), nBaseHeight)); diff --git a/sw/source/uibase/inc/DashedLine.hxx b/sw/source/uibase/inc/DashedLine.hxx index a070754aa850..6b01a342b9c9 100644 --- a/sw/source/uibase/inc/DashedLine.hxx +++ b/sw/source/uibase/inc/DashedLine.hxx @@ -22,7 +22,7 @@ public: SwDashedLine( vcl::Window* pParent, Color& ( *pColorFn )() ); virtual ~SwDashedLine( ) override; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; }; #endif diff --git a/sw/source/uibase/inc/HeaderFooterWin.hxx b/sw/source/uibase/inc/HeaderFooterWin.hxx index 6e9fec7be6a1..ab4d4d343a6e 100644 --- a/sw/source/uibase/inc/HeaderFooterWin.hxx +++ b/sw/source/uibase/inc/HeaderFooterWin.hxx @@ -35,7 +35,7 @@ public: void SetOffset( Point aOffset, long nXLineStart, long nXLineEnd ); - 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 Select( ) override; diff --git a/sw/source/uibase/inc/PageBreakWin.hxx b/sw/source/uibase/inc/PageBreakWin.hxx index 0f2e7dc8a04f..21e0bbc60757 100644 --- a/sw/source/uibase/inc/PageBreakWin.hxx +++ b/sw/source/uibase/inc/PageBreakWin.hxx @@ -37,7 +37,7 @@ public: virtual ~SwPageBreakWin() 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 Select( ) override; virtual void MouseMove( const MouseEvent& rMEvt ) override; virtual void Activate( ) override; diff --git a/sw/source/uibase/inc/bmpwin.hxx b/sw/source/uibase/inc/bmpwin.hxx index 56bf247e5912..909f6c7be291 100644 --- a/sw/source/uibase/inc/bmpwin.hxx +++ b/sw/source/uibase/inc/bmpwin.hxx @@ -35,7 +35,7 @@ private: bool bVert : 1; bool bGraphic : 1; - 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; diff --git a/sw/source/uibase/inc/chartins.hxx b/sw/source/uibase/inc/chartins.hxx index b610bbece966..bb1c6d860e23 100644 --- a/sw/source/uibase/inc/chartins.hxx +++ b/sw/source/uibase/inc/chartins.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CHARTINS_HXX #define INCLUDED_SW_SOURCE_UIBASE_INC_CHARTINS_HXX -Point SwGetChartDialogPos( const vcl::Window *pParentWin, const Size& rDialogSize, const Rectangle& rLogicChart ); +Point SwGetChartDialogPos( const vcl::Window *pParentWin, const Size& rDialogSize, const tools::Rectangle& rLogicChart ); void SwInsertChart( vcl::Window *pParent, SfxBindings *pBindings ); #endif // INCLUDED_SW_SOURCE_UIBASE_INC_CHARTINS_HXX diff --git a/sw/source/uibase/inc/colex.hxx b/sw/source/uibase/inc/colex.hxx index 869b943a10e3..c1c9ce014004 100644 --- a/sw/source/uibase/inc/colex.hxx +++ b/sw/source/uibase/inc/colex.hxx @@ -99,7 +99,7 @@ private: SwFormatCol m_aCols; protected: - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; public: SwColumnOnlyExample(vcl::Window*); diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index f641f9b5cb14..b21e84508c03 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -114,7 +114,7 @@ class SwContentTree static bool bIsInDrag; bool m_bIsKeySpace; - Rectangle m_aOldRectangle; + tools::Rectangle m_aOldRectangle; /** * Before any data will be deleted, the last active entry has to be found. @@ -158,7 +158,7 @@ protected: SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ) 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; void EditEntry( SvTreeListEntry* pEntry, EditEntryMode nMode ); diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index 550842735687..8124664f46c2 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -188,7 +188,7 @@ protected: virtual void DataChanged( const DataChangedEvent& ) override; 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 GetFocus() override; virtual void LoseFocus() override; @@ -295,7 +295,7 @@ public: virtual void Command( const CommandEvent& rCEvt ) override; /// @see OutputDevice::LogicInvalidate(). - void LogicInvalidate(const Rectangle* pRectangle) override; + void LogicInvalidate(const tools::Rectangle* pRectangle) override; /// Same as MouseButtonDown(), but coordinates are in logic unit. void LogicMouseButtonDown(const MouseEvent& rMouseEvent); /// Same as MouseButtonUp(), but coordinates are in logic unit. diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index d454715ec010..2e0c43dec906 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -42,7 +42,7 @@ class Printer; class SwEnvPreview : public vcl::Window { - void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; + void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override; public: diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx index 263e77fac52f..0f5a36fb2e63 100644 --- a/sw/source/uibase/inc/mailmergehelper.hxx +++ b/sw/source/uibase/inc/mailmergehelper.hxx @@ -65,7 +65,7 @@ class SW_DLLPUBLIC SwAddressPreview : public vcl::Window void DrawText_Impl(vcl::RenderContext& rRenderContext, const OUString& rAddress, const Point& rTopLeft, const Size& rSize, bool bIsSelected); - 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 MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void KeyInput( const KeyEvent& rKEvt ) override; diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index 534c3ed78c4a..90a20d6ac7ec 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -156,7 +156,7 @@ public: bool IsGlobalMode() const {return m_bGlobalMode;} SwView* GetCreateView() const; - void CreateNavigationTool(const Rectangle& rRect, bool bSetFocus, vcl::Window *pParent); + void CreateNavigationTool(const tools::Rectangle& rRect, bool bSetFocus, vcl::Window *pParent); }; class SwNavigationChild : public SfxChildWindowContext diff --git a/sw/source/uibase/inc/numprevw.hxx b/sw/source/uibase/inc/numprevw.hxx index 424b3abe4ffd..eb018c078bd9 100644 --- a/sw/source/uibase/inc/numprevw.hxx +++ b/sw/source/uibase/inc/numprevw.hxx @@ -35,7 +35,7 @@ class NumberingPreview : public vcl::Window sal_uInt16 nActLevel; protected: - virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const tools::Rectangle& rRect ) override; public: NumberingPreview(vcl::Window* pParent) diff --git a/sw/source/uibase/inc/olmenu.hxx b/sw/source/uibase/inc/olmenu.hxx index a2077cd3baf8..45bfdf2d5eba 100644 --- a/sw/source/uibase/inc/olmenu.hxx +++ b/sw/source/uibase/inc/olmenu.hxx @@ -95,7 +95,7 @@ public: return *m_xPopupMenu.get(); } - void Execute( const Rectangle& rPopupPos, vcl::Window* pWin ); + void Execute( const tools::Rectangle& rPopupPos, vcl::Window* pWin ); void Execute( sal_uInt16 nId ); }; diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 728c0f0ce4d4..484c7f6318f0 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -113,7 +113,7 @@ public: SwCaptionPreview(vcl::Window* pParent, WinBits nStyle); virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; void SetPreviewText( const OUString& rText ); - 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; }; diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index aaf35150498e..b963128adcde 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -286,14 +286,14 @@ class SwMarkPreview : public vcl::Window Color m_aTextCol; // text Color m_aPrintAreaCol; // frame for print area - Rectangle aPage; - Rectangle aLeftPagePrtArea; - Rectangle aRightPagePrtArea; + tools::Rectangle aPage; + tools::Rectangle aLeftPagePrtArea; + tools::Rectangle aRightPagePrtArea; sal_uInt16 nMarkPos; - void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; - void PaintPage(vcl::RenderContext& rRenderContext, const Rectangle &rRect); + void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override; + void PaintPage(vcl::RenderContext& rRenderContext, const tools::Rectangle &rRect); void InitColors(); protected: diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index 0c3445ff4631..08427f6c778a 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -53,7 +53,7 @@ class SwPagePreviewWin : public vcl::Window Fraction maScale; SwPagePreview& mrView; bool mbCalcScaleForPreviewLayout; - Rectangle maPaintedPreviewDocRect; + tools::Rectangle maPaintedPreviewDocRect; SwPagePreviewLayout* mpPgPreviewLayout; void SetPagePreview( sal_uInt8 nRow, sal_uInt8 nCol ); @@ -65,7 +65,7 @@ public: virtual ~SwPagePreviewWin() override; // calls SwViewShell::Paint - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; virtual void KeyInput( const KeyEvent & ) override; virtual void Command( const CommandEvent& rCEvt ) override; virtual void MouseButtonDown(const MouseEvent& rMEvt) override; @@ -136,7 +136,7 @@ public: void AdjustPreviewToNewZoom( const sal_uInt16 _nZoomFactor, const SvxZoomType _eZoomType ); - const Rectangle& GetPaintedPreviewDocRect() const + const tools::Rectangle& GetPaintedPreviewDocRect() const { return maPaintedPreviewDocRect; } @@ -172,7 +172,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell // visible range OUString m_sPageStr; Size m_aDocSize; - Rectangle m_aVisArea; + tools::Rectangle m_aVisArea; // MDI control elements VclPtr<SwScrollbar> m_pHScrollbar; @@ -239,7 +239,7 @@ public: void DocSzChgd(const Size& rNewSize); - void SetVisArea( const Rectangle& ); + void SetVisArea( const tools::Rectangle& ); void ScrollViewSzChg(); void ScrollDocSzChg(); diff --git a/sw/source/uibase/inc/scroll.hxx b/sw/source/uibase/inc/scroll.hxx index a2dc6e31b9ef..d279f73fa54f 100644 --- a/sw/source/uibase/inc/scroll.hxx +++ b/sw/source/uibase/inc/scroll.hxx @@ -41,7 +41,7 @@ public: // changing of document size void DocSzChgd(const Size &rNewSize); // changing of visible region - void ViewPortChgd(const Rectangle &rRectangle); + void ViewPortChgd(const tools::Rectangle &rRectangle); // what is it?? bool IsHoriScroll() const { return bHori; } diff --git a/sw/source/uibase/inc/shdwcrsr.hxx b/sw/source/uibase/inc/shdwcrsr.hxx index 46dae2953a6f..bade87e6d821 100644 --- a/sw/source/uibase/inc/shdwcrsr.hxx +++ b/sw/source/uibase/inc/shdwcrsr.hxx @@ -45,7 +45,7 @@ public: void Paint(); - Rectangle GetRect() const; + tools::Rectangle GetRect() const; }; #endif diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx index a94e10af1f33..ef9f90a096f8 100644 --- a/sw/source/uibase/inc/srcedtw.hxx +++ b/sw/source/uibase/inc/srcedtw.hxx @@ -43,7 +43,7 @@ class TextViewOutWin : public vcl::Window TextView* pTextView; protected: - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& ) override; virtual void KeyInput( const KeyEvent& rKeyEvt ) override; virtual void MouseMove( const MouseEvent& rMEvt ) override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; diff --git a/sw/source/uibase/inc/swruler.hxx b/sw/source/uibase/inc/swruler.hxx index 824eaca10642..c8f1deb12842 100644 --- a/sw/source/uibase/inc/swruler.hxx +++ b/sw/source/uibase/inc/swruler.hxx @@ -40,7 +40,7 @@ public: * Paint the ruler. * \param rRect ignored */ - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; protected: SwViewShell * mpViewShell; //< Shell to check if there is any comments on doc and their visibility @@ -82,7 +82,7 @@ protected: * It is horizontally aligned to the SideBar panel. * \return The area where the comment control is. */ - Rectangle GetCommentControlRegion(); + tools::Rectangle GetCommentControlRegion(); /** * Paint the comment control on VirtualDevice. diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index b8d3c886f0b3..86aa66d8cc46 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -660,7 +660,7 @@ void SwSpellPopup::checkRedline() } } -void SwSpellPopup::Execute( const Rectangle& rWordPos, vcl::Window* pWin ) +void SwSpellPopup::Execute( const tools::Rectangle& rWordPos, vcl::Window* pWin ) { sal_uInt16 nRet = m_xPopupMenu->Execute(pWin, pWin->LogicToPixel(rWordPos)); Execute( nRet ); diff --git a/sw/source/uibase/lingu/sdrhhcwrap.cxx b/sw/source/uibase/lingu/sdrhhcwrap.cxx index 109e6d20d1f6..ee42ddec3339 100644 --- a/sw/source/uibase/lingu/sdrhhcwrap.cxx +++ b/sw/source/uibase/lingu/sdrhhcwrap.cxx @@ -80,7 +80,7 @@ SdrHHCWrapper::SdrHHCWrapper( SwView* pVw, InsertView( pOutlView ); Point aPoint( 0, 0 ); - Rectangle aRect( aPoint, aSize ); + tools::Rectangle aRect( aPoint, aSize ); pOutlView->SetOutputArea( aRect ); // SetText( NULL ); ClearModifyFlag(); @@ -94,7 +94,7 @@ SdrHHCWrapper::~SdrHHCWrapper() OSL_ENSURE( pSdrView, "SdrHHCWrapper without DrawView?" ); pSdrView->SdrEndTextEdit( true ); SetUpdateMode(false); - pOutlView->SetOutputArea( Rectangle( Point(), Size(1, 1) ) ); + pOutlView->SetOutputArea( tools::Rectangle( Point(), Size(1, 1) ) ); } RemoveView( pOutlView ); delete pOutlView; @@ -115,7 +115,7 @@ bool SdrHHCWrapper::ConvertNextDocument() OSL_ENSURE( pSdrView, "SdrHHCWrapper without DrawView?" ); pSdrView->SdrEndTextEdit( true ); SetUpdateMode(false); - pOutlView->SetOutputArea( Rectangle( Point(), Size(1, 1) ) ); + pOutlView->SetOutputArea( tools::Rectangle( Point(), Size(1, 1) ) ); SetPaperSize( Size(1, 1) ); Clear(); pTextObj = nullptr; @@ -151,7 +151,7 @@ bool SdrHHCWrapper::ConvertNextDocument() SdrPageView* pPV = pSdrView->GetSdrPageView(); nDocIndex = n; bNextDoc = true; - pOutlView->SetOutputArea( Rectangle( Point(), Size(1,1))); + pOutlView->SetOutputArea( tools::Rectangle( Point(), Size(1,1))); SetPaperSize( pTextObj->GetLogicRect().GetSize() ); SetUpdateMode(true); pView->GetWrtShell().MakeVisible(pTextObj->GetLogicRect()); diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx index 6ce0db3ad389..2ed26d26f061 100644 --- a/sw/source/uibase/misc/swruler.cxx +++ b/sw/source/uibase/misc/swruler.cxx @@ -49,17 +49,17 @@ void ImplDrawArrow(vcl::RenderContext& rRenderContext, long nX, long nY, const C rRenderContext.SetFillColor(rColor); if (bPointRight) { - rRenderContext.DrawRect(Rectangle(nX + 0, nY + 0, nX + 0, nY + 6) ); - rRenderContext.DrawRect(Rectangle(nX + 1, nY + 1, nX + 1, nY + 5) ); - rRenderContext.DrawRect(Rectangle(nX + 2, nY + 2, nX + 2, nY + 4) ); - rRenderContext.DrawRect(Rectangle(nX + 3, nY + 3, nX + 3, nY + 3) ); + rRenderContext.DrawRect(tools::Rectangle(nX + 0, nY + 0, nX + 0, nY + 6) ); + rRenderContext.DrawRect(tools::Rectangle(nX + 1, nY + 1, nX + 1, nY + 5) ); + rRenderContext.DrawRect(tools::Rectangle(nX + 2, nY + 2, nX + 2, nY + 4) ); + rRenderContext.DrawRect(tools::Rectangle(nX + 3, nY + 3, nX + 3, nY + 3) ); } else { - rRenderContext.DrawRect(Rectangle(nX + 0, nY + 3, nX + 0, nY + 3)); - rRenderContext.DrawRect(Rectangle(nX + 1, nY + 2, nX + 1, nY + 4)); - rRenderContext.DrawRect(Rectangle(nX + 2, nY + 1, nX + 2, nY + 5)); - rRenderContext.DrawRect(Rectangle(nX + 3, nY + 0, nX + 3, nY + 6)); + rRenderContext.DrawRect(tools::Rectangle(nX + 0, nY + 3, nX + 0, nY + 3)); + rRenderContext.DrawRect(tools::Rectangle(nX + 1, nY + 2, nX + 1, nY + 4)); + rRenderContext.DrawRect(tools::Rectangle(nX + 2, nY + 1, nX + 2, nY + 5)); + rRenderContext.DrawRect(tools::Rectangle(nX + 3, nY + 0, nX + 3, nY + 6)); } } @@ -92,7 +92,7 @@ void SwCommentRuler::dispose() SvxRuler::dispose(); } -void SwCommentRuler::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) +void SwCommentRuler::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) { SvxRuler::Paint(rRenderContext, rRect); @@ -106,7 +106,7 @@ void SwCommentRuler::DrawCommentControl(vcl::RenderContext& rRenderContext) const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings(); bool bIsCollapsed = ! mpViewShell->GetPostItMgr()->ShowNotes(); - Rectangle aControlRect = GetCommentControlRegion(); + tools::Rectangle aControlRect = GetCommentControlRegion(); maVirDev->SetOutputSizePixel(aControlRect.GetSize()); // Paint comment control background @@ -125,7 +125,7 @@ void SwCommentRuler::DrawCommentControl(vcl::RenderContext& rRenderContext) maVirDev->SetLineColor(); } - maVirDev->DrawRect( Rectangle( Point(), aControlRect.GetSize() ) ); + maVirDev->DrawRect( tools::Rectangle( Point(), aControlRect.GetSize() ) ); // Label and arrow tip OUString aLabel( SW_RESSTR ( STR_COMMENTS_LABEL ) ); @@ -248,7 +248,7 @@ void SwCommentRuler::MouseButtonDown( const MouseEvent& rMEvt ) void SwCommentRuler::Update() { - Rectangle aPreviousControlRect = GetCommentControlRegion(); + tools::Rectangle aPreviousControlRect = GetCommentControlRegion(); SvxRuler::Update(); if (aPreviousControlRect != GetCommentControlRegion()) Invalidate(); @@ -265,7 +265,7 @@ void SwCommentRuler::UpdateCommentHelpText() } // TODO Make Ruler return its central rectangle instead of margins. -Rectangle SwCommentRuler::GetCommentControlRegion() +tools::Rectangle SwCommentRuler::GetCommentControlRegion() { long nLeft = 0; SwPostItMgr *pPostItMgr = mpViewShell->GetPostItMgr(); @@ -274,7 +274,7 @@ Rectangle SwCommentRuler::GetCommentControlRegion() //triggers an update of the uiview, but the result of the ctor hasn't been //set into the mpViewShell yet, so GetPostItMgr is temporarily still NULL if (!pPostItMgr) - return Rectangle(); + return tools::Rectangle(); unsigned long nSidebarWidth = pPostItMgr->GetSidebarWidth(true); //FIXME When the page width is larger then screen, the ruler is misplaced by one pixel @@ -287,7 +287,7 @@ Rectangle SwCommentRuler::GetCommentControlRegion() long nRight = nLeft + nSidebarWidth + pPostItMgr->GetSidebarBorderWidth(true); long nBottom = nTop + GetRulerVirHeight() - 3; - Rectangle aRect(nLeft, nTop, nRight, nBottom); + tools::Rectangle aRect(nLeft, nTop, nRight, nBottom); return aRect; } diff --git a/sw/source/uibase/ribbar/drawbase.cxx b/sw/source/uibase/ribbar/drawbase.cxx index 2fcdd4f0b9ff..d2b2eff39099 100644 --- a/sw/source/uibase/ribbar/drawbase.cxx +++ b/sw/source/uibase/ribbar/drawbase.cxx @@ -602,7 +602,7 @@ void SwDrawBase::CreateDefaultObject() aStartPos.Y() -= 4 * MM50; aEndPos.X() += 8 * MM50; aEndPos.Y() += 4 * MM50; - Rectangle aRect(aStartPos, aEndPos); + tools::Rectangle aRect(aStartPos, aEndPos); m_pSh->CreateDefaultShape( static_cast< sal_uInt16 >(m_pWin->GetSdrDrawMode()), aRect, m_nSlotId); } diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx index e5363622fa31..81f9b0b3da4f 100644 --- a/sw/source/uibase/ribbar/inputwin.cxx +++ b/sw/source/uibase/ribbar/inputwin.cxx @@ -109,7 +109,7 @@ SwInputWindow::SwInputWindow(vcl::Window* pParent, SfxDispatcher* pDispatcher) Size aSizeTbx = CalcWindowSizePixel(); Size aEditSize = aEdit->GetSizePixel(); - Rectangle aItemRect( GetItemRect(FN_FORMULA_CALC) ); + tools::Rectangle aItemRect( GetItemRect(FN_FORMULA_CALC) ); long nMaxHeight = (aEditSize.Height() > aItemRect.GetHeight()) ? aEditSize.Height() : aItemRect.GetHeight(); if( nMaxHeight+2 > aSizeTbx.Height() ) aSizeTbx.Height() = nMaxHeight+2; diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index cbd82e01256d..296345a4d3b6 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -608,8 +608,8 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) aNewAttr.Put(*pNewItem); } - Rectangle aNullRect; - Rectangle aOutRect = pOLV->GetOutputArea(); + tools::Rectangle aNullRect; + tools::Rectangle aOutRect = pOLV->GetOutputArea(); if (aNullRect != aOutRect) pOLV->SetAttribs(aNewAttr); diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx index 1e2407dbce2a..56d203bd19ba 100644 --- a/sw/source/uibase/shells/drwtxtsh.cxx +++ b/sw/source/uibase/shells/drwtxtsh.cxx @@ -162,9 +162,9 @@ void SwDrawTextShell::StateDisableItems( SfxItemSet &rSet ) void SwDrawTextShell::SetAttrToMarked(const SfxItemSet& rAttr) { - Rectangle aNullRect; + tools::Rectangle aNullRect; OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView(); - Rectangle aOutRect = pOLV->GetOutputArea(); + tools::Rectangle aOutRect = pOLV->GetOutputArea(); if (aNullRect != aOutRect) { diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx index 6d92d9bd0b27..777be9f04156 100644 --- a/sw/source/uibase/shells/grfsh.cxx +++ b/sw/source/uibase/shells/grfsh.cxx @@ -157,7 +157,7 @@ void SwGrfShell::Execute(SfxRequest &rReq) SwMirrorGrf aMirror( static_cast<const SwMirrorGrf&>( aSet.Get(RES_GRFATR_MIRRORGRF)) ); SwCropGrf aCrop( static_cast<const SwCropGrf&>( aSet.Get(RES_GRFATR_CROPGRF)) ); - Rectangle aCropRectangle( + tools::Rectangle aCropRectangle( convertTwipToMm100(aCrop.GetLeft()), convertTwipToMm100(aCrop.GetTop()), convertTwipToMm100(aCrop.GetRight()), @@ -170,7 +170,7 @@ void SwGrfShell::Execute(SfxRequest &rReq) { rSh.StartAllAction(); rSh.StartUndo(SwUndoId::START); - Rectangle aScaledCropedRectangle = aDialog->GetScaledCropRectangle(); + tools::Rectangle aScaledCropedRectangle = aDialog->GetScaledCropRectangle(); aCrop.SetLeft( convertMm100ToTwip( aScaledCropedRectangle.Left() )); aCrop.SetTop( convertMm100ToTwip( aScaledCropedRectangle.Top() )); @@ -876,7 +876,7 @@ void SwGrfShell::ExecuteRotation(SfxRequest &rReq) SfxItemSet aSet( rShell.GetAttrPool(), RES_GRFATR_CROPGRF, RES_GRFATR_CROPGRF ); rShell.GetCurAttr( aSet ); SwCropGrf aCrop( static_cast<const SwCropGrf&>( aSet.Get(RES_GRFATR_CROPGRF) ) ); - Rectangle aCropRectangle(aCrop.GetLeft(), aCrop.GetTop(), aCrop.GetRight(), aCrop.GetBottom()); + tools::Rectangle aCropRectangle(aCrop.GetLeft(), aCrop.GetTop(), aCrop.GetRight(), aCrop.GetBottom()); if (rReq.GetSlot() == SID_ROTATE_GRAPHIC_LEFT) { diff --git a/sw/source/uibase/shells/grfshex.cxx b/sw/source/uibase/shells/grfshex.cxx index c32ed1c94bc8..0559e218a322 100644 --- a/sw/source/uibase/shells/grfshex.cxx +++ b/sw/source/uibase/shells/grfshex.cxx @@ -133,7 +133,7 @@ bool SwTextShell::InsertMediaDlg( SfxRequest& rReq ) if (!bRet) { return bRet; } } - SdrMediaObj* pObj = new SdrMediaObj( Rectangle( aPos, aSize ) ); + SdrMediaObj* pObj = new SdrMediaObj( tools::Rectangle( aPos, aSize ) ); pObj->SetModel(rSh.GetDoc()->getIDocumentDrawModelAccess().GetDrawModel()); // set before setURL pObj->setURL( realURL, "" ); diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx b/sw/source/uibase/sidebar/StylePresetsPanel.cxx index 19be3ef44174..a82a478649e1 100644 --- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx +++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx @@ -43,7 +43,7 @@ namespace sw { namespace sidebar { namespace { void renderPreview(sfx2::StyleManager* pStyleManager, OutputDevice& aOutputDevice, - OUString const & sName, sal_Int32 nHeight, Rectangle& aRect) + OUString const & sName, sal_Int32 nHeight, tools::Rectangle& aRect) { SfxStyleSheetBase* pStyleSheet = pStyleManager->Search(sName, SfxStyleFamily::Para); @@ -88,7 +88,7 @@ BitmapEx GenerateStylePreview(SfxObjectShell& rSource, OUString& aName) long y = 0; { pVirtualDev->SetFillColor(COL_LIGHTGRAY); - Rectangle aNameRect(0, y, nPreviewWidth, nNameHeight); + tools::Rectangle aNameRect(0, y, nPreviewWidth, nNameHeight); pVirtualDev->DrawRect(aNameRect); vcl::Font aFont; @@ -107,18 +107,18 @@ BitmapEx GenerateStylePreview(SfxObjectShell& rSource, OUString& aName) } { - Rectangle aRenderRect(Point(nMargin, y), aSize); + tools::Rectangle aRenderRect(Point(nMargin, y), aSize); renderPreview(pStyleManager, *pVirtualDev.get(), "Title", nTitleHeight, aRenderRect); y += nTitleHeight; } { - Rectangle aRenderRect(Point(nMargin, y), aSize); + tools::Rectangle aRenderRect(Point(nMargin, y), aSize); renderPreview(pStyleManager, *pVirtualDev.get(), "Heading 1", nHeadingHeight, aRenderRect); y += nHeadingHeight; } { - Rectangle aRenderRect(Point(nMargin, y), aSize); + tools::Rectangle aRenderRect(Point(nMargin, y), aSize); renderPreview(pStyleManager, *pVirtualDev.get(), "Text Body", nTextBodyHeight, aRenderRect); } diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx index 46e32a973fe6..bd91fef1db4e 100644 --- a/sw/source/uibase/sidebar/ThemePanel.cxx +++ b/sw/source/uibase/sidebar/ThemePanel.cxx @@ -405,10 +405,10 @@ BitmapEx GenerateColorPreview(const svx::ColorSet& rColorSet) for (sal_uInt32 i = 0; i < 12; i += 2) { pVirtualDev->SetFillColor(rColorSet.getColor(i)); - pVirtualDev->DrawRect(Rectangle(x, y1, x + SIZE, y1 + SIZE)); + pVirtualDev->DrawRect(tools::Rectangle(x, y1, x + SIZE, y1 + SIZE)); pVirtualDev->SetFillColor(rColorSet.getColor(i + 1)); - pVirtualDev->DrawRect(Rectangle(x, y2, x + SIZE, y2 + SIZE)); + pVirtualDev->DrawRect(tools::Rectangle(x, y2, x + SIZE, y2 + SIZE)); x += SIZE + BORDER; } diff --git a/sw/source/uibase/table/chartins.cxx b/sw/source/uibase/table/chartins.cxx index 2f7d457cd56c..5689f9517ca9 100644 --- a/sw/source/uibase/table/chartins.cxx +++ b/sw/source/uibase/table/chartins.cxx @@ -56,7 +56,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -Point SwGetChartDialogPos( const vcl::Window *pParentWin, const Size& rDialogSize, const Rectangle& rLogicChart ) +Point SwGetChartDialogPos( const vcl::Window *pParentWin, const Size& rDialogSize, const tools::Rectangle& rLogicChart ) { // positioning code according to spec; similar to Calc fuins2.cxx Point aRet; @@ -64,11 +64,11 @@ Point SwGetChartDialogPos( const vcl::Window *pParentWin, const Size& rDialogSiz OSL_ENSURE( pParentWin, "Window not found" ); if (pParentWin) { - Rectangle aObjPixel = pParentWin->LogicToPixel( rLogicChart, pParentWin->GetMapMode() ); - Rectangle aObjAbs( pParentWin->OutputToAbsoluteScreenPixel( aObjPixel.TopLeft() ), + tools::Rectangle aObjPixel = pParentWin->LogicToPixel( rLogicChart, pParentWin->GetMapMode() ); + tools::Rectangle aObjAbs( pParentWin->OutputToAbsoluteScreenPixel( aObjPixel.TopLeft() ), pParentWin->OutputToAbsoluteScreenPixel( aObjPixel.BottomRight() ) ); - Rectangle aDesktop = pParentWin->GetDesktopRectPixel(); + tools::Rectangle aDesktop = pParentWin->GetDesktopRectPixel(); Size aSpace = pParentWin->LogicToPixel( Size( 8, 12 ), MapUnit::MapAppFont ); bool bLayoutRTL = ::GetActiveView()->GetWrtShell().IsTableRightToLeft(); @@ -208,7 +208,7 @@ void SwInsertChart(vcl::Window* pParent, SfxBindings* pBindings ) SwRect aSwRect; if (pFlyFrameFormat) aSwRect = pFlyFrameFormat->GetAnchoredObj()->GetObjRectWithSpaces(); - Rectangle aRect( aSwRect.SVRect() ); + tools::Rectangle aRect( aSwRect.SVRect() ); Point aDialogPos = SwGetChartDialogPos( &rWrtShell.GetView().GetEditWin(), aDialogSize, aRect ); xDialogProps->setPropertyValue("Position", uno::makeAny( awt::Point(aDialogPos.getX(),aDialogPos.getY()) ) ); diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 0fc2886efe30..8cc1aa5bf376 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -190,7 +190,7 @@ SwPagePreviewWin::SwPagePreviewWin( vcl::Window *pParent, SwPagePreview& rPView , mpViewShell(nullptr) , mrView(rPView) , mbCalcScaleForPreviewLayout(true) - , maPaintedPreviewDocRect(Rectangle(0,0,0,0)) + , maPaintedPreviewDocRect(tools::Rectangle(0,0,0,0)) , mpPgPreviewLayout(nullptr) { SetOutDevViewType( OutDevViewType::PrintPreview ); @@ -209,7 +209,7 @@ SwPagePreviewWin::~SwPagePreviewWin() { } -void SwPagePreviewWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) +void SwPagePreviewWin::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) { if (!mpViewShell || !mpViewShell->GetLayout()) return; @@ -220,7 +220,7 @@ void SwPagePreviewWin::Paint(vcl::RenderContext& rRenderContext, const Rectangl if (!maPxWinSize.Height() || !maPxWinSize.Width()) maPxWinSize = GetOutputSizePixel(); - Rectangle aRect(rRenderContext.LogicToPixel(rRect)); + tools::Rectangle aRect(rRenderContext.LogicToPixel(rRect)); mpPgPreviewLayout->Prepare(1, Point(0,0), maPxWinSize, mnSttPage, maPaintedPreviewDocRect); SetSelectedPage(1); @@ -1290,7 +1290,7 @@ void SwPagePreview::CreateScrollbar( bool bHori ) bool SwPagePreview::ChgPage( int eMvMode, bool bUpdateScrollbar ) { - Rectangle aPixVisArea( m_pViewWin->LogicToPixel( m_aVisArea ) ); + tools::Rectangle aPixVisArea( m_pViewWin->LogicToPixel( m_aVisArea ) ); bool bChg = m_pViewWin->MovePage( eMvMode ) || eMvMode == SwPagePreviewWin::MV_CALC || eMvMode == SwPagePreviewWin::MV_NEWWINSIZE; @@ -1334,7 +1334,7 @@ void SwPagePreview::InnerResizePixel( const Point &rOfst, const Size &rSize, bo { SvBorder aBorder; CalcAndSetBorderPixel( aBorder, true ); - Rectangle aRect( rOfst, rSize ); + tools::Rectangle aRect( rOfst, rSize ); aRect += aBorder; ViewResizePixel( *m_pViewWin, aRect.TopLeft(), aRect.GetSize(), m_pViewWin->GetOutputSizePixel(), @@ -1353,7 +1353,7 @@ void SwPagePreview::OuterResizePixel( const Point &rOfst, const Size &rSize ) Size aTmpSize( m_pViewWin->GetOutputSizePixel() ); Point aBottomRight( m_pViewWin->PixelToLogic( Point( aTmpSize.Width(), aTmpSize.Height() ) ) ); - SetVisArea( Rectangle( Point(), aBottomRight ) ); + SetVisArea( tools::Rectangle( Point(), aBottomRight ) ); // Call of the DocSzChgd-Methode of the scrollbars is necessary, // because from the maximum scroll range half the height of the @@ -1369,11 +1369,11 @@ void SwPagePreview::OuterResizePixel( const Point &rOfst, const Size &rSize ) *m_pVScrollbar, *m_pHScrollbar, *m_pScrollFill ); } -void SwPagePreview::SetVisArea( const Rectangle &rRect ) +void SwPagePreview::SetVisArea( const tools::Rectangle &rRect ) { const Point aTopLeft(AlignToPixel(rRect.TopLeft())); const Point aBottomRight(AlignToPixel(rRect.BottomRight())); - Rectangle aLR(aTopLeft,aBottomRight); + tools::Rectangle aLR(aTopLeft,aBottomRight); if(aLR == m_aVisArea) return; @@ -1436,7 +1436,7 @@ IMPL_LINK( SwPagePreview, ScrollHdl, ScrollBar *, p, void ) Point aPos = pScrollbar->GetParent()->OutputToScreenPixel( pScrollbar->GetPosPixel()); aPos.Y() = pScrollbar->OutputToScreenPixel(pScrollbar->GetPointerPosPixel()).Y(); - Rectangle aRect; + tools::Rectangle aRect; aRect.Left() = aPos.X() -8; aRect.Right() = aRect.Left(); aRect.Top() = aPos.Y(); @@ -1462,7 +1462,7 @@ IMPL_LINK( SwPagePreview, EndScrollHdl, ScrollBar *, p, void ) if( !pScrollbar->IsHoriScroll() ) // scroll vertically { if ( Help::IsQuickHelpEnabled() ) - Help::ShowQuickHelp(pScrollbar, Rectangle(), OUString()); + Help::ShowQuickHelp(pScrollbar, tools::Rectangle(), OUString()); if ( GetViewShell()->PagePreviewLayout()->DoesPreviewLayoutRowsFitIntoWindow() ) { // Scroll how many pages ?? @@ -1608,7 +1608,7 @@ void SwPagePreview::ScrollViewSzChg() } else //vertical scrolling by pixel { - const Rectangle& rDocRect = m_pViewWin->GetPaintedPreviewDocRect(); + const tools::Rectangle& rDocRect = m_pViewWin->GetPaintedPreviewDocRect(); const Size& rPreviewSize = GetViewShell()->PagePreviewLayout()->GetPreviewDocSize(); m_pVScrollbar->SetRangeMax(rPreviewSize.Height()) ; @@ -1628,7 +1628,7 @@ void SwPagePreview::ScrollViewSzChg() } if(m_pHScrollbar) { - const Rectangle& rDocRect = m_pViewWin->GetPaintedPreviewDocRect(); + const tools::Rectangle& rDocRect = m_pViewWin->GetPaintedPreviewDocRect(); const Size& rPreviewSize = GetViewShell()->PagePreviewLayout()->GetPreviewDocSize(); Range aRange(0,0); @@ -1746,7 +1746,7 @@ void SwPagePreviewWin::RepaintCoreRect( const SwRect& rRect ) // #i24183# if ( mpPgPreviewLayout->PreviewLayoutValid() ) { - mpPgPreviewLayout->Repaint( Rectangle( rRect.Pos(), rRect.SSize() ) ); + mpPgPreviewLayout->Repaint( tools::Rectangle( rRect.Pos(), rRect.SSize() ) ); } } diff --git a/sw/source/uibase/uiview/scroll.cxx b/sw/source/uibase/uiview/scroll.cxx index 680af2a0ce1d..e8474e16bab4 100644 --- a/sw/source/uibase/uiview/scroll.cxx +++ b/sw/source/uibase/uiview/scroll.cxx @@ -52,7 +52,7 @@ void SwScrollbar::DocSzChgd( const Size &rSize ) // Will be called after a change of the visible view section. -void SwScrollbar::ViewPortChgd( const Rectangle &rRect ) +void SwScrollbar::ViewPortChgd( const tools::Rectangle &rRect ) { long nThumb, nVisible; if( bHori ) diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index 9c9995147109..2d0e7093195c 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -148,7 +148,7 @@ static void lcl_PrintHeader( vcl::RenderContext &rOutDev, sal_Int32 nPages, sal_ long nXLeft = nLeftMargin-nBorder; long nXRight = aSz.Width()-RMARGPRN+nBorder; - rOutDev.DrawRect( Rectangle( + rOutDev.DrawRect( tools::Rectangle( Point( nXLeft, nYTop ), Size( nXRight-nXLeft, aSz.Height() - nYTop - BMARGPRN + nBorder ) ) ); diff --git a/sw/source/uibase/uiview/swcli.cxx b/sw/source/uibase/uiview/swcli.cxx index 61f26823cc91..29782e885031 100644 --- a/sw/source/uibase/uiview/swcli.cxx +++ b/sw/source/uibase/uiview/swcli.cxx @@ -40,7 +40,7 @@ SwOleClient::SwOleClient(SwView *pView, SwEditWin *pWin, const svt::EmbeddedObje SetObject( xObj.GetObject() ); } -void SwOleClient::RequestNewObjectArea( Rectangle& aLogRect ) +void SwOleClient::RequestNewObjectArea( tools::Rectangle& aLogRect ) { // The server wants to change the client size. // We put the desired size in the core. The attributes of the frame diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 0b3e0dfd6561..d630906a3b13 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -1077,7 +1077,7 @@ void SwView::WriteUserData( OUString &rUserData, bool bBrowse ) // Then that stored data are not persistent! const SwRect& rRect = m_pWrtShell->GetCharRect(); - const Rectangle& rVis = GetVisArea(); + const tools::Rectangle& rVis = GetVisArea(); rUserData = OUString::number( rRect.Left() ); rUserData += ";"; @@ -1147,7 +1147,7 @@ void SwView::ReadUserData( const OUString &rUserData, bool bBrowse ) { m_pWrtShell->EnableSmooth( false ); - const Rectangle aVis( nLeft, nTop, nRight, nBottom ); + const tools::Rectangle aVis( nLeft, nTop, nRight, nBottom ); sal_Int32 nOff = 0; SvxZoomType eZoom; @@ -1244,7 +1244,7 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue > SET_CURR_SHELL(m_pWrtShell); const beans::PropertyValue *pValue = rSequence.getConstArray(); const SwRect& rRect = m_pWrtShell->GetCharRect(); - const Rectangle &rVis = GetVisArea(); + const tools::Rectangle &rVis = GetVisArea(); const SwViewOption* pVOpt = m_pWrtShell->GetViewOptions(); sal_Int64 nX = rRect.Left(), nY = rRect.Top(), nLeft = rVis.Left(), nTop = rVis.Top(); @@ -1345,7 +1345,7 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue > if (nBottom <= (m_pWrtShell->GetDocSize().Height()+nAdd) ) { m_pWrtShell->EnableSmooth( false ); - const Rectangle aVis( nLeft, nTop, nRight, nBottom ); + const tools::Rectangle aVis( nLeft, nTop, nRight, nBottom ); SvxZoomType eZoom; if ( !m_pWrtShell->GetViewOptions()->getBrowseMode() ) @@ -1466,7 +1466,7 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue > void SwView::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue >& rSequence ) { const SwRect& rRect = m_pWrtShell->GetCharRect(); - const Rectangle& rVis = GetVisArea(); + const tools::Rectangle& rVis = GetVisArea(); std::vector<beans::PropertyValue> aVector; diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 1e885c75eb74..e730e1d49d08 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -547,7 +547,7 @@ void SwView::Execute(SfxRequest &rReq) case FN_PAGEDOWN: case FN_PAGEDOWN_SEL: { - Rectangle aVis( GetVisArea() ); + tools::Rectangle aVis( GetVisArea() ); SwEditWin& rTmpWin = GetEditWin(); if ( FN_PAGEUP == nSlot || FN_PAGEUP_SEL == nSlot ) PageUpCursor(FN_PAGEUP_SEL == nSlot); diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx index 78af0533809c..4b4b62e9567e 100644 --- a/sw/source/uibase/uiview/viewdraw.cxx +++ b/sw/source/uibase/uiview/viewdraw.cxx @@ -130,7 +130,7 @@ void SwView::ExecDraw(SfxRequest& rReq) //determine the size of the object if(pObj->IsGroupObject()) { - const Rectangle& rBoundRect = static_cast<SdrObjGroup*>(pObj)->GetCurrentBoundRect(); + const tools::Rectangle& rBoundRect = static_cast<SdrObjGroup*>(pObj)->GetCurrentBoundRect(); aStartPos.X() -= rBoundRect.GetWidth()/2; aStartPos.Y() -= rBoundRect.GetHeight()/2; } diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index 1b3a9a80aec1..c2ad2042e94d 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -920,7 +920,7 @@ void SwView::ExecFieldPopup( const Point& rPt, IFieldmark *fieldBM ) m_pFieldPopup = VclPtr<SwFieldDialog>::Create( m_pEditWin, fieldBM ); m_pFieldPopup->SetPopupModeEndHdl( LINK( this, SwView, FieldPopupModeEndHdl ) ); - Rectangle aRect( m_pEditWin->OutputToScreenPixel( aPixPos ), Size( 0, 0 ) ); + tools::Rectangle aRect( m_pEditWin->OutputToScreenPixel( aPixPos ), Size( 0, 0 ) ); m_pFieldPopup->StartPopupMode( aRect, FloatWinPopupFlags::Down|FloatWinPopupFlags::GrabFocus ); } diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx index 59dc0a234c96..503a7cae6b7a 100644 --- a/sw/source/uibase/uiview/viewport.cxx +++ b/sw/source/uibase/uiview/viewport.cxx @@ -174,7 +174,7 @@ m_aDocSz = rSz; } //If text has been deleted, it may be that the VisArea points behind the visible range. - Rectangle aNewVisArea( m_aVisArea ); + tools::Rectangle aNewVisArea( m_aVisArea ); bool bModified = false; SwTwips lGreenOffset = IsDocumentBorder() ? DOCUMENTBORDER : DOCUMENTBORDER * 2; SwTwips lTmp = m_aDocSz.Width() + lGreenOffset; @@ -207,7 +207,7 @@ m_aDocSz = rSz; // Set VisArea newly -void SwView::SetVisArea( const Rectangle &rRect, bool bUpdateScrollbar ) +void SwView::SetVisArea( const tools::Rectangle &rRect, bool bUpdateScrollbar ) { Size aOldSz( m_aVisArea.GetSize() ); if (comphelper::LibreOfficeKit::isActive() && m_pWrtShell) @@ -220,7 +220,7 @@ void SwView::SetVisArea( const Rectangle &rRect, bool bUpdateScrollbar ) const SwTwips lMin = IsDocumentBorder() ? DOCUMENTBORDER : 0; // No negative position, no negative size - Rectangle aLR = rRect; + tools::Rectangle aLR = rRect; if( aLR.Top() < lMin ) { aLR.Bottom() += lMin - aLR.Top(); @@ -269,7 +269,7 @@ void SwView::SetVisArea( const Rectangle &rRect, bool bUpdateScrollbar ) { // If the size of VisArea is unchanged, we extend the size of the VisArea // InternalObject on. By that the transport of errors shall be avoided. - Rectangle aVis( m_aVisArea ); + tools::Rectangle aVis( m_aVisArea ); if ( aVis.GetSize() == aOldSz ) aVis.SetSize( GetDocShell()->SfxObjectShell::GetVisArea(ASPECT_CONTENT).GetSize() ); // TODO/LATER: why casting?! @@ -318,7 +318,7 @@ void SwView::SetVisArea( const Point &rPt, bool bUpdateScrollbar ) const long lXDiff = m_aVisArea.Left() - aPt.X(); const long lYDiff = m_aVisArea.Top() - aPt.Y(); - SetVisArea( Rectangle( aPt, + SetVisArea( tools::Rectangle( aPt, Point( m_aVisArea.Right() - lXDiff, m_aVisArea.Bottom() - lYDiff ) ), bUpdateScrollbar); } @@ -332,7 +332,7 @@ void SwView::CheckVisArea() if ( m_aVisArea.Left() != DOCUMENTBORDER || m_aVisArea.Top() != DOCUMENTBORDER ) { - Rectangle aNewVisArea( m_aVisArea ); + tools::Rectangle aNewVisArea( m_aVisArea ); aNewVisArea.Move( DOCUMENTBORDER - m_aVisArea.Left(), DOCUMENTBORDER - m_aVisArea.Top() ); SetVisArea( aNewVisArea ); @@ -349,7 +349,7 @@ void SwView::CheckVisArea() // sal_uInt16 nRange optional accurate indication of the // range by which to scroll if necessary. -void SwView::CalcPt( Point *pPt, const Rectangle &rRect, +void SwView::CalcPt( Point *pPt, const tools::Rectangle &rRect, sal_uInt16 nRangeX, sal_uInt16 nRangeY) { @@ -395,23 +395,23 @@ void SwView::CalcPt( Point *pPt, const Rectangle &rRect, // Scrolling -bool SwView::IsScroll( const Rectangle &rRect ) const +bool SwView::IsScroll( const tools::Rectangle &rRect ) const { return m_bCenterCursor || m_bTopCursor || !m_aVisArea.IsInside(rRect); } -void SwView::Scroll( const Rectangle &rRect, sal_uInt16 nRangeX, sal_uInt16 nRangeY ) +void SwView::Scroll( const tools::Rectangle &rRect, sal_uInt16 nRangeX, sal_uInt16 nRangeY ) { if ( m_aVisArea.IsEmpty() ) return; - Rectangle aOldVisArea( m_aVisArea ); + tools::Rectangle aOldVisArea( m_aVisArea ); long nDiffY = 0; vcl::Window* pCareWn = SwViewShell::GetCareWin(GetWrtShell()); if ( pCareWn ) { - Rectangle aDlgRect( GetEditWin().PixelToLogic( + tools::Rectangle aDlgRect( GetEditWin().PixelToLogic( pCareWn->GetWindowExtentsRelative( &GetEditWin() ) ) ); // Only if the dialogue is not the VisArea right or left: if ( aDlgRect.Left() < m_aVisArea.Right() && @@ -463,7 +463,7 @@ void SwView::Scroll( const Rectangle &rRect, sal_uInt16 nRangeX, sal_uInt16 nRan aSize.Width() = std::min( aSize.Width(), aVisSize.Width() ); aSize.Height()= std::min( aSize.Height(),aVisSize.Height()); - CalcPt( &aPt, Rectangle( rRect.TopLeft(), aSize ), + CalcPt( &aPt, tools::Rectangle( rRect.TopLeft(), aSize ), static_cast< sal_uInt16 >((aVisSize.Width() - aSize.Width()) / 2), static_cast< sal_uInt16 >((aVisSize.Height()- aSize.Height())/ 2) ); @@ -712,7 +712,7 @@ IMPL_LINK( SwView, ScrollHdl, ScrollBar *, p, void ) //QuickHelp: if( m_pWrtShell->GetPageCnt() > 1 ) { - Rectangle aRect; + tools::Rectangle aRect; aRect.Left() = pScrollbar->GetParent()->OutputToScreenPixel( pScrollbar->GetPosPixel() ).X() -8; aRect.Top() = pScrollbar->OutputToScreenPixel( @@ -754,7 +754,7 @@ IMPL_LINK( SwView, EndScrollHdl, ScrollBar *, p, void ) if(nPgNum) { nPgNum = 0; - Help::ShowQuickHelp(pScrollbar, Rectangle(), OUString()); + Help::ShowQuickHelp(pScrollbar, tools::Rectangle(), OUString()); } Point aPos( m_aVisArea.TopLeft() ); bool bBorder = IsDocumentBorder(); @@ -774,7 +774,7 @@ IMPL_LINK( SwView, EndScrollHdl, ScrollBar *, p, void ) void SwView::CalcVisArea( const Size &rOutPixel ) { Point aTopLeft; - Rectangle aRect( aTopLeft, rOutPixel ); + tools::Rectangle aRect( aTopLeft, rOutPixel ); aTopLeft = GetEditWin().PixelToLogic( aTopLeft ); Point aBottomRight( GetEditWin().PixelToLogic( aRect.BottomRight() ) ); @@ -1164,7 +1164,7 @@ bool SwView::UpdateScrollbars() if ( !m_aVisArea.IsEmpty() ) { const bool bBorder = IsDocumentBorder(); - Rectangle aTmpRect( m_aVisArea ); + tools::Rectangle aTmpRect( m_aVisArea ); if ( bBorder ) { Point aPt( DOCUMENTBORDER, DOCUMENTBORDER ); diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx index c2727e428106..91d61c453fb5 100644 --- a/sw/source/uibase/uiview/viewtab.cxx +++ b/sw/source/uibase/uiview/viewtab.cxx @@ -1961,7 +1961,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) case SID_RULER_LR_MIN_MAX: { - Rectangle aRectangle; + tools::Rectangle aRectangle; if( ( nFrameType & FrameTypeFlags::COLSECT ) && !IsTabColFromDoc() && ( nFrameType & ( FrameTypeFlags::TABLE|FrameTypeFlags::COLUMN ) ) ) { diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 64b5dff73365..af8853741696 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -3159,7 +3159,7 @@ bool SwXTextDocument::isMimeTypeSupported() return aDataHelper.GetXTransferable().is() && SwTransferable::IsPaste(*pWrtShell, aDataHelper); } -void SwXTextDocument::setClientVisibleArea(const Rectangle& rRectangle) +void SwXTextDocument::setClientVisibleArea(const tools::Rectangle& rRectangle) { SwView* pView = pDocShell->GetView(); if (!pView) @@ -3242,7 +3242,7 @@ OUString SwXTextDocument::getPostIts() const SwPostItField* pField = pWin->GetPostItField(); const SwRect& aRect = pWin->GetAnchorRect(); - const Rectangle aSVRect(aRect.Pos().getX(), + const tools::Rectangle aSVRect(aRect.Pos().getX(), aRect.Pos().getY(), aRect.Pos().getX() + aRect.SSize().Width(), aRect.Pos().getY() + aRect.SSize().Height()); diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index f399699081be..8db9a70127b5 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -2486,7 +2486,7 @@ void SwContentTree::ShowTree() } void SwContentTree::Paint( vcl::RenderContext& rRenderContext, - const Rectangle& rRect ) + const tools::Rectangle& rRect ) { // Start the update timer on the first paint; avoids // flicker on the first reveal. @@ -2947,7 +2947,7 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt ) aSize.Width() = GetSizePixel().Width() - aPos.X(); aPos = OutputToScreenPixel(aPos); - Rectangle aItemRect( aPos, aSize ); + tools::Rectangle aItemRect( aPos, aSize ); if(bBalloon) { aPos.X() += aSize.Width(); @@ -2961,7 +2961,7 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt ) } else { - Help::ShowQuickHelp( this, Rectangle(), OUString() ); + Help::ShowQuickHelp( this, tools::Rectangle(), OUString() ); bCallBase = false; } } diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index f18bb5b26e3c..74402e468e7f 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -479,7 +479,7 @@ void SwGlobalTree::RequestHelp( const HelpEvent& rHEvt ) aSize.Width() = GetSizePixel().Width() - aEntryPos.X(); aEntryPos = OutputToScreenPixel(aEntryPos); - Rectangle aItemRect( aEntryPos, aSize ); + tools::Rectangle aItemRect( aEntryPos, aSize ); if(Help::IsBalloonHelpEnabled()) { aEntryPos.X() += aSize.Width(); diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index fe05f73da6a9..9904dd5083db 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -416,12 +416,12 @@ void SwNavHelpToolBox::MouseButtonDown(const MouseEvent &rEvt) ToolBox::MouseButtonDown(rEvt); } -void SwNavigationPI::CreateNavigationTool(const Rectangle& rRect, bool bSetFocus, vcl::Window *pParent) +void SwNavigationPI::CreateNavigationTool(const tools::Rectangle& rRect, bool bSetFocus, vcl::Window *pParent) { Reference< XFrame > xFrame = GetCreateView()->GetViewFrame()->GetFrame().GetFrameInterface(); VclPtrInstance<SwScrollNaviPopup> pPopup(FN_SCROLL_NAVIGATION, xFrame, pParent); - Rectangle aRect(rRect); + tools::Rectangle aRect(rRect); Point aT1 = aRect.TopLeft(); aT1 = pPopup->GetParent()->OutputToScreenPixel(pPopup->GetParent()->AbsoluteScreenToOutputPixel(m_aContentToolBox->OutputToAbsoluteScreenPixel(aT1))); aRect.SetPos(aT1); @@ -636,8 +636,8 @@ SwNavigationPI::SwNavigationPI(SfxBindings* _pBindings, // Double separators are not allowed, so you have to // determine the suitable size differently. - Rectangle aFirstRect = m_aContentToolBox->GetItemRect(m_aContentToolBox->GetItemId("anchor")); - Rectangle aSecondRect = m_aContentToolBox->GetItemRect(m_aContentToolBox->GetItemId("header")); + tools::Rectangle aFirstRect = m_aContentToolBox->GetItemRect(m_aContentToolBox->GetItemId("anchor")); + tools::Rectangle aSecondRect = m_aContentToolBox->GetItemRect(m_aContentToolBox->GetItemId("header")); Size aItemWinSize( aFirstRect.Left() - aSecondRect.Left(), aFirstRect.Bottom() - aFirstRect.Top() ); Size aOptimalSize(m_xEdit->get_preferred_size()); diff --git a/sw/source/uibase/utlui/shdwcrsr.cxx b/sw/source/uibase/utlui/shdwcrsr.cxx index 0fcfa7f3543f..78a4e44a5b74 100644 --- a/sw/source/uibase/utlui/shdwcrsr.cxx +++ b/sw/source/uibase/utlui/shdwcrsr.cxx @@ -97,7 +97,7 @@ void SwShadowCursor::Paint() DrawCursor( aOldPt, nOldHeight, nOldMode ); } -Rectangle SwShadowCursor::GetRect() const +tools::Rectangle SwShadowCursor::GetRect() const { long nH = nOldHeight; Point aPt( aOldPt ); @@ -115,7 +115,7 @@ Rectangle SwShadowCursor::GetRect() const aSz.Width() *= 2; } - return pWin->PixelToLogic( Rectangle( aPt, aSz ) ); + return pWin->PixelToLogic( tools::Rectangle( aPt, aSz ) ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/utlui/viewlayoutctrl.cxx b/sw/source/uibase/utlui/viewlayoutctrl.cxx index 89be94c86e40..0c7db9333786 100644 --- a/sw/source/uibase/utlui/viewlayoutctrl.cxx +++ b/sw/source/uibase/utlui/viewlayoutctrl.cxx @@ -87,9 +87,9 @@ void SwViewLayoutControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState void SwViewLayoutControl::Paint( const UserDrawEvent& rUsrEvt ) { vcl::RenderContext* pDev = rUsrEvt.GetRenderContext(); - Rectangle aRect(rUsrEvt.GetRect()); + tools::Rectangle aRect(rUsrEvt.GetRect()); - const Rectangle aControlRect = getControlRect(); + const tools::Rectangle aControlRect = getControlRect(); const bool bSingleColumn = 0 == mpImpl->mnState; const bool bAutomatic = 1 == mpImpl->mnState; @@ -119,7 +119,7 @@ void SwViewLayoutControl::Paint( const UserDrawEvent& rUsrEvt ) bool SwViewLayoutControl::MouseButtonDown( const MouseEvent & rEvt ) { - const Rectangle aRect = getControlRect(); + const tools::Rectangle aRect = getControlRect(); const Point aPoint = rEvt.GetPosPixel(); const long nXDiff = aPoint.X() - aRect.Left(); @@ -167,7 +167,7 @@ bool SwViewLayoutControl::MouseButtonDown( const MouseEvent & rEvt ) bool SwViewLayoutControl::MouseMove( const MouseEvent & rEvt ) { - const Rectangle aRect = getControlRect(); + const tools::Rectangle aRect = getControlRect(); const Point aPoint = rEvt.GetPosPixel(); const long nXDiff = aPoint.X() - aRect.Left(); diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 0cdab48eac0b..a03b62bab3ae 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -603,7 +603,7 @@ void SwWrtShell::MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point& GetView().FindIPClient( xObj.GetObject(), &(GetView().GetEditWin()) ); if ( pCli ) { - Rectangle aArea = pCli->GetObjArea(); + tools::Rectangle aArea = pCli->GetObjArea(); aArea += rOffset; pCli->SetObjArea( aArea ); } |