gnumeric r17228 - trunk/src

[mortenw svn gnome org]

Author: mortenw
Date: Fri Mar 20 13:19:17 2009
New Revision: 17228
URL: http://svn.gnome.org/viewvc/gnumeric?rev=17228&view=rev

Log:
Simplify



Modified:
   trunk/src/workbook-view.c

Modified: trunk/src/workbook-view.c
==============================================================================
--- trunk/src/workbook-view.c	(original)
+++ trunk/src/workbook-view.c	Fri Mar 20 13:19:17 2009
@@ -288,8 +288,9 @@
 		GnmRange corner;
 		GnmRange const *r;
 
-		if (NULL == (r = gnm_sheet_merge_contains_pos (sv->sheet, &sv->edit_pos)))
-			r = range_init_cellpos_size (&corner, &sv->edit_pos, 1, 1);
+		r = gnm_sheet_merge_contains_pos (sv->sheet, &sv->edit_pos);
+		if (r == NULL)
+			r = range_init_cellpos (&corner, &sv->edit_pos);
 		wbv->validation_combo = gnm_validation_combo_new (val, sv);
 		sheet_object_anchor_init (&anchor, r, a_offsets,
 			GOD_ANCHOR_DIR_DOWN_RIGHT);