diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-30 20:27:55 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-31 06:27:11 +0000 |
| commit | a5a571307fb3306b74ab46b085cde6388270a770 (patch) | |
| tree | 66d4ce12bb5236c50ab6a5d253bc8c6d8b5d292d /sw/source/core | |
| parent | 17d821af6bb9df93569836a92f6bed975587fc6c (diff) | |
tdf#82580 tools: rename Rectangle to tools::Rectangle
Mostly generated using
make check COMPILER_EXTERNAL_TOOL=1 CCACHE_PREFIX=clang-rename-wrapper RENAME_ARGS="-qualified-name=Rectangle -new-name=tools::Rectangle"
Except some modules have their own foo::tools namespace, so there have
to use ::tools::Rectangle. This commit just moves the class from the
global namespace, it does not update pre/postwin.h yet.
Change-Id: I42b2de3c6f769fcf28cfe086f98eb31e42a305f2
Reviewed-on: https://gerrit.libreoffice.org/35923
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sw/source/core')
40 files changed, 202 insertions, 202 deletions
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index 53d5d538a782..cba7854b5c35 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -853,7 +853,7 @@ awt::Rectangle SAL_CALL SwAccessibleContext::getBoundsImpl(bool bRelative) } SwRect aLogBounds( GetBounds( *(GetMap()), GetFrame() ) ); // twip relative to document root - Rectangle aPixBounds( 0, 0, 0, 0 ); + tools::Rectangle aPixBounds( 0, 0, 0, 0 ); if( GetFrame()->IsPageFrame() && static_cast < const SwPageFrame * >( GetFrame() )->IsEmptyPage() ) { diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index d91b0c9835b8..20114aec7094 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -236,7 +236,7 @@ awt::Rectangle SAL_CALL SwAccessibleDocumentBase::getBounds() throw uno::RuntimeException("no Window", static_cast<cppu::OWeakObject*>(this)); } - Rectangle aPixBounds( pWin->GetWindowExtentsRelative( pWin->GetAccessibleParentWindow() ) ); + tools::Rectangle aPixBounds( pWin->GetWindowExtentsRelative( pWin->GetAccessibleParentWindow() ) ); awt::Rectangle aBox( aPixBounds.Left(), aPixBounds.Top(), aPixBounds.GetWidth(), aPixBounds.GetHeight() ); @@ -307,7 +307,7 @@ sal_Bool SAL_CALL SwAccessibleDocumentBase::containsPoint( throw uno::RuntimeException("no Window", static_cast<cppu::OWeakObject*>(this)); } - Rectangle aPixBounds( pWin->GetWindowExtentsRelative( nullptr ) ); + tools::Rectangle aPixBounds( pWin->GetWindowExtentsRelative( nullptr ) ); aPixBounds.Move(-aPixBounds.Left(), -aPixBounds.Top()); Point aPixPoint( aPoint.X, aPoint.Y ); diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx index 18f27ec241bd..8a93692db121 100644 --- a/sw/source/core/access/accframe.cxx +++ b/sw/source/core/access/accframe.cxx @@ -231,7 +231,7 @@ SwAccessibleChild SwAccessibleFrame::GetChildAtPixel( const SwRect& rVisArea, SwRect aLogBounds( rLower.GetBounds( rAccMap ) ); if( !aLogBounds.IsEmpty() ) { - Rectangle aPixBounds( rAccMap.CoreToPixel( aLogBounds.SVRect() ) ); + tools::Rectangle aPixBounds( rAccMap.CoreToPixel( aLogBounds.SVRect() ) ); if( aPixBounds.IsInside( rPixPos ) ) aRet = rLower; } @@ -262,7 +262,7 @@ SwAccessibleChild SwAccessibleFrame::GetChildAtPixel( const SwRect& rVisArea, SwRect aLogBounds( rLower.GetBounds( rAccMap ) ); if( !aLogBounds.IsEmpty() ) { - Rectangle aPixBounds( rAccMap.CoreToPixel( aLogBounds.SVRect() ) ); + tools::Rectangle aPixBounds( rAccMap.CoreToPixel( aLogBounds.SVRect() ) ); if( aPixBounds.IsInside( rPixPos ) ) aRet = rLower; } diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx index b2471797b673..d5c86979364e 100644 --- a/sw/source/core/access/accfrmobj.cxx +++ b/sw/source/core/access/accfrmobj.cxx @@ -277,7 +277,7 @@ SwRect SwAccessibleChild::GetBox( const SwAccessibleMap& rAccMap ) const if (pWin) { aBox = SwRect( pWin->PixelToLogic( - Rectangle( mpWindow->GetPosPixel(), + tools::Rectangle( mpWindow->GetPosPixel(), mpWindow->GetSizePixel() ) ) ); } } diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index a5dd93ebd1d7..0e3d01b66f45 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -638,7 +638,7 @@ public: // helper class that stores preview data class SwAccPreviewData { - typedef std::vector<Rectangle> Rectangles; + typedef std::vector<tools::Rectangle> Rectangles; Rectangles maPreviewRects; Rectangles maLogicRects; @@ -720,12 +720,12 @@ void SwAccPreviewData::Update( const SwAccessibleMap& rAccMap, aPage = (*aPageIter)->pPage; // add preview page rectangle to <maPreviewRects> - Rectangle aPreviewPgRect( (*aPageIter)->aPreviewWinPos, (*aPageIter)->aPageSize ); + tools::Rectangle aPreviewPgRect( (*aPageIter)->aPreviewWinPos, (*aPageIter)->aPageSize ); maPreviewRects.push_back( aPreviewPgRect ); // add logic page rectangle to <maLogicRects> SwRect aLogicPgSwRect( aPage.GetBox( rAccMap ) ); - Rectangle aLogicPgRect( aLogicPgSwRect.SVRect() ); + tools::Rectangle aLogicPgRect( aLogicPgSwRect.SVRect() ); maLogicRects.push_back( aLogicPgRect ); // union visible area with visible part of logic page rectangle if ( (*aPageIter)->bVisible ) @@ -754,7 +754,7 @@ struct ContainsPredicate { const Point& mrPoint; explicit ContainsPredicate( const Point& rPoint ) : mrPoint(rPoint) {} - bool operator() ( const Rectangle& rRect ) const + bool operator() ( const tools::Rectangle& rRect ) const { return rRect.IsInside( mrPoint ); } @@ -3067,7 +3067,7 @@ void SwAccessibleMap::FireEvents() } -Rectangle SwAccessibleMap::GetVisibleArea() const +tools::Rectangle SwAccessibleMap::GetVisibleArea() const { MapMode aSrc( MapUnit::MapTwip ); MapMode aDest( MapUnit::Map100thMM ); @@ -3249,9 +3249,9 @@ static inline long lcl_CorrectCoarseValue(long aCoarseValue, long aFineValue, return aResult; } -static inline void lcl_CorrectRectangle(Rectangle & rRect, - const Rectangle & rSource, - const Rectangle & rInGrid) +static inline void lcl_CorrectRectangle(tools::Rectangle & rRect, + const tools::Rectangle & rSource, + const tools::Rectangle & rInGrid) { rRect.Left() = lcl_CorrectCoarseValue(rRect.Left(), rSource.Left(), rInGrid.Left(), false); @@ -3263,16 +3263,16 @@ static inline void lcl_CorrectRectangle(Rectangle & rRect, rInGrid.Bottom(), true); } -Rectangle SwAccessibleMap::CoreToPixel( const Rectangle& rRect ) const +tools::Rectangle SwAccessibleMap::CoreToPixel( const tools::Rectangle& rRect ) const { - Rectangle aRect; + tools::Rectangle aRect; if( GetShell()->GetWin() ) { MapMode aMapMode; GetMapMode( rRect.TopLeft(), aMapMode ); aRect = GetShell()->GetWin()->LogicToPixel( rRect, aMapMode ); - Rectangle aTmpRect = GetShell()->GetWin()->PixelToLogic( aRect, aMapMode ); + tools::Rectangle aTmpRect = GetShell()->GetWin()->PixelToLogic( aRect, aMapMode ); lcl_CorrectRectangle(aRect, rRect, aTmpRect); } diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index f6a577ebf4c0..4af5ec7beeee 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -1389,7 +1389,7 @@ css::uno::Sequence< css::style::TabStop > SwAccessibleParagraph::GetCurrentTabSt SwRect aTmpRect(0, 0, tabs[0].Position, 0); - Rectangle aScreenRect( GetMap()->CoreToPixel( aTmpRect.SVRect() )); + tools::Rectangle aScreenRect( GetMap()->CoreToPixel( aTmpRect.SVRect() )); SwRect aFrameLogBounds( GetBounds( *(GetMap()) ) ); // twip rel to doc root Point aFramePixPos( GetMap()->CoreToPixel( aFrameLogBounds.SVRect() ).TopLeft() ); @@ -2372,7 +2372,7 @@ awt::Rectangle SwAccessibleParagraph::getCharacterBounds( throw uno::RuntimeException("no Window", static_cast<cppu::OWeakObject*>(this)); } - Rectangle aScreenRect( GetMap()->CoreToPixel( aCoreRect.SVRect() )); + tools::Rectangle aScreenRect( GetMap()->CoreToPixel( aCoreRect.SVRect() )); SwRect aFrameLogBounds( GetBounds( *(GetMap()) ) ); // twip rel to doc root Point aFramePixPos( GetMap()->CoreToPixel( aFrameLogBounds.SVRect() ).TopLeft() ); @@ -3551,7 +3551,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getNumberOfLineWithCaret() throw uno::RuntimeException("no Window", static_cast<cppu::OWeakObject*>(this)); } - Rectangle aScreenRect( GetMap()->CoreToPixel( aCursorCoreRect.SVRect() )); + tools::Rectangle aScreenRect( GetMap()->CoreToPixel( aCursorCoreRect.SVRect() )); SwRect aFrameLogBounds( GetBounds( *(GetMap()) ) ); // twip rel to doc root Point aFramePixPos( GetMap()->CoreToPixel( aFrameLogBounds.SVRect() ).TopLeft() ); diff --git a/sw/source/core/bastyp/swrect.cxx b/sw/source/core/bastyp/swrect.cxx index c40b7a281e15..93937b9f2861 100644 --- a/sw/source/core/bastyp/swrect.cxx +++ b/sw/source/core/bastyp/swrect.cxx @@ -26,7 +26,7 @@ #include <math.h> #include <stdlib.h> -SwRect::SwRect( const Rectangle &rRect ) : +SwRect::SwRect( const tools::Rectangle &rRect ) : m_Point( rRect.Left(), rRect.Top() ) { m_Size.setWidth(rRect.Right() == RECT_EMPTY ? 0 : diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index b08b066e02b1..8c3020005e86 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -1273,7 +1273,7 @@ bool SwCursorShell::GoPrevCursor() return true; } -void SwCursorShell::Paint(vcl::RenderContext& rRenderContext, const Rectangle &rRect) +void SwCursorShell::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle &rRect) { comphelper::FlagRestorationGuard g(mbSelectAll, StartsWithTable() && ExtendedSelectedAll()); SET_CURR_SHELL( this ); diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index 696ddc26213d..dae0a1591a3e 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -209,7 +209,7 @@ void SwVisibleCursor::SetPosAndShow(SfxViewShell* pViewShell) } // notify about the cursor position & size - Rectangle aSVRect(aRect.Pos().getX(), aRect.Pos().getY(), aRect.Pos().getX() + aRect.SSize().Width(), aRect.Pos().getY() + aRect.SSize().Height()); + tools::Rectangle aSVRect(aRect.Pos().getX(), aRect.Pos().getY(), aRect.Pos().getX() + aRect.SSize().Width(), aRect.Pos().getY() + aRect.SSize().Height()); OString sRect = aSVRect.toString(); if (pViewShell) { @@ -338,7 +338,7 @@ void SwSelPaintRects::Show(std::vector<OString>* pSelectionRectangles) for(size_type a = 0; a < size(); ++a) { const SwRect aNextRect((*this)[a]); - const Rectangle aPntRect(aNextRect.SVRect()); + const tools::Rectangle aPntRect(aNextRect.SVRect()); aNewRanges.push_back(basegfx::B2DRange( aPntRect.Left(), aPntRect.Top(), @@ -451,7 +451,7 @@ void SwSelPaintRects::HighlightInputField() SwRects* pRects = static_cast<SwRects*>(pCursorForInputTextField.get()); for (const SwRect & rNextRect : *pRects) { - const Rectangle aPntRect(rNextRect.SVRect()); + const tools::Rectangle aPntRect(rNextRect.SVRect()); aInputFieldRanges.push_back(basegfx::B2DRange( aPntRect.Left(), aPntRect.Top(), diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx index 7bf6cba8e05e..a39db5f8b0f1 100644 --- a/sw/source/core/doc/docfly.cxx +++ b/sw/source/core/doc/docfly.cxx @@ -776,7 +776,7 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList, SwFormatAnchor aNewAnch( _eAnchorType ); SwAnchoredObject *pAnchoredObj = pContact->GetAnchoredObj(pObj); - Rectangle aObjRect(pAnchoredObj->GetObjRect().SVRect()); + tools::Rectangle aObjRect(pAnchoredObj->GetObjRect().SVRect()); const Point aPt( aObjRect.TopLeft() ); switch ( _eAnchorType ) diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index b232f782d82a..fce675b9225d 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -684,8 +684,8 @@ static void lcl_correctlyAlignRect( SwRect& rAlignedGrfArea, const SwRect& rInAr if(!pOut) return; - Rectangle aPxRect = pOut->LogicToPixel( rInArea.SVRect() ); - Rectangle aNewPxRect( aPxRect ); + tools::Rectangle aPxRect = pOut->LogicToPixel( rInArea.SVRect() ); + tools::Rectangle aNewPxRect( aPxRect ); while( aNewPxRect.Left() < aPxRect.Left() ) { rAlignedGrfArea.Left( rAlignedGrfArea.Left()+1 ); @@ -1038,11 +1038,11 @@ void SwNoTextFrame::PaintPicture( vcl::RenderContext* pOut, const SwRect &rGrfAr uno::Reference < embed::XEmbeddedObject > xObj = pOLENd->GetOLEObj().GetOleRef(); if ( xObj.is() && xObj->getCurrentState() == embed::EmbedStates::ACTIVE ) { - ::svt::EmbeddedObjectRef::DrawShading( Rectangle( aPosition, aSize ), pOut ); + ::svt::EmbeddedObjectRef::DrawShading( tools::Rectangle( aPosition, aSize ), pOut ); } } else - ::svt::EmbeddedObjectRef::DrawPaintReplacement( Rectangle( aPosition, aSize ), pOLENd->GetOLEObj().GetCurrentPersistName(), pOut ); + ::svt::EmbeddedObjectRef::DrawPaintReplacement( tools::Rectangle( aPosition, aSize ), pOLENd->GetOLEObj().GetCurrentPersistName(), pOut ); sal_Int64 nMiscStatus = pOLENd->GetOLEObj().GetOleRef()->getStatus( pOLENd->GetAspect() ); if ( !bPrn && dynamic_cast< const SwCursorShell *>( pShell ) != nullptr && ( diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx index b9f5faccfa3f..718b5fe5f227 100644 --- a/sw/source/core/doc/textboxhelper.cxx +++ b/sw/source/core/doc/textboxhelper.cxx @@ -282,9 +282,9 @@ uno::Any SwTextBoxHelper::queryInterface(SwFrameFormat* pShape, const uno::Type& return aRet; } -Rectangle SwTextBoxHelper::getTextRectangle(SwFrameFormat* pShape, bool bAbsolute) +tools::Rectangle SwTextBoxHelper::getTextRectangle(SwFrameFormat* pShape, bool bAbsolute) { - Rectangle aRet; + tools::Rectangle aRet; aRet.SetEmpty(); auto pCustomShape = dynamic_cast<SdrObjCustomShape*>(pShape->FindRealSdrObject()); if (pCustomShape) @@ -308,7 +308,7 @@ Rectangle SwTextBoxHelper::getTextRectangle(SwFrameFormat* pShape, bool bAbsolut Size aSize(pCustomShape->GetLogicRect().GetSize()); aPoint.X() -= aSize.Width() / 2; aPoint.Y() -= aSize.Height() / 2; - Rectangle aLogicRect(aPoint, aSize); + tools::Rectangle aLogicRect(aPoint, aSize); aRet.Move(-1 * aLogicRect.Left(), -1 * aLogicRect.Top()); } @@ -325,7 +325,7 @@ void SwTextBoxHelper::syncProperty(SwFrameFormat* pShape, const OUString& rPrope SdrObject* pObject = pShape->FindRealSdrObject(); if (pObject) { - Rectangle aRectangle(pObject->GetSnapRect()); + tools::Rectangle aRectangle(pObject->GetSnapRect()); syncProperty(pShape, RES_HORI_ORIENT, MID_HORIORIENT_POSITION, uno::makeAny(static_cast<sal_Int32>(convertTwipToMm100(aRectangle.Left())))); syncProperty(pShape, RES_VERT_ORIENT, MID_VERTORIENT_POSITION, uno::makeAny(static_cast<sal_Int32>(convertTwipToMm100(aRectangle.Top())))); } @@ -524,7 +524,7 @@ void SwTextBoxHelper::syncProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_u // Position/size should be the text position/size, not the shape one as-is. if (bAdjustX || bAdjustY || bAdjustSize) { - Rectangle aRect = getTextRectangle(pShape, /*bAbsolute=*/false); + tools::Rectangle aRect = getTextRectangle(pShape, /*bAbsolute=*/false); if (!aRect.IsEmpty()) { if (bAdjustX || bAdjustY) @@ -611,7 +611,7 @@ void SwTextBoxHelper::syncFlyFrameAttr(SwFrameFormat& rShape, SfxItemSet& rSet) auto& rOrient = static_cast<const SwFormatVertOrient&>(*aIter.GetCurItem()); SwFormatVertOrient aOrient(rOrient); - Rectangle aRect = getTextRectangle(&rShape, /*bAbsolute=*/false); + tools::Rectangle aRect = getTextRectangle(&rShape, /*bAbsolute=*/false); if (!aRect.IsEmpty()) aOrient.SetPos(aOrient.GetPos() + aRect.getY()); @@ -631,7 +631,7 @@ void SwTextBoxHelper::syncFlyFrameAttr(SwFrameFormat& rShape, SfxItemSet& rSet) auto& rOrient = static_cast<const SwFormatHoriOrient&>(*aIter.GetCurItem()); SwFormatHoriOrient aOrient(rOrient); - Rectangle aRect = getTextRectangle(&rShape, /*bAbsolute=*/false); + tools::Rectangle aRect = getTextRectangle(&rShape, /*bAbsolute=*/false); if (!aRect.IsEmpty()) aOrient.SetPos(aOrient.GetPos() + aRect.getX()); @@ -648,7 +648,7 @@ void SwTextBoxHelper::syncFlyFrameAttr(SwFrameFormat& rShape, SfxItemSet& rSet) SwFormatHoriOrient aHoriOrient(rShape.GetHoriOrient()); SwFormatFrameSize aSize(pFormat->GetFrameSize()); - Rectangle aRect = getTextRectangle(&rShape, /*bAbsolute=*/false); + tools::Rectangle aRect = getTextRectangle(&rShape, /*bAbsolute=*/false); if (!aRect.IsEmpty()) { aVertOrient.SetPos(aVertOrient.GetPos() + aRect.getY()); diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 291ae1a58e5e..883cc616db64 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -882,7 +882,7 @@ SdrObject* SwDrawContact::GetDrawObjectByAnchorFrame( const SwFrame& _rAnchorFra return pRetDrawObj; } -void SwDrawContact::NotifyBackgrdOfAllVirtObjs(const Rectangle* pOldBoundRect) +void SwDrawContact::NotifyBackgrdOfAllVirtObjs(const tools::Rectangle* pOldBoundRect) { for(auto& rpDrawVirtObj : maDrawVirtObjs) { @@ -916,7 +916,7 @@ void SwDrawContact::NotifyBackgrdOfAllVirtObjs(const Rectangle* pOldBoundRect) /// local method to notify the background for a drawing object - #i26791# static void lcl_NotifyBackgroundOfObj( SwDrawContact& _rDrawContact, const SdrObject& _rObj, - const Rectangle* _pOldObjRect ) + const tools::Rectangle* _pOldObjRect ) { // #i34640# SwAnchoredObject* pAnchoredObj = @@ -950,7 +950,7 @@ static void lcl_NotifyBackgroundOfObj( SwDrawContact& _rDrawContact, void SwDrawContact::Changed( const SdrObject& rObj, SdrUserCallType eType, - const Rectangle& rOldBoundRect ) + const tools::Rectangle& rOldBoundRect ) { // #i26791# - no event handling, if existing <SwViewShell> // is in construction @@ -1085,7 +1085,7 @@ void lcl_textBoxSizeNotify(SwFrameFormat* pFormat) void SwDrawContact::Changed_( const SdrObject& rObj, SdrUserCallType eType, - const Rectangle* pOldBoundRect ) + const tools::Rectangle* pOldBoundRect ) { // suppress handling of nested <SdrObjUserCall> events NestedUserCallHdl aNestedUserCallHdl( this, eType ); @@ -1203,7 +1203,7 @@ void SwDrawContact::Changed_( const SdrObject& rObj, { // #i34748# - If no last object rectangle is // provided by the anchored object, use parameter <pOldBoundRect>. - const Rectangle& aOldObjRect = pAnchoredDrawObj->GetLastObjRect() + const tools::Rectangle& aOldObjRect = pAnchoredDrawObj->GetLastObjRect() ? *(pAnchoredDrawObj->GetLastObjRect()) : *(pOldBoundRect); // #i79400# @@ -1373,8 +1373,8 @@ void SwDrawContact::SwClientNotify(const SwModify& rMod, const SfxHint& rHint) { // determine old object rectangle of 'master' drawing object // for notification - const Rectangle* pOldRect = nullptr; - Rectangle aOldRect; + const tools::Rectangle* pOldRect = nullptr; + tools::Rectangle aOldRect; if(GetAnchorFrame()) { // --> #i36181# - include spacing in object @@ -1606,7 +1606,7 @@ void SwDrawContact::DisconnectFromLayout( bool _bMoveMasterToInvisibleLayer ) !(GetFormat()->GetDoc()->IsInDtor()) && GetAnchorFrame() && !GetAnchorFrame()->IsInDtor() ) { - const Rectangle aOldRect( maAnchoredDrawObj.GetObjRectWithSpaces().SVRect() ); + const tools::Rectangle aOldRect( maAnchoredDrawObj.GetObjRectWithSpaces().SVRect() ); lcl_NotifyBackgroundOfObj( *this, *GetMaster(), &aOldRect ); NotifyBackgrdOfAllVirtObjs( &aOldRect ); } @@ -2267,7 +2267,7 @@ void SwDrawVirtObj::NbcSetAnchorPos(const Point& rPnt) // #i97197# // the methods relevant for positioning -const Rectangle& SwDrawVirtObj::GetCurrentBoundRect() const +const tools::Rectangle& SwDrawVirtObj::GetCurrentBoundRect() const { if(aOutRect.IsEmpty()) { @@ -2277,7 +2277,7 @@ const Rectangle& SwDrawVirtObj::GetCurrentBoundRect() const return aOutRect; } -const Rectangle& SwDrawVirtObj::GetLastBoundRect() const +const tools::Rectangle& SwDrawVirtObj::GetLastBoundRect() const { return aOutRect; } @@ -2286,7 +2286,7 @@ const Point SwDrawVirtObj::GetOffset() const { // do NOT use IsEmpty() here, there is already a useful offset // in the position - if(aOutRect == Rectangle()) + if(aOutRect == tools::Rectangle()) { return Point(); } @@ -2382,7 +2382,7 @@ void SwDrawVirtObj::Resize(const Point& rRef, const Fraction& xFact, const Fract { if(xFact.GetNumerator() != xFact.GetDenominator() || yFact.GetNumerator() != yFact.GetDenominator()) { - Rectangle aBoundRect0; if(pUserCall) aBoundRect0 = GetLastBoundRect(); + tools::Rectangle aBoundRect0; if(pUserCall) aBoundRect0 = GetLastBoundRect(); rRefObj.Resize(rRef - GetOffset(), xFact, yFact, bUnsetRelative); SetRectsDirty(); SendUserCall(SdrUserCallType::Resize, aBoundRect0); @@ -2393,7 +2393,7 @@ void SwDrawVirtObj::Rotate(const Point& rRef, long nAngle, double sn, double cs) { if(nAngle) { - Rectangle aBoundRect0; if(pUserCall) aBoundRect0 = GetLastBoundRect(); + tools::Rectangle aBoundRect0; if(pUserCall) aBoundRect0 = GetLastBoundRect(); rRefObj.Rotate(rRef - GetOffset(), nAngle, sn, cs); SetRectsDirty(); SendUserCall(SdrUserCallType::Resize, aBoundRect0); @@ -2402,7 +2402,7 @@ void SwDrawVirtObj::Rotate(const Point& rRef, long nAngle, double sn, double cs) void SwDrawVirtObj::Mirror(const Point& rRef1, const Point& rRef2) { - Rectangle aBoundRect0; if(pUserCall) aBoundRect0 = GetLastBoundRect(); + tools::Rectangle aBoundRect0; if(pUserCall) aBoundRect0 = GetLastBoundRect(); rRefObj.Mirror(rRef1 - GetOffset(), rRef2 - GetOffset()); SetRectsDirty(); SendUserCall(SdrUserCallType::Resize, aBoundRect0); @@ -2412,7 +2412,7 @@ void SwDrawVirtObj::Shear(const Point& rRef, long nAngle, double tn, bool bVShea { if(nAngle) { - Rectangle aBoundRect0; if(pUserCall) aBoundRect0 = GetLastBoundRect(); + tools::Rectangle aBoundRect0; if(pUserCall) aBoundRect0 = GetLastBoundRect(); rRefObj.Shear(rRef - GetOffset(), nAngle, tn, bVShear); SetRectsDirty(); SendUserCall(SdrUserCallType::Resize, aBoundRect0); @@ -2425,7 +2425,7 @@ void SwDrawVirtObj::RecalcSnapRect() aSnapRect += GetOffset(); } -const Rectangle& SwDrawVirtObj::GetSnapRect() const +const tools::Rectangle& SwDrawVirtObj::GetSnapRect() const { const_cast<SwDrawVirtObj*>(this)->aSnapRect = rRefObj.GetSnapRect(); const_cast<SwDrawVirtObj*>(this)->aSnapRect += GetOffset(); @@ -2433,25 +2433,25 @@ const Rectangle& SwDrawVirtObj::GetSnapRect() const return aSnapRect; } -void SwDrawVirtObj::SetSnapRect(const Rectangle& rRect) +void SwDrawVirtObj::SetSnapRect(const tools::Rectangle& rRect) { - Rectangle aBoundRect0; if(pUserCall) aBoundRect0 = GetLastBoundRect(); - Rectangle aR(rRect); + tools::Rectangle aBoundRect0; if(pUserCall) aBoundRect0 = GetLastBoundRect(); + tools::Rectangle aR(rRect); aR -= GetOffset(); rRefObj.SetSnapRect(aR); SetRectsDirty(); SendUserCall(SdrUserCallType::Resize, aBoundRect0); } -void SwDrawVirtObj::NbcSetSnapRect(const Rectangle& rRect) +void SwDrawVirtObj::NbcSetSnapRect(const tools::Rectangle& rRect) { - Rectangle aR(rRect); + tools::Rectangle aR(rRect); aR -= GetOffset(); SetRectsDirty(); rRefObj.NbcSetSnapRect(aR); } -const Rectangle& SwDrawVirtObj::GetLogicRect() const +const tools::Rectangle& SwDrawVirtObj::GetLogicRect() const { const_cast<SwDrawVirtObj*>(this)->aSnapRect = rRefObj.GetLogicRect(); const_cast<SwDrawVirtObj*>(this)->aSnapRect += GetOffset(); @@ -2459,19 +2459,19 @@ const Rectangle& SwDrawVirtObj::GetLogicRect() const return aSnapRect; } -void SwDrawVirtObj::SetLogicRect(const Rectangle& rRect) +void SwDrawVirtObj::SetLogicRect(const tools::Rectangle& rRect) { - Rectangle aBoundRect0; if(pUserCall) aBoundRect0 = GetLastBoundRect(); - Rectangle aR(rRect); + tools::Rectangle aBoundRect0; if(pUserCall) aBoundRect0 = GetLastBoundRect(); + tools::Rectangle aR(rRect); aR -= GetOffset(); rRefObj.SetLogicRect(aR); SetRectsDirty(); SendUserCall(SdrUserCallType::Resize, aBoundRect0); } -void SwDrawVirtObj::NbcSetLogicRect(const Rectangle& rRect) +void SwDrawVirtObj::NbcSetLogicRect(const tools::Rectangle& rRect) { - Rectangle aR(rRect); + tools::Rectangle aR(rRect); aR -= GetOffset(); rRefObj.NbcSetLogicRect(aR); SetRectsDirty(); diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index 4913c148f940..87d24545d790 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -314,7 +314,7 @@ basegfx::B2DRange SwVirtFlyDrawObj::getOuterBound() const if(pFlyFrame) { - const Rectangle aOuterRectangle(pFlyFrame->Frame().Pos(), pFlyFrame->Frame().SSize()); + const tools::Rectangle aOuterRectangle(pFlyFrame->Frame().Pos(), pFlyFrame->Frame().SSize()); if(!aOuterRectangle.IsEmpty()) { @@ -338,7 +338,7 @@ basegfx::B2DRange SwVirtFlyDrawObj::getInnerBound() const if(pFlyFrame) { - const Rectangle aInnerRectangle(pFlyFrame->Frame().Pos() + pFlyFrame->Prt().Pos(), pFlyFrame->Prt().SSize()); + const tools::Rectangle aInnerRectangle(pFlyFrame->Frame().Pos() + pFlyFrame->Prt().Pos(), pFlyFrame->Prt().SSize()); if(!aInnerRectangle.IsEmpty()) { @@ -488,16 +488,16 @@ void SwVirtFlyDrawObj::SetRect() const if ( GetFlyFrame()->Frame().HasArea() ) const_cast<SwVirtFlyDrawObj*>(this)->aOutRect = GetFlyFrame()->Frame().SVRect(); else - const_cast<SwVirtFlyDrawObj*>(this)->aOutRect = Rectangle(); + const_cast<SwVirtFlyDrawObj*>(this)->aOutRect = tools::Rectangle(); } -const Rectangle& SwVirtFlyDrawObj::GetCurrentBoundRect() const +const tools::Rectangle& SwVirtFlyDrawObj::GetCurrentBoundRect() const { SetRect(); return aOutRect; } -const Rectangle& SwVirtFlyDrawObj::GetLastBoundRect() const +const tools::Rectangle& SwVirtFlyDrawObj::GetLastBoundRect() const { return GetCurrentBoundRect(); } @@ -512,15 +512,15 @@ void SwVirtFlyDrawObj::RecalcSnapRect() SetRect(); } -const Rectangle& SwVirtFlyDrawObj::GetSnapRect() const +const tools::Rectangle& SwVirtFlyDrawObj::GetSnapRect() const { SetRect(); return aOutRect; } -void SwVirtFlyDrawObj::SetSnapRect(const Rectangle& ) +void SwVirtFlyDrawObj::SetSnapRect(const tools::Rectangle& ) { - Rectangle aTmp( GetLastBoundRect() ); + tools::Rectangle aTmp( GetLastBoundRect() ); SetRect(); SetChanged(); BroadcastObjectChange(); @@ -528,20 +528,20 @@ void SwVirtFlyDrawObj::SetSnapRect(const Rectangle& ) pUserCall->Changed(*this, SdrUserCallType::Resize, aTmp); } -void SwVirtFlyDrawObj::NbcSetSnapRect(const Rectangle& ) +void SwVirtFlyDrawObj::NbcSetSnapRect(const tools::Rectangle& ) { SetRect(); } -const Rectangle& SwVirtFlyDrawObj::GetLogicRect() const +const tools::Rectangle& SwVirtFlyDrawObj::GetLogicRect() const { SetRect(); return aOutRect; } -void SwVirtFlyDrawObj::SetLogicRect(const Rectangle& ) +void SwVirtFlyDrawObj::SetLogicRect(const tools::Rectangle& ) { - Rectangle aTmp( GetLastBoundRect() ); + tools::Rectangle aTmp( GetLastBoundRect() ); SetRect(); SetChanged(); BroadcastObjectChange(); @@ -549,14 +549,14 @@ void SwVirtFlyDrawObj::SetLogicRect(const Rectangle& ) pUserCall->Changed(*this, SdrUserCallType::Resize, aTmp); } -void SwVirtFlyDrawObj::NbcSetLogicRect(const Rectangle& ) +void SwVirtFlyDrawObj::NbcSetLogicRect(const tools::Rectangle& ) { SetRect(); } ::basegfx::B2DPolyPolygon SwVirtFlyDrawObj::TakeXorPoly() const { - const Rectangle aSourceRectangle(GetFlyFrame()->Frame().SVRect()); + const tools::Rectangle aSourceRectangle(GetFlyFrame()->Frame().SVRect()); const ::basegfx::B2DRange aSourceRange(aSourceRectangle.Left(), aSourceRectangle.Top(), aSourceRectangle.Right(), aSourceRectangle.Bottom()); ::basegfx::B2DPolyPolygon aRetval; @@ -722,7 +722,7 @@ void SwVirtFlyDrawObj::NbcCrop(const Point& rRef, const Fraction& xFact, const F // Compute old and new rect. This will give us the deformation to apply to // the object to crop - Rectangle aOldRect( aOutRect ); + tools::Rectangle aOldRect( aOutRect ); const long nOldWidth = aOldRect.GetWidth(); const long nOldHeight = aOldRect.GetHeight(); @@ -730,7 +730,7 @@ void SwVirtFlyDrawObj::NbcCrop(const Point& rRef, const Fraction& xFact, const F if (!nOldWidth || !nOldHeight) return; - Rectangle aNewRect( aOutRect ); + tools::Rectangle aNewRect( aOutRect ); ResizeRect( aNewRect, rRef, xFact, yFact ); // Get graphic object size in 100th of mm @@ -751,7 +751,7 @@ void SwVirtFlyDrawObj::NbcCrop(const Point& rRef, const Fraction& xFact, const F pSh->GetCurAttr( aSet ); 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()), @@ -922,7 +922,7 @@ void SwVirtFlyDrawObj::Crop(const Point& rRef, const Fraction& xFact, const Frac void SwVirtFlyDrawObj::addCropHandles(SdrHdlList& rTarget) const { - Rectangle aRect(GetSnapRect()); + tools::Rectangle aRect(GetSnapRect()); if(!aRect.IsEmpty()) { diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx index b1a2190bf2ba..5c2c42ca8d99 100644 --- a/sw/source/core/draw/dpage.cxx +++ b/sw/source/core/draw/dpage.cxx @@ -118,13 +118,13 @@ void InsertGridFrame( SdrPageGridFrameList *pLst, const SwFrame *pPg ) { SwRect aPrt( pPg->Prt() ); aPrt += pPg->Frame().Pos(); - const Rectangle aUser( aPrt.SVRect() ); - const Rectangle aPaper( pPg->Frame().SVRect() ); + const tools::Rectangle aUser( aPrt.SVRect() ); + const tools::Rectangle aPaper( pPg->Frame().SVRect() ); pLst->Insert( SdrPageGridFrame( aPaper, aUser ) ); } const SdrPageGridFrameList* SwDPage::GetGridFrameList( - const SdrPageView* pPV, const Rectangle *pRect ) const + const SdrPageView* pPV, const tools::Rectangle *pRect ) const { SwViewShell* pSh = static_cast< SwDrawModel* >(GetModel())->GetDoc().getIDocumentLayoutAccess().GetCurrentViewShell(); if(pSh) @@ -236,7 +236,7 @@ bool SwDPage::RequestHelp( vcl::Window* pWindow, SdrView* pView, } // then display the help: - Rectangle aRect( rEvt.GetMousePosPixel(), Size(1,1) ); + tools::Rectangle aRect( rEvt.GetMousePosPixel(), Size(1,1) ); if( rEvt.GetMode() & HelpEventMode::BALLOON ) { Help::ShowBalloon( pWindow, rEvt.GetMousePosPixel(), aRect, sText ); diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index 7ef966ca04b3..94192f51b299 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -648,7 +648,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos, } bool SwDrawView::TakeDragLimit( SdrDragMode eMode, - Rectangle& rRect ) const + tools::Rectangle& rRect ) const { const SdrMarkList &rMrkList = GetMarkedObjectList(); bool bRet = false; @@ -676,7 +676,7 @@ const SwFrame* SwDrawView::CalcAnchor() //Search for paragraph bound objects, otherwise only the //current anchor. Search only if we currently drag. const SwFrame* pAnch; - Rectangle aMyRect; + tools::Rectangle aMyRect; const bool bFly = dynamic_cast< const SwVirtFlyDrawObj *>( pObj ) != nullptr; if ( bFly ) { @@ -712,7 +712,7 @@ const SwFrame* SwDrawView::CalcAnchor() } else { - Rectangle aRect = pObj->GetSnapRect(); + tools::Rectangle aRect = pObj->GetSnapRect(); aPt = bTopRight ? aRect.TopRight() : aRect.TopLeft(); } @@ -796,7 +796,7 @@ void SwDrawView::ModelHasChanged() } } -void SwDrawView::MakeVisible( const Rectangle &rRect, vcl::Window & ) +void SwDrawView::MakeVisible( const tools::Rectangle &rRect, vcl::Window & ) { OSL_ENSURE( rImp.GetShell()->GetWin(), "MakeVisible, unknown Window"); rImp.GetShell()->MakeVisible( SwRect( rRect ) ); diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index bd4f5e6b1ee0..0453b72d2b5d 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -920,7 +920,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc ) // Therefore we calculate the absolute position here // and after the insert the anchor of the object // is set to the anchor of the group object. - Rectangle aSnapRect = pNew->GetSnapRect(); + tools::Rectangle aSnapRect = pNew->GetSnapRect(); if( pNew->GetAnchorPos().X() || pNew->GetAnchorPos().Y() ) { const Point aPoint( 0, 0 ); @@ -1371,9 +1371,9 @@ void SwFEShell::Paste( SvStream& rStrm, SwPasteSdr nAction, const Point* pPt ) } SdrObject* pNewObj = pClpObj->Clone(); - Rectangle aOldObjRect( pOldObj->GetCurrentBoundRect() ); + tools::Rectangle aOldObjRect( pOldObj->GetCurrentBoundRect() ); Size aOldObjSize( aOldObjRect.GetSize() ); - Rectangle aNewRect( pNewObj->GetCurrentBoundRect() ); + tools::Rectangle aNewRect( pNewObj->GetCurrentBoundRect() ); Size aNewSize( aNewRect.GetSize() ); Fraction aScaleWidth( aOldObjSize.Width(), aNewSize.Width() ); @@ -1520,7 +1520,7 @@ void SwFEShell::Paste( SvStream& rStrm, SwPasteSdr nAction, const Point* pPt ) } else pObj->SetLayer( GetDoc()->getIDocumentDrawModelAccess().GetHeavenId() ); - const Rectangle &rSnap = pObj->GetSnapRect(); + const tools::Rectangle &rSnap = pObj->GetSnapRect(); const Size aDiff( rSnap.GetWidth()/2, rSnap.GetHeight()/2 ); pView->MoveMarkedObj( aDiff ); ImpEndCreate(); diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index c495a35abf73..a3f167e1b15d 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -1748,7 +1748,7 @@ bool SwFEShell::ReplaceSdrObj( const OUString& rGrfName, const OUString& rFltNam if( dynamic_cast<const SwVirtFlyDrawObj*>( pObj) == nullptr ) { // then let's do it: - const Rectangle &rBound = pObj->GetSnapRect(); + const tools::Rectangle &rBound = pObj->GetSnapRect(); Point aRelPos( pObj->GetRelativePos() ); const long nWidth = rBound.Right() - rBound.Left(); diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 9df3d900447f..bd2b296d42bc 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -1754,7 +1754,7 @@ bool SwFEShell::ImpEndCreate() Imp()->GetDrawView()->UnmarkAll(); - const Rectangle &rBound = rSdrObj.GetSnapRect(); + const tools::Rectangle &rBound = rSdrObj.GetSnapRect(); Point aPt( rBound.TopRight() ); // alien identifier should end up on defaults @@ -1783,7 +1783,7 @@ bool SwFEShell::ImpEndCreate() // The crsr should not be too far away bCharBound = true; - Rectangle aRect( aTmp.SVRect() ); + tools::Rectangle aRect( aTmp.SVRect() ); aRect.Left() -= MM50*2; aRect.Top() -= MM50*2; aRect.Right() += MM50*2; @@ -2240,7 +2240,7 @@ void SwFEShell::DelSelectedObj() // For the statusline to request the current conditions Size SwFEShell::GetObjSize() const { - Rectangle aRect; + tools::Rectangle aRect; if ( Imp()->HasDrawView() ) { if ( Imp()->GetDrawView()->IsAction() ) @@ -2256,7 +2256,7 @@ Point SwFEShell::GetAnchorObjDiff() const const SdrView *pView = Imp()->GetDrawView(); OSL_ENSURE( pView, "GetAnchorObjDiff without DrawView?" ); - Rectangle aRect; + tools::Rectangle aRect; if ( Imp()->GetDrawView()->IsAction() ) Imp()->GetDrawView()->TakeActionRect( aRect ); else @@ -2675,7 +2675,7 @@ void SwFEShell::CheckUnboundObjects() SdrObject *pObj = rMrkList.GetMark( i )->GetMarkedSdrObj(); if ( !GetUserCall(pObj) ) { - const Rectangle &rBound = pObj->GetSnapRect(); + const tools::Rectangle &rBound = pObj->GetSnapRect(); const Point aPt( rBound.TopLeft() ); const SwFrame *pPage = GetLayout()->Lower(); const SwFrame *pLast = pPage; @@ -2891,7 +2891,7 @@ long SwFEShell::GetSectionWidth( SwFormat const & rFormat ) const return 0; } - void SwFEShell::CreateDefaultShape( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, const Rectangle& rRect, + void SwFEShell::CreateDefaultShape( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, const tools::Rectangle& rRect, sal_uInt16 nSlotId) { SdrView* pDrawView = GetDrawView(); @@ -2902,19 +2902,19 @@ long SwFEShell::GetSectionWidth( SwFormat const & rFormat ) const if(pObj) { - Rectangle aRect(rRect); + tools::Rectangle aRect(rRect); if(OBJ_CARC == eSdrObjectKind || OBJ_CCUT == eSdrObjectKind) { // force quadratic if(aRect.GetWidth() > aRect.GetHeight()) { - aRect = Rectangle( + aRect = tools::Rectangle( Point(aRect.Left() + ((aRect.GetWidth() - aRect.GetHeight()) / 2), aRect.Top()), Size(aRect.GetHeight(), aRect.GetHeight())); } else { - aRect = Rectangle( + aRect = tools::Rectangle( Point(aRect.Left(), aRect.Top() + ((aRect.GetHeight() - aRect.GetWidth()) / 2)), Size(aRect.GetWidth(), aRect.GetWidth())); } diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx index 3d097c07e998..9368eb893b07 100644 --- a/sw/source/core/inc/dflyobj.hxx +++ b/sw/source/core/inc/dflyobj.hxx @@ -81,16 +81,16 @@ public: virtual void TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const override; // we treat the size calculation completely on ourself here - virtual const Rectangle& GetCurrentBoundRect() const override; - virtual const Rectangle& GetLastBoundRect() const override; + virtual const tools::Rectangle& GetCurrentBoundRect() const override; + virtual const tools::Rectangle& GetLastBoundRect() const override; virtual void RecalcBoundRect() override; virtual void RecalcSnapRect() override; - virtual const Rectangle& GetSnapRect() const override; - virtual void SetSnapRect(const Rectangle& rRect) override; - virtual void NbcSetSnapRect(const Rectangle& rRect) override; - virtual const Rectangle& GetLogicRect() const override; - virtual void SetLogicRect(const Rectangle& rRect) override; - virtual void NbcSetLogicRect(const Rectangle& rRect) override; + virtual const tools::Rectangle& GetSnapRect() const override; + virtual void SetSnapRect(const tools::Rectangle& rRect) override; + virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; + virtual const tools::Rectangle& GetLogicRect() const override; + virtual void SetLogicRect(const tools::Rectangle& rRect) override; + virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override; virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const override; virtual void NbcMove (const Size& rSiz) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx index 54a74913df63..d5c2bf6bdd23 100644 --- a/sw/source/core/inc/dview.hxx +++ b/sw/source/core/inc/dview.hxx @@ -92,8 +92,8 @@ public: virtual void ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos, sal_uLong nNewPos ) override; - virtual bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const override; - virtual void MakeVisible( const Rectangle&, vcl::Window &rWin ) override; + virtual bool TakeDragLimit(SdrDragMode eMode, tools::Rectangle& rRect) const override; + virtual void MakeVisible( const tools::Rectangle&, vcl::Window &rWin ) override; virtual void CheckPossibilities() override; const SwViewShellImp &Imp() const { return rImp; } diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx index 5a3ee5cf2ac6..9d450f9a26f7 100644 --- a/sw/source/core/layout/anchoreddrawobject.cxx +++ b/sw/source/core/layout/anchoreddrawobject.cxx @@ -629,12 +629,12 @@ const SwRect SwAnchoredDrawObject::GetObjBoundRect() const // Resize objects with relative width or height if ( !bGroupShape && GetPageFrame( ) && ( GetDrawObj( )->GetRelativeWidth( ) || GetDrawObj()->GetRelativeHeight( ) ) ) { - Rectangle aCurrObjRect = GetDrawObj()->GetCurrentBoundRect(); + tools::Rectangle aCurrObjRect = GetDrawObj()->GetCurrentBoundRect(); long nTargetWidth = aCurrObjRect.GetWidth( ); if ( GetDrawObj( )->GetRelativeWidth( ) ) { - Rectangle aPageRect; + tools::Rectangle aPageRect; if (GetDrawObj()->GetRelativeWidthRelation() == text::RelOrientation::FRAME) // Exclude margins. aPageRect = GetPageFrame()->Prt().SVRect(); @@ -646,7 +646,7 @@ const SwRect SwAnchoredDrawObject::GetObjBoundRect() const long nTargetHeight = aCurrObjRect.GetHeight( ); if ( GetDrawObj( )->GetRelativeHeight( ) ) { - Rectangle aPageRect; + tools::Rectangle aPageRect; if (GetDrawObj()->GetRelativeHeightRelation() == text::RelOrientation::FRAME) // Exclude margins. aPageRect = GetPageFrame()->Prt().SVRect(); @@ -722,11 +722,11 @@ void SwAnchoredDrawObject::AdjustPositioningAttr( const SwFrame* _pNewAnchorFram // --> #i34748# - change return type. // If member <mpLastObjRect> is NULL, create one. -void SwAnchoredDrawObject::SetLastObjRect( const Rectangle& _rNewLastRect ) +void SwAnchoredDrawObject::SetLastObjRect( const tools::Rectangle& _rNewLastRect ) { if ( !mpLastObjRect ) { - mpLastObjRect.reset( new Rectangle ); + mpLastObjRect.reset( new tools::Rectangle ); } *(mpLastObjRect) = _rNewLastRect; } diff --git a/sw/source/core/layout/dumpfilter.cxx b/sw/source/core/layout/dumpfilter.cxx index c4eac12058da..1bf1c37c1465 100644 --- a/sw/source/core/layout/dumpfilter.cxx +++ b/sw/source/core/layout/dumpfilter.cxx @@ -96,7 +96,7 @@ namespace sw // Get sure that the whole layout is processed: set a visible area // even though there isn't any need of it pXDoc->GetDocShell()->GetWrtShell()->StartAction(); - Rectangle aRect( 0, 0, 26000, 21000 ); + tools::Rectangle aRect( 0, 0, 26000, 21000 ); pXDoc->GetDocShell()->SetVisArea( aRect ); pLayout->InvalidateAllContent( SwInvalidateFlags::Size ); pXDoc->GetDocShell()->GetWrtShell()->EndAction(); diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 26ae76bfe086..db26a6f99cbb 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -2076,7 +2076,7 @@ void SwLayIdle::ShowIdle( ColorData eColorData ) vcl::Window *pWin = pImp->GetShell()->GetWin(); if (pWin && !pWin->SupportsDoubleBuffering()) // FIXME make this work with double-buffering { - Rectangle aRect( 0, 0, 5, 5 ); + tools::Rectangle aRect( 0, 0, 5, 5 ); aRect = pWin->PixelToLogic( aRect ); // Depending on if idle layout is in progress or not, draw a "red square" or a "green square". pWin->Push( PushFlags::FILLCOLOR|PushFlags::LINECOLOR ); diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 69510b6aa757..109d4486c475 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -1248,7 +1248,7 @@ void SwAlignRect( SwRect &rRect, const SwViewShell *pSh, const vcl::RenderContex gProp.pSFlyMetafileOut.get() : pRenderContext; // Hold original rectangle in pixel - const Rectangle aOrgPxRect = pOut->LogicToPixel( rRect.SVRect() ); + const tools::Rectangle aOrgPxRect = pOut->LogicToPixel( rRect.SVRect() ); // Determine pixel-center rectangle in twip const SwRect aPxCenterRect( pOut->PixelToLogic( aOrgPxRect ) ); @@ -1375,7 +1375,7 @@ static void lcl_CompPxPosAndAdjustPos( const vcl::RenderContext& _rOut, */ void SwAlignGrfRect( SwRect *pGrfRect, const vcl::RenderContext &rOut ) { - Rectangle aPxRect = rOut.LogicToPixel( pGrfRect->SVRect() ); + tools::Rectangle aPxRect = rOut.LogicToPixel( pGrfRect->SVRect() ); pGrfRect->Pos( rOut.PixelToLogic( aPxRect.TopLeft() ) ); pGrfRect->SSize( rOut.PixelToLogic( aPxRect.GetSize() ) ); } @@ -2308,18 +2308,18 @@ static void lcl_AdjustRectToPixelSize( SwRect& io_aSwRect, const vcl::RenderCont // local object of class <Rectangle> in Twip coordinates // calculated from given rectangle aligned to pixel centers. - const Rectangle aPxCenterRect = aOut.PixelToLogic( + const tools::Rectangle aPxCenterRect = aOut.PixelToLogic( aOut.LogicToPixel( io_aSwRect.SVRect() ) ); // local constant object of class <Rectangle> representing given rectangle // in pixel. - const Rectangle aOrgPxRect = aOut.LogicToPixel( io_aSwRect.SVRect() ); + const tools::Rectangle aOrgPxRect = aOut.LogicToPixel( io_aSwRect.SVRect() ); // calculate adjusted rectangle from pixel centered rectangle. // Due to rounding differences <aPxCenterRect> doesn't exactly represents // the Twip-centers. Thus, adjust borders by half of pixel width/height plus 1. // Afterwards, adjust calculated Twip-positions of the all borders. - Rectangle aSizedRect = aPxCenterRect; + tools::Rectangle aSizedRect = aPxCenterRect; aSizedRect.Left() -= (aTwipToPxSize.Width()/2 + 1); aSizedRect.Right() += (aTwipToPxSize.Width()/2 + 1); aSizedRect.Top() -= (aTwipToPxSize.Height()/2 + 1); @@ -2349,8 +2349,8 @@ static void lcl_AdjustRectToPixelSize( SwRect& io_aSwRect, const vcl::RenderCont io_aSwRect = SwRect( aSizedRect ); #if OSL_DEBUG_LEVEL > 0 - Rectangle aTestOrgPxRect = aOut.LogicToPixel( io_aSwRect.SVRect() ); - Rectangle aTestNewPxRect = aOut.LogicToPixel( aSizedRect ); + tools::Rectangle aTestOrgPxRect = aOut.LogicToPixel( io_aSwRect.SVRect() ); + tools::Rectangle aTestNewPxRect = aOut.LogicToPixel( aSizedRect ); OSL_ENSURE( aTestOrgPxRect == aTestNewPxRect, "Error in lcl_AlignRectToPixelSize(..): Adjusted rectangle has incorrect position or size"); // check Left() @@ -3830,7 +3830,7 @@ void SwColumnFrame::PaintBreak( ) const drawinglayer::attribute::FontAttribute aFontAttr = drawinglayer::primitive2d::getFontAttributeFromVclFont( aFontSize, aFont, false, false ); - Rectangle aTextRect; + tools::Rectangle aTextRect; pOut->GetTextBoundRect( aTextRect, aBreakText ); long nTextOff = ( nWidth - aTextRect.GetWidth() ) / 2; @@ -6050,7 +6050,7 @@ static void lcl_paintBitmapExToRect(vcl::RenderContext *pOut, const Point& aPoin // The problem is that if we get called multiple times and the color is // partly transparent, then the result will get darker and darker. To avoid // this, always paint the background color before doing the real paint. - Rectangle aRect(aPoint, aSize); + tools::Rectangle aRect(aPoint, aSize); switch (eArea) { @@ -6247,18 +6247,18 @@ static void lcl_paintBitmapExToRect(vcl::RenderContext *pOut, const Point& aPoin if (pMgr && pMgr->ShowNotes() && pMgr->HasNotes()) // do not show anything in print preview { sal_Int32 nScrollerHeight = pMgr->GetSidebarScrollerHeight(); - const Rectangle &aVisRect = _pViewShell->VisArea().SVRect(); + const tools::Rectangle &aVisRect = _pViewShell->VisArea().SVRect(); //draw border and sidepane _pViewShell->GetOut()->SetLineColor(); if (!bRight) { _pViewShell->GetOut()->SetFillColor(COL_NOTES_SIDEPANE_BORDER); - _pViewShell->GetOut()->DrawRect(Rectangle(Point(aPageRect.Left()-pMgr->GetSidebarBorderWidth(),aPageRect.Top()),Size(pMgr->GetSidebarBorderWidth(),aPageRect.Height()))) ; + _pViewShell->GetOut()->DrawRect(tools::Rectangle(Point(aPageRect.Left()-pMgr->GetSidebarBorderWidth(),aPageRect.Top()),Size(pMgr->GetSidebarBorderWidth(),aPageRect.Height()))) ; if (Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) _pViewShell->GetOut()->SetFillColor(COL_BLACK); else _pViewShell->GetOut()->SetFillColor(COL_NOTES_SIDEPANE); - _pViewShell->GetOut()->DrawRect(Rectangle(Point(aPageRect.Left()-pMgr->GetSidebarWidth()-pMgr->GetSidebarBorderWidth(),aPageRect.Top()),Size(pMgr->GetSidebarWidth(),aPageRect.Height()))) ; + _pViewShell->GetOut()->DrawRect(tools::Rectangle(Point(aPageRect.Left()-pMgr->GetSidebarWidth()-pMgr->GetSidebarBorderWidth(),aPageRect.Top()),Size(pMgr->GetSidebarWidth(),aPageRect.Height()))) ; } else { @@ -6282,8 +6282,8 @@ static void lcl_paintBitmapExToRect(vcl::RenderContext *pOut, const Point& aPoin aPointTop = !bRight ? Point(aPageRect.Left() - pMgr->GetSidebarWidth() + _pViewShell->GetOut()->PixelToLogic(Size(2,0)).Width(),aPageRect.Top() + _pViewShell->GetOut()->PixelToLogic(Size(0,2)).Height()) : Point(aPageRect.Right() + pMgr->GetSidebarBorderWidth() + _pViewShell->GetOut()->PixelToLogic(Size(2,0)).Width(),aPageRect.Top() + _pViewShell->GetOut()->PixelToLogic(Size(0,2)).Height()); Size aSize(pMgr->GetSidebarWidth() - _pViewShell->GetOut()->PixelToLogic(Size(4,0)).Width(), _pViewShell->GetOut()->PixelToLogic(Size(0,nScrollerHeight)).Height()) ; - Rectangle aRectBottom(aPointBottom,aSize); - Rectangle aRectTop(aPointTop,aSize); + tools::Rectangle aRectBottom(aPointBottom,aSize); + tools::Rectangle aRectTop(aPointTop,aSize); if (aRectBottom.IsOver(aVisRect)) { @@ -6843,7 +6843,7 @@ static void lcl_RefreshLine( const SwLayoutFrame *pLay, //Is the Obj placed on the line const long nP1OthPt = !bHori ? rP1.X() : rP1.Y(); - const Rectangle &rBound = pObj->GetCurrentBoundRect(); + const tools::Rectangle &rBound = pObj->GetCurrentBoundRect(); const Point aDrPt( rBound.TopLeft() ); const long nDrOthPt = !bHori ? aDrPt.X() : aDrPt.Y(); const Size aDrSz( rBound.GetSize() ); diff --git a/sw/source/core/layout/virtoutp.cxx b/sw/source/core/layout/virtoutp.cxx index 690a166f70f0..5fa2af0aedac 100644 --- a/sw/source/core/layout/virtoutp.cxx +++ b/sw/source/core/layout/virtoutp.cxx @@ -148,7 +148,7 @@ void SwLayVout::Enter( SwViewShell *pShell, SwRect &rRect, bool bOn ) SwRect aTmp( rRect ); aTmp.SSize().Width() += aPixSz.Width()/2 + 1; aTmp.SSize().Height()+= aPixSz.Height()/2 + 1; - Rectangle aTmpRect( pO->LogicToPixel( aTmp.SVRect() ) ); + tools::Rectangle aTmpRect( pO->LogicToPixel( aTmp.SVRect() ) ); OSL_ENSURE( !pSh->GetWin()->IsReallyVisible() || aTmpRect.GetWidth() <= pSh->GetWin()->GetOutputSizePixel().Width() + 2, diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 333303daa0a7..7c42aa9dd723 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -890,7 +890,7 @@ const uno::Reference < embed::XEmbeddedObject > SwOLEObj::GetOleRef() if ( !xObj.is() ) { // We could not load this part (probably broken) - Rectangle aArea; + tools::Rectangle aArea; SwFrame *pFrame = pOLENd->getLayoutFrame(nullptr); if ( pFrame ) { diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index 129770957527..e4639c609222 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -1506,15 +1506,15 @@ SwEnhancedPDFExportHelper::~SwEnhancedPDFExportHelper() { } -Rectangle SwEnhancedPDFExportHelper::SwRectToPDFRect(const SwPageFrame* pCurrPage, - const Rectangle& rRectangle) const +tools::Rectangle SwEnhancedPDFExportHelper::SwRectToPDFRect(const SwPageFrame* pCurrPage, + const tools::Rectangle& rRectangle) const { SwPostItMode nPostItMode = mrPrintData.GetPrintPostIts(); if (nPostItMode != SwPostItMode::InMargins) return rRectangle; //the page has been scaled by 75% and vertically centered, so adjust these //rectangles equivalently - Rectangle aRect(rRectangle); + tools::Rectangle aRect(rRectangle); Size aRectSize(aRect.GetSize()); double fScale = 0.75; aRectSize.Width() = (aRectSize.Width() * fScale); @@ -1609,7 +1609,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() aNote.Contents = pField->GetText(); // Link Export - Rectangle aRect(SwRectToPDFRect(pCurrPage, rNoteRect.SVRect())); + tools::Rectangle aRect(SwRectToPDFRect(pCurrPage, rNoteRect.SVRect())); pPDFExtOutDevData->CreateNote(aRect, aNote, aNotePageNum); } } @@ -1683,7 +1683,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() // Destination Export if ( -1 != nDestPageNum ) { - Rectangle aRect(SwRectToPDFRect(pCurrPage, rDestRect.SVRect())); + tools::Rectangle aRect(SwRectToPDFRect(pCurrPage, rDestRect.SVRect())); nDestId = pPDFExtOutDevData->CreateDest(aRect, nDestPageNum); } } @@ -1707,7 +1707,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() for (sal_Int32 aLinkPageNum : aLinkPageNums) { // Link Export - Rectangle aRect(SwRectToPDFRect(pSelectionPage, rLinkRect.SVRect())); + tools::Rectangle aRect(SwRectToPDFRect(pSelectionPage, rLinkRect.SVRect())); const sal_Int32 nLinkId = pPDFExtOutDevData->CreateLink(aRect, aLinkPageNum); @@ -1768,7 +1768,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() // Destination Export if ( -1 != nDestPageNum ) { - Rectangle aRect(SwRectToPDFRect(pCurrPage, rDestRect.SVRect())); + tools::Rectangle aRect(SwRectToPDFRect(pCurrPage, rDestRect.SVRect())); nDestId = pPDFExtOutDevData->CreateDest(aRect, nDestPageNum); } } @@ -1784,7 +1784,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() // Link Export for (sal_Int32 aLinkPageNum : aLinkPageNums) { - Rectangle aRect(SwRectToPDFRect(pCurrPage, aLinkRect.SVRect())); + tools::Rectangle aRect(SwRectToPDFRect(pCurrPage, aLinkRect.SVRect())); const sal_Int32 nLinkId = pPDFExtOutDevData->CreateLink(aRect, aLinkPageNum); @@ -1828,7 +1828,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() if (!aMediaURL.isEmpty()) { const SwPageFrame* pCurrPage = mrSh.GetLayout()->GetPageAtPos(aSnapRect.Center()); - Rectangle aPDFRect(SwRectToPDFRect(pCurrPage, aSnapRect.SVRect())); + tools::Rectangle aPDFRect(SwRectToPDFRect(pCurrPage, aSnapRect.SVRect())); for (sal_Int32 nScreenPageNum : aScreenPageNums) { sal_Int32 nScreenId = pPDFExtOutDevData->CreateScreen(aPDFRect, nScreenPageNum); @@ -1894,7 +1894,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() if ( -1 != nDestPageNum ) { // Destination Export - Rectangle aRect(SwRectToPDFRect(pCurrPage, rDestRect.SVRect())); + tools::Rectangle aRect(SwRectToPDFRect(pCurrPage, rDestRect.SVRect())); const sal_Int32 nDestId = pPDFExtOutDevData->CreateDest(aRect, nDestPageNum); // #i44368# Links in Header/Footer @@ -1994,7 +1994,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() for (sal_Int32 aLinkPageNum : aLinkPageNums) { // Link Export - Rectangle aRect(SwRectToPDFRect(pCurrPage, aLinkRect.SVRect())); + tools::Rectangle aRect(SwRectToPDFRect(pCurrPage, aLinkRect.SVRect())); const sal_Int32 nLinkId = pPDFExtOutDevData->CreateLink(aRect, aLinkPageNum); @@ -2060,7 +2060,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() if ( -1 != nDestPageNum ) { // Destination Export - Rectangle aRect(SwRectToPDFRect(pCurrPage, rDestRect.SVRect())); + tools::Rectangle aRect(SwRectToPDFRect(pCurrPage, rDestRect.SVRect())); const sal_Int32 nDestId = pPDFExtOutDevData->CreateDest(aRect, nDestPageNum); @@ -2109,7 +2109,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() // Destination Export if ( -1 != nDestPageNum ) { - Rectangle aRect(SwRectToPDFRect(pCurrPage, rDestRect.SVRect())); + tools::Rectangle aRect(SwRectToPDFRect(pCurrPage, rDestRect.SVRect())); pPDFExtOutDevData->CreateNamedDest(sBkName, aRect, nDestPageNum); } } @@ -2145,7 +2145,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() if ( -1 != nDestPageNum ) { - Rectangle aRect(SwRectToPDFRect(pCurrPage, rDestRect.SVRect())); + tools::Rectangle aRect(SwRectToPDFRect(pCurrPage, rDestRect.SVRect())); if ( aIBeg->nLinkId != -1 ) { // Destination Export @@ -2272,7 +2272,7 @@ void SwEnhancedPDFExportHelper::MakeHeaderFooterLinks( vcl::PDFExtOutDevData& rP for (sal_Int32 aHFLinkPageNum : aHFLinkPageNums) { // Link Export - Rectangle aRect(SwRectToPDFRect(pPageFrame, aHFLinkRect.SVRect())); + tools::Rectangle aRect(SwRectToPDFRect(pPageFrame, aHFLinkRect.SVRect())); const sal_Int32 nHFLinkId = rPDFExtOutDevData.CreateLink(aRect, aHFLinkPageNum); diff --git a/sw/source/core/text/blink.cxx b/sw/source/core/text/blink.cxx index 5602fd1024de..fc492ae5723a 100644 --- a/sw/source/core/text/blink.cxx +++ b/sw/source/core/text/blink.cxx @@ -102,7 +102,7 @@ IMPL_LINK_NOARG(SwBlink, Blinker, Timer *, void) nHeight = pTmp->GetPortion()->SvLSize().Height(); } - Rectangle aRefresh( aPos, Size( nWidth, nHeight ) ); + tools::Rectangle aRefresh( aPos, Size( nWidth, nHeight ) ); aRefresh.Right() += ( aRefresh.Bottom()- aRefresh.Top() ) / 8; pTmp->GetRootFrame() ->GetCurrShell()->InvalidateWindows( aRefresh ); diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 2f4a79fa1afa..5240a44001d2 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -1046,7 +1046,7 @@ void SwTextPaintInfo::DrawPostIts( const SwLinePortion&, bool bScript ) const if ( GetTextFrame()->IsVertical() ) GetTextFrame()->SwitchHorizontalToVertical( aTmpRect ); - const Rectangle aRect( aTmpRect.SVRect() ); + const tools::Rectangle aRect( aTmpRect.SVRect() ); SwViewOption::PaintPostIts( const_cast<OutputDevice*>(GetOut()), aRect, bScript ); } } @@ -1068,7 +1068,7 @@ void SwTextPaintInfo::DrawCheckBox(const SwFieldFormCheckboxPortion &rPor, bool pOut->Pop(); } const int delta=10; - Rectangle r(aIntersect.Left()+delta, aIntersect.Top()+delta, aIntersect.Right()-delta, aIntersect.Bottom()-delta); + tools::Rectangle r(aIntersect.Left()+delta, aIntersect.Top()+delta, aIntersect.Right()-delta, aIntersect.Bottom()-delta); m_pOut->Push( PushFlags::LINECOLOR | PushFlags::FILLCOLOR ); m_pOut->SetLineColor( Color(0, 0, 0)); m_pOut->SetFillColor(); diff --git a/sw/source/core/text/noteurl.cxx b/sw/source/core/text/noteurl.cxx index 1de13e292764..a8c723cdd742 100644 --- a/sw/source/core/text/noteurl.cxx +++ b/sw/source/core/text/noteurl.cxx @@ -51,7 +51,7 @@ void SwNoteURL::FillImageMap( ImageMap *pMap, const Point &rPos, const SwURLNote &rNote = m_List[i]; SwRect aSwRect( rNote.GetRect() ); aSwRect -= rPos; - Rectangle aRect( OutputDevice::LogicToLogic( aSwRect.SVRect(), + tools::Rectangle aRect( OutputDevice::LogicToLogic( aSwRect.SVRect(), rMap, aMap ) ); IMapRectangleObject aObj( aRect, rNote.GetURL(), OUString(), OUString(), rNote.GetTarget(), OUString(), true, false ); diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx index b24fe59e84a3..bc88313a1033 100644 --- a/sw/source/core/text/porfly.cxx +++ b/sw/source/core/text/porfly.cxx @@ -354,7 +354,7 @@ void SwFlyCntPortion::SetBase( const SwTextFrame& rFrame, const Point &rBase, { // It has, so look up its text rectangle, and adjust the position // of the textbox accordingly. - Rectangle aTextRectangle = SwTextBoxHelper::getTextRectangle(pShape); + tools::Rectangle aTextRectangle = SwTextBoxHelper::getTextRectangle(pShape); SwFormatHoriOrient aHori(pTextBox->GetHoriOrient()); aHori.SetHoriOrient(css::text::HoriOrientation::NONE); diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx index 2410f6c9572e..23f2d7534b71 100644 --- a/sw/source/core/text/txtdrop.cxx +++ b/sw/source/core/text/txtdrop.cxx @@ -753,7 +753,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTextFormatInfo &rInf // reset pCurrPart to first part pCurrPart = pDrop->GetPart(); bool bFirstGlyphRect = true; - Rectangle aCommonRect, aRect; + tools::Rectangle aCommonRect, aRect; while ( pCurrPart ) { @@ -802,7 +802,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTextFormatInfo &rInf { // We do not have a window or our window could not // give us glyph boundaries. - aRect = Rectangle( Point( 0, 0 ), Size( 0, nAscent ) ); + aRect = tools::Rectangle( Point( 0, 0 ), Size( 0, nAscent ) ); } } diff --git a/sw/source/core/text/txtpaint.cxx b/sw/source/core/text/txtpaint.cxx index dc34ca0d1fd3..f503b4121699 100644 --- a/sw/source/core/text/txtpaint.cxx +++ b/sw/source/core/text/txtpaint.cxx @@ -69,7 +69,7 @@ void SwSaveClip::ChgClip_( const SwRect &rRect, const SwTextFrame* pFrame, pOut->SetClipRegion(); else { - Rectangle aRect( rRect.SVRect() ); + tools::Rectangle aRect( rRect.SVRect() ); // Having underscores in our line, we enlarged the repaint area // (see frmform.cxx) because for some fonts it could be too small. diff --git a/sw/source/core/text/txtpaint.hxx b/sw/source/core/text/txtpaint.hxx index 5408517e6d94..7959dfa834a0 100644 --- a/sw/source/core/text/txtpaint.hxx +++ b/sw/source/core/text/txtpaint.hxx @@ -70,7 +70,7 @@ public: class DbgRect : public SwDbgOut { public: - DbgRect( OutputDevice* pOut, const Rectangle &rRect, + DbgRect( OutputDevice* pOut, const tools::Rectangle &rRect, const bool bOn = true, ColorData eColor = COL_LIGHTBLUE ); }; @@ -97,7 +97,7 @@ inline DbgBackColor::~DbgBackColor() } } -inline DbgRect::DbgRect( OutputDevice* pOutDev, const Rectangle &rRect, +inline DbgRect::DbgRect( OutputDevice* pOutDev, const tools::Rectangle &rRect, const bool bOn, ColorData eColor ) : SwDbgOut( pOutDev, bOn ) diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index b8cbd98c160a..84122febaf3f 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -2219,8 +2219,8 @@ awt::Point SAL_CALL SwXShape::getPosition() // to the determined attribute position // #i34750#: // consider the layout direction - const Rectangle aMemberObjRect = GetSvxShape()->GetSdrObject()->GetSnapRect(); - const Rectangle aGroupObjRect = pTopGroupObj->GetSnapRect(); + const tools::Rectangle aMemberObjRect = GetSvxShape()->GetSdrObject()->GetSnapRect(); + const tools::Rectangle aGroupObjRect = pTopGroupObj->GetSnapRect(); // #i53320# - relative position of group member and // top group object is always given in horizontal left-to-right layout. awt::Point aOffset( 0, 0 ); @@ -2400,7 +2400,7 @@ awt::Point SwXShape::GetAttrPosition() pObj->GetAnchorPos().Y() == 0 && aAttrPos.X == 0 && aAttrPos.Y == 0 ) { - const Rectangle aObjRect = pObj->GetSnapRect(); + const tools::Rectangle aObjRect = pObj->GetSnapRect(); aAttrPos.X = convertTwipToMm100(aObjRect.Left()); aAttrPos.Y = convertTwipToMm100(aObjRect.Top()); } diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx index 47c19d92e736..fc023046a74b 100644 --- a/sw/source/core/view/pagepreviewlayout.cxx +++ b/sw/source/core/view/pagepreviewlayout.cxx @@ -286,7 +286,7 @@ bool SwPagePreviewLayout::Prepare( const sal_uInt16 _nProposedStartPageNum, const Point& rProposedStartPos, const Size& _rPxWinSize, sal_uInt16& _onStartPageNum, - Rectangle& _orDocPreviewPaintRect, + tools::Rectangle& _orDocPreviewPaintRect, const bool _bStartWithPageAtFirstCol ) { @@ -694,7 +694,7 @@ bool SwPagePreviewLayout::CalcPreviewDataForPage( const SwPageFrame& _rPage, */ bool SwPagePreviewLayout::SetBookPreviewMode( const bool _bEnableBookPreview, sal_uInt16& _onStartPageNum, - Rectangle& _orDocPreviewPaintRect ) + tools::Rectangle& _orDocPreviewPaintRect ) { if ( mbBookPreview != _bEnableBookPreview) { @@ -893,7 +893,7 @@ struct PreviewPosInsidePagePred { if ( _pPreviewPage->bVisible ) { - Rectangle aPreviewPageRect( _pPreviewPage->aPreviewWinPos, _pPreviewPage->aPageSize ); + tools::Rectangle aPreviewPageRect( _pPreviewPage->aPreviewWinPos, _pPreviewPage->aPageSize ); return aPreviewPageRect.IsInside( mnPreviewPos ); } return false; @@ -999,7 +999,7 @@ public: /** paint prepared preview */ -bool SwPagePreviewLayout::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rOutRect) const +bool SwPagePreviewLayout::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rOutRect) const { PreviewRenderContextGuard aGuard(mrParentViewShell, &rRenderContext); // check environment and parameters @@ -1057,7 +1057,7 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& rRenderContext, const Rectan } // prepare data for paint of pages - const Rectangle aPxOutRect( pOutputDev->LogicToPixel(rOutRect) ); + const tools::Rectangle aPxOutRect( pOutputDev->LogicToPixel(rOutRect) ); MapMode aMapMode( pOutputDev->GetMapMode() ); MapMode aSavedMapMode = aMapMode; @@ -1071,10 +1071,10 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& rRenderContext, const Rectan if ( !(*aPageIter)->bVisible ) continue; - Rectangle aPageRect( (*aPageIter)->aLogicPos, (*aPageIter)->aPageSize ); + tools::Rectangle aPageRect( (*aPageIter)->aLogicPos, (*aPageIter)->aPageSize ); aMapMode.SetOrigin( (*aPageIter)->aMapOffset ); pOutputDev->SetMapMode( aMapMode ); - Rectangle aPxPaintRect = pOutputDev->LogicToPixel( aPageRect ); + tools::Rectangle aPxPaintRect = pOutputDev->LogicToPixel( aPageRect ); if ( aPxOutRect.IsOver( aPxPaintRect) ) { const SwPageFrame* pPage = (*aPageIter)->pPage; @@ -1112,7 +1112,7 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& rRenderContext, const Rectan mrParentViewShell.maVisArea = aPageRect; aPxPaintRect.Intersection( aPxOutRect ); - Rectangle aPaintRect = pOutputDev->PixelToLogic( aPxPaintRect ); + tools::Rectangle aPaintRect = pOutputDev->PixelToLogic( aPxPaintRect ); mrParentViewShell.Paint(rRenderContext, aPaintRect); // --> OD 2007-08-15 #i80691# @@ -1168,7 +1168,7 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& rRenderContext, const Rectan OD 18.12.2002 #103492# */ -void SwPagePreviewLayout::Repaint( const Rectangle& rInvalidCoreRect ) const +void SwPagePreviewLayout::Repaint( const tools::Rectangle& rInvalidCoreRect ) const { // check environment and parameters { @@ -1200,11 +1200,11 @@ void SwPagePreviewLayout::Repaint( const Rectangle& rInvalidCoreRect ) const if ( !(*aPageIter)->bVisible ) continue; - Rectangle aPageRect( (*aPageIter)->aLogicPos, (*aPageIter)->aPageSize ); + tools::Rectangle aPageRect( (*aPageIter)->aLogicPos, (*aPageIter)->aPageSize ); if ( rInvalidCoreRect.IsOver( aPageRect ) ) { aPageRect.Intersection(rInvalidCoreRect); - Rectangle aInvalidPreviewRect = aPageRect; + tools::Rectangle aInvalidPreviewRect = aPageRect; aInvalidPreviewRect.SetPos( aInvalidPreviewRect.TopLeft() - (*aPageIter)->aLogicPos + (*aPageIter)->aPreviewWinPos ); @@ -1245,18 +1245,18 @@ void SwPagePreviewLayout::PaintSelectMarkAtPage(vcl::RenderContext& rRenderConte // OD 19.02.2003 #107369# - use aligned page rectangle, as it is used for // page border and shadow paint - see <SwPageFrame::PaintBorderAndShadow(..)> ::SwAlignRect( aPageRect, &mrParentViewShell, pOutputDev ); - Rectangle aPxPageRect = pOutputDev->LogicToPixel( aPageRect.SVRect() ); + tools::Rectangle aPxPageRect = pOutputDev->LogicToPixel( aPageRect.SVRect() ); // draw two rectangle // OD 19.02.2003 #107369# - adjust position of select mark rectangle - Rectangle aRect( aPxPageRect.Left(), aPxPageRect.Top(), + tools::Rectangle aRect( aPxPageRect.Left(), aPxPageRect.Top(), aPxPageRect.Right(), aPxPageRect.Bottom() ); aRect = pOutputDev->PixelToLogic( aRect ); pOutputDev->SetFillColor(); // OD 20.02.2003 #107369# - no fill color pOutputDev->SetLineColor( aSelPgLineColor ); pOutputDev->DrawRect( aRect ); // OD 19.02.2003 #107369# - adjust position of select mark rectangle - aRect = Rectangle( aPxPageRect.Left()+1, aPxPageRect.Top()+1, + aRect = tools::Rectangle( aPxPageRect.Left()+1, aPxPageRect.Top()+1, aPxPageRect.Right()-1, aPxPageRect.Bottom()-1 ); aRect = pOutputDev->PixelToLogic( aRect ); pOutputDev->DrawRect( aRect ); @@ -1291,21 +1291,21 @@ void SwPagePreviewLayout::MarkNewSelectedPage( const sal_uInt16 _nSelectedPage ) SwRect aPageRect( pOldSelectedPreviewPage->aPreviewWinPos, pOldSelectedPreviewPage->aPageSize ); ::SwAlignRect( aPageRect, &mrParentViewShell, pOutputDev ); - Rectangle aPxPageRect = pOutputDev->LogicToPixel( aPageRect.SVRect() ); + tools::Rectangle aPxPageRect = pOutputDev->LogicToPixel( aPageRect.SVRect() ); // invalidate top mark line - Rectangle aInvalPxRect( aPxPageRect.Left(), aPxPageRect.Top(), + tools::Rectangle aInvalPxRect( aPxPageRect.Left(), aPxPageRect.Top(), aPxPageRect.Right(), aPxPageRect.Top()+1 ); mrParentViewShell.GetWin()->Invalidate( pOutputDev->PixelToLogic( aInvalPxRect ) ); // invalidate right mark line - aInvalPxRect = Rectangle( aPxPageRect.Right()-1, aPxPageRect.Top(), + aInvalPxRect = tools::Rectangle( aPxPageRect.Right()-1, aPxPageRect.Top(), aPxPageRect.Right(), aPxPageRect.Bottom() ); mrParentViewShell.GetWin()->Invalidate( pOutputDev->PixelToLogic( aInvalPxRect ) ); // invalidate bottom mark line - aInvalPxRect = Rectangle( aPxPageRect.Left(), aPxPageRect.Bottom()-1, + aInvalPxRect = tools::Rectangle( aPxPageRect.Left(), aPxPageRect.Bottom()-1, aPxPageRect.Right(), aPxPageRect.Bottom() ); mrParentViewShell.GetWin()->Invalidate( pOutputDev->PixelToLogic( aInvalPxRect ) ); // invalidate left mark line - aInvalPxRect = Rectangle( aPxPageRect.Left(), aPxPageRect.Top(), + aInvalPxRect = tools::Rectangle( aPxPageRect.Left(), aPxPageRect.Top(), aPxPageRect.Left()+1, aPxPageRect.Bottom() ); mrParentViewShell.GetWin()->Invalidate( pOutputDev->PixelToLogic( aInvalPxRect ) ); } diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx index ddd003c75465..8ef6860d25ff 100644 --- a/sw/source/core/view/vdraw.cxx +++ b/sw/source/core/view/vdraw.cxx @@ -198,8 +198,8 @@ void SwViewShellImp::NotifySizeChg( const Size &rNewSz ) GetPageView()->GetPage()->SetSize( rNewSz ); // Limitation of the work area - const Rectangle aDocRect( Point( DOCUMENTBORDER, DOCUMENTBORDER ), rNewSz ); - const Rectangle &rOldWork = GetDrawView()->GetWorkArea(); + const tools::Rectangle aDocRect( Point( DOCUMENTBORDER, DOCUMENTBORDER ), rNewSz ); + const tools::Rectangle &rOldWork = GetDrawView()->GetWorkArea(); bool bCheckDrawObjs = false; if ( aDocRect != rOldWork ) { @@ -251,7 +251,7 @@ void SwViewShellImp::NotifySizeChg( const Size &rNewSz ) continue; } - const Rectangle aObjBound( pObj->GetCurrentBoundRect() ); + const tools::Rectangle aObjBound( pObj->GetCurrentBoundRect() ); if ( !aDocRect.IsInside( aObjBound ) ) { Size aSz; diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index d25ac93e2d3d..95dde86e2a7e 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -139,7 +139,7 @@ lcl_PaintTransparentFormControls(SwViewShell & rShell, SwRect const& rRect) if (rShell.GetWin()) { vcl::Window& rWindow = *(rShell.GetWin()); - const Rectangle aRectanglePixel(rShell.GetOut()->LogicToPixel(rRect.SVRect())); + const tools::Rectangle aRectanglePixel(rShell.GetOut()->LogicToPixel(rRect.SVRect())); PaintTransparentChildren(rWindow, aRectanglePixel); } } @@ -342,9 +342,9 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd ) bool bSizeOK = true; - Rectangle aTmp1( aRect.SVRect() ); + tools::Rectangle aTmp1( aRect.SVRect() ); aTmp1 = GetOut()->LogicToPixel( aTmp1 ); - Rectangle aTmp2( GetOut()->PixelToLogic( aTmp1 ) ); + tools::Rectangle aTmp2( GetOut()->PixelToLogic( aTmp1 ) ); if ( aTmp2.Left() > aRect.Left() ) aTmp1.Left() = std::max( 0L, aTmp1.Left() - 1L ); if ( aTmp2.Top() > aRect.Top() ) @@ -1135,7 +1135,7 @@ void SwViewShell::VisPortChgd( const SwRect &rRect) // ignore objects that are not actually placed on the page if (pObj->IsFormatPossible()) { - const Rectangle &rBound = pObj->GetObjRect().SVRect(); + const tools::Rectangle &rBound = pObj->GetObjRect().SVRect(); if (rBound.Left() != FAR_AWAY) { // OD 03.03.2003 #107927# - use correct datatype const SwTwips nL = std::max( 0L, rBound.Left() - nOfst ); @@ -1150,7 +1150,7 @@ void SwViewShell::VisPortChgd( const SwRect &rRect) } pPage = static_cast<const SwPageFrame*>(pPage->GetNext()); } - Rectangle aRect( aPrevArea.SVRect() ); + tools::Rectangle aRect( aPrevArea.SVRect() ); aRect.Left() = nMinLeft; aRect.Right() = nMaxRight; if( VisArea().IsOver( aPrevArea ) && !mnLockPaint ) @@ -1211,7 +1211,7 @@ void SwViewShell::VisPortChgd( const SwRect &rRect) Imp()->UpdateAccessible(); } -bool SwViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRect ) +bool SwViewShell::SmoothScroll( long lXDiff, long lYDiff, const tools::Rectangle *pRect ) { #if !defined(MACOSX) && !defined(ANDROID) && !defined(IOS) // #i98766# - disable smooth scrolling for Mac @@ -1354,7 +1354,7 @@ bool SwViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRect lScroll = aTmpOldVis.Top() - VisArea().Top(); if ( pRect ) { - Rectangle aTmp( aTmpOldVis.SVRect() ); + tools::Rectangle aTmp( aTmpOldVis.SVRect() ); aTmp.Left() = pRect->Left(); aTmp.Right()= pRect->Right(); GetWin()->Scroll( 0, lScroll, aTmp, ScrollFlags::Children); @@ -1392,12 +1392,12 @@ bool SwViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRect if(!Imp()->m_bStopSmooth) { // start paint on logic base - const Rectangle aTargetLogic(Imp()->m_aSmoothRect.SVRect()); + const tools::Rectangle aTargetLogic(Imp()->m_aSmoothRect.SVRect()); DLPrePaint2(vcl::Region(aTargetLogic)); // get target rectangle in discrete pixels OutputDevice& rTargetDevice = mpTargetPaintWindow->GetTargetOutputDevice(); - const Rectangle aTargetPixel(rTargetDevice.LogicToPixel(aTargetLogic)); + const tools::Rectangle aTargetPixel(rTargetDevice.LogicToPixel(aTargetLogic)); // get source top-left in discrete pixels const Point aSourceTopLeft(pVout->LogicToPixel(aTargetLogic.TopLeft())); @@ -1534,7 +1534,7 @@ void SwViewShell::PaintDesktop_(vcl::RenderContext& /*rRenderContext*/, const Sw for ( auto &rRgn : rRegion ) { - const Rectangle aRectangle(rRgn.SVRect()); + const tools::Rectangle aRectangle(rRgn.SVRect()); // #i93170# // Here we have a real Problem. On the one hand we have the buffering for paint @@ -1720,7 +1720,7 @@ public: }; } -void SwViewShell::Paint(vcl::RenderContext& rRenderContext, const Rectangle &rRect) +void SwViewShell::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle &rRect) { RenderContextGuard aGuard(mpOut, &rRenderContext, this); if ( mnLockPaint ) @@ -1890,7 +1890,7 @@ void SwViewShell::PaintTile(VirtualDevice &rDevice, int contextWidth, int contex GetWin()->EnableMapMode(false); } - Rectangle aOutRect = Rectangle(Point(tilePosX, tilePosY), + tools::Rectangle aOutRect = tools::Rectangle(Point(tilePosX, tilePosY), rDevice.PixelToLogic(Size(contextWidth, contextHeight))); // Make the requested area visible -- we can't use MakeVisible as that will diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx index b9f516251d1f..21ab2083f50c 100644 --- a/sw/source/core/view/vprint.cxx +++ b/sw/source/core/view/vprint.cxx @@ -580,7 +580,7 @@ bool SwViewShell::PrintOrPDFExport( } void SwViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, const SwPrintData& rOptions, - vcl::RenderContext& rRenderContext, const Rectangle& rRect ) + vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) { // For printing a shell is needed. Either the Doc already has one, than we // create a new view, or it has none, than we create the first view. |