rpms/openoffice.org/devel openoffice.org-2.0.3.ooo65308.notespaste.sd.patch, NONE, 1.1 openoffice.org.spec, 1.704, 1.705

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.ooo65308.notespaste.sd.patch 
Log Message:
paste 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/devel/openoffice.org.spec,v
retrieving revision 1.704
retrieving revision 1.705
diff -u -r1.704 -r1.705
--- openoffice.org.spec	11 May 2006 17:20:30 -0000	1.704
+++ openoffice.org.spec	11 May 2006 17:32:11 -0000	1.705
@@ -223,6 +223,7 @@
 Patch33: openoffice.org-2.0.3.ooo65230.x86_64.automation.patch
 Patch34: openoffice.org-2.0.3.oooXXXXX.agg24.canvas.patch
 Patch35: openoffice.org-2.0.3.ooo65304.sn.vcl.patch
+Patch36: openoffice.org-2.0.3.ooo65308.notespaste.sd.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1140,6 +1141,7 @@
 %patch33 -p1 -b .ooo65230.x86_64.automation.patch
 %patch34 -p1 -b .oooXXXXX.agg24.canvas.patch
 %patch35 -p1 -b .ooo65304.sn.vcl.patch
+%patch36 -p1 -b .ooo65308.notespaste.sd.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -3734,6 +3736,7 @@
 - add openoffice.org-2.0.3.gccXXXXX.svtools.R_X86_64_PC32.patch workaround
 - add openoffice.org-2.0.3.ooo65052.bridges.makeasmpic.patch
 - add openoffice.org-2.0.3.ooo65304.sn.vcl.patch for rh#191155#
+- add openoffice.org-2.0.3.ooo65308.notespaste.sd.patch for rh#191333#
 
 * Thu Apr 27 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.13
 - rh#189630# lfs trouble