rpms/openoffice.org/FC-5 openoffice.org-2.0.3.ooo65308.notespaste.sd.patch, NONE, 1.1 openoffice.org.spec, 1.661, 1.662

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv28265

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.ooo65308.notespaste.sd.patch 
Log Message:
notes paste crash workaround

openoffice.org-2.0.3.ooo65308.notespaste.sd.patch:
 sd/source/ui/view/sdview3.cxx |    6 ++++++
 source/ui/view/sdview3.cxx    |    0 
 2 files changed, 6 insertions(+)

--- NEW FILE openoffice.org-2.0.3.ooo65308.notespaste.sd.patch ---
Index: source/ui/view/sdview3.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/view/sdview3.cxx,v
retrieving revision 1.63
diff -u -r1.63 sdview3.cxx
--- openoffice.org.orig/sd/source/ui/view/sdview3.cxx	1 Feb 2006 18:41:14 -0000	1.63
+++ openoffice.org/sd/source/ui/view/sdview3.cxx	11 May 2006 17:27:27 -0000
@@ -718,6 +718,12 @@
 				}
 			}
 		}
+		else if (!pOwnData->GetWorkDocument())
+		{
+			OSL_ASSERT (pOwnData->GetWorkDocument()!=NULL);
+			aDropErrorTimer.Start();
+			bReturn = FALSE;
+		}
 		else
 		{
 		    SdDrawDocument*	pWorkModel = (SdDrawDocument*) pOwnData->GetWorkDocument();


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.661
retrieving revision 1.662
diff -u -r1.661 -r1.662
--- openoffice.org.spec	11 May 2006 15:50:24 -0000	1.661
+++ openoffice.org.spec	11 May 2006 17:35:22 -0000	1.662
@@ -166,6 +166,7 @@
 Patch38: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
 Patch39: openoffice.org-2.0.2.ooo64743.vcl.adjustonlevel1.patch
 Patch40: openoffice.org-2.0.3.ooo65304.sn.vcl.patch
+Patch41: openoffice.org-2.0.3.ooo65308.notespaste.sd.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -815,6 +816,7 @@
 %patch38 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
 %patch39 -p1 -b .ooo64743.vcl.adjustonlevel1.patch
 %patch40 -p1 -b .ooo65304.sn.vcl.patch
+%patch41 -p1 -b .ooo65308.notespaste.sd.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -3262,6 +3264,7 @@
 * Wed Apr 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.10
 - rh#191206# update workspace.atkbridge to final version
 - rh#191155# add openoffice.org-2.0.3.ooo65304.sn.vcl.patch
+- rh#191333# add openoffice.org-2.0.3.ooo65308.notespaste.sd.patch
 
 * Wed Apr 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.9
 - avoid the patch backup in final rpms