rpms/openoffice.org/FC-6 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.24, 1.25 openoffice.org.spec, 1.933, 1.934

[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-serv26100

Modified Files:
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 
	openoffice.org.spec 
Log Message:
Resolves: rhbz#230993 Won't print to newly discovered printers

openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:
 inc/jobset.hxx                                          |    0 
 inc/print.h                                             |    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                     |  546 +++++++++++++++-
 svtools/source/dialogs/printdlg.hrc                     |    2 
 svtools/util/makefile.mk                                |    8 
 util/makefile.mk                                        |    0 
 vcl/inc/jobset.hxx                                      |    3 
 vcl/inc/print.h                                         |    2 
 vcl/inc/print.hxx                                       |    3 
 vcl/source/gdi/jobset.cxx                               |  194 +++++
 vcl/source/gdi/print.cxx                                |   11 
 28 files changed, 809 insertions(+), 13 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	12 Feb 2007 11:06:38 -0000	1.24
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	15 Mar 2007 12:11:13 -0000	1.25
@@ -325,10 +325,11 @@
 diff -u -r1.23 printdlg.cxx
 --- openoffice.org.orig/svtools/source/dialogs/printdlg.cxx	17 Sep 2006 14:45:21 -0000	1.23
 +++ openoffice.org/svtools/source/dialogs/printdlg.cxx	16 Nov 2006 14:14:35 -0000
-@@ -85,9 +85,55 @@
+@@ -85,9 +85,57 @@
  #include <comphelper/processfactory.hxx>
  #endif
  
++extern void ImplDeletePrnQueueList();
 +#ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_
 +#include <com/sun/star/frame/XFrame.hpp>
 +#endif
@@ -842,6 +843,7 @@
 +									rManager.stopsearch();
 +								    rManager.startsearch();
 +									rManager.checkPrintersChanged(true);
++									ImplDeletePrnQueueList();
 +								}
 +								else
 +								{
@@ -1100,3 +1102,18 @@
      String aFeature( RTL_CONSTASCII_USTRINGPARAM( "[{\n%%BeginFeature: *" ) );
      aFeature += pKey->getKey();
      aFeature += ' ';
+Index: inc/print.h
+===================================================================
+RCS file: /cvs/gsl/vcl/inc/print.h,v
+retrieving revision 1.3
+diff -u -r1.3 print.h
+--- openoffice.org.orig/vcl/inc/print.h	9 Sep 2005 11:15:23 -0000	1.3
++++ openoffice.org/vcl/inc/print.h	15 Mar 2007 12:07:29 -0000
+@@ -82,6 +82,6 @@
+ // - Prototypes -
+ // --------------
+ 
+-void ImplDeletePrnQueueList();
++VCL_DLLPUBLIC void ImplDeletePrnQueueList();
+ 
+ #endif // _SV_PRINT_H


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v
retrieving revision 1.933
retrieving revision 1.934
diff -u -r1.933 -r1.934
--- openoffice.org.spec	13 Mar 2007 11:32:40 -0000	1.933
+++ openoffice.org.spec	15 Mar 2007 12:11:13 -0000	1.934
@@ -1,6 +1,6 @@
 %define oootag OOD680
 %define ooomilestone 5
-%define rh_rpm_release 5.16
+%define rh_rpm_release 5.17
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -2583,6 +2583,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Thu Mar 15 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.17
+- Resolves: rhbz#230993 Won't print to newly discovered printers
+
 * Tue Mar 13 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.16
 - Resolves: rhbz#231788 exiting bibliography on x86_64 crash