rpms/openoffice.org/F-8 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.38, 1.39 openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch, 1.1, 1.2 openoffice.org.spec, 1.1344, 1.1345

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1643

Modified Files:
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 
	openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch 
	openoffice.org.spec 
Log Message:
Resolves: rhbz#429897 one click print with lpr-only backend fix

openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:

Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-8/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	17 Oct 2007 11:42:07 -0000	1.38
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	24 Jan 2008 18:48:34 -0000	1.39
@@ -526,7 +526,7 @@
 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
-@@ -407,10 +407,15 @@
+@@ -409,10 +409,15 @@
          m_pDests( NULL ),
          m_bNewDests( false )
  {
@@ -543,7 +543,7 @@
  {
      if( m_aDestThread )
      {
-@@ -422,6 +427,11 @@
+@@ -424,6 +429,11 @@
  
      if( m_nDests && m_pDests )
          m_pCUPSWrapper->cupsFreeDests( m_nDests, (cups_dest_t*)m_pDests );
@@ -555,7 +555,7 @@
      delete m_pCUPSWrapper;
  }
  
-@@ -475,9 +485,10 @@
+@@ -477,9 +487,10 @@
  
      // clear old stuff
      m_aCUPSDestMap.clear();
@@ -567,7 +567,7 @@
      
      // check for CUPS server(?) > 1.2
      // since there is no API to query, check for options that were
-@@ -485,9 +496,9 @@
+@@ -487,9 +498,9 @@
      // this is needed to check for %%IncludeFeature support
      // (#i65684#, #i65491#)
      cups_dest_t* pDest = ((cups_dest_t*)m_pDests);
@@ -581,12 +581,20 @@
  
 @@ -569,6 +580,10 @@
  
+         if( it->second.m_aInfo.m_aFeatures.getLength() > 0 )
+             continue;
++
++        if (it->first == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Generic Printer")))
++            continue;
++
+         aRemovePrinters.push_back( it->first );
+     }
+     while( aRemovePrinters.begin() != aRemovePrinters.end() )
+@@ -579,6 +594,7 @@
+ 
      m_pCUPSWrapper->cupsSetPasswordCB( setPasswordCallback );
  #endif // ENABLE_CUPS
 +
-+	addPrinter(rtl::OUString::createFromAscii("Generic Printer"),
-+		rtl::OUString::createFromAscii("SGENPRT"));
-+
  }
  
  #ifdef ENABLE_CUPS

openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch:

Index: openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-8/openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch	21 Jan 2008 17:04:30 -0000	1.1
+++ openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch	24 Jan 2008 18:48:34 -0000	1.2
@@ -3,8 +3,8 @@
 RCS file: /cvs/gsl/vcl/unx/source/gdi/salgdi2.cxx,v
 retrieving revision 1.41
 diff -u -r1.41 salgdi2.cxx
---- openoffice.org.org/vcl/source/gdi/salgdi2.cxx	3 Aug 2007 14:10:03 -0000	1.41
-+++ openoffice.org/vcl/source/gdi/salgdi2.cxx	21 Jan 2008 10:33:05 -0000
+--- openoffice.org.org/vcl/unx/source/gdi/salgdi2.cxx	3 Aug 2007 14:10:03 -0000	1.41
++++ openoffice.org/vcl/unx/source/gdi/salgdi2.cxx	21 Jan 2008 10:33:05 -0000
 @@ -939,6 +939,7 @@
  
      // TODO: used ScopedPic


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-8/openoffice.org.spec,v
retrieving revision 1.1344
retrieving revision 1.1345
diff -u -r1.1344 -r1.1345
--- openoffice.org.spec	21 Jan 2008 17:04:30 -0000	1.1344
+++ openoffice.org.spec	24 Jan 2008 18:48:34 -0000	1.1345
@@ -2835,6 +2835,7 @@
 - Resolves: rhbz#429278 add workspace.sw8u9bf01.patch
 - Resolves: rhbz#428574 add workspace.sw24bf02.patch
 - remove pixmap leak openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch
+- Resolves: rhbz#429897 one click print with lpr-only backend fix
 
 * Fri Jan 11 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.11
 - Resolves: rhbz#426876 add openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch