summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorChristian Lippka ORACLE <christian.lippka@oracle.com>2011-12-06 02:48:42 +0100
committerThorsten Behrens <tbehrens@suse.com>2011-12-06 09:39:12 +0100
commitf0a1b95f99bed6d184e3020b5c7e30bc6c1597f6 (patch)
treee30279438605a800855f9e2ce65accbdc6b88d91 /sw
parent15aeab6cbd0b50b1d78646f03588237b8473285c (diff)
impress210: #i41995# fixed import of path animation from sxi files
# HG changeset patch # User Christian Lippka ORACLE <christian.lippka@oracle.com> # Date 1299691949 -3600 # Node ID 8edc33ef50a3b6ebbc4e88d574b6b1ba57b1dbaa # Parent 0b9b11216b0d3401f8824542dd5f2794eb141035 impress210: #i41995# fixed import of path animation from sxi files
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/dcontact.hxx2
-rw-r--r--sw/source/core/draw/dcontact.cxx2
-rw-r--r--sw/source/core/draw/dflyobj.cxx2
-rw-r--r--sw/source/core/inc/dflyobj.hxx2
4 files changed, 4 insertions, 4 deletions
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index ff317e5e40d4..4c2bb433108e 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -293,7 +293,7 @@ class SwDrawVirtObj : public SdrVirtObj
virtual void NbcSetAnchorPos(const Point& rPnt);
// 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 998b1672ba83..38ec0a01f508 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -2384,7 +2384,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 6eac60586127..82629d804f3d 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -582,7 +582,7 @@ const Rectangle& SwVirtFlyDrawObj::GetLastBoundRect() const
}
-void SwVirtFlyDrawObj::RecalcBoundRect()
+void SwVirtFlyDrawObj::RecalcBoundRect(bool)
{
SetRect();
}
diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx
index 9e3cf0dff55e..1ac349decc0d 100644
--- a/sw/source/core/inc/dflyobj.hxx
+++ b/sw/source/core/inc/dflyobj.hxx
@@ -102,7 +102,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);