rpms/openoffice.org/devel openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.19, 1.20 openoffice.org.spec, 1.1011, 1.1012

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 
	openoffice.org.spec 
Log Message:
cupsinitalize crash

openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:
 inc/jobset.hxx                                          |    0 
 inc/print.hxx                                           |    0 
 inc/printdlg.hxx                                        |    0 
 inc/psprint/ppdparser.hxx                               |    0 
 openoffice.org.orig/svtools/source/dialogs/printdlg.src |   10 
 psprint/inc/psprint/ppdparser.hxx                       |    4 
 psprint/source/printer/cupsmgr.cxx                      |   11 
 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 
 source/printer/cupsmgr.cxx                              |    0 
 source/printergfx/printerjob.cxx                        |    0 
 svtools/inc/printdlg.hxx                                |    2 
 svtools/source/dialogs/makefile.mk                      |    4 
 svtools/source/dialogs/printdlg.cxx                     |  516 +++++++++++++++-
 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, 757 insertions(+), 14 deletions(-)

Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	22 Jan 2007 09:27:00 -0000	1.19
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	28 Jan 2007 15:01:13 -0000	1.20
@@ -363,6 +363,18 @@
      
      // check for CUPS server(?) > 1.2
      // since there is no API to query, check for options that were
+@@ -485,9 +486,9 @@
+     // this is needed to check for %%IncludeFeature support
+     // (#i65684#, #i65491#)
+     cups_dest_t* pDest = ((cups_dest_t*)m_pDests);
+-    const char* pOpt = m_pCUPSWrapper->cupsGetOption( "printer-info",
++    const char* pOpt = pDest ? m_pCUPSWrapper->cupsGetOption( "printer-info",
+                                                       pDest->num_options,
+-                                                      pDest->options );
++                                                      pDest->options ) : 0;
+     if( pOpt )
+         m_bUseIncludeFeature = true;
+ 
 @@ -569,6 +570,10 @@
  
      m_pCUPSWrapper->cupsSetPasswordCB( setPasswordCallback );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1011
retrieving revision 1.1012
diff -u -r1.1011 -r1.1012
--- openoffice.org.spec	27 Jan 2007 16:17:12 -0000	1.1011
+++ openoffice.org.spec	28 Jan 2007 15:01:13 -0000	1.1012
@@ -1,6 +1,6 @@
 %define oootag OOF680
 %define ooomilestone 4
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -2584,6 +2584,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Sun Jan 28 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-4.2
+- fix CUPSManager::initialize
+
 * Sat Jan 27 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-4.1
 - next candidate