[gnumeric: 3/3] Merge branch 'andreas'

[Andreas J. Guelzow <guelzow src gnome org>]

commit 391b11ff8e5c790b13952c008e6c73ee747106c3
Merge: 95aa01c... d915c19...
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Sat May 16 16:54:59 2009 -0600

    Merge branch 'andreas'

 ChangeLog           |    5 +++++
 src/xml-sax-write.c |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --cc ChangeLog
index e072774,f4353b0..202f6be
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,20 -1,10 +1,25 @@@
 +2009-05-16  Morten Welinder  <terra gnome org>
 +
 +	Fix for #490479:
 +
 +	* src/graph.c (gnm_go_data_preferred_fmt): Don't check dep->sheet.
 +
 +	* src/sheet-object.c (cb_sheet_object_invalidate_sheet): Clear
 +	dep->sheet if necessary.
 +
 +	* src/gui-clipboard.c (table_cellregion_read): Invalidate the
 +	sheets in the temporary workbook.
 +
 +	* src/clipboard.c (cellregion_invalidate_sheet): Clear
 +	->origin_sheet if that is what we are invalidating.
 +
  2009-05-16  Andreas J. Guelzow <aguelzow pyrshep ca>
  
+ 	* src/xml-sax-write.c (xml_write_style): since we index into the 
+ 	  array with our enum we should make the order match.
+ 
+ 2009-05-16  Andreas J. Guelzow <aguelzow pyrshep ca>
+ 
  	* schemas/gnumeric-dialogs.schemas.in: fix some long descriptions
  	* schemas/gnumeric-general.schemas.in: ditto
  	* src/gnm-plugin.c: add a translator comment