[gnumeric] we need the full extent not just the cells-extent
- From: Andreas J. Guelzow <guelzow src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] we need the full extent not just the cells-extent
- Date: Mon, 13 Jun 2011 02:18:25 +0000 (UTC)
commit 3e0b7832f31740166dc017814e4e3d607c17d2d5
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date: Sun Jun 12 20:17:26 2011 -0600
we need the full extent not just the cells-extent
2011-06-12 Andreas J. Guelzow <aguelzow pyrshep ca>
* openoffice-write.c (odf_write_sheet): we need the full extent not
just the cells-extent
doc/developer/odf-foreign.txt | 5 ++++-
plugins/openoffice/ChangeLog | 5 +++++
plugins/openoffice/openoffice-write.c | 7 +++++--
3 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/doc/developer/odf-foreign.txt b/doc/developer/odf-foreign.txt
index 73dcab1..142ba11 100644
--- a/doc/developer/odf-foreign.txt
+++ b/doc/developer/odf-foreign.txt
@@ -1,7 +1,8 @@
Due to the limitations of the ODF file format we occasionally add foreign elements and attributes to those files. This text documents those elements and attributes.
-Note: Any reference to ODF 1.3 refers tot eh current work-in-progress in the OASIS ODF TC.
+Note: Any reference to ODF 1.3 refers to the current work-in-progress in the OASIS ODF TC.
+*******************************************************************************************
Part 1: In ODF 1.0 and 1.1 files only.
2) Attributes added by GOffice:
@@ -17,6 +18,7 @@ gnm:display-equation
gnm:display-r-square
used instead of the ODF1.2 attribute chart:...
+*******************************************************************************************
Part 2: In ODF 1.0, 1.1 and ODF 1.2 files only.
1) Elements and attributes added by goffice:
@@ -37,6 +39,7 @@ gnm:step-center-x in ODF1.3: step-center-x
gnm:step-center-y in ODF1.3: step-center-y
various attribute values specifying chart:interpolation types
+*******************************************************************************************
Part 3: In any ODF files:
1) Elements and attributes added by goffice:
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index d8d3e35..4fadb10 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-12 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+ * openoffice-write.c (odf_write_sheet): we need the full extent not
+ just the cells-extent
+
2011-06-09 Andreas J. Guelzow <aguelzow pyrshep ca>
* openoffice-read.c (odf_fraction): handle absence of min_i_digits
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 0ca026a..f70de5d 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -3357,11 +3357,14 @@ odf_write_sheet (GnmOOExport *state)
int max_cols = gnm_sheet_get_max_cols (sheet);
int max_rows = gnm_sheet_get_max_rows (sheet);
GnmStyle **col_styles = g_new0 (GnmStyle *, max_cols);
- GnmRange extent, style_extent;
+ GnmRange extent, style_extent, cell_extent;
GSList *sheet_merges = NULL;
GnmPageBreaks *pb = sheet->print_info->page_breaks.v;
- extent = sheet_get_cells_extent (sheet);
+ extent = sheet_get_extent (sheet, FALSE);
+ cell_extent = sheet_get_cells_extent (sheet);
+ extent = range_union (&extent, &cell_extent);
+
style_extent = extent;
/* We only want to get the common column style */
sheet_style_get_extent (sheet, &style_extent, col_styles);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]