diff options
| author | Christian Lippka ORACLE <christian.lippka@oracle.com> | 2011-03-09 18:32:29 +0100 |
|---|---|---|
| committer | Christian Lippka ORACLE <christian.lippka@oracle.com> | 2011-03-09 18:32:29 +0100 |
| commit | fb3e8f4852851cb6387a523d9aa21f7615df74f4 (patch) | |
| tree | 48ed100fb1e45da2c6f32ccb938b86faeae76b0e | |
| parent | CWS-TOOLING: integrate CWS hr75 (diff) | |
| download | core-fb3e8f4852851cb6387a523d9aa21f7615df74f4.tar.gz core-fb3e8f4852851cb6387a523d9aa21f7615df74f4.zip | |
impress210: #i41995# fixed import of path animation from sxi files
| -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 7d5fec3e37c0..a6f336d2776e 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(); + virtual void RecalcBoundRect(bool bForce = false); 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 c510705c533c..3893f52769f0 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() +void SwDrawVirtObj::RecalcBoundRect(bool) { // 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 e8b5c378a2ec..251e2cc26281 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() +void __EXPORT SwVirtFlyDrawObj::RecalcBoundRect(bool) { SetRect(); } diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx index 23216709a50a..64c987c54384 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(); + virtual void RecalcBoundRect(bool bForce = false); virtual void RecalcSnapRect(); virtual const Rectangle& GetSnapRect() const; virtual void SetSnapRect(const Rectangle& rRect); |