diff options
| author | Christian Lippka ORACLE <christian.lippka@oracle.com> | 2011-03-30 10:57:41 +0200 |
|---|---|---|
| committer | Christian Lippka ORACLE <christian.lippka@oracle.com> | 2011-03-30 10:57:41 +0200 |
| commit | 7a8a9644f0c9318bae6a82b44ef0326d0eb1f376 (patch) | |
| tree | 65dadc1b8aacdc2f2fa8f4b1c3865d60045d7842 | |
| parent | Automated merge with http://hg-lan.germany.sun.com/ooo/DEV300 (diff) | |
| download | core-7a8a9644f0c9318bae6a82b44ef0326d0eb1f376.tar.gz core-7a8a9644f0c9318bae6a82b44ef0326d0eb1f376.zip | |
impress210: #i41995# using view contact to get bound rect for old path animation import
| -rw-r--r-- | sw/inc/dcontact.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/draw/dcontact.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/draw/dflyobj.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/inc/dflyobj.hxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index a6f336d2776e..7d5fec3e37c0 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -342,7 +342,7 @@ class SwDrawVirtObj : public SdrVirtObj // #108784# // All overloaded methods which need to use the offset - virtual void RecalcBoundRect(bool bForce = false); + virtual void RecalcBoundRect(); virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const; virtual ::basegfx::B2DPolyPolygon TakeContour() const; virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const; diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 3893f52769f0..c510705c533c 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -2599,7 +2599,7 @@ void SwDrawVirtObj::SetBoundRectDirty() // do nothing to not lose model information in aOutRect } -void SwDrawVirtObj::RecalcBoundRect(bool) +void SwDrawVirtObj::RecalcBoundRect() { // OD 2004-04-05 #i26791# - switch order of calling <GetOffset()> and // <ReferencedObj().GetCurrentBoundRect()>, because <GetOffset()> calculates diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index a18a8947682c..492b44e5c89f 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -563,7 +563,7 @@ const Rectangle& __EXPORT SwVirtFlyDrawObj::GetLastBoundRect() const } -void __EXPORT SwVirtFlyDrawObj::RecalcBoundRect(bool) +void __EXPORT SwVirtFlyDrawObj::RecalcBoundRect() { SetRect(); } diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx index 64c987c54384..23216709a50a 100644 --- a/sw/source/core/inc/dflyobj.hxx +++ b/sw/source/core/inc/dflyobj.hxx @@ -101,7 +101,7 @@ public: //Wir nehemen die Groessenbehandlung vollstaendig selbst in die Hand. virtual const Rectangle& GetCurrentBoundRect() const; virtual const Rectangle& GetLastBoundRect() const; - virtual void RecalcBoundRect(bool bForce = false); + virtual void RecalcBoundRect(); virtual void RecalcSnapRect(); virtual const Rectangle& GetSnapRect() const; virtual void SetSnapRect(const Rectangle& rRect); |