[ooo-build-commit] patches/dev300

[Thorsten Behrens]

 patches/dev300/apply                          |    3 +
 patches/dev300/svx-autoshape-cache-purge.diff |   42 ++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)

New commits:
commit ee5d9251a97d57a983b9812c1514c2998f5b49b1
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Fri Jul 31 11:29:18 2009 +0200

    Purge autoshape geometry on model change
    
    * patches/dev300/apply: added the patch
    * patches/dev300/svx-autoshape-cache-purge.diff: bin the generated
      custom shape sub-shapes when the model changes (to avoid
      referencing stale itemsets)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index e8e29a1..e338ea5 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3301,6 +3301,9 @@ basegfx-color-tools.diff, thorsten
 # much improved surface shades, gradient color for customshapes
 ppt-customshape-shading-fix.diff, n#485637, thorsten
 
+# purge autoshape geometry on model change
+svx-autoshape-cache-purge.diff, n#520104, thorsten
+
 [ OOXML ]
 oox-pptx-import-fix-placeholder-text-style.diff, n#479834, rodo
 oox-pptx-import-fix-text-body-properties-priority.diff, n#403402, rodo
diff --git a/patches/dev300/svx-autoshape-cache-purge.diff b/patches/dev300/svx-autoshape-cache-purge.diff
new file mode 100644
index 0000000..898f604
--- /dev/null
+++ b/patches/dev300/svx-autoshape-cache-purge.diff
@@ -0,0 +1,42 @@
+fix a nasty clipboard crasher in slidesorter
+
+From: Thorsten Behrens <thb at openoffice.org>
+
+
+---
+
+ svx/inc/svx/svdoashp.hxx       |    2 ++
+ svx/source/svdraw/svdoashp.cxx |    6 ++++++
+ 2 files changed, 8 insertions(+), 0 deletions(-)
+
+
+diff --git svx/inc/svx/svdoashp.hxx svx/inc/svx/svdoashp.hxx
+index 10b5103..39fcf90 100644
+--- svx/inc/svx/svdoashp.hxx
++++ svx/inc/svx/svdoashp.hxx
+@@ -179,6 +179,8 @@ public:
+ 	virtual UINT16 GetObjIdentifier() const;
+ 	virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
+ 
++	virtual void SetModel(SdrModel* pNewModel);
++
+ 	virtual void RecalcSnapRect();
+ 
+ 	virtual const Rectangle& GetSnapRect()  const;
+diff --git svx/source/svdraw/svdoashp.cxx svx/source/svdraw/svdoashp.cxx
+index 73cdbd8..483859a 100644
+--- svx/source/svdraw/svdoashp.cxx
++++ svx/source/svdraw/svdoashp.cxx
+@@ -1678,6 +1678,12 @@ void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
+ 	}
+ }
+ 
++void SdrObjCustomShape::SetModel(SdrModel* pNewModel)
++{
++	SdrTextObj::SetModel(pNewModel);
++    mXRenderedCustomShape.clear();
++}
++
+ UINT16 SdrObjCustomShape::GetObjIdentifier() const
+ {
+ 	return UINT16(OBJ_CUSTOMSHAPE);