Attachment 154386 Details for Bug 216332 – park this here in case I delete it or do something else equally stupid

[patch] park this here in case I delete it or do something else equally stupid

diffthing (text/plain), 7.55 KB, created by Caolan McNamara on 2007-05-09 10:52:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Caolan McNamara

Created: 2007-05-09 10:52:37 UTC

Size: 7.55 KB

patch

obsolete

>? openoffice.org-2.2.0-14.8.src.rpm
>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.31
>diff -u -r1.31 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
>--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	4 May 2007 14:23:08 -0000	1.31
>+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	9 May 2007 10:50:54 -0000
>@@ -1,3 +1,72 @@
>+Index: inc/psprint/jobdata.hxx
>+===================================================================
>+RCS file: /cvs/gsl/psprint/inc/psprint/jobdata.hxx,v
>+retrieving revision 1.4
>+diff -u -r1.4 jobdata.hxx
>+--- openoffice.org.orig/psprint/inc/psprint/jobdata.hxx	4 Dec 2006 16:33:06 -0000	1.4
>++++ openoffice.org/psprint/inc/psprint/jobdata.hxx	9 May 2007 10:45:05 -0000
>+@@ -51,6 +51,7 @@
>+ 
>+ struct JobData
>+ {
>++    bool                    m_bCupsJob;
>+     int                     m_nCopies;
>+     int                     m_nLeftMarginAdjust;
>+     int                     m_nRightMarginAdjust;
>+@@ -66,6 +67,7 @@
>+     PPDContext              m_aContext;
>+ 
>+     JobData() :
>++            m_bCupsJob( false ),
>+             m_nCopies( 1 ),
>+             m_nLeftMarginAdjust( 0 ),
>+             m_nRightMarginAdjust( 0 ),
>+Index: source/printer/jobdata.cxx
>+===================================================================
>+RCS file: /cvs/gsl/psprint/source/printer/jobdata.cxx,v
>+retrieving revision 1.9
>+diff -u -r1.9 jobdata.cxx
>+--- openoffice.org.orig/psprint/source/printer/jobdata.cxx	4 Dec 2006 16:33:20 -0000	1.9
>++++ openoffice.org/psprint/source/printer/jobdata.cxx	9 May 2007 10:45:55 -0000
>+@@ -46,6 +46,7 @@
>+ 
>+ JobData& JobData::operator=(const JobData& rRight)
>+ {
>++    m_bCupsJob				= rRight.m_bCupsJob;
>+     m_nCopies				= rRight.m_nCopies;
>+     m_nLeftMarginAdjust		= rRight.m_nLeftMarginAdjust;
>+     m_nRightMarginAdjust	= rRight.m_nRightMarginAdjust;
>+@@ -94,6 +95,10 @@
>+     aLine += ByteString::CreateFromInt32( m_nCopies );
>+     aStream.WriteLine( aLine );
>+ 
>++    aLine = "cups=";
>++    aLine += ByteString::CreateFromInt32( m_bCupsJob );
>++    aStream.WriteLine( aLine );
>++
>+     aLine = "margindajustment=";
>+     aLine += ByteString::CreateFromInt32( m_nLeftMarginAdjust );
>+     aLine += ',';
>+@@ -136,6 +141,7 @@
>+     bool bVersion       = false;
>+     bool bPrinter       = false;
>+     bool bOrientation   = false;
>++    bool bCups          = false;
>+     bool bCopies        = false;
>+     bool bContext       = false;
>+     bool bMargin        = false;
>+@@ -162,6 +168,11 @@
>+             bCopies = true;
>+             rJobData.m_nCopies = aLine.Copy( 7 ).ToInt32();
>+         }
>++        else if( aLine.CompareTo( "cups=", 5 ) == COMPARE_EQUAL )
>++        {
>++            bCups = true;
>++            rJobData.m_bCupsJob = aLine.Copy( 5 ).ToInt32();
>++        }
>+         else if( aLine.CompareTo( "margindajustment=",17 ) == COMPARE_EQUAL )
>+         {
>+             bMargin = true;
> Index: source/printergfx/printerjob.cxx
> ===================================================================
> RCS file: /cvs/gsl/psprint/source/printergfx/printerjob.cxx,v
>@@ -5,16 +74,15 @@
> 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
>-@@ -740,6 +740,9 @@
>-     if( ! pKey || ! pValue )
>-         return true;
>- 
>-+    if (pValue->m_bCupsOnly)
>-+        return true;
>-+
>-     OStringBuffer aFeature(256);
>-     aFeature.append( "[{\n" );
>-     if( bUseIncluseFeature )
>+@@ -1150,7 +1154,7 @@
>+             WritePS (pFile, "<< /NumCopies null /Policies << /NumCopies 1 >> >> setpagedevice\n" );
>+     }
>+ 
>+-    bool bFeatureSuccess = writeFeatureList( pFile, rJob, true );
>++    bool bFeatureSuccess = !rJob.m_bCupsJob ? writeFeatureList( pFile, rJob, true ) : true;
>+ 
>+     WritePS (pFile, "%%EndSetup\n");
>+ 
> Index: inc/psprint/ppdparser.hxx
> ===================================================================
> RCS file: /cvs/gsl/psprint/inc/psprint/ppdparser.hxx,v
>@@ -22,12 +90,11 @@
> diff -u -r1.9 ppdparser.hxx
> --- openoffice.org.orig/psprint/inc/psprint/ppdparser.hxx	8 Sep 2005 16:34:44 -0000	1.9
> +++ openoffice.org/psprint/inc/psprint/ppdparser.hxx	19 May 2006 13:15:15 -0000
>-@@ -61,6 +61,8 @@
>+@@ -61,6 +61,7 @@
>      String          m_aOptionTranslation;
>      String          m_aValue;
>      String          m_aValueTranslation;
>-+    bool            m_bCupsOnly;
>-+    PPDValue() : m_eType(eInvocation), m_bCupsOnly(false) {}
>++    PPDValue() : m_eType(eInvocation) {}
>  };
>  
>  // ----------------------------------------------------------------------
>@@ -144,7 +211,7 @@
>  // =======================================================================
>  
>  DBG_NAME( JobSetup )
>-@@ -244,6 +245,199 @@
>+@@ -244,6 +245,198 @@
>  		mpData = new ImplJobSetup();
>  
>  	mpData->maValueMap[ rKey ] = rValue;
>@@ -332,13 +399,12 @@
> +			PPDKey* pNewKey = new PPDKey( rKey );
> +            PPDValue* pValue = pNewKey->insertValue(rValue);
> +            pValue->m_eType = eInvocation;
>-+            pValue->m_bCupsOnly = true;
> +            pValue->m_aValue = rValue;
> +			const_cast<PPDParser*>(aInfo.m_pParser)->insertKey( rKey, pNewKey );
> +			aInfo.m_aContext.setValue(pNewKey, pValue);
> +		}
> +	}
>-+
>++    aInfo.m_bCupsJob=true;
> +    copyJobDataToJobSetup( mpData, aInfo );
> +
>  }
>@@ -557,7 +623,7 @@
>  {
>  	FreeResource();
>  
>-@@ -608,6 +656,246 @@
>+@@ -608,6 +656,250 @@
>  
>  // -----------------------------------------------------------------------
>  
>@@ -575,9 +641,13 @@
> +		pPrinter->SetJobCupsKey( String::CreateFromAscii(key+5), String::CreateFromAscii(value));
> +	else if ((!strcmp(key, "reverse")) && (!strcmp(value, "true")))
> +		pPrinter->SetJobCupsKey(String::CreateFromAscii("OutputOrder"), String::CreateFromAscii("Reverse"));
>++	else if ((!strcmp(key, "collate")) && (!strcmp(value, "true")))
>++		pPrinter->SetJobCupsKey(String::CreateFromAscii("Collate"), String::CreateFromAscii("True"));
>++	else if (!strcmp(key, "n-copies"))
>++		pPrinter->SetJobCupsKey(String::CreateFromAscii("Copies"), String::CreateFromAscii(value));
> +}
> +
>-+void ExportAsPDF(const rtl::OUString &rFileURL, sal_Bool, sal_uInt32, PrintDialogRange eRange, const OUString &rRange)
>++void ExportAsPDF(const rtl::OUString &rFileURL, PrintDialogRange eRange, const OUString &rRange)
> +{
> +		Reference < XFramesSupplier > xDesktop =
> +                Reference < XFramesSupplier >(
>@@ -804,7 +874,7 @@
>  short PrintDialog::Execute()
>  {
>  	if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
>-@@ -625,15 +908,308 @@
>+@@ -625,15 +908,309 @@
>  	ImplInitControls();
>  	ImplModifyControlHdl( NULL );
>  
>@@ -1007,10 +1077,11 @@
> +				else
> +					meCheckRange = PRINTDIALOG_ALL;
> +
>-+				SetCopyCount(gtk_print_settings_get_int_with_default (pSettings, GTK_PRINT_SETTINGS_N_COPIES, 1));
>-+				BOOL bGtkCollate = gtk_print_settings_get_collate(pSettings);
>-+				EnableCollate(bGtkCollate);
>-+				CheckCollate(bGtkCollate);
>++				//Tell OOo to only print 1 simple copy, we'll stick everything
>++				//else through cups
>++				SetCopyCount(1);
>++				EnableCollate(false);
>++				CheckCollate(false);
> +
> +				pStr = 0;
> +
>@@ -1022,7 +1093,7 @@
> +					gtk_widget_hide( aHandle.pDialog );
> +					rtl::OUString sFileURL;
> +					FileBase::getFileURLFromSystemPath(sPath, sFileURL);
>-+					ExportAsPDF(sFileURL, IsCollateEnabled(), GetCopyCount(), meCheckRange, maRangeText);
>++					ExportAsPDF(sFileURL, meCheckRange, maRangeText);
> +				}
> +				else
> +				{

Actions: View | Diff

Attachments on bug 216332: 153865 | 153930 | 154009 | 154010 | 154386