[gnumeric] xlsx: fix graph bounding box on import.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] xlsx: fix graph bounding box on import.
- Date: Mon, 19 Jan 2015 19:24:53 +0000 (UTC)
commit 3d8becb4b95e662bbea9cc3e501db8fc47e9857a
Author: Morten Welinder <terra gnome org>
Date: Mon Jan 19 14:23:56 2015 -0500
xlsx: fix graph bounding box on import.
The parenthesis in (a ? b : c) * s is important.
NEWS | 3 ++-
plugins/excel/ChangeLog | 3 +++
plugins/excel/xlsx-read-drawing.c | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index 295e3a1..cc4812c 100644
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,8 @@ Morten:
* Fix ADDRESS problem.
* Fix sheet-filter problem with errors. [#742601]
* Improve error handling for .gnumeric a bit.
- * Improve xlsx graph import: line colour; marker size; marker color; no lines.
+ * Improve xlsx graph import: line colour; marker size; marker color;
+ no lines; bounding box.
* Improve xlsx graph export: line style; bar/col direction; marker shape;
marker size; marker color; axis label; chart title.
* Improve xlsx export: default col widths; schema validity.
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index 9611baf..0553bb5 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,5 +1,8 @@
2015-01-19 Morten Welinder <terra gnome org>
+ * xlsx-read-drawing.c (xlsx_drawing_twoCellAnchor_end): Fix
+ operator precedence.
+
* xlsx-write-drawing.c (xlsx_write_one_plot): Use
xlsx_plottype_from_type_name for readability.
diff --git a/plugins/excel/xlsx-read-drawing.c b/plugins/excel/xlsx-read-drawing.c
index 39d9f0e..74ca83a 100644
--- a/plugins/excel/xlsx-read-drawing.c
+++ b/plugins/excel/xlsx-read-drawing.c
@@ -2249,7 +2249,7 @@ xlsx_drawing_twoCellAnchor_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
} else {
cri = sheet_col_get (state->sheet, state->drawing_pos[i]);
/* FIXME: scaling horizontally just like in xlsx_CT_Col */
- size = cri? cri->size_pts: sheet_col_get_default_size_pts (state->sheet) *
1.16191275167785;
+ size = (cri? cri->size_pts: sheet_col_get_default_size_pts (state->sheet)) *
1.16191275167785;
}
coords[i / 2] = (double) state->drawing_pos[i + 1] / 12700. / size;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]