Commit 9594e4f9 authored by Jean Bréfort's avatar Jean Bréfort Committed by Jean Bréfort

Don't use auto_shape or auto_dash when plot has no marker/line and series

2006-09-30  Jean Brefort  <jean.brefort@normalesup.org>

	* ms-chart.c: (end): Don't use auto_shape or auto_dash when plot has
	no marker/line and series have while importing from excel. [#319727]
parent a5adf684
Gnumeric 1.6.4
Jean Brefort:
* Don't use auto_shape or auto_dash when plot has no marker/line
and series have while importing from excel. [#319727]
Morten:
* Fix sheet-manage dialog crash. [#336165]
* Fix paste from other gnumerics. [#337215]
......@@ -73,7 +77,7 @@ Morten:
* Fix DATE compatibility for bizarre input.
* Cleanup parameter handling in financial functions.
Jon Kre:
Jon Kåre:
* Hand clipboard off to clipboard manager when exiting.
Nick Lamb:
......@@ -232,7 +236,7 @@ Jody:
* Warnings when consolidating single columns. [#308431]
* Improve sync of cell editing and editline for autocomplete. [#308303]
Jon Kre:
Jon Kåre:
* Improve sc/xspread import.
* Export page orientation to Excel.
* Fix top margin/header interaction bug in page setup. [#310055]
......@@ -291,7 +295,7 @@ Jody:
* Delete while editing should not clear the cell. [#165172]
* R1C1 support.
Jon Kre:
Jon Kåre:
* Don't output the xml declaration for xhtml. [#303827]
Michal Kaukic:
......@@ -367,7 +371,7 @@ Jody:
* Add vertical alignment DISTRIBUTED
* Fix xls in/out of rotation
Jon Kre:
Jon Kåre:
* Don't crash on csv file with invalid unicode [#167190]
* Import html hyperlinks as hyperlinks.
* Fix session management bug when gnumeric is minimized. [#166769]
......@@ -783,7 +787,7 @@ Jody:
http://bugzilla.gnome.org/show_bug.cgi?id=114153
* Respect 0 as no-compression for xml export
Jon Kre:
Jon Kåre:
* Fix the CORBA plugin.
* Add pangoft2 dependency.
http://bugzilla.gnome.org/show_bug.cgi?id=153701
......@@ -837,7 +841,7 @@ Jody:
* Add full screen toggle
* Auto recognize csv files < 80 characters long
Jon Kre:
Jon Kåre:
* Export text objects to Excel
Kasal:
......@@ -909,7 +913,7 @@ Jody:
http://bugzilla.gnome.org/show_bug.cgi?id=143724
* Clip large dbf files to compile time file limits
Jon Kre:
Jon Kåre:
* Export images to Excel
* Read images from native Gnumeric format
* Read and save images we cannot render without loss to and
......@@ -1235,7 +1239,7 @@ Jody:
John Gill:
* Add a field menu and keyboard shortcuts to the sort dialog
Jon Kre:
Jon Kåre:
* Fix encoding of author field in summary.
http://bugzilla.gnome.org/show_bug.cgi?id=129702
......@@ -1509,7 +1513,7 @@ Jody:
* XLS import legend position
* Honour and edit manual min/max values for axis
Jon Kre:
Jon Kåre:
* Ensure that scrollbars always show up in font combo when
needed (http://bugzilla.gnome.org/show_bug.cgi?id=121877).
......@@ -1532,7 +1536,7 @@ Jean Brefort:
* Basic SVG renderer for charting engine.
* Implement brightness style gradients
Jon Kre:
Jon Kåre:
* Add 'Save As' entry for graph objects. Support png for now.
* Persist Styles for charting engine.
* Begin to enable support for is_auto
......@@ -1557,7 +1561,7 @@ Jody:
* Fix dynamic depend leak.
* Improve performance when deleting multiple sheets at once.
* Only export a charting style field if it is interesting.
* Hook up the Jean's SVG exporter to Jon Kre's Chart Save As
* Hook up the Jean's SVG exporter to Jon Kåre's Chart Save As
* Bound clipping for xy/bar/col/line/area
* Finish axis life cycle support
......@@ -1659,7 +1663,7 @@ John Gill:
* More XLish heuristics for autofill range selection.
* Support End keys, and XL style 'transition' keys
Jon Kre:
Jon Kåre:
* Improve color combo.
* Fix keynav for various kinds of combos.
* Make splash screen display code clairvoyant.
......@@ -1875,7 +1879,7 @@ Jody:
* Added Skeleton for importing MS Excel XML.
* Changed default toolbar layout to icon only.
Jon Kre:
Jon Kåre:
* Finish UI for managing hyperlinks of various sorts.
* Skip sheet chooser page in text export when there is only
one sheet (Fixes 84791).
......@@ -1922,7 +1926,7 @@ Jody:
* Fix parser's handling of unknown function.
* Remove unnecessary new/free of dates.
Jon Kre:
Jon Kåre:
* Open DB connections read only.
* Improve password dialog.
* Show password dialog also for files given on command line.
......@@ -1971,7 +1975,7 @@ Jody:
* XLS export for autofilters
* Fix print dialog's entry of repeated cols/rows
Jon Kre:
Jon Kåre:
* Separate GUI for showing progress and messages before first
spreadsheet window is displayed.
* Fix 98661.
......@@ -2040,7 +2044,7 @@ Jody:
* Implement intersheet and 3d references for xls97 export
* Fix xls import of 3d external references
Jon Kre:
Jon Kåre:
* Merged File/Open and File/Import
* Remove code which supported the File/Open File/Import
distinction.
......@@ -2194,7 +2198,7 @@ Tim A. Garner:
* Hide hidden data in html export
* In the LaTeX exporter optionally export math in italics
Jon Kre:
Jon Kåre:
* Remove old Python plugin
--------------------------------------------------------------------------
......@@ -2246,7 +2250,7 @@ Morten:
* Fix loading of sheets with error constants in expressions, such
as #REF!
Lutz Mller:
Lutz Müller:
* Drag & Drop sheet re-ordering
--------------------------------------------------------------------------
......@@ -2271,7 +2275,7 @@ Jody:
reading our sheets.
* Partially fix printing images
Jon Kre:
Jon Kåre:
* Port to new libgsf big file api
Jukka:
......@@ -2444,7 +2448,7 @@ Morten:
* Start making Search and Search/Replace UTF-8 safe.
* Resurrect long double support.
Jon Kre:
Jon Kåre:
* Use GsfInput in the Python plugin loader
* Use GsfInput in the Nautilus component
* Open all probe-able file formats from the Nautilus component
......@@ -2503,7 +2507,7 @@ Morten:
* Prevent gcc 2.96 compilation.
* Fix leaks for unknown function stubs.
Jon Kre:
Jon Kåre:
* Install bonobo control
* Merge bonobo control commands into container's menus
* Make bonobo control zoomable
......@@ -2566,7 +2570,7 @@ Jody:
* Start support for filter importing.
* Fix sheetobjects in the presence of panes.
Jon Kre:
Jon Kåre:
* Enable bonobo
* fix hpux build
* Clean up Guile plugin
......@@ -2715,7 +2719,7 @@ Jody:
* Add a sample external data source.
* fix paste-special.
Jon Kre:
Jon Kåre:
* More correct import of "automatic" colors from Excel.
* Export "automatic" colors to Excel.
* Simplify and fix bugs in Excel color import and export.
......@@ -2815,7 +2819,7 @@ Jody:
* Try REALLY hard to find an expression in xml not
marked as being a value.
Jon Kre:
Jon Kåre:
* Added WEEKNUM and ISOWEEKNUM
Morten:
......@@ -3476,7 +3480,7 @@ Jody:
* Partial support for outline mode
* Misc bugs.
Jon Kre:
Jon Kåre:
* New architecture for selecting cell ranges into dialogs.
* Fix dialog placement.
......@@ -3547,7 +3551,7 @@ Morten:
* Column header drawing fix.
* [Linear] Regression fix.
Jon Kre:
Jon Kåre:
* item-edit fix.
Translations:
......@@ -3571,7 +3575,7 @@ Jody:
* Improve pixel matching of XL import.
* Add option to manage printing ranges with only styles.
Jon Kre:
Jon Kåre:
* Improve file save dialog.
Morten:
......@@ -3629,7 +3633,7 @@ Jody:
* More work on expression relocation.
* Bugs.
Jon Kre:
Jon Kåre:
* Improve XL export of non-builtin functions.
Morten:
......@@ -3665,7 +3669,7 @@ Jody:
* Some initial work on an MVC split for workbooks.
* More work on double click fill support.
Jon Kre:
Jon Kåre:
* When format toolbar is vertical, replace font and size
selectors with a button.
......@@ -3710,7 +3714,7 @@ Jody:
John Gill:
* Double click fill support.
Jon Kre:
Jon Kåre:
* Make print work with new gnome-print
* Lots of printing/margin bugs.
......@@ -3781,7 +3785,7 @@ Jody:
* Extend auto-fill to support months and years.
* Some translation bugs.
Jon Kre:
Jon Kåre:
* Tooltips for combo boxes.
* Synchronize list selection with entry field in combo boxes.
* Make units in print setup dialog user selectable.
......
2006-09-30 Jean Brefort <jean.brefort@normalesup.org>
* ms-chart.c: (end): Don't use auto_shape or auto_dash when plot has
no marker/line and series have while importing from excel. [#319727]
2006-03-21 Jody Goldberg <jody@gnome.org>
* Release 1.6.3
......@@ -4117,7 +4122,7 @@
Add support for setting the frozen flag.
(ms_excel_sheet_new) : init the freeze flag here.
2001-07-13 Lutz Mller <urc8@rz.uni-karlsruhe.de>
2001-07-13 Lutz Müller <urc8@rz.uni-karlsruhe.de>
* ms-escher.c (ms_escher_read_ClientData): Syntax and name of
sheet_object_bonobo_load(_persist)_stream changed.
......
......@@ -2210,6 +2210,7 @@ BC_R(end)(XLChartHandler const *handle,
XLChartSeries *eseries;
GogSeries *series;
GogStyle *style;
gboolean plot_has_lines = FALSE, plot_has_marks = FALSE;
/* check series now and create 3d plot if necessary */
if (s->is_surface) {
......@@ -2413,17 +2414,22 @@ not_a_matrix:
if (type != NULL && style->marker.mark != NULL &&
(!strcmp (type, "GogXYPlot") ||
!strcmp (type, "GogLinePlot") ||
!strcmp (type, "GogRadarPlot")))
!strcmp (type, "GogRadarPlot"))) {
plot_has_marks =
go_marker_get_shape (style->marker.mark) != GO_MARKER_NONE;
g_object_set (G_OBJECT (s->plot),
"default-style-has-markers",
style->marker.mark->shape != GO_MARKER_NONE,
plot_has_marks,
NULL);
if (type != NULL && 0 == strcmp (type, "GogXYPlot"))
}
if (type != NULL && 0 == strcmp (type, "GogXYPlot")) {
plot_has_lines = style->line.dash_type != GO_LINE_NONE;
g_object_set (G_OBJECT (s->plot),
"default-style-has-lines",
style->line.width >= 0 &&
style->line.dash_type != GO_LINE_NONE,
plot_has_lines,
NULL);
}
g_object_unref (s->default_plot_style);
s->default_plot_style = NULL;
......@@ -2529,6 +2535,12 @@ not_a_matrix:
/* These avoid warnings when exporting, do we really care? */
style->fill.auto_fore = FALSE;
style->fill.auto_back = FALSE;
} else {
if (!plot_has_marks &&
go_marker_get_shape (style->marker.mark) != GO_MARKER_NONE)
style->marker.auto_shape = FALSE;
if (!plot_has_lines && style->line.dash_type != GO_LINE_NONE)
style->line.auto_dash = FALSE;
}
g_object_set (G_OBJECT (series),
"style", style,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment