impress210: #i41995# using view contact to get bound rect for old path animation import

6 files changed, 6 insertions, 22 deletions

diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx
index ef915a43ae30..86d6f0717bb7 100644
--- a/svx/inc/svx/svdobj.hxx
+++ b/svx/inc/svx/svdobj.hxx
@@ -673,8 +673,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 bae18a85a261..9cf0ad056047 100644
--- a/svx/inc/svx/svdogrp.hxx
+++ b/svx/inc/svx/svdogrp.hxx
@@ -79,9 +79,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 void operator=(const SdrObject& rObj);
 
     virtual void TakeObjNameSingul(String& rName) const;
diff --git a/svx/inc/svx/svdovirt.hxx b/svx/inc/svx/svdovirt.hxx
index b169e9e03958..dba62f84730e 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 SdrObject* Clone() const;
     virtual void operator=(const SdrObject& rObj);
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 2655a335eedc..cc2ece168ec7 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -926,14 +926,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 c62732ed044b..152ab501f8e6 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -282,18 +282,6 @@ const Rectangle& SdrObjGroup::GetCurrentBoundRect() const
     // <--
 }
 
-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
 {
     // --> OD 2007-02-01 #144962#
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index b276fcc375a4..c6703f2305df 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -148,7 +148,7 @@ const Rectangle& SdrVirtObj::GetLastBoundRect() const
     return aOutRect;
 }
 
-void SdrVirtObj::RecalcBoundRect(bool /*bForced*/)
+void SdrVirtObj::RecalcBoundRect()
 {
     aOutRect=rRefObj.GetCurrentBoundRect();
     aOutRect+=aAnchor;