gnumeric r17175 - in trunk: . src

[guelzow svn gnome org]

Author: guelzow
Date: Thu Mar  5 04:09:44 2009
New Revision: 17175
URL: http://svn.gnome.org/viewvc/gnumeric?rev=17175&view=rev

Log:
2009-03-04  Andreas J. Guelzow <aguelzow pyrshep ca>

	* src/sheet.c (sheet_get_printarea): If the print area has been set 
	  to something other than the full sheet, always use the whole
	  print area.




Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/src/sheet.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Thu Mar  5 04:09:44 2009
@@ -2,6 +2,8 @@
 
 Andreas
 	* Fix style critical on latex export [#574125]
+	* Always print the whole printarea even if it has no
+	  content or style. [#554116] [#572818]
 
 Morten:
 	* Fix multihead issues with cell comments.

Modified: trunk/src/sheet.c
==============================================================================
--- trunk/src/sheet.c	(original)
+++ trunk/src/sheet.c	Thu Mar  5 04:09:44 2009
@@ -1751,24 +1751,20 @@
 {
 	static GnmRange const dummy = { { 0,0 }, { 0,0 } };
 	GnmRange r;
-	GnmRange print_area;
-	GnmRange intersect;
 
 	g_return_val_if_fail (IS_SHEET (sheet), dummy);
 
+	if (!ignore_printarea) {
+		r = sheet_get_nominal_printarea (sheet);
+		if (!range_is_full (&r, TRUE) || !range_is_full (&r, FALSE))
+			return r;
+	}
+	
 	r = sheet_get_extent (sheet, TRUE);
 	if (include_styles)
 		sheet_style_get_extent (sheet, &r, NULL);
 
-	if (ignore_printarea)
-		return r;
-
-	print_area = sheet_get_nominal_printarea (sheet);
-
-	if (range_intersection (&intersect, &r, &print_area))
-		return intersect;
-
-	return dummy;
+	return r;
 }
 
 struct cb_fit {