gnumeric r16294 - in branches/gnumeric-1-8: . src

[mortenw svn gnome org]

Author: mortenw
Date: Fri Jan 25 00:04:44 2008
New Revision: 16294
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16294&view=rev

Log:
2008-01-24  Jean Brefort  <jean brefort normalesup org>

	* src/clipboard.c (paste_object): Fix paste-graph
	problem.  [#507342]



Modified:
   branches/gnumeric-1-8/ChangeLog
   branches/gnumeric-1-8/NEWS
   branches/gnumeric-1-8/src/clipboard.c

Modified: branches/gnumeric-1-8/NEWS
==============================================================================
--- branches/gnumeric-1-8/NEWS	(original)
+++ branches/gnumeric-1-8/NEWS	Fri Jan 25 00:04:44 2008
@@ -1,5 +1,8 @@
 Gnumeric 1.8.1
 
+Jean:
+	* Fix graph paste.  [#507342]
+
 Jody:
 	* Fix cell comment positioning problem.  [#506017]
 

Modified: branches/gnumeric-1-8/src/clipboard.c
==============================================================================
--- branches/gnumeric-1-8/src/clipboard.c	(original)
+++ branches/gnumeric-1-8/src/clipboard.c	Fri Jan 25 00:04:44 2008
@@ -240,8 +240,8 @@
 	SheetObjectAnchor tmp;
 
 	sheet_object_anchor_assign (&tmp, sheet_object_get_anchor (src));
-	if ((pt->paste_flags & PASTE_COMMENTS)) {
-		if (G_OBJECT_TYPE (src) != CELL_COMMENT_TYPE ||
+	if (G_OBJECT_TYPE (src) == CELL_COMMENT_TYPE) {
+		if ((pt->paste_flags & PASTE_COMMENTS) &&
 		    (pt->paste_flags & PASTE_IGNORE_COMMENTS_AT_ORIGIN &&
 		     tmp.cell_bound.start.col == 0  &&
 		     tmp.cell_bound.start.row == 0))