rpms/openoffice.org/devel openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.43, 1.43.2.1

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 
Log Message:
fix up printing

openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:

Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.43
retrieving revision 1.43.2.1
diff -u -r1.43 -r1.43.2.1
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	29 Jan 2008 11:59:58 -0000	1.43
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	13 Mar 2008 07:41:18 -0000	1.43.2.1
@@ -109,34 +109,7 @@
 diff -u -r1.40 printerjob.cxx
 --- openoffice.org.orig/psprint/source/printergfx/printerjob.cxx	24 Oct 2006 15:06:47 -0000	1.40
 +++ openoffice.org/psprint/source/printergfx/printerjob.cxx	9 Nov 2006 10:40:31 -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" );
-@@ -663,6 +669,17 @@
+@@ -669,6 +669,17 @@
  
      mnResolution	= nRes;
  
@@ -154,27 +127,18 @@
      mnWidthPt       = nWidth;
      mnHeightPt      = nHeight;
  
-@@ -715,6 +732,19 @@
+@@ -721,7 +732,9 @@
      WritePS (pPageHeader, aPageNo);
      WritePS (pPageHeader, "\n");
  
+-    if( rJobSetup.m_eOrientation == orientation::Landscape )
 +    orientation::type eOrientation = rJobSetup.m_bNumberUpJob ? orientation::Portrait : rJobSetup.m_eOrientation;
 +
 +    if( eOrientation == orientation::Landscape )
-+    {
-+        WritePS (pPageHeader, "%%PageOrientation: Landscape\n");
-+        mnLandscapes++;
-+    }
-+    else
-+    {
-+        WritePS (pPageHeader, "%%PageOrientation: Portrait\n");
-+        mnPortraits++;
-+    }
-+
-     sal_Char  pBBox [256];
-     sal_Int32 nChar = 0;
- 
-@@ -886,7 +916,8 @@
+     {
+         WritePS (pPageHeader, "%%PageOrientation: Landscape\n");
+         mnLandscapes++;
+@@ -903,7 +916,8 @@
      sal_Char  pTranslate [128];
      sal_Int32 nChar = 0;
  
@@ -184,7 +148,7 @@
      {
          nChar  = psp::appendStr  ("gsave\n[",   pTranslate); 
          nChar += psp::getValueOfDouble (        pTranslate + nChar, mfXScale, 5);
-@@ -1197,7 +1228,7 @@
+@@ -1214,7 +1228,7 @@
              WritePS (pFile, "<< /NumCopies null /Policies << /NumCopies 1 >> >> setpagedevice\n" );
      }
  
@@ -1565,11 +1529,11 @@
  #endif // _SV_PRINT_H
 --- openoffice.org.orig/sfx2/source/view/viewprn.cxx	2007-05-01 13:18:31.000000000 +0100
 +++ openoffice.org/sfx2/source/view/viewprn.cxx	2007-05-01 13:18:44.000000000 +0100
-@@ -175,6 +175,7 @@
- 
- 	// Dialog ausf"uhren
- 	SfxPrintOptionsDialog* pDlg = new SfxPrintOptionsDialog( _pParent, _pViewSh, _pOptions );
-+        pDlg->SetNativeParent(_pParent ? _pParent->GetNativeHandle() : 0);
+@@ -203,6 +203,7 @@
+ 	SfxPrintOptionsDialog* pDlg = new SfxPrintOptionsDialog( _pPrintParent ? static_cast<Window*>(_pPrintParent)
+                                                                            : static_cast<Window*>(_pSetupParent),
+                                                              _pViewSh, _pOptions );
++        pDlg->SetNativeParent(_pPrintParent ? _pPrintParent->GetNativeHandle() : 0);
  	if ( _bHelpDisabled )
  		pDlg->DisableHelp();
  	if ( pDlg->Execute() == RET_OK )
@@ -1673,20 +1637,3 @@
  };
  
  
-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;