gnumeric r17258 - in trunk: . plugins/lotus-123

[mortenw svn gnome org]

Author: mortenw
Date: Tue Mar 31 01:47:53 2009
New Revision: 17258
URL: http://svn.gnome.org/viewvc/gnumeric?rev=17258&view=rev

Log:
2009-03-30  Morten Welinder  <terra gnome org>

	* lotus-formula.c (lotus_placeholder): Lookup name, just in case
	we have already added a placeholder.



Modified:
   trunk/NEWS
   trunk/plugins/lotus-123/ChangeLog
   trunk/plugins/lotus-123/lotus-formula.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Tue Mar 31 01:47:53 2009
@@ -10,6 +10,7 @@
 	* Fix XLS loading crashes.  [#577205] [#577208] [#577259] [#577260]
 	[#577348] [#577351]
 	* Add sorted sheet list to tab menu.
+	* Fix criticals during Lotus load.
 
 --------------------------------------------------------------------------
 Gnumeric 1.9.5

Modified: trunk/plugins/lotus-123/lotus-formula.c
==============================================================================
--- trunk/plugins/lotus-123/lotus-formula.c	(original)
+++ trunk/plugins/lotus-123/lotus-formula.c	Tue Mar 31 01:47:53 2009
@@ -274,7 +274,9 @@
 lotus_placeholder (char const *lname)
 {
 	char *gname = g_strconcat ("LOTUS_", lname, NULL);
-	GnmFunc *func = gnm_func_add_placeholder (NULL, gname, "Lotus ", TRUE);
+	GnmFunc *func = gnm_func_lookup (gname, NULL);
+	if (!func)
+		func = gnm_func_add_placeholder (NULL, gname, "Lotus ", TRUE);
 	g_free (gname);
 	return func;
 }