gnumeric r17064 - in trunk: . plugins/excel

[mortenw svn gnome org]

Author: mortenw
Date: Sun Jan 11 17:14:07 2009
New Revision: 17064
URL: http://svn.gnome.org/viewvc/gnumeric?rev=17064&view=rev

Log:
2009-01-11  Morten Welinder  <terra gnome org>

	* ms-formula-write.c (write_node): Don't introduce parentheses
	around explicit parentheses.  Fixes #567380.



Modified:
   trunk/NEWS
   trunk/plugins/excel/ChangeLog
   trunk/plugins/excel/ms-formula-write.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sun Jan 11 17:14:07 2009
@@ -63,6 +63,7 @@
 	* Sanitize error cases for DAY, MONTH, YEAR.
 	* Fix column-split problem with fixed-width stf import.
 	* Fix problem with deprecated gtk+ stuff in glade files.
+	* Fix xls export problem generating extra ()s.  [#567380]
 
 --------------------------------------------------------------------------
 Gnumeric 1.9.3

Modified: trunk/plugins/excel/ms-formula-write.c
==============================================================================
--- trunk/plugins/excel/ms-formula-write.c	(original)
+++ trunk/plugins/excel/ms-formula-write.c	Sun Jan 11 17:14:07 2009
@@ -683,7 +683,7 @@
 	case GNM_EXPR_OP_ANY_BINARY :
 		if (target_type != XL_ARRAY)
 			target_type = XL_VAL;
-
+		/* Fall through.  */
 	case GNM_EXPR_OP_RANGE_CTOR:
 	case GNM_EXPR_OP_INTERSECT: {
 		int const prec = operations[op].prec;
@@ -794,7 +794,7 @@
 		write_node (pd, expr->unary.value, operations[op].prec,
 			(target_type != XL_ARRAY) ? XL_VAL : XL_ARRAY);
 		push_guint8 (pd, operations[op].xl_op);
-		if (prec <= paren_level)
+		if (op != GNM_EXPR_OP_PAREN && prec <= paren_level)
 			push_guint8 (pd, FORMULA_PTG_PAREN);
 		break;
 	}