applied_patches/0589-svx-autoshape-cache-purge.diff

   1 fix a nasty clipboard crasher in slidesorter
   2
   3 From: Thorsten Behrens <thb@openoffice.org>
   4
   5
   6 ---
   7
   8  svx/inc/svx/svdoashp.hxx       |    2 ++
   9  svx/source/svdraw/svdoashp.cxx |    6 ++++++
  10  2 files changed, 8 insertions(+), 0 deletions(-)
  11
  12
  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;
  20
  21 +       virtual void SetModel(SdrModel* pNewModel);
  22 +
  23         virtual void RecalcSnapRect();
  24
  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
  31         }
  32  }
  33
  34 +void SdrObjCustomShape::SetModel(SdrModel* pNewModel)
  35 +{
  36 +       SdrTextObj::SetModel(pNewModel);
  37 +    mXRenderedCustomShape.clear();
  38 +}
  39 +
  40  UINT16 SdrObjCustomShape::GetObjIdentifier() const
  41  {
  42         return UINT16(OBJ_CUSTOMSHAPE);