diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-05-25 19:25:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-05-26 08:42:07 +0200 |
| commit | 399149155cf4f882541848ea53bfa5c9806b23f8 (patch) | |
| tree | 7d4beaebdff4d0c725fda27662009c2b2f7b0fe1 /sw/source/core/draw | |
| parent | 581f12c0bdfb718379c16bef01d71ee9e45a5b5a (diff) | |
make SwRect(Rectangle) constructor explicit
Change-Id: I715aa9499598c483ccf907f829c9ba3540edf216
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116120
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/core/draw')
| -rw-r--r-- | sw/source/core/draw/dcontact.cxx | 8 | ||||
| -rw-r--r-- | sw/source/core/draw/dflyobj.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 9ae68e2a05ef..579866cedcbe 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -1237,7 +1237,7 @@ void SwDrawContact::Changed_( const SdrObject& rObj, SwFrameFormat::tLayoutDir eLayoutDir = pAnchoredDrawObj->GetFrameFormat().GetLayoutDir(); // use geometry of drawing object - SwRect aObjRect( rObj.GetSnapRect() ); + tools::Rectangle aObjRect( rObj.GetSnapRect() ); // If drawing object is a member of a group, the adjustment // of the positioning and the alignment attributes has to // be done for the top group object. @@ -1311,9 +1311,9 @@ void SwDrawContact::Changed_( const SdrObject& rObj, // #i34748# - use new method // <SwAnchoredDrawObject::SetLastObjRect(..)>. const_cast<SwAnchoredDrawObject*>(pAnchoredDrawObj) - ->SetLastObjRect( aObjRect.SVRect() ); + ->SetLastObjRect( aObjRect ); } - else if ( aObjRect.SSize() != aOldObjRect.GetSize() ) + else if ( aObjRect.GetSize() != aOldObjRect.GetSize() ) { InvalidateObjs_(); // #i35007# - notify anchor frame @@ -1990,7 +1990,7 @@ void SwDrawContact::ChkPage() SwPageFrame* pPg = ( maAnchoredDrawObj.GetAnchorFrame() && maAnchoredDrawObj.GetAnchorFrame()->IsPageFrame() ) ? GetPageFrame() - : FindPage( GetMaster()->GetCurrentBoundRect() ); + : FindPage( SwRect(GetMaster()->GetCurrentBoundRect()) ); if ( GetPageFrame() == pPg ) return; diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index 93a66ba6b625..41cea972ee05 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -1112,7 +1112,7 @@ void SwVirtFlyDrawObj::NbcResize(const Point& rRef, const Fraction& xFact, const // need to save aOutRect to FrameArea, will be restored to aOutRect in // SwVirtFlyDrawObj::NbcMove currently for TransformableSwFrames SwFrameAreaDefinition::FrameAreaWriteAccess aFrm(*GetFlyFrame()); - aFrm.setSwRect(m_aOutRect); + aFrm.setSwRect(SwRect(m_aOutRect)); } // keep old hack - not clear what happens here |