rpms/openoffice.org/devel openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.41, 1.42 openoffice.org.spec, 1.1404, 1.1405 pseudoworkspace.valgrind1.patch, 1.26, 1.27

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1574

Modified Files:
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 
	openoffice.org.spec pseudoworkspace.valgrind1.patch 
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/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	23 Jan 2008 08:55:15 -0000	1.41
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	24 Jan 2008 18:47:12 -0000	1.42
@@ -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


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1404
retrieving revision 1.1405
diff -u -r1.1404 -r1.1405
--- openoffice.org.spec	23 Jan 2008 13:14:09 -0000	1.1404
+++ openoffice.org.spec	24 Jan 2008 18:47:12 -0000	1.1405
@@ -1,6 +1,6 @@
 %define oootag OOH680
 %define ooomilestone 4
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -2863,6 +2863,9 @@
 
 
 %changelog
+* Thu Jan 23 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-4.2
+- Resolves: rhbz#429897 one click print with lpr-only backend fix
+
 * Wed Jan 22 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-4.1
 - next milestone
 - drop integrated openoffice.org-2.4.0.ooo83410.solenv.renameserbian.patch

pseudoworkspace.valgrind1.patch:

Index: pseudoworkspace.valgrind1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- pseudoworkspace.valgrind1.patch	20 Jan 2008 20:28:41 -0000	1.26
+++ pseudoworkspace.valgrind1.patch	24 Jan 2008 18:47:12 -0000	1.27
@@ -107,3 +107,56 @@
  		aMemStm.Seek( 0 );
  
  		switch( SotExchange::GetFormatIdFromMimeType( rMimeType ) )
+Index: source/svdraw/svdfppt.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/svdraw/svdfppt.cxx,v
+retrieving revision 1.154
+diff -u -r1.154 svdfppt.cxx
+--- openoffice.org.orig/svx/source/svdraw/svdfppt.cxx	31 Jul 2007 17:32:32 -0000	1.154
++++ openoffice.org/svx/source/svdraw/svdfppt.cxx	23 Jan 2008 20:38:04 -0000
+@@ -526,6 +526,11 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////////////////////////
+ 
++void PptColorSchemeAtom::Clear()
++{
++    memset(&aData[0], 0, 32);
++}
++
+ Color PptColorSchemeAtom::GetColor( USHORT nNum ) const
+ {
+ 	Color aRetval;
+Index: inc/svx/svdfppt.hxx
+===================================================================
+RCS file: /cvs/graphics/svx/inc/svx/svdfppt.hxx,v
+retrieving revision 1.3
+diff -u -r1.3 svdfppt.hxx
+--- openoffice.org.orig/svx/inc/svx/svdfppt.hxx	10 May 2007 14:32:05 -0000	1.3
++++ openoffice.org/svx/inc/svx/svdfppt.hxx	23 Jan 2008 20:39:05 -0000
+@@ -310,6 +310,9 @@
+     BYTE				aData[32];
+ 
+ public:
++						PptColorSchemeAtom () { Clear(); }
++    void				Clear();
++
+ 
+     Color				GetColor( USHORT nNum ) const;
+ 
+Index: source/inc/svdoimp.hxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/inc/svdoimp.hxx,v
+retrieving revision 1.11
+diff -u -r1.11 svdoimp.hxx
+--- openoffice.org.orig/svx/source/inc/svdoimp.hxx	26 Nov 2007 14:51:11 -0000	1.11
++++ openoffice.org/svx/source/inc/svdoimp.hxx	24 Jan 2008 11:57:41 -0000
+@@ -258,7 +258,8 @@
+ 		basegfx::B2DPolyPolygon& rPoLi)
+ 	:	mrLineAttr(rAttr),
+ 		maAreaPolyPolygon(rPoPo),
+-		maLinePolyPolygon(rPoLi)
++		maLinePolyPolygon(rPoLi),
++		mbLineDraft(false)
+ 	{
+ 	}
+