rpms/openoffice.org/devel workspace.impress178.patch, NONE, 1.1 openoffice.org.spec, 1.2047, 1.2048

[Caolan McNamara]

Author: caolanm

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

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/devel/openoffice.org.spec,v
retrieving revision 1.2047
retrieving revision 1.2048
diff -u -p -r1.2047 -r1.2048
--- openoffice.org.spec	19 Oct 2009 11:38:48 -0000	1.2047
+++ openoffice.org.spec	20 Oct 2009 19:09:47 -0000	1.2048
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 2
-%define rh_rpm_release 4
+%define rh_rpm_release 5
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -119,6 +119,7 @@ Patch45: openoffice.org-3.2.0.ooo105988.
 Patch46: openoffice.org-3.2.0.rhbz521460.svx.revert-paper-sizes-reordering.patch
 Patch47: openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch
 Patch48: openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch
+Patch49: workspace.impress178.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1627,6 +1628,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch46 -p1 -b .rhbz521460.svx.revert-paper-sizes-reordering.patch
 %patch47 -p0 -b .oooXXXXXX.vcl.dontresolve.patch
 %patch48 -p0 -b .ooo106032.linguistic.defaulttoplain.patch
+%patch49 -p0 -b .workspace.impress178.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4127,6 +4129,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Tue Oct 20 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-2.5.UNBUILT
+- Resolves: ooo#103757 custom shape cut and paste (caolanm)
+
 * Mon Oct 19 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-2.4
 - Resolves: rhbz#521460 add openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch (caolanm)
 - Related:  rhbz#529521 add openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch (caolanm)