rpms/openoffice.org/devel openoffice.org-2.4.0.ooo85643.psprint.helppreviewers.patch, NONE, 1.1 openoffice.org.spec, 1.1407, 1.1408

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2342

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.4.0.ooo85643.psprint.helppreviewers.patch 
Log Message:
help previewers rotate pages

openoffice.org-2.4.0.ooo85643.psprint.helppreviewers.patch:

--- NEW FILE openoffice.org-2.4.0.ooo85643.psprint.helppreviewers.patch ---
Index: inc/psprint/printerjob.hxx
===================================================================
RCS file: /cvs/gsl/psprint/inc/psprint/printerjob.hxx,v
retrieving revision 1.10
diff -u -r1.10 printerjob.hxx
--- openoffice.org.orig/psprint/inc/psprint/printerjob.hxx	12 Dec 2007 14:55:42 -0000	1.10
+++ openoffice.org/psprint/inc/psprint/printerjob.hxx	28 Jan 2008 15:20:51 -0000
@@ -81,6 +81,9 @@
     sal_uInt32      mnMaxWidthPt;
     sal_uInt32      mnMaxHeightPt;
 
+    int mnLandscapes;
+    int mnPortraits;
+
     sal_uInt32      mnLMarginPt;
     sal_uInt32      mnRMarginPt;
     sal_uInt32      mnTMarginPt;
Index: source/printergfx/printerjob.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/printergfx/printerjob.cxx,v
retrieving revision 1.45
diff -u -r1.45 printerjob.cxx
--- openoffice.org.orig/psprint/source/printergfx/printerjob.cxx	12 Dec 2007 14:56:41 -0000	1.45
+++ openoffice.org/psprint/source/printergfx/printerjob.cxx	28 Jan 2008 15:25:24 -0000
@@ -412,6 +412,7 @@
 {
     m_bQuickJob = bIsQuickJob;
     mnMaxWidthPt = mnMaxHeightPt = 0;
+    mnLandscapes = mnPortraits = 0;
     m_pGraphics = pGraphics;
     InitPaperSize (rSetupData);
 
@@ -504,6 +505,7 @@
     // Other
     WritePS (mpJobHeader, "%%DocumentData: Clean7Bit\n");
     WritePS (mpJobHeader, "%%Pages: (atend)\n");
+    WritePS (mpJobHeader, "%%Orientation: (atend)\n");
     WritePS (mpJobHeader, "%%PageOrder: Ascend\n");
     WritePS (mpJobHeader, "%%EndComments\n");
 
@@ -535,6 +537,10 @@
     aTrailer.append( (sal_Int32)mnMaxWidthPt );
     aTrailer.append( " " );
     aTrailer.append( (sal_Int32)mnMaxHeightPt );
+    if( mnLandscapes > mnPortraits )
+        aTrailer.append("\n%%Orientation: Landscape");
+    else
+        aTrailer.append("\n%%Orientation: Portrait");
     aTrailer.append( "\n%%Pages: " );
     aTrailer.append( (sal_Int32)maPageList.size() );
     aTrailer.append( "\n%%EOF\n" );
@@ -715,6 +721,17 @@
     WritePS (pPageHeader, aPageNo);
     WritePS (pPageHeader, "\n");
 
+    if( rJobSetup.m_eOrientation == orientation::Landscape )
+    {
+        WritePS (pPageHeader, "%%PageOrientation: Landscape\n");
+        mnLandscapes++;
+    }
+    else
+    {
+        WritePS (pPageHeader, "%%PageOrientation: Portrait\n");
+        mnPortraits++;
+    }
+
     sal_Char  pBBox [256];
     sal_Int32 nChar = 0;
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1407
retrieving revision 1.1408
diff -u -r1.1407 -r1.1408
--- openoffice.org.spec	28 Jan 2008 09:33:20 -0000	1.1407
+++ openoffice.org.spec	28 Jan 2008 15:38:15 -0000	1.1408
@@ -1,6 +1,6 @@
 %define oootag OOH680
-%define ooomilestone 4
-%define rh_rpm_release 2
+%define ooomilestone 5
+%define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -142,6 +142,7 @@
 Patch68: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
 Patch69: openoffice.org-2.4.0.ooo85487.evoconnectivity.patch
 Patch70: workspace.cairotext01.patch
+Patch71: openoffice.org-2.4.0.ooo85643.psprint.helppreviewers.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1098,6 +1099,7 @@
 %patch68 -p1 -b .ooo85448.emptyrpath.patch
 %patch69 -p1 -b .ooo85487.evoconnectivity.patch
 %patch70 -p1 -b .workspace.cairotext01.patch
+%patch71 -p1 -b .ooo85643.psprint.helppreviewers.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2864,10 +2866,13 @@
 
 
 %changelog
-* Mon Jan 28 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-4.2
+* Mon Jan 28 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-5.1
+- next milestone
 - replace cairotext with workspace.cairotext01.patch, not use
   SAL_DISABLE_CAIROTEXT=1 to disable as cairo text rendering is now
   default
+- add openoffice.org-2.4.0.ooo85643.psprint.helppreviewers.patch to 
+  help gv/evince rotate landscape pages when previewing
 
 * Thu Jan 23 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-4.1
 - next milestone