diff options
Diffstat (limited to 'svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx')
| -rw-r--r-- | svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx index c3f8666ad1d9..5c4bb784c515 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx @@ -45,13 +45,13 @@ namespace sdr basegfx::B2DRange ViewContactOfSdrObjCustomShape::getCorrectedTextBoundRect() const { - tools::Rectangle aObjectBound(GetCustomShapeObj().GetGeoRect()); - aObjectBound += GetCustomShapeObj().GetGridOffset(); + const tools::Rectangle aObjectBound(GetCustomShapeObj().GetGeoRect()); tools::Rectangle aTextBound(aObjectBound); GetCustomShapeObj().GetTextBounds(aTextBound); - aTextBound += GetCustomShapeObj().GetGridOffset(); basegfx::B2DRange aTextRange(aTextBound.Left(), aTextBound.Top(), aTextBound.Right(), aTextBound.Bottom()); - const basegfx::B2DRange aObjectRange(aObjectBound.Left(), aObjectBound.Top(), aObjectBound.Right(), aObjectBound.Bottom()); + const basegfx::B2DRange aObjectRange( + aObjectBound.Left(), aObjectBound.Top(), + aObjectBound.Right(), aObjectBound.Bottom()); // no need to correct if no extra text range if(aTextRange != aObjectRange) @@ -118,18 +118,8 @@ namespace sdr const SdrObject* pSdrObjRepresentation = GetCustomShapeObj().GetSdrObjectFromCustomShape(); bool b3DShape(false); - Point aGridOff = GetCustomShapeObj().GetGridOffset(); - if(pSdrObjRepresentation) { - // Hack for calc, transform position of object according - // to current zoom so as objects relative position to grid - // appears stable - // TTTT: Need to check what *exactly* this is doing - in it's current - // form it's indeed pretty much a 'hack' as mentioned above and massively - // in the way for future changes... - const_cast< SdrObject* >( pSdrObjRepresentation )->SetGridOffset( aGridOff ); - // tdf#118498 The processing of SdrObjListIter for SdrIterMode::DeepNoGroups // did change for 3D-Objects, it now correctly enters and iterates the // SdrObjects in the E3dScene (same as for SdrObjGroup). This is more correct @@ -160,10 +150,10 @@ namespace sdr { // take unrotated snap rect as default, then get the // unrotated text box. Rotation needs to be done centered - tools::Rectangle aObjectBound(GetCustomShapeObj().GetGeoRect()); - // hack for calc grid sync - aObjectBound += GetCustomShapeObj().GetGridOffset(); - const basegfx::B2DRange aObjectRange(aObjectBound.Left(), aObjectBound.Top(), aObjectBound.Right(), aObjectBound.Bottom()); + const tools::Rectangle aObjectBound(GetCustomShapeObj().GetGeoRect()); + const basegfx::B2DRange aObjectRange( + aObjectBound.Left(), aObjectBound.Top(), + aObjectBound.Right(), aObjectBound.Bottom()); // #i101684# get the text range unrotated and absolute to the object range const basegfx::B2DRange aTextRange(getCorrectedTextBoundRect()); |