rpms/openoffice.org/F-10 openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch, NONE, 1.1 openoffice.org.spec, 1.1720, 1.1721

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch 
Log Message:
Resolves: rhbz#486934 add openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch

openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch:

--- NEW FILE openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch ---
Index: source/ui/dochdl/swdtflvr.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/dochdl/swdtflvr.cxx,v
retrieving revision 1.120
diff -u -r1.120 swdtflvr.cxx
--- sw.orig/source/ui/dochdl/swdtflvr.cxx	7 Jul 2008 07:25:25 -0000	1.120
+++ sw/source/ui/dochdl/swdtflvr.cxx	23 Feb 2009 12:34:35 -0000
@@ -569,8 +570,13 @@
 			break;
 
 		case SOT_FORMAT_STRING:
-			bOK = SetObject( pClpDocFac->GetDoc(),
+			{
+				SwDoc *pDoc = pClpDocFac->GetDoc();
+				ASSERT( pDoc, "Document not found" );
+				pDoc->SetClipBoard( true );
+				bOK = SetObject( pDoc,
 								SWTRANSFER_OBJECTTYPE_STRING, rFlavor );
+			}
 			break;
 
 		case SOT_FORMAT_RTF:


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1720
retrieving revision 1.1721
diff -u -r1.1720 -r1.1721
--- openoffice.org.spec	23 Feb 2009 12:28:29 -0000	1.1720
+++ openoffice.org.spec	23 Feb 2009 12:46:11 -0000	1.1721
@@ -142,6 +142,7 @@
 Patch69: workspace.xmergeclean.patch
 Patch70: openoffice.org-3.1.0.ooo99427.sd.ensure-icons-state.patch
 Patch71: openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch
+Patch72: openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1408,6 +1409,7 @@
 %patch69 -p1 -b .workspace.xmergeclean.patch
 %patch70 -p1 -b .ooo99427.sd.ensure-icons-state.patch
 %patch71 -p1 -b .ooo99526.sw.mailmergeup.outofrange.patch
+%patch72 -p1 -b .ooo99529.sw.notrailingnewline.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3782,6 +3784,7 @@
   jaxp implementations
 - Resolves: rhbz#486362 add openoffice.org-3.1.0.ooo99427.sd.ensure-icons-state.patch
 - Resolves: rhbz#486807 add openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch
+- Resolves: rhbz#486934 add openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch
 
 * Tue Jan 20 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
 - Resolves: rhbz#479624 add