rpms/openoffice.org/F-12 workspace.impress178.patch, NONE, 1.1 openoffice.org.spec, 1.2021, 1.2022

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16975/F-12

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.impress178.patch 
Log Message:
Resolves: ooo#103757 custom shape cut and paste (caolanm)

workspace.impress178.patch:
 inc/svx/svdoashp.hxx       |    2 ++
 source/svdraw/svdoashp.cxx |    6 ++++++
 2 files changed, 8 insertions(+)

--- NEW FILE workspace.impress178.patch ---
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);


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2021
retrieving revision 1.2022
diff -u -p -r1.2021 -r1.2022
--- openoffice.org.spec	19 Oct 2009 09:09:59 -0000	1.2021
+++ openoffice.org.spec	20 Oct 2009 19:09:47 -0000	1.2022
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 13
+%define rh_rpm_release 14
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -165,6 +165,7 @@ Patch88: workspace.vcl106.patch
 Patch89: openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch
 Patch90: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
 Patch91: openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch
+Patch92: workspace.impress178.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1716,6 +1717,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch89 -p0 -b .oooXXXXXX.vcl.sniffscriptforsubs.patch
 %patch90 -p0 -b .ooo105988.svx.a11ycrash.patch
 %patch91 -p0 -b .oooXXXXXX.vcl.dontresolve.patch
+%patch92 -p0 -b .workspace.impress178.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4249,6 +4251,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Tue Oct 20 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.14
+- Resolves: ooo#103757 custom shape cut and paste (caolanm)
+
 * Mon Oct 19 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.13
 - Resolves: ooo#105988 a11y crash in impress (caolanm)
 - Related: rhbz#529521 add openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch