update dev300-m57
[ooovba.git] / applied_patches / 0700-svx-autoshape-cache-purge.diff
blob898f604ca4cae33d629505a7834b1f66a8e0c54c
1 fix a nasty clipboard crasher in slidesorter
3 From: Thorsten Behrens <thb@openoffice.org>
6 ---
8 svx/inc/svx/svdoashp.hxx | 2 ++
9 svx/source/svdraw/svdoashp.cxx | 6 ++++++
10 2 files changed, 8 insertions(+), 0 deletions(-)
13 diff --git svx/inc/svx/svdoashp.hxx svx/inc/svx/svdoashp.hxx
14 index 10b5103..39fcf90 100644
15 --- svx/inc/svx/svdoashp.hxx
16 +++ svx/inc/svx/svdoashp.hxx
17 @@ -179,6 +179,8 @@ public:
18 virtual UINT16 GetObjIdentifier() const;
19 virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
21 + virtual void SetModel(SdrModel* pNewModel);
23 virtual void RecalcSnapRect();
25 virtual const Rectangle& GetSnapRect() const;
26 diff --git svx/source/svdraw/svdoashp.cxx svx/source/svdraw/svdoashp.cxx
27 index 73cdbd8..483859a 100644
28 --- svx/source/svdraw/svdoashp.cxx
29 +++ svx/source/svdraw/svdoashp.cxx
30 @@ -1678,6 +1678,12 @@ void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
34 +void SdrObjCustomShape::SetModel(SdrModel* pNewModel)
36 + SdrTextObj::SetModel(pNewModel);
37 + mXRenderedCustomShape.clear();
40 UINT16 SdrObjCustomShape::GetObjIdentifier() const
42 return UINT16(OBJ_CUSTOMSHAPE);