rpms/openoffice.org/devel openoffice.org.spec, 1.1323, 1.1324 workspace.fpicker6.patch, 1.4, 1.5

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec workspace.fpicker6.patch 
Log Message:
Resolves: rhbz#334841 fix 'all files' glob in in mail merge picker


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1323
retrieving revision 1.1324
diff -u -r1.1323 -r1.1324
--- openoffice.org.spec	16 Oct 2007 07:25:49 -0000	1.1323
+++ openoffice.org.spec	16 Oct 2007 19:28:07 -0000	1.1324
@@ -2791,6 +2791,7 @@
 %changelog
 * Tue Oct 16 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.4
 - Resolves: rhbz#333201 dangling symlinks
+- Resolves: rhbz#334841 fix "all files" glob in in mail merge picker
 
 * Fri Oct 12 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.3
 - reenable prelink-optimized launchers

workspace.fpicker6.patch:

Index: workspace.fpicker6.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.fpicker6.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- workspace.fpicker6.patch	16 Aug 2007 07:04:22 -0000	1.4
+++ workspace.fpicker6.patch	16 Oct 2007 19:28:07 -0000	1.5
@@ -22,6 +22,15 @@
          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