[gnumeric: 2/2] Merge branch 'outline'

[Jean Bréfort <jbrefort src gnome org>]

commit e10dd59e0ac13c00a1961bffa79f60f93213050e
Merge: d18eb2b... 8d8ca74...
Author: Jean Brefort <jean brefort normalesup org>
Date:   Mon Aug 31 19:24:17 2009 +0200

    Merge branch 'outline'
    
    Conflicts:
    	ChangeLog

 ChangeLog                          |   13 +++++++++++++
 plugins/excel/ChangeLog            |    9 +++++++++
 plugins/excel/ms-chart.c           |   24 ++++++++----------------
 plugins/excel/ms-excel-read.c      |    6 +++---
 plugins/excel/ms-excel-write.c     |    4 +---
 plugins/excel/xlsx-read.c          |    2 --
 src/dialogs/ChangeLog              |    7 +++++++
 src/dialogs/dialog-autoformat.c    |    4 ++--
 src/dialogs/dialog-cell-format.c   |    2 +-
 src/dialogs/dialog-printer-setup.c |   16 ++++++++--------
 src/gnm-pane.c                     |    8 ++++----
 src/gnm-so-filled.c                |   28 ++++++++++++++--------------
 src/gnm-so-polygon.c               |    8 ++++----
 src/item-edit.c                    |    4 ++--
 src/sheet-object-cell-comment.c    |    2 +-
 src/sheet-object-image.c           |    2 +-
 16 files changed, 78 insertions(+), 61 deletions(-)
---
diff --cc ChangeLog
index 9b5875b,493647d..89543ce
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,16 +1,21 @@@
+ 2009-08-31  Jean Brefort  <jean brefort normalesup org>
+ 
+ 	* src/gnm-pane.c (new_control_point), (set_acetate_coords):
+ 	replace GOStyle::outline.
+ 	* src/gnm-so-filled.c (sof_default_style),
+ 	(gnm_so_filled_draw_cairo), (gnm_so_filled_read_xml_dom),
+ 	(gnm_so_filled_write_xml_sax), (gnm_so_filled_prep_sax_parser):
+ 	* src/gnm-so-polygon.c (sop_default_style): ditto.
+ 	* src/item-edit.c (item_edit_draw): fixed cursor position.
+ 	* src/sheet-object-cell-comment.c (cell_comment_new_view):
+ 	replace GOStyle::outline.
+ 	* src/sheet-object-image.c (gnm_soi_draw_cairo): ditto.
+ 
 +2009-08-31  Morten Welinder  <terra gnome org>
 +
 +	* src/sheet-control-gui.c (scg_mode_edit): update menu sensitivity
 +	here.  Fixes #593624.
 +
  2009-08-30  Morten Welinder <terra gnome org>
  
  	* configure.in: Post-release bump.