rpms/openoffice.org/F-7 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.35, 1.36 openoffice.org.spec, 1.1197, 1.1198 workspace.fpicker6.patch, 1.4, 1.5

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 
	openoffice.org.spec workspace.fpicker6.patch 
Log Message:
Resolves: ooo#82671 print crash

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-7/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	10 Oct 2007 16:11:56 -0000	1.35
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	17 Oct 2007 11:44:32 -0000	1.36
@@ -287,7 +287,7 @@
  // =======================================================================
  
  DBG_NAME( JobSetup )
-@@ -244,6 +245,229 @@
+@@ -244,6 +245,231 @@
  		mpData = new ImplJobSetup();
  
  	mpData->maValueMap[ rKey ] = rValue;
@@ -440,6 +440,8 @@
 +	if (aInfo.m_pParser)
 +        const_cast<PPDParser*>(aInfo.m_pParser)->Reset();
 +
++    aInfo.m_aContext.rebuildFromStreamBuffer( NULL, 0 );
++
 +    aInfo.m_bCupsJob=false;
 +    copyJobDataToJobSetup( mpData, aInfo );
 +}


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org.spec,v
retrieving revision 1.1197
retrieving revision 1.1198
diff -u -r1.1197 -r1.1198
--- openoffice.org.spec	16 Oct 2007 19:04:44 -0000	1.1197
+++ openoffice.org.spec	17 Oct 2007 11:44:32 -0000	1.1198
@@ -2764,6 +2764,8 @@
 * Tue Oct 16 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.3
 - Resolves: rhbz#335051 visibility semantics just aren't reliable and 
   its behaviour opaque and is effectively useless.
+- Resolves: ooo#82671 print crash
+- Resolves: rhbz#334841 fix "all files" glob in in mail merge picker
 
 * Tue Oct 16 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.2
 - Resolves: rhbz#333201 dangling symlinks

workspace.fpicker6.patch:

Index: workspace.fpicker6.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/workspace.fpicker6.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- workspace.fpicker6.patch	10 Oct 2007 16:11:56 -0000	1.4
+++ workspace.fpicker6.patch	17 Oct 2007 11:44:32 -0000	1.5
@@ -21,7 +21,15 @@
          aSelectedFiles[0] = uritounicode(path);
          g_free(path);
      }
-
+@@ -1913,7 +1922,7 @@
+     static const OUString aStarDot = OUString::createFromAscii( "*." );
+     OUString aTokens;
+ 
+-	bool bAllGlob = !rType.compareToAscii( "*.*" );
++	bool bAllGlob = !rType.compareToAscii( "*.*" ) || !rType.compareToAscii( "*" );
+ 	if (bAllGlob)
+ 		gtk_file_filter_add_pattern( filter, "*" );
+ 	else
 Index: fpicker/source/unx/gnome/SalGtkPicker.cxx
 ===================================================================
 RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkPicker.cxx,v