rpms/openoffice.org/devel openoffice.org-1.9.121.rh127576.gnomeprintui.patch, 1.11, 1.12 openoffice.org.spec, 1.658, 1.659

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.121.rh127576.gnomeprintui.patch 
	openoffice.org.spec 
Log Message:
give this a whirl

openoffice.org-1.9.121.rh127576.gnomeprintui.patch:
 configuration/ppds/SGENPRT.PS                |    0 
 configuration/psprint.conf                   |    0 
 inc/jobset.hxx                               |    0 
 inc/print.hxx                                |    0 
 psprint/source/printer/cupsmgr.cxx           |   13 
 psprint_config/configuration/ppds/SGENPRT.PS |    3 
 psprint_config/configuration/psprint.conf    |    2 
 source/dialogs/makefile.mk                   |    0 
 source/dialogs/printdlg.cxx                  |    0 
 source/gdi/jobset.cxx                        |    0 
 source/printer/cupsmgr.cxx                   |    0 
 svtools/source/dialogs/makefile.mk           |    4 
 svtools/source/dialogs/printdlg.cxx          |  525 ++++++++++++++++++++++++++-
 svtools/util/makefile.mk                     |    8 
 util/makefile.mk                             |    0 
 vcl/inc/jobset.hxx                           |    1 
 vcl/inc/print.hxx                            |    1 
 vcl/source/gdi/jobset.cxx                    |  194 +++++++++
 18 files changed, 746 insertions(+), 5 deletions(-)

Index: openoffice.org-1.9.121.rh127576.gnomeprintui.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.121.rh127576.gnomeprintui.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openoffice.org-1.9.121.rh127576.gnomeprintui.patch	29 Mar 2006 10:45:00 -0000	1.11
+++ openoffice.org-1.9.121.rh127576.gnomeprintui.patch	11 Apr 2006 12:34:53 -0000	1.12
@@ -5,6 +5,16 @@
 diff -u -p -u -r1.12 cupsmgr.cxx
 --- openoffice.org.orig/psprint/source/printer/cupsmgr.cxx	6 Jun 2005 16:07:42 -0000	1.12
 +++ openoffice.org/psprint/source/printer/cupsmgr.cxx	25 Jul 2005 15:02:37 -0000
+@@ -406,6 +406,9 @@
+ 
+ void CUPSManager::runDests()
+ {
++	if( m_nDests && m_pDests )
++		m_pCUPSWrapper->cupsFreeDests( m_nDests, (cups_dest_t*)m_pDests );
++
+ #if OSL_DEBUG_LEVEL > 1
+     fprintf( stderr, "starting cupsGetDests\n" );
+ #endif
 @@ -475,9 +487,10 @@ void CUPSManager::initialize()
  
      // clear old stuff
@@ -28,6 +38,16 @@
  }
  
  #ifdef ENABLE_CUPS
+@@ -867,6 +870,9 @@
+ 
+     if( bChanged )
++    {
++		runDests();
+         initialize();
++    }
+ 
+     return bChanged;
+ }
 Index: inc/print.hxx
 ===================================================================
 RCS file: /cvs/gsl/vcl/inc/print.hxx,v
@@ -528,7 +548,7 @@
  short PrintDialog::Execute()
  {
  	if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
-@@ -647,6 +832,343 @@ short PrintDialog::Execute()
+@@ -647,6 +832,345 @@ short PrintDialog::Execute()
  	ImplInitControls();
  	ImplModifyControlHdl( NULL );
  
@@ -726,6 +746,8 @@
 +				OUString sOldPrinterName(pPrinter->GetName());
 +				if (sNewPrinterName != sOldPrinterName)
 +				{
++					psp::PrinterInfoManager& rMgr = psp::PrinterInfoManager::get();
++					rMgr.checkPrintersChanged();
 +					USHORT nCount = Printer::GetQueueCount();
 +					USHORT i = 0;
 +					for (i = 0; i < nCount; ++i)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.658
retrieving revision 1.659
diff -u -r1.658 -r1.659
--- openoffice.org.spec	10 Apr 2006 13:18:50 -0000	1.658
+++ openoffice.org.spec	11 Apr 2006 12:34:53 -0000	1.659
@@ -1,6 +1,6 @@
 %define oootag OOB680
 %define ooomilestone 5
-%define rh_rpm_release 8
+%define rh_rpm_release 8.cmc
 
 %define build_fc6 1
 %define build_rhel4 0
@@ -3570,6 +3570,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Tue Apr 11 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.9
+- rh#187939# not detecting changes to CUPS printers during execution
+
 * Mon Apr 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.8
 - rh#188053# more a11y fixes
 - ooo#63583# committed to workspace.atkbridge