diff options
Diffstat (limited to 'sw/source')
141 files changed, 557 insertions, 557 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. diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx index c383adea2bef..dfbd0172b9e1 100644 --- a/sw/source/filter/html/htmldrawreader.cxx +++ b/sw/source/filter/html/htmldrawreader.cxx @@ -513,7 +513,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable ) if( aTwipSz.Width() < MINFLY ) aTwipSz.Width() = MINFLY; - m_pMarquee->SetLogicRect( Rectangle( 0, 0, aTwipSz.Width(), aTwipSz.Height() ) ); + m_pMarquee->SetLogicRect( tools::Rectangle( 0, 0, aTwipSz.Width(), aTwipSz.Height() ) ); // und das Objekt in das Dok einfuegen InsertDrawObject( m_pMarquee, aSpace, eVertOri, eHoriOri, aStyleItemSet, @@ -538,8 +538,8 @@ void SwHTMLParser::EndMarquee() { // Da es keine fixe Hoehe gibt, das Text-Objekt erstmal breiter // als den Text machen, damit nicht umgebrochen wird. - const Rectangle& rOldRect = m_pMarquee->GetLogicRect(); - m_pMarquee->SetLogicRect( Rectangle( rOldRect.TopLeft(), + const tools::Rectangle& rOldRect = m_pMarquee->GetLogicRect(); + m_pMarquee->SetLogicRect( tools::Rectangle( rOldRect.TopLeft(), Size( USHRT_MAX, 240 ) ) ); } @@ -575,9 +575,9 @@ void SwHTMLParser::ResizeDrawObject( SdrObject* pObj, SwTwips nWidth ) return; // die alte Groesse - const Rectangle& rOldRect = pObj->GetLogicRect(); + const tools::Rectangle& rOldRect = pObj->GetLogicRect(); Size aNewSz( nWidth, rOldRect.GetSize().Height() ); - pObj->SetLogicRect( Rectangle( rOldRect.TopLeft(), aNewSz ) ); + pObj->SetLogicRect( tools::Rectangle( rOldRect.TopLeft(), aNewSz ) ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx index 873486be7a29..8d008133835c 100644 --- a/sw/source/filter/ww8/escher.hxx +++ b/sw/source/filter/ww8/escher.hxx @@ -168,7 +168,7 @@ public: virtual void WriteFrameExtraData(const SwFrameFormat& rFormat) override; - EscherExHostAppData* StartShape(const css::uno::Reference< css::drawing::XShape > &, const Rectangle*) override {return &aHostData;} + EscherExHostAppData* StartShape(const css::uno::Reference< css::drawing::XShape > &, const tools::Rectangle*) override {return &aHostData;} private: SwEscherEx(const SwEscherEx&) = delete; SwEscherEx &operator=(const SwEscherEx&) = delete; diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx index d76a1f63a3fe..2719453f4080 100644 --- a/sw/source/filter/ww8/rtfsdrexport.cxx +++ b/sw/source/filter/ww8/rtfsdrexport.cxx @@ -81,7 +81,7 @@ void RtfSdrExport::CloseContainer() EscherEx::CloseContainer(); } -sal_uInt32 RtfSdrExport::EnterGroup(const OUString& /*rShapeName*/, const Rectangle* /*pRect*/) +sal_uInt32 RtfSdrExport::EnterGroup(const OUString& /*rShapeName*/, const tools::Rectangle* /*pRect*/) { return GenerateShapeId(); } @@ -129,7 +129,7 @@ inline sal_Int32 impl_GetPointComponent(const sal_uInt8*& pVal, std::size_t& rVe return nRet; } -void RtfSdrExport::Commit(EscherPropertyContainer& rProps, const Rectangle& rRect) +void RtfSdrExport::Commit(EscherPropertyContainer& rProps, const tools::Rectangle& rRect) { if (m_nShapeType == ESCHER_ShpInst_Nil) return; @@ -399,7 +399,7 @@ void RtfSdrExport::Commit(EscherPropertyContainer& rProps, const Rectangle& rRec } } -void RtfSdrExport::AddLineDimensions(const Rectangle& rRectangle) +void RtfSdrExport::AddLineDimensions(const tools::Rectangle& rRectangle) { // We get the position relative to (the current?) character m_aShapeProps.insert(std::pair<OString,OString>("posrelh", "3")); @@ -425,7 +425,7 @@ void RtfSdrExport::AddLineDimensions(const Rectangle& rRectangle) m_aShapeStyle.append(OOO_STRING_SVTOOLS_RTF_SHPBOTTOM).append(rRectangle.Bottom()); } -void RtfSdrExport::AddRectangleDimensions(OStringBuffer& rBuffer, const Rectangle& rRectangle) +void RtfSdrExport::AddRectangleDimensions(OStringBuffer& rBuffer, const tools::Rectangle& rRectangle) { // We get the position relative to (the current?) character m_aShapeProps.insert(std::pair<OString,OString>("posrelh", "3")); diff --git a/sw/source/filter/ww8/rtfsdrexport.hxx b/sw/source/filter/ww8/rtfsdrexport.hxx index a6cb56ef2f07..0f060d1dafff 100644 --- a/sw/source/filter/ww8/rtfsdrexport.hxx +++ b/sw/source/filter/ww8/rtfsdrexport.hxx @@ -83,24 +83,24 @@ protected: using EscherEx::EndShape; void EndShape(sal_Int32 nShapeElement); - virtual void Commit(EscherPropertyContainer& rProps, const Rectangle& rRect) override; + virtual void Commit(EscherPropertyContainer& rProps, const tools::Rectangle& rRect) override; private: virtual void OpenContainer(sal_uInt16 nEscherContainer, int nRecInstance = 0) override; virtual void CloseContainer() override; - virtual sal_uInt32 EnterGroup(const OUString& rShapeName, const Rectangle* pBoundRect) override; + virtual sal_uInt32 EnterGroup(const OUString& rShapeName, const tools::Rectangle* pBoundRect) override; virtual void LeaveGroup() override; virtual void AddShape(sal_uInt32 nShapeType, sal_uInt32 nShapeFlags, sal_uInt32 nShapeId = 0) override; private: /// Add starting and ending point of a line to the m_pShapeAttrList. - void AddLineDimensions(const Rectangle& rRectangle); + void AddLineDimensions(const tools::Rectangle& rRectangle); /// Add position and size to the OStringBuffer. - void AddRectangleDimensions(OStringBuffer& rBuffer, const Rectangle& rRectangle); + void AddRectangleDimensions(OStringBuffer& rBuffer, const tools::Rectangle& rRectangle); /// Exports the pib property of the shape void impl_writeGraphic(); diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index 9aeecca7caf0..eb0bc7cc3b52 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -215,7 +215,7 @@ namespace ww8 // #i43447# - determine layout size { SwRect aLayRect( rFormat.FindLayoutRect() ); - Rectangle aRect( aLayRect.SVRect() ); + tools::Rectangle aRect( aLayRect.SVRect() ); // The Object is not rendered (e.g. something in unused // header/footer) - thus, get the values from the format. if ( aLayRect.IsEmpty() ) diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index c96d61d4961a..2a9d581f5e32 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -722,7 +722,7 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const const SwFrameFormat &rFormat = rFrameFormat.GetFrameFormat(); const SdrObject* pObj = rFormat.FindRealSdrObject(); - Rectangle aRect; + tools::Rectangle aRect; SwFormatVertOrient rVOr = rFormat.GetVertOrient(); SwFormatHoriOrient rHOr = rFormat.GetHoriOrient(); // #i30669# - convert the positioning attributes. @@ -1629,7 +1629,7 @@ void SwBasicEscherEx::WriteGrfBullet(const Graphic& rGrf) aSize = OutputDevice::LogicToLogic( aSize,rGrf.GetPrefMapMode(), aMap100mm ); } Point aEmptyPoint; - Rectangle aRect( aEmptyPoint, aSize ); + tools::Rectangle aRect( aEmptyPoint, aSize ); sal_uInt32 nBlibId = mxGlobal->GetBlibID( *(mxGlobal->QueryPictureStream()), aUniqueId,aRect ); if (nBlibId) aPropOpt.AddOpt(ESCHER_Prop_pib, nBlibId, true); @@ -1717,7 +1717,7 @@ sal_Int32 SwBasicEscherEx::WriteGrfFlyFrame(const SwFrameFormat& rFormat, sal_uI } Point aEmptyPoint; - Rectangle aRect( aEmptyPoint, aSize ); + tools::Rectangle aRect( aEmptyPoint, aSize ); sal_uInt32 nBlibId = mxGlobal->GetBlibID( *QueryPictureStream(), aUniqueId, aRect ); @@ -1943,7 +1943,7 @@ void SwBasicEscherEx::WriteBrushAttr(const SvxBrushItem &rBrush, } Point aEmptyPoint; - Rectangle aRect(aEmptyPoint, aSize); + tools::Rectangle aRect(aEmptyPoint, aSize); sal_uInt32 nBlibId = mxGlobal->GetBlibID( *QueryPictureStream(), aUniqueId, aRect); @@ -3012,7 +3012,7 @@ void SwBasicEscherEx::WriteOLEPicture(EscherPropertyContainer &rPropOpt, OString aId = aGraphicObject.GetUniqueID(); if (!aId.isEmpty()) { - Rectangle aRect = rObj.GetLogicRect(); + tools::Rectangle aRect = rObj.GetLogicRect(); aRect.SetPos(Point(0,0)); aRect.Right() = DrawModelToEmu(aRect.Right()); aRect.Bottom() = DrawModelToEmu(aRect.Bottom()); @@ -3144,7 +3144,7 @@ void SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrUnoObj& rFo //I think I painted myself into a little bit of a //corner by trying to use the uno interface for //controls export - Rectangle aRect = rFormObj.GetLogicRect(); + tools::Rectangle aRect = rFormObj.GetLogicRect(); aRect.SetPos(Point(0,0)); awt::Size aSize; aSize.Width = TWIPS_TO_MM(aRect.Right()); diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index 018bfa829d3b..7fdb12949f5a 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -131,11 +131,11 @@ bool WW8Export::TestOleNeedsGraphic(const SwAttrSet& rSet, // bGraphicNeeded set to true is right / fixes #i51670#. bGraphicNeeded = true; Point aTmpPoint; - Rectangle aRect( aTmpPoint, Size( nX, nY ) ); + tools::Rectangle aRect( aTmpPoint, Size( nX, nY ) ); Graphic aGraph(aWMF); ErrCode nErr = ERRCODE_NONE; - Rectangle aVisArea; + tools::Rectangle aVisArea; sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT; if ( pOLENd ) nAspect = pOLENd->GetAspect(); diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index bf10e860df31..29efc3460f2b 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -346,7 +346,7 @@ SdrObject* SwWW8ImplReader::ReadRect(WW8_DPHEAD* pHd, SfxAllItemSet &rSet) aP1.X() += (sal_Int16)SVBT16ToShort( pHd->dxa ); aP1.Y() += (sal_Int16)SVBT16ToShort( pHd->dya ); - SdrObject* pObj = new SdrRectObj( Rectangle( aP0, aP1 ) ); + SdrObject* pObj = new SdrRectObj( tools::Rectangle( aP0, aP1 ) ); SetStdAttr( rSet, aRect.aLnt, aRect.aShd ); SetFill( rSet, aRect.aFill ); @@ -367,7 +367,7 @@ SdrObject* SwWW8ImplReader::ReadElipse(WW8_DPHEAD* pHd, SfxAllItemSet &rSet) aP1.X() += (sal_Int16)SVBT16ToShort( pHd->dxa ); aP1.Y() += (sal_Int16)SVBT16ToShort( pHd->dya ); - SdrObject* pObj = new SdrCircObj( OBJ_CIRC, Rectangle( aP0, aP1 ) ); + SdrObject* pObj = new SdrCircObj( OBJ_CIRC, tools::Rectangle( aP0, aP1 ) ); SetStdAttr( rSet, aElipse.aLnt, aElipse.aShd ); SetFill( rSet, aElipse.aFill ); @@ -399,7 +399,7 @@ SdrObject* SwWW8ImplReader::ReadArc(WW8_DPHEAD* pHd, SfxAllItemSet &rSet) aP1.X() -= (sal_Int16)SVBT16ToShort( pHd->dxa ); } - SdrObject* pObj = new SdrCircObj( OBJ_SECT, Rectangle( aP0, aP1 ), + SdrObject* pObj = new SdrCircObj( OBJ_SECT, tools::Rectangle( aP0, aP1 ), nW * 9000, ( ( nW + 1 ) & 3 ) * 9000 ); SetStdAttr( rSet, aArc.aLnt, aArc.aShd ); @@ -1127,7 +1127,7 @@ void SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj, SfxItemSet aFlySet( m_rDoc.GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1 ); - Rectangle aInnerDist( pRecord->nDxTextLeft, + tools::Rectangle aInnerDist( pRecord->nDxTextLeft, pRecord->nDyTextTop, pRecord->nDxTextRight, pRecord->nDyTextBottom ); @@ -1212,9 +1212,9 @@ SdrObject* SwWW8ImplReader::ReadTextBox(WW8_DPHEAD* pHd, SfxAllItemSet &rSet) aP1.X() += (sal_Int16)SVBT16ToShort( pHd->dxa ); aP1.Y() += (sal_Int16)SVBT16ToShort( pHd->dya ); - SdrObject* pObj = new SdrRectObj( OBJ_TEXT, Rectangle( aP0, aP1 ) ); + SdrObject* pObj = new SdrRectObj( OBJ_TEXT, tools::Rectangle( aP0, aP1 ) ); pObj->SetModel( m_pDrawModel ); - pObj->NbcSetSnapRect(Rectangle(aP0, aP1)); + pObj->NbcSetSnapRect(tools::Rectangle(aP0, aP1)); Size aSize( (sal_Int16)SVBT16ToShort( pHd->dxa ) , (sal_Int16)SVBT16ToShort( pHd->dya ) ); @@ -1274,9 +1274,9 @@ SdrObject* SwWW8ImplReader::ReadCaptionBox(WW8_DPHEAD* pHd, SfxAllItemSet &rSet) + m_nDrawYOfs2 + (sal_Int16)SVBT16ToShort( xP[1] ) ); xP.reset(); - SdrCaptionObj* pObj = new SdrCaptionObj( Rectangle( aP0, aP1 ), aP2 ); + SdrCaptionObj* pObj = new SdrCaptionObj( tools::Rectangle( aP0, aP1 ), aP2 ); pObj->SetModel( m_pDrawModel ); - pObj->NbcSetSnapRect(Rectangle(aP0, aP1)); + pObj->NbcSetSnapRect(tools::Rectangle(aP0, aP1)); Size aSize( (sal_Int16)SVBT16ToShort( aCallB.dpheadTxbx.dxa ), (sal_Int16)SVBT16ToShort( aCallB.dpheadTxbx.dya ) ); bool bEraseThisObject; @@ -1423,7 +1423,7 @@ void SwWW8ImplReader::ReadGrafLayer1( WW8PLCFspecial* pPF, long nGrafAnchorCp ) { m_pWWZOrder->InsertDrawingObject(pObject, SVBT16ToShort(aDo.dhgt)); - Rectangle aRect(pObject->GetSnapRect()); + tools::Rectangle aRect(pObject->GetSnapRect()); const sal_uInt32 nCntRelTo = 3; @@ -1611,7 +1611,7 @@ sal_Int32 SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor, void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj, SfxItemSet& rFlySet, MSO_LineStyle eLineStyle, MSO_LineDashing eDashing, MSO_SPT eShapeType, - Rectangle& rInnerDist ) + tools::Rectangle& rInnerDist ) { /* am Rahmen zu setzende Frame-Attribute @@ -1701,7 +1701,7 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj, // Size: SwFormatFrameSize if( SfxItemState::SET != rFlySet.GetItemState(RES_FRM_SIZE, false) ) { - const Rectangle& rSnapRect = pSdrObj->GetSnapRect(); + const tools::Rectangle& rSnapRect = pSdrObj->GetSnapRect(); // if necessary adapt width and position of the framework: The // recorded interior is to remain equally large despite thick edges. rFlySet.Put( SwFormatFrameSize(bFixSize ? ATT_FIX_SIZE : ATT_VAR_SIZE, @@ -2484,7 +2484,7 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp ) if (!m_pMSDffManager->GetModel()) m_pMSDffManager->SetModel(m_pDrawModel, 1440); - Rectangle aRect(pF->nXaLeft, pF->nYaTop, pF->nXaRight, pF->nYaBottom); + tools::Rectangle aRect(pF->nXaLeft, pF->nYaTop, pF->nXaRight, pF->nYaBottom); SvxMSDffImportData aData( aRect ); /* @@ -2873,7 +2873,7 @@ SwFlyFrameFormat* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject, // More attributes can be used in a frame compared to the // Edit-Engine, and it can contain field, OLEs or graphics... - Rectangle aInnerDist(pRecord->nDxTextLeft, pRecord->nDyTextTop, + tools::Rectangle aInnerDist(pRecord->nDxTextLeft, pRecord->nDyTextTop, pRecord->nDxTextRight, pRecord->nDyTextBottom); SwFormatFrameSize aFrameSize(ATT_FIX_SIZE, pF->nXaRight - pF->nXaLeft, pF->nYaBottom - pF->nYaTop); @@ -3000,7 +3000,7 @@ SwFlyFrameFormat* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObj { // Note that the escher inner distance only seems to be honoured in // word for textboxes, not for graphics and ole objects. - Rectangle aInnerDist(0, 0, 0, 0); + tools::Rectangle aInnerDist(0, 0, 0, 0); MatchSdrItemsIntoFlySet(rpObject, rFlySet, pRecord->eLineStyle, pRecord->eLineDashing, pRecord->eShapeType, aInnerDist); diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx index 3f02ec98927d..0c560bebe297 100644 --- a/sw/source/filter/ww8/ww8graf2.cxx +++ b/sw/source/filter/ww8/ww8graf2.cxx @@ -548,8 +548,8 @@ SwFrameFormat* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj, m_pDataStream->SeekRel( nNameLen ); } - Rectangle aChildRect; - Rectangle aClientRect( 0,0, aPD.nWidth, aPD.nHeight); + tools::Rectangle aChildRect; + tools::Rectangle aClientRect( 0,0, aPD.nWidth, aPD.nHeight); SvxMSDffImportData aData( aClientRect ); pObject = m_pMSDffManager->ImportObj(*m_pDataStream, &aData, aClientRect, aChildRect ); if (pObject) @@ -583,7 +583,7 @@ SwFrameFormat* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj, // object itself, no idea why it's this call (or even // what the call actually does), but that's what // ImportGraf() (called by ImportObj()) uses. - pObject->SetSnapRect( Rectangle( 0, 0, aPD.nWidth, aPD.nHeight )); + pObject->SetSnapRect( tools::Rectangle( 0, 0, aPD.nWidth, aPD.nHeight )); } // A graphic of this type in this location is always @@ -608,7 +608,7 @@ SwFrameFormat* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj, } // Modified for i120716,for graf importing from MS Word 2003 // binary format, there is no border distance. - Rectangle aInnerDist(0,0,0,0); + tools::Rectangle aInnerDist(0,0,0,0); MatchSdrItemsIntoFlySet( pObject, aAttrSet, pRecord->eLineStyle, pRecord->eLineDashing, pRecord->eShapeType, aInnerDist ); diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 908dcd0f7b71..108bf115eee5 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -558,8 +558,8 @@ sal_uInt32 SwMSDffManager::GetFilterFlags() // #i32596# - consider new parameter <_nCalledByGroup> SdrObject* SwMSDffManager::ImportOLE( sal_uInt32 nOLEId, const Graphic& rGrf, - const Rectangle& rBoundRect, - const Rectangle& rVisArea, + const tools::Rectangle& rBoundRect, + const tools::Rectangle& rVisArea, const int _nCalledByGroup, sal_Int64 nAspect ) const { @@ -639,7 +639,7 @@ void SwWW8ImplReader::SetToggleBiDiAttrFlags(sal_uInt16 nFlags) SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, DffObjData& rObjData, void* pData, - Rectangle& rTextRect, + tools::Rectangle& rTextRect, SdrObject* pObj ) { @@ -833,7 +833,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, // The vertical paragraph justification are contained within the // BoundRect so calculate it here - Rectangle aNewRect(rTextRect); + tools::Rectangle aNewRect(rTextRect); aNewRect.Bottom() -= nTextTop + nTextBottom; aNewRect.Right() -= nTextLeft + nTextRight; @@ -4309,7 +4309,7 @@ void wwSectionManager::SetSegmentToPageDesc(const wwSection &rSection, if (mrReader.m_pWDop->fUseBackGroundInAllmodes && mrReader.m_pMSDffManager) { - Rectangle aRect(0, 0, 100, 100); // A dummy, we don't care about the size + tools::Rectangle aRect(0, 0, 100, 100); // A dummy, we don't care about the size SvxMSDffImportData aData(aRect); SdrObject* pObject = nullptr; if (mrReader.m_pMSDffManager->GetShape(0x401, pObject, aData)) diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 4ed2ce372cf6..1be7bc99c999 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -747,8 +747,8 @@ private: // indicates, if the OLE object is imported inside a group object virtual SdrObject* ImportOLE( sal_uInt32 nOLEId, const Graphic& rGrf, - const Rectangle& rBoundRect, - const Rectangle& rVisArea, + const tools::Rectangle& rBoundRect, + const tools::Rectangle& rVisArea, const int _nCalledByGroup, sal_Int64 nAspect ) const override; @@ -762,7 +762,7 @@ public: void DisableFallbackStream(); void EnableFallbackStream(); protected: - virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rObjData, void* pData, Rectangle& rTextRect, SdrObject* pObj ) override; + virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rObjData, void* pData, tools::Rectangle& rTextRect, SdrObject* pObj ) override; }; class wwSection @@ -1439,7 +1439,7 @@ private: // them for now static bool SetBorder(SvxBoxItem& rBox, const WW8_BRCVer9* pbrc, short *pSizeArray=nullptr, sal_uInt8 nSetBorders=0xFF); - static void GetBorderDistance(const WW8_BRCVer9* pbrc, Rectangle& rInnerDist); + static void GetBorderDistance(const WW8_BRCVer9* pbrc, tools::Rectangle& rInnerDist); static sal_uInt16 GetParagraphAutoSpace(bool fDontUseHTMLAutoSpacing); static bool SetShadow(SvxShadowItem& rShadow, const short *pSizeArray, const WW8_BRCVer9& aRightBrc); @@ -1452,7 +1452,7 @@ private: MSO_LineStyle eLineStyle, MSO_LineDashing eDashing, MSO_SPT eShapeType, sal_Int32 &rLineWidth, SvxBoxItem& rBox ); void MatchSdrItemsIntoFlySet( SdrObject* pSdrObj, SfxItemSet &aFlySet, - MSO_LineStyle eLineStyle, MSO_LineDashing eDashing, MSO_SPT eShapeType, Rectangle &rInnerDist ); + MSO_LineStyle eLineStyle, MSO_LineDashing eDashing, MSO_SPT eShapeType, tools::Rectangle &rInnerDist ); static void AdjustLRWrapForWordMargins(const SvxMSDffImportRec &rRecord, SvxLRSpaceItem &rLR); static void AdjustULWrapForWordMargins(const SvxMSDffImportRec &rRecord, @@ -1498,10 +1498,10 @@ private: SwFrameFormat* ImportGraf(SdrTextObj* pTextObj = nullptr, SwFrameFormat* pFlyFormat = nullptr); SdrObject* ImportOleBase( Graphic& rGraph, const Graphic* pGrf=nullptr, - const SfxItemSet* pFlySet=nullptr, const Rectangle& aVisArea = Rectangle() ); + const SfxItemSet* pFlySet=nullptr, const tools::Rectangle& aVisArea = tools::Rectangle() ); SwFrameFormat* ImportOle( const Graphic* = nullptr, const SfxItemSet* pFlySet = nullptr, - const SfxItemSet* pGrfSet = nullptr, const Rectangle& aVisArea = Rectangle() ); + const SfxItemSet* pGrfSet = nullptr, const tools::Rectangle& aVisArea = tools::Rectangle() ); SwFlyFrameFormat* InsertOle(SdrOle2Obj &rObject, const SfxItemSet &rFlySet, const SfxItemSet *rGrfSet); diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index b461ebd2f5d4..0761a370804b 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -243,7 +243,7 @@ SwFlyFrameFormat* SwWW8ImplReader::InsertOle(SdrOle2Obj &rObject, } SwFrameFormat* SwWW8ImplReader::ImportOle(const Graphic* pGrf, - const SfxItemSet* pFlySet, const SfxItemSet *pGrfSet, const Rectangle& aVisArea ) + const SfxItemSet* pFlySet, const SfxItemSet *pGrfSet, const tools::Rectangle& aVisArea ) { ::SetProgressState(m_nProgress, m_pDocShell); // Update SwFrameFormat* pFormat = nullptr; @@ -331,7 +331,7 @@ bool SwWW8ImplReader::ImportOleWMF(tools::SvRef<SotStorage> xSrc1,GDIMetaFile &r } SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph, - const Graphic* pGrf, const SfxItemSet* pFlySet, const Rectangle& aVisArea ) + const Graphic* pGrf, const SfxItemSet* pFlySet, const tools::Rectangle& aVisArea ) { if (!m_pStg) { @@ -377,7 +377,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph, } } // StorageStreams closed again - Rectangle aRect(0, 0, nX, nY); + tools::Rectangle aRect(0, 0, nX, nY); if (pFlySet) { diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index f12707b2142b..b763a4627143 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -1443,9 +1443,9 @@ bool SwWW8ImplReader::SetShadow(SvxShadowItem& rShadow, const short *pSizeArray, } void SwWW8ImplReader::GetBorderDistance(const WW8_BRCVer9* pbrc, - Rectangle& rInnerDist) + tools::Rectangle& rInnerDist) { - rInnerDist = Rectangle( pbrc[ 1 ].dptSpace() * 20, + rInnerDist = tools::Rectangle( pbrc[ 1 ].dptSpace() * 20, pbrc[ 0 ].dptSpace() * 20, pbrc[ 3 ].dptSpace() * 20, pbrc[ 2 ].dptSpace() * 20 ); @@ -4840,7 +4840,7 @@ void SwWW8ImplReader::Read_Border(sal_uInt16 , const sal_uInt8*, short nLen) SetBorder(aBox, aBrcs, &aSizeArray[0], nBorder); - Rectangle aInnerDist; + tools::Rectangle aInnerDist; GetBorderDistance( aBrcs, aInnerDist ); if (nBorder & (1 << WW8_LEFT)) diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index 12f6bf3fe507..edb7683ff03a 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -348,7 +348,7 @@ void SwXMLExport::GetViewSettings(Sequence<PropertyValue>& aProps) pValue[nIndex++].Value <<= xBox; SwDoc *pDoc = getDoc(); - const Rectangle rRect = + const tools::Rectangle rRect = pDoc->GetDocShell()->GetVisArea( ASPECT_CONTENT ); bool bTwip = pDoc->GetDocShell()->GetMapUnit ( ) == MapUnit::MapTwip; diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index e8c1de23783c..1a6c33753775 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -961,7 +961,7 @@ void SwXMLImport::SetViewSettings(const Sequence < PropertyValue > & aViewProps) SolarMutexGuard aGuard; SwDoc *pDoc = getDoc(); - Rectangle aRect; + tools::Rectangle aRect; if( pDoc->GetDocShell() ) aRect = pDoc->GetDocShell()->GetVisArea( ASPECT_CONTENT ); //TODO/LATER: why that cast?! diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index 75809efb4bba..a1c4e991d50c 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -236,7 +236,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject( SfxItemSet aItemSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END ); Size aTwipSize( 0, 0 ); - Rectangle aVisArea( 0, 0, nWidth, nHeight ); + tools::Rectangle aVisArea( 0, 0, nWidth, nHeight ); lcl_putHeightAndWidth( aItemSet, nHeight, nWidth, &aTwipSize.Height(), &aTwipSize.Width() ); diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index c7a0ac320d5c..135469e6f955 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -92,7 +92,7 @@ class SwDropCapsPict : public Control Size maTextSize; Reference< css::i18n::XBreakIterator > xBreak; - virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle &rRect) override; + virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const tools::Rectangle &rRect) override; void CheckScript(); Size CalcTextSize(); inline void InitPrinter(); @@ -343,7 +343,7 @@ void SwDropCapsPict::UpdatePaintSettings() Invalidate(); } -void SwDropCapsPict::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /*rRect*/) +void SwDropCapsPict::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& /*rRect*/) { if (!IsVisible()) return; @@ -355,8 +355,8 @@ void SwDropCapsPict::Paint(vcl::RenderContext& rRenderContext, const Rectangle& Size aOutputSizePixel(GetOutputSizePixel()); - rRenderContext.DrawRect(Rectangle(Point(0, 0), aOutputSizePixel)); - rRenderContext.SetClipRegion(vcl::Region(Rectangle(Point(BORDER, BORDER), + rRenderContext.DrawRect(tools::Rectangle(Point(0, 0), aOutputSizePixel)); + rRenderContext.SetClipRegion(vcl::Region(tools::Rectangle(Point(BORDER, BORDER), Size(aOutputSizePixel.Width () - 2 * BORDER, aOutputSizePixel.Height() - 2 * BORDER)))); @@ -367,7 +367,7 @@ void SwDropCapsPict::Paint(vcl::RenderContext& rRenderContext, const Rectangle& for (int i = 0; i < LINES; ++i) { - rRenderContext.DrawRect(Rectangle(Point(BORDER, nY0 + i * mnTotLineH), + rRenderContext.DrawRect(tools::Rectangle(Point(BORDER, nY0 + i * mnTotLineH), Size(aOutputSizePixel.Width() - 2 * BORDER, mnLineH))); } @@ -377,7 +377,7 @@ void SwDropCapsPict::Paint(vcl::RenderContext& rRenderContext, const Rectangle& if (mpPage && mpPage->m_pDropCapsBox->IsChecked()) { const Size aTextSize(maTextSize.Width() + nDistW, maTextSize.Height()); - rRenderContext.DrawRect(Rectangle(Point(BORDER, nY0), aTextSize)); + rRenderContext.DrawRect(tools::Rectangle(Point(BORDER, nY0), aTextSize)); // draw Text DrawPrev(rRenderContext, Point(BORDER, nY0)); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 25431a1111cc..caa0b5a51f1b 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -423,11 +423,11 @@ Size SwCaptionPreview::GetOptimalSize() const return LogicToPixel(Size(106 , 20), MapMode(MapUnit::MapAppFont)); } -void SwCaptionPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) +void SwCaptionPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) { Window::Paint(rRenderContext, rRect); - rRenderContext.DrawRect(Rectangle(Point(0, 0), GetSizePixel())); + rRenderContext.DrawRect(tools::Rectangle(Point(0, 0), GetSizePixel())); rRenderContext.DrawText(Point(4, 6), maText); } diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index b9e222bc8c52..1aa355027b8f 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -72,7 +72,7 @@ using namespace ::com::sun::star; namespace { -void drawRect(vcl::RenderContext& rRenderContext, const Rectangle &rRect, const Color &rFillColor, const Color &rLineColor) +void drawRect(vcl::RenderContext& rRenderContext, const tools::Rectangle &rRect, const Color &rFillColor, const Color &rLineColor) { rRenderContext.SetFillColor(rFillColor); rRenderContext.SetLineColor(rLineColor); @@ -1588,7 +1588,7 @@ void SwMarkPreview::DataChanged( const DataChangedEvent& rDCEvt ) InitColors(); } -void SwMarkPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle &/*rRect*/) +void SwMarkPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle &/*rRect*/) { const Size aSz(GetOutputSizePixel()); @@ -1604,7 +1604,7 @@ void SwMarkPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle &/ const long nTBorder = 4; const long nBBorder = 4; - aLeftPagePrtArea = Rectangle(Point(nLBorder, nTBorder), Point((nOutWPix - 1) - nRBorder, (nOutHPix - 1) - nBBorder)); + aLeftPagePrtArea = tools::Rectangle(Point(nLBorder, nTBorder), Point((nOutWPix - 1) - nRBorder, (nOutHPix - 1) - nBBorder)); const long nWidth = aLeftPagePrtArea.GetWidth(); const long nKorr = (nWidth & 1) != 0 ? 0 : 1; aLeftPagePrtArea.SetSize(Size(nWidth / 2 - (nLBorder + nRBorder) / 2 + nKorr, aLeftPagePrtArea.GetHeight())); @@ -1613,7 +1613,7 @@ void SwMarkPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle &/ aRightPagePrtArea.Move(aLeftPagePrtArea.GetWidth() + nLBorder + nRBorder + 1, 0); // draw shadow - Rectangle aShadow(aPage); + tools::Rectangle aShadow(aPage); aShadow += Point(3, 3); drawRect(rRenderContext, aShadow, m_aShadowCol, m_aTransCol); @@ -1621,7 +1621,7 @@ void SwMarkPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle &/ drawRect(rRenderContext, aPage, m_aBgCol, m_aLineCol); // draw separator - Rectangle aPageSeparator(aPage); + tools::Rectangle aPageSeparator(aPage); aPageSeparator.SetSize(Size(2, aPageSeparator.GetHeight())); aPageSeparator.Move(aPage.GetWidth() / 2 - 1, 0); drawRect(rRenderContext, aPageSeparator, m_aLineCol, m_aTransCol); @@ -1629,8 +1629,8 @@ void SwMarkPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle &/ PaintPage(rRenderContext, aLeftPagePrtArea); PaintPage(rRenderContext, aRightPagePrtArea); - Rectangle aLeftMark(Point(aPage.Left() + 2, aLeftPagePrtArea.Top() + 4), Size(aLeftPagePrtArea.Left() - 4, 2)); - Rectangle aRightMark(Point(aRightPagePrtArea.Right() + 2, aRightPagePrtArea.Bottom() - 6), Size(aLeftPagePrtArea.Left() - 4, 2)); + tools::Rectangle aLeftMark(Point(aPage.Left() + 2, aLeftPagePrtArea.Top() + 4), Size(aLeftPagePrtArea.Left() - 4, 2)); + tools::Rectangle aRightMark(Point(aRightPagePrtArea.Right() + 2, aRightPagePrtArea.Bottom() - 6), Size(aLeftPagePrtArea.Left() - 4, 2)); switch (nMarkPos) { @@ -1658,7 +1658,7 @@ void SwMarkPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle &/ drawRect(rRenderContext, aRightMark, m_aMarkCol, m_aTransCol); } -void SwMarkPreview::PaintPage(vcl::RenderContext& rRenderContext, const Rectangle &rRect) +void SwMarkPreview::PaintPage(vcl::RenderContext& rRenderContext, const tools::Rectangle &rRect) { // draw PrintArea drawRect(rRenderContext, rRect, m_aTransCol, m_aPrintAreaCol); @@ -1668,7 +1668,7 @@ void SwMarkPreview::PaintPage(vcl::RenderContext& rRenderContext, const Rectangl sal_uLong nRTextBorder = 4; sal_uLong nTTextBorder = 4; - Rectangle aTextLine = rRect; + tools::Rectangle aTextLine = rRect; aTextLine.SetSize(Size(aTextLine.GetWidth(), 2)); aTextLine.Left() += nLTextBorder; aTextLine.Right() -= nRTextBorder; diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 513c8101269b..f5b74e4b9e5e 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -68,7 +68,7 @@ class SwAddressControl_Impl : public Control DECL_LINK(GotFocusHdl_Impl, Control&, void); DECL_LINK(EditModifyHdl_Impl, Edit&, void); - void MakeVisible(const Rectangle& aRect); + void MakeVisible(const tools::Rectangle& aRect); virtual bool PreNotify( NotifyEvent& rNEvt ) override; virtual void Command( const CommandEvent& rCEvt ) override; @@ -275,12 +275,12 @@ IMPL_LINK(SwAddressControl_Impl, GotFocusHdl_Impl, Control&, rControl, void) Edit* pEdit = static_cast<Edit*>(&rControl); if(GetFocusFlags::Tab & pEdit->GetGetFocusFlags()) { - Rectangle aRect(pEdit->GetPosPixel(), pEdit->GetSizePixel()); + tools::Rectangle aRect(pEdit->GetPosPixel(), pEdit->GetSizePixel()); MakeVisible(aRect); } } -void SwAddressControl_Impl::MakeVisible(const Rectangle & rRect) +void SwAddressControl_Impl::MakeVisible(const tools::Rectangle & rRect) { long nThumb = m_pScrollBar->GetThumbPos(); //determine range of visible positions @@ -320,7 +320,7 @@ void SwAddressControl_Impl::SetCursorTo(std::size_t nElement) { Edit* pEdit = m_aEdits[nElement].get(); pEdit->GrabFocus(); - Rectangle aRect(pEdit->GetPosPixel(), pEdit->GetSizePixel()); + tools::Rectangle aRect(pEdit->GetPosPixel(), pEdit->GetSizePixel()); MakeVisible(aRect); } diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index c73699fbde24..9e6d710078df 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -66,7 +66,7 @@ void SwEnvPreview::DataChanged( const DataChangedEvent& rDCEvt ) Invalidate(); } -void SwEnvPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle &) +void SwEnvPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle &) { const StyleSettings& rSettings = rRenderContext.GetSettings().GetStyleSettings(); SetBackground(rRenderContext.GetSettings().GetStyleSettings().GetDialogColor()); @@ -94,7 +94,7 @@ void SwEnvPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle &) const long nX = (GetOutputSizePixel().Width () - nW) / 2; const long nY = (GetOutputSizePixel().Height() - nH) / 2; rRenderContext.SetFillColor(aBack); - rRenderContext.DrawRect(Rectangle(Point(nX, nY), Size(nW, nH))); + rRenderContext.DrawRect(tools::Rectangle(Point(nX, nY), Size(nW, nH))); // Sender if (rItem.bSend) @@ -105,7 +105,7 @@ void SwEnvPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle &) const long nSendH = static_cast<long>(f * (rItem.lAddrFromTop - rItem.lSendFromTop - 566)); rRenderContext.SetFillColor(aMedium); - rRenderContext.DrawRect(Rectangle(Point(nSendX, nSendY), Size(nSendW, nSendH))); + rRenderContext.DrawRect(tools::Rectangle(Point(nSendX, nSendY), Size(nSendW, nSendH))); } // Addressee @@ -114,7 +114,7 @@ void SwEnvPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle &) const long nAddrW = static_cast<long>(f * (nPageW - rItem.lAddrFromLeft - 566)); const long nAddrH = static_cast<long>(f * (nPageH - rItem.lAddrFromTop - 566)); rRenderContext.SetFillColor(aMedium); - rRenderContext.DrawRect(Rectangle(Point(nAddrX, nAddrY), Size(nAddrW, nAddrH))); + rRenderContext.DrawRect(tools::Rectangle(Point(nAddrX, nAddrY), Size(nAddrW, nAddrH))); // Stamp const long nStmpW = static_cast<long>(f * 1417 /* 2,5 cm */); @@ -123,7 +123,7 @@ void SwEnvPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle &) const long nStmpY = nY + static_cast<long>(f * 566); rRenderContext.SetFillColor(aBack); - rRenderContext.DrawRect(Rectangle(Point(nStmpX, nStmpY), Size(nStmpW, nStmpH))); + rRenderContext.DrawRect(tools::Rectangle(Point(nStmpX, nStmpY), Size(nStmpW, nStmpH))); } SwEnvDlg::SwEnvDlg(vcl::Window* pParent, const SfxItemSet& rSet, diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index a6673a180c85..d272566ca190 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -144,7 +144,7 @@ Size SwLabPreview::GetOptimalSize() const VCL_BUILDER_FACTORY(SwLabPreview) -void SwLabPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) +void SwLabPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) { const Size aSz(GetOutputSizePixel()); @@ -202,7 +202,7 @@ void SwLabPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) const long lY3 = lY0 + ROUND(f * (m_aItem.m_lUpper + m_aItem.m_lVDist )); // draw outline (area) - rRenderContext.DrawRect(Rectangle(Point(lX0, lY0), Size(lOutlineW, lOutlineH))); + rRenderContext.DrawRect(tools::Rectangle(Point(lX0, lY0), Size(lOutlineW, lOutlineH))); // draw outline (border) rRenderContext.SetLineColor(rFieldTextColor); @@ -214,13 +214,13 @@ void SwLabPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) rRenderContext.DrawLine(Point(lX0, lY0 + lOutlineH - 1), Point(lX0 + lOutlineW - 1, lY0 + lOutlineH - 1)); // Down // Labels - rRenderContext.SetClipRegion(vcl::Region(Rectangle(Point(lX0, lY0), Size(lOutlineW, lOutlineH)))); + rRenderContext.SetClipRegion(vcl::Region(tools::Rectangle(Point(lX0, lY0), Size(lOutlineW, lOutlineH)))); rRenderContext.SetFillColor(COL_LIGHTGRAYBLUE); const sal_Int32 nRows = std::min<sal_Int32>(2, m_aItem.m_nRows); const sal_Int32 nCols = std::min<sal_Int32>(2, m_aItem.m_nCols); for (sal_Int32 nRow = 0; nRow < nRows; ++nRow) for (sal_Int32 nCol = 0; nCol < nCols; ++nCol) - rRenderContext.DrawRect(Rectangle(Point(lX0 + ROUND(f * (m_aItem.m_lLeft + nCol * m_aItem.m_lHDist)), + rRenderContext.DrawRect(tools::Rectangle(Point(lX0 + ROUND(f * (m_aItem.m_lLeft + nCol * m_aItem.m_lHDist)), lY0 + ROUND(f * (m_aItem.m_lUpper + nRow * m_aItem.m_lVDist))), Size(ROUND(f * m_aItem.m_lWidth), ROUND(f * m_aItem.m_lHeight)))); diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 1d26b342da78..4840eba3ba13 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -54,7 +54,7 @@ class SwLabPreview : public vcl::Window SwLabItem m_aItem; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override; virtual Size GetOptimalSize() const override; diff --git a/sw/source/ui/fldui/FldRefTreeListBox.cxx b/sw/source/ui/fldui/FldRefTreeListBox.cxx index 436b2740a9ca..e5ae1dc91923 100644 --- a/sw/source/ui/fldui/FldRefTreeListBox.cxx +++ b/sw/source/ui/fldui/FldRefTreeListBox.cxx @@ -53,7 +53,7 @@ void SwFieldRefTreeListBox::RequestHelp( const HelpEvent& rHEvt ) aSize.Width() = GetSizePixel().Width() - aPos.X(); aPos = OutputToScreenPixel(aPos); - Rectangle aItemRect( aPos, aSize ); + tools::Rectangle aItemRect( aPos, aSize ); Help::ShowQuickHelp( this, aItemRect, sEntry, QuickHelpFlags::Left|QuickHelpFlags::VCenter ); bCallBase = false; diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index cfc424d0bfa2..12a6cb4dbc92 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -140,7 +140,7 @@ void SwFieldDlg::Initialize(SfxChildWinInfo *pInfo) } Point aPoint; - Rectangle aRect = GetDesktopRectPixel(); + tools::Rectangle aRect = GetDesktopRectPixel(); aPoint.X() = aRect.Right() - aSize.Width(); aPoint.Y() = aRect.Bottom() - aSize.Height(); diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index c18867b180ca..88f3ecbbea36 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -1363,7 +1363,7 @@ void ColumnValueSet::UserDraw(const UserDrawEvent& rUDEvt) vcl::RenderContext* pDev = rUDEvt.GetRenderContext(); const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); - Rectangle aRect = rUDEvt.GetRect(); + tools::Rectangle aRect = rUDEvt.GetRect(); const sal_uInt16 nItemId = rUDEvt.GetItemId(); long nRectWidth = aRect.GetWidth(); long nRectHeight = aRect.GetHeight(); diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index c5f236eecd43..dc9d86d4e8cd 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2644,7 +2644,7 @@ Size BmpWindow::GetOptimalSize() const VCL_BUILDER_FACTORY_ARGS(BmpWindow, 0) -void BmpWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) +void BmpWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) { // Setup rRenderContext.SetBackground(); @@ -2685,7 +2685,7 @@ void BmpWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) } // #i119307# clear window background, the graphic might have transparency - rRenderContext.DrawRect(Rectangle(aPntPos, aPntSz)); + rRenderContext.DrawRect(tools::Rectangle(aPntPos, aPntSz)); if (bHorz || bVert) { diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 9eb671adafcb..af9ae83a0aff 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -164,7 +164,7 @@ class SwEntryBrowseBox : public SwEntryBrowseBox_Base protected: virtual bool SeekRow( long nRow ) override; - virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId) const override; + virtual void PaintCell(OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColId) const override; virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol) override; virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol) override; virtual bool SaveModified() override; @@ -1782,7 +1782,7 @@ void SwIdxTreeListBox::RequestHelp( const HelpEvent& rHEvt ) aSize.Width() = GetSizePixel().Width() - aPos.X(); aPos = OutputToScreenPixel(aPos); - Rectangle aItemRect( aPos, aSize ); + tools::Rectangle aItemRect( aPos, aSize ); Help::ShowQuickHelp( this, aItemRect, sEntry, QuickHelpFlags::Left|QuickHelpFlags::VCenter ); } @@ -3420,7 +3420,7 @@ bool SwTokenWindow::CreateQuickHelp(Control* pCtrl, } Point aPos = OutputToScreenPixel(pCtrl->GetPosPixel()); - Rectangle aItemRect( aPos, pCtrl->GetSizePixel() ); + tools::Rectangle aItemRect( aPos, pCtrl->GetSizePixel() ); if ( rToken.eTokenType != TOKEN_TAB_STOP ) { if (!rToken.sCharStyleName.isEmpty()) @@ -3959,7 +3959,7 @@ OUString SwEntryBrowseBox::GetCellText(long nRow, sal_uInt16 nColumn) const } void SwEntryBrowseBox::PaintCell(OutputDevice& rDev, - const Rectangle& rRect, sal_uInt16 nColumnId) const + const tools::Rectangle& rRect, sal_uInt16 nColumnId) const { const DrawTextFlags nStyle = DrawTextFlags::Clip | DrawTextFlags::Center; rDev.DrawText( rRect, GetCellText( m_nCurrentRow, nColumnId ), nStyle ); diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 85ec9bfdc5f9..161e477200f8 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -425,7 +425,7 @@ void SwGlossaryGroupTLB::RequestHelp( const HelpEvent& rHEvt ) if((aPos.X() + aSize.Width()) > GetSizePixel().Width()) aSize.Width() = GetSizePixel().Width() - aPos.X(); aPos = OutputToScreenPixel(aPos); - Rectangle aItemRect( aPos, aSize ); + tools::Rectangle aItemRect( aPos, aSize ); GlosBibUserData* pData = static_cast<GlosBibUserData*>(pEntry->GetUserData()); const OUString sMsg = pData->sPath + "/" + pData->sGroupName.getToken(0, GLOS_DELIM) diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index d43c566d4a20..8ed1d7c611a4 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -882,7 +882,7 @@ void SwGlTreeListBox::RequestHelp( const HelpEvent& rHEvt ) if((aPos.X() + aSize.Width()) > GetSizePixel().Width()) aSize.Width() = GetSizePixel().Width() - aPos.X(); aPos = OutputToScreenPixel(aPos); - Rectangle aItemRect( aPos, aSize ); + tools::Rectangle aItemRect( aPos, aSize ); OUString sMsg; if(!GetParent(pEntry)) { diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 5cb3d369d13d..8aa522fc0d87 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -251,7 +251,7 @@ IMPL_LINK( SwOutlineTabDialog, FormHdl, Button *, pBtn, void ) } pFormMenu->SetSelectHdl(LINK(this, SwOutlineTabDialog, MenuSelectHdl)); - pFormMenu->Execute(pBtn, Rectangle(Point(0,0), pBtn->GetSizePixel()), PopupMenuFlags::ExecuteDown); + pFormMenu->Execute(pBtn, tools::Rectangle(Point(0,0), pBtn->GetSizePixel()), PopupMenuFlags::ExecuteDown); } IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu, bool ) @@ -903,7 +903,7 @@ static long lcl_DrawGraphic(vcl::RenderContext* pVDev, const SwNumFormat &rForma VCL_BUILDER_FACTORY(NumberingPreview) // paint numbering's preview -void NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /*rRect*/) +void NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& /*rRect*/) { const Size aSize(rRenderContext.PixelToLogic(GetOutputSizePixel())); @@ -914,7 +914,7 @@ void NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle // #101524# OJ pVDev->SetFillColor(rRenderContext.GetSettings().GetStyleSettings().GetWindowColor()); pVDev->SetLineColor(rRenderContext.GetSettings().GetStyleSettings().GetButtonTextColor()); - pVDev->DrawRect(Rectangle(Point(0,0), aSize)); + pVDev->DrawRect(tools::Rectangle(Point(0,0), aSize)); if (pActNum) { @@ -1044,11 +1044,11 @@ void NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle nXStart = rFormat.GetIndentAt() / nWidthRelation; } - Rectangle aRect1(Point(nTextXPos, nYStart + nFontHeight / 2), Size(aSize.Width() / 2, 2)); + tools::Rectangle aRect1(Point(nTextXPos, nYStart + nFontHeight / 2), Size(aSize.Width() / 2, 2)); pVDev->SetFillColor(rRenderContext.GetSettings().GetStyleSettings().GetWindowColor()); // Color( COL_BLACK ) ); pVDev->DrawRect(aRect1); - Rectangle aRect2(Point(nXStart, nYStart + nLineHeight + nFontHeight / 2), Size(aSize.Width() / 2, 2)); + tools::Rectangle aRect2(Point(nXStart, nYStart + nLineHeight + nFontHeight / 2), Size(aSize.Width() / 2, 2)); pVDev->DrawRect(aRect2); nYStart += 2 * nLineHeight; } diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index e56366234591..0cbfba9f4e72 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -57,7 +57,7 @@ public: virtual void Resize() override; protected: - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; private: SwTableAutoFormat aCurData; @@ -82,7 +82,7 @@ private: uno::Reference<i18n::XBreakIterator> m_xBreak; void Init(); - void DoPaint(vcl::RenderContext& rRenderContext, const Rectangle& rRect); + void DoPaint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect); void CalcCellArray(bool bFitWidth); void CalcLineMap(); void PaintCells(vcl::RenderContext& rRenderContext); @@ -706,7 +706,7 @@ MAKENUMSTR: SvtScriptedTextHelper aScriptedText(rRenderContext); Size aStrSize; sal_uInt8 nFormatIndex = GetFormatIndex( nCol, nRow ); - Rectangle cellRect = maArray.GetCellRect( nCol, nRow ); + tools::Rectangle cellRect = maArray.GetCellRect( nCol, nRow ); Point aPos = cellRect.TopLeft(); long nRightX = 0; @@ -885,10 +885,10 @@ void AutoFormatPreview::NotifyChange( const SwTableAutoFormat& rNewData ) bFitWidth = aCurData.IsJustify(); // true; //??? CalcCellArray( bFitWidth ); CalcLineMap(); - Invalidate(Rectangle(Point(0,0), GetSizePixel())); + Invalidate(tools::Rectangle(Point(0,0), GetSizePixel())); } -void AutoFormatPreview::DoPaint(vcl::RenderContext& rRenderContext, const Rectangle& /*rRect*/) +void AutoFormatPreview::DoPaint(vcl::RenderContext& rRenderContext, const tools::Rectangle& /*rRect*/) { DrawModeFlags nOldDrawMode = aVD->GetDrawMode(); if (rRenderContext.GetSettings().GetStyleSettings().GetHighContrastMode()) @@ -920,7 +920,7 @@ void AutoFormatPreview::DoPaint(vcl::RenderContext& rRenderContext, const Rectan aVD->SetOutputSizePixel(theWndSize); oldColor = aVD->GetLineColor(); aVD->SetLineColor(); - aVD->DrawRect(Rectangle(Point(0,0), theWndSize)); + aVD->DrawRect(tools::Rectangle(Point(0,0), theWndSize)); rRenderContext.SetLineColor(oldColor); @@ -934,7 +934,7 @@ void AutoFormatPreview::DoPaint(vcl::RenderContext& rRenderContext, const Rectan aVD->SetDrawMode(nOldDrawMode); } -void AutoFormatPreview::Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) +void AutoFormatPreview::Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) { DoPaint(rRenderContext, rRect); } 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 ); } |