diff options
Diffstat (limited to 'svx')
-rw-r--r-- | svx/inc/svx/svdobj.hxx | 3 | ||||
-rw-r--r-- | svx/inc/svx/svdogrp.hxx | 3 | ||||
-rw-r--r-- | svx/inc/svx/svdovirt.hxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdobj.cxx | 6 | ||||
-rw-r--r-- | svx/source/svdraw/svdogrp.cxx | 12 | ||||
-rw-r--r-- | svx/source/svdraw/svdovirt.cxx | 2 |
6 files changed, 6 insertions, 22 deletions
diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx index 2b69930c28bf..1bac35e49232 100644 --- a/svx/inc/svx/svdobj.hxx +++ b/svx/inc/svx/svdobj.hxx @@ -660,8 +660,7 @@ public: // a new method for accessing the last BoundRect. virtual const Rectangle& GetLastBoundRect() const; - // If bForced is true, the boundrect is also calculated when the model is locked - virtual void RecalcBoundRect(bool bForced = false); + virtual void RecalcBoundRect(); void BroadcastObjectChange() const; diff --git a/svx/inc/svx/svdogrp.hxx b/svx/inc/svx/svdogrp.hxx index 5b96c38ddacb..7e48ec372ae7 100644 --- a/svx/inc/svx/svdogrp.hxx +++ b/svx/inc/svx/svdogrp.hxx @@ -80,9 +80,6 @@ public: virtual const Rectangle& GetCurrentBoundRect() const; virtual const Rectangle& GetSnapRect() const; - // If bForced is true, the boundrect is also calculated when the model is locked - virtual void RecalcBoundRect(bool bForced = false); - virtual SdrObjGroup* Clone() const; SdrObjGroup& operator=(const SdrObjGroup& rObj); diff --git a/svx/inc/svx/svdovirt.hxx b/svx/inc/svx/svdovirt.hxx index 5d05a68b43cf..95536ef3bc40 100644 --- a/svx/inc/svx/svdovirt.hxx +++ b/svx/inc/svx/svdovirt.hxx @@ -76,7 +76,7 @@ public: virtual const Rectangle& GetCurrentBoundRect() const; virtual const Rectangle& GetLastBoundRect() const; - virtual void RecalcBoundRect(bool bForced = false); + virtual void RecalcBoundRect(); virtual void SetChanged(); virtual SdrVirtObj* Clone() const; SdrVirtObj& operator=(const SdrVirtObj& rObj); diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index d5a2fe3fab0b..d96080bcd99d 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -828,14 +828,14 @@ const Rectangle& SdrObject::GetLastBoundRect() const return aOutRect; } -void SdrObject::RecalcBoundRect(bool bForced) +void SdrObject::RecalcBoundRect() { // #i101680# suppress BoundRect calculations on import(s) - if(pModel && pModel->isLocked() && !bForced ) + if(pModel && pModel->isLocked()) return; // central new method which will calculate the BoundRect using primitive geometry - if(aOutRect.IsEmpty() || bForced) + if(aOutRect.IsEmpty()) { const drawinglayer::primitive2d::Primitive2DSequence xPrimitives(GetViewContact().getViewIndependentPrimitive2DSequence()); diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx index ff5fec569796..df0fe3f8d674 100644 --- a/svx/source/svdraw/svdogrp.cxx +++ b/svx/source/svdraw/svdogrp.cxx @@ -267,18 +267,6 @@ const Rectangle& SdrObjGroup::GetCurrentBoundRect() const return aOutRect; } -void SdrObjGroup::RecalcBoundRect(bool bForced) -{ - if( bForced ) - { - sal_uIntPtr nAnz=pSub->GetObjCount(); - for( sal_uIntPtr i=0; i<nAnz; i++) - pSub->GetObj(i)->RecalcBoundRect(true); - } - - SdrObject::RecalcBoundRect(bForced); -} - const Rectangle& SdrObjGroup::GetSnapRect() const { // <aOutRect> has to contain the bounding rectangle diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index 10fa828dc40c..2aa7d0e0351e 100644 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -137,7 +137,7 @@ const Rectangle& SdrVirtObj::GetLastBoundRect() const return aOutRect; } -void SdrVirtObj::RecalcBoundRect(bool) +void SdrVirtObj::RecalcBoundRect() { aOutRect=rRefObj.GetCurrentBoundRect(); aOutRect+=aAnchor; |