[gnumeric] ods: fix reading of conditions in number format.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] ods: fix reading of conditions in number format.
- Date: Sat, 29 Mar 2014 00:42:04 +0000 (UTC)
commit 26963f97b977e49542b381e4d51436c09a97b629
Author: Morten Welinder <terra gnome org>
Date: Fri Mar 28 20:41:25 2014 -0400
ods: fix reading of conditions in number format.
plugins/openoffice/ChangeLog | 4 ++++
plugins/openoffice/openoffice-read.c | 9 +++------
2 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index c03c906..9881710 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-28 Morten Welinder <terra gnome org>
+
+ * openoffice-read.c (odf_map): Fix condition !=.
+
2014-03-27 Morten Welinder <terra gnome org>
* openoffice-read.c (odf_number_style_end): Simplify building a
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index f7e5b7f..ac97857 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -5171,12 +5171,9 @@ odf_map (GsfXMLIn *xin, xmlChar const **attrs)
if (condition != NULL && style_name != NULL && g_str_has_prefix (condition, "value()")) {
condition += 7;
while (*condition == ' ') condition++;
- if (*condition == '>' || *condition == '<' || *condition == '=') {
- state->conditions = g_slist_prepend (state->conditions, g_strdup (condition));
- state->cond_formats = g_slist_prepend (state->cond_formats,
- g_strdup (style_name));
- return;
- }
+ state->conditions = g_slist_prepend (state->conditions, g_strdup (condition));
+ state->cond_formats = g_slist_prepend (state->cond_formats,
+ g_strdup (style_name));
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]