rpms/openoffice.org/FC-6 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.20, 1.21

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv8658

Modified Files:
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 
Log Message:
api different in 2.0.X

openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:
 inc/jobset.hxx                                          |    0 
 inc/print.hxx                                           |    0 
 inc/printdlg.hxx                                        |    0 
 openoffice.org.orig/svtools/source/dialogs/printdlg.src |   10 
 psprint/inc/cupsmgr.hxx                                 |    2 
 psprint/inc/psprint/ppdparser.hxx                       |    4 
 psprint/inc/psprint/printerinfomanager.hxx              |    2 
 psprint/source/printer/cupsmgr.cxx                      |   18 
 psprint/source/printer/printerinfomanager.cxx           |    8 
 psprint/source/printergfx/printerjob.cxx                |    3 
 source/dialogs/makefile.mk                              |    0 
 source/dialogs/printdlg.cxx                             |    0 
 source/dialogs/printdlg.hrc                             |    0 
 source/dialogs/printdlg.src                             |    0 
 source/gdi/jobset.cxx                                   |    0 
 source/gdi/print.cxx                                    |    0 
 svtools/inc/printdlg.hxx                                |    2 
 svtools/source/dialogs/makefile.mk                      |    4 
 svtools/source/dialogs/printdlg.cxx                     |  541 +++++++++++++++-
 svtools/source/dialogs/printdlg.hrc                     |    2 
 svtools/util/makefile.mk                                |    8 
 util/makefile.mk                                        |    0 
 vcl/inc/jobset.hxx                                      |    3 
 vcl/inc/print.hxx                                       |    3 
 vcl/source/gdi/jobset.cxx                               |  194 +++++
 vcl/source/gdi/print.cxx                                |   11 
 26 files changed, 803 insertions(+), 12 deletions(-)

Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	30 Jan 2007 11:28:36 -0000	1.20
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	30 Jan 2007 13:00:53 -0000	1.21
@@ -634,7 +634,7 @@
  short PrintDialog::Execute()
  {
  	if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
-@@ -625,15 +908,245 @@
+@@ -625,15 +908,256 @@
  	ImplInitControls();
  	ImplModifyControlHdl( NULL );
  
@@ -817,7 +817,18 @@
 +					{
 +						for (int i = 0; i < 2; ++i)
 +						{
-+	                        if (const QueueInfo* pInfo = Printer::GetQueueInfo( sNewPrinterName, false ))
++	                        const QueueInfo* pInfo = 0;
++	                        USHORT nCount = Printer::GetQueueCount();
++	                        for (USHORT j = 0; j < nCount; ++j)
++	                        {
++	                        	const QueueInfo& rInfo = Printer::GetQueueInfo(j, false);
++	                        	if (OUString(rInfo.GetPrinterName()) == sNewPrinterName)
++	                        	{
++	                        		pInfo = &rInfo;
++	                        		break;
++	                        	}
++	                        }
++	                        if (pInfo)
 +	                        {
 +	                            Printer aTempPrinter(*pInfo);
 +	                            mpPrinter->SetPrinterProps(&aTempPrinter);