rpms/openoffice.org/F-7 openoffice.org-2.2.1.ooo78895.sw.overlappingpdf.patch, NONE, 1.1 openoffice.org.spec, 1.1184, 1.1185

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11965

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.2.1.ooo78895.sw.overlappingpdf.patch 
Log Message:
- Resolves: rhbz#244656 overlapping glyphs in pdf export

openoffice.org-2.2.1.ooo78895.sw.overlappingpdf.patch:

--- NEW FILE openoffice.org-2.2.1.ooo78895.sw.overlappingpdf.patch ---
Index: source/core/view/vprint.cxx
===================================================================
RCS file: /cvs/sw/sw/source/core/view/vprint.cxx,v
retrieving revision 1.40
diff -u -r1.40 vprint.cxx
--- openoffice.org.orig/sw/source/core/view/vprint.cxx	22 Nov 2006 11:24:38 -0000	1.40
+++ openoffice.org/sw/source/core/view/vprint.cxx	26 Jun 2007 13:57:05 -0000
@@ -159,6 +159,8 @@
 #include <fmtpdsc.hxx>		// SwFmtPageDesc
 #endif
 
+#include <vcl/virdev.hxx>
+
 #define JOBSET_ERR_DEFAULT  		0
 #define JOBSET_ERR_ERROR 			1
 #define JOBSET_ERR_ISSTARTET 		2
@@ -1050,8 +1052,13 @@
 			"MinSeite groesser MaxSeite." );
 
     SfxPrinter* pPrt = 0;   //!! will be 0 for PDF export !!
+    VirtualDevice* pPDFVirDev = 0;
     if (pPDFOut)
+    {
+        pPDFVirDev = pDoc->getVirtualDevice(true);
+        pPDFVirDev->SetReferenceDevice( VirtualDevice::REFDEV_MODE_PDF1 );
         pPDFOut->Push();
+    }
     else
     {
         // wenn kein Drucker vorhanden ist, wird nicht gedruckt
@@ -1534,7 +1541,10 @@
 
     // restore settings of OutputDevicef
     if (pPDFOut)
+    {
         pPDFOut->Pop();
+        pPDFVirDev->SetReferenceDevice( VirtualDevice::REFDEV_MODE_MSO1 );
+    }
 
 	return bStartJob;
 }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org.spec,v
retrieving revision 1.1184
retrieving revision 1.1185
diff -u -r1.1184 -r1.1185
--- openoffice.org.spec	15 Jun 2007 10:01:45 -0000	1.1184
+++ openoffice.org.spec	26 Jun 2007 14:12:44 -0000	1.1185
@@ -139,6 +139,7 @@
 Patch80: openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch
 Patch81: openoffice.org-2.2.1.ooo78392.sixtyfour.tools.patch
 Patch82: openoffice.org-2.2.1.oooXXXXX.xmloff.outofrange.patch
+Patch83: openoffice.org-2.2.1.ooo78895.sw.overlappingpdf.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1071,6 +1072,7 @@
 %patch80 -p1 -b .ooo78383.vcl.printxerror.patch
 %patch81 -p1 -b .ooo78392.sixtyfour.tools.patch
 %patch82 -p1 -b .oooXXXXX.xmloff.outofrange.patch
+%patch83 -p1 -b .ooo78895.sw.overlappingpdf.patch
 
 cp %{SOURCE1} extras/source/database/evolocal.odb
 
@@ -2651,6 +2653,7 @@
 * Wed Jun 13 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.12.UNRELEASED
 - Resolves: rhbz#243904 openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch
 - Resolves: rhbz#242692 openoffice.org-2.2.1.oooXXXXX.xmloff.outofrange.patch
+- Resolves: rhbz#244656 overlapping glyphs in pdf export
 - add openoffice.org-2.2.1.ooo78392.sixtyfour.tools.patch
 
 * Fri Jun 07 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.11