rpms/openoffice.org/devel openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch, NONE, 1.1 openoffice.org.spec, 1.1821, 1.1822

[Caolan McNamara]

Author: caolanm

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

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/devel/openoffice.org.spec,v
retrieving revision 1.1821
retrieving revision 1.1822
diff -u -r1.1821 -r1.1822
--- openoffice.org.spec	23 Feb 2009 12:28:30 -0000	1.1821
+++ openoffice.org.spec	23 Feb 2009 12:46:11 -0000	1.1822
@@ -126,6 +126,7 @@
 Patch53: openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch
 Patch54: openoffice.org-3.1.0.ooo99427.sd.ensure-icons-state.patch
 Patch55: openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch
+Patch56: openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1586,6 +1587,7 @@
 %patch53 -p0 -b .ooo99407.filter-detectsmalldevicefilters.patch
 %patch54 -p0 -b .ooo99427.sd.ensure-icons-state.patch
 %patch55 -p0 -b .ooo99526.sw.mailmergeup.outofrange.patch
+%patch56 -p0 -b .ooo99529.sw.notrailingnewline.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4098,6 +4100,7 @@
 %changelog
 * Mon Feb 23 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-2.2
 - 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
 
 * Fri Feb 20 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-2.1
 - next milestone