[gnumeric] Fix ODF roundtrip of conditional formats. [#726201
- From: Andreas J. Guelzow <guelzow src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Fix ODF roundtrip of conditional formats. [#726201
- Date: Thu, 13 Mar 2014 04:06:56 +0000 (UTC)
commit fe69e9ef3368d6b7566e7630ee390b511c8a6273
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date: Wed Mar 12 22:06:23 2014 -0600
Fix ODF roundtrip of conditional formats. [#726201
2014-03-12 Andreas J. Guelzow <aguelzow pyrshep ca>
* openoffice-read.c (oo_style_prop_cell): only set strikethrough
when read
NEWS | 2 +-
plugins/openoffice/ChangeLog | 5 +++++
plugins/openoffice/openoffice-read.c | 6 +++---
3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/NEWS b/NEWS
index d1aff2f..e27723a 100644
--- a/NEWS
+++ b/NEWS
@@ -8,7 +8,7 @@ Andreas:
* Fix fill-alignment export/import to and from ODF. [part of #726035]
* Fix distributed-alignment export to ODF. [part of #726035]
* Fix ODF roundtrip of "center accross selection". [#726010]
- * Improve ODF roundtrip of conditional formats. [part of #726201]
+ * Fix ODF roundtrip of conditional formats. [#726201]
Morten:
* Support volatile functions. [#305798]
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 61d4347..ded9ebc 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,10 @@
2014-03-12 Andreas J. Guelzow <aguelzow pyrshep ca>
+ * openoffice-read.c (oo_style_prop_cell): only set strikethrough
+ when read
+
+2014-03-12 Andreas J. Guelzow <aguelzow pyrshep ca>
+
* openoffice-write.c (odf_write_style_cell_properties): write
repeat-content only when it is defined
* openoffice-read.c (odf_style_set_align_h): don't set the slignment
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index c63e605..73ea1de 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -6356,9 +6356,9 @@ oo_style_prop_cell (GsfXMLIn *xin, xmlChar const **attrs)
gnm_style_set_font_script (style, GO_FONT_SCRIPT_SUB);
}
-
- gnm_style_set_font_strike (style, strike_through_style > 0 ||
- (strike_through_type > 0 && strike_through_style == -1));
+ if (strike_through_style != -1 || strike_through_type != -1)
+ gnm_style_set_font_strike (style, strike_through_style > 0 ||
+ (strike_through_type > 0 && strike_through_style == -1));
if (underline_style > 0) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]