ooo-build r13314 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Sun Jul 20 03:49:36 2008
New Revision: 13314
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13314&view=rev

Log:
2008-07-19  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/gtk-fpicker-blank-text-fix-tools.diff: make the texts
	in the GTK native file picker show up again (i#90178).

	* patches/dev300/apply: apply the new patch.


Added:
   trunk/patches/dev300/gtk-fpicker-blank-text-fix-tools.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Sun Jul 20 03:49:36 2008
@@ -1363,6 +1363,10 @@
 # Missing accel in Gtk+ fpicker. n#354447
 fpicker-gtk-accel-n354447.diff, n#354447, hub
 
+[ Fpickers ]
+# Fix blank texts in GTK fpicker dialogs.
+gtk-fpicker-blank-text-fix-tools.diff, i#90178, kohei
+
 [ AddressBooks ]
 
 # Evolution should also be default database(n#66217).

Added: trunk/patches/dev300/gtk-fpicker-blank-text-fix-tools.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/gtk-fpicker-blank-text-fix-tools.diff	Sun Jul 20 03:49:36 2008
@@ -0,0 +1,13 @@
+diff --git tools/inc/tools/resmgr.hxx tools/inc/tools/resmgr.hxx
+index cfc575c..94b6cb2 100644
+--- tools/inc/tools/resmgr.hxx
++++ tools/inc/tools/resmgr.hxx
+@@ -38,7 +38,7 @@
+ #include <com/sun/star/lang/Locale.hpp>
+ 
+ #define CREATEVERSIONRESMGR_NAME( Name )   #Name
+-#define CREATEVERSIONRESMGR( Name ) 	   ResMgr::CreateResMgr( #Name )
++#define CREATEVERSIONRESMGR( Name )        ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( Name ) )
+ 
+ #define LOCALE_MAX_FALLBACK 6
+